diff options
| author | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-15 21:42:30 +0000 |
|---|---|---|
| committer | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-15 21:42:30 +0000 |
| commit | 173a67478ae1edc460b8a67e5e91a15849117fda (patch) | |
| tree | dd335c84a7a146f94037b2811651420d4191fa88 /media | |
| parent | 82c6632d7c983bacb05016813777c039a3de0b55 (diff) | |
| download | chromium_src-173a67478ae1edc460b8a67e5e91a15849117fda.zip chromium_src-173a67478ae1edc460b8a67e5e91a15849117fda.tar.gz chromium_src-173a67478ae1edc460b8a67e5e91a15849117fda.tar.bz2 | |
Revert 235405 "Revert 235337 "media: Enabling Opus playback by d..."
Will change the test expectations instead: crrev.com/71653011
> Revert 235337 "media: Enabling Opus playback by default."
>
> Very likely breaks media/media-can-play-ogg.html and media/media-can-play-webm.html in webkit layout tests. Reverting to confirm.
>
> > media: Enabling Opus playback by default.
> >
> > Flipping the flag for Opus playback from disabled by default
> > to enabled by default. Changing the name of the flag to
> > "disable-opus-playback".
> >
> > TEST=media_unittests
> > BUG=315606
> > TBR=cpu
> >
> > Review URL: https://codereview.chromium.org/62183002
>
> TBR=vigneshv@chromium.org
>
> Review URL: https://codereview.chromium.org/74303002
TBR=zmo@chromium.org
Review URL: https://codereview.chromium.org/63643005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235430 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/media_switches.cc | 4 | ||||
| -rw-r--r-- | media/base/media_switches.h | 2 | ||||
| -rw-r--r-- | media/base/run_all_unittests.cc | 4 | ||||
| -rw-r--r-- | media/filters/stream_parser_factory.cc | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc index 84974f3..3718d96 100644 --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc @@ -12,8 +12,8 @@ const char kAudioBufferSize[] = "audio-buffer-size"; // Enable EAC3 playback in MSE. const char kEnableEac3Playback[] = "enable-eac3-playback"; -// Enables Opus playback in media elements. -const char kEnableOpusPlayback[] = "enable-opus-playback"; +// Disables Opus playback in media elements. +const char kDisableOpusPlayback[] = "disable-opus-playback"; // Disables VP8 Alpha playback in media elements. const char kDisableVp8AlphaPlayback[] = "disable-vp8-alpha-playback"; diff --git a/media/base/media_switches.h b/media/base/media_switches.h index a2c0c91..43b62df 100644 --- a/media/base/media_switches.h +++ b/media/base/media_switches.h @@ -16,7 +16,7 @@ MEDIA_EXPORT extern const char kAudioBufferSize[]; MEDIA_EXPORT extern const char kEnableEac3Playback[]; -MEDIA_EXPORT extern const char kEnableOpusPlayback[]; +MEDIA_EXPORT extern const char kDisableOpusPlayback[]; MEDIA_EXPORT extern const char kDisableVp8AlphaPlayback[]; diff --git a/media/base/run_all_unittests.cc b/media/base/run_all_unittests.cc index fe097f1..f1a0092 100644 --- a/media/base/run_all_unittests.cc +++ b/media/base/run_all_unittests.cc @@ -41,10 +41,6 @@ void TestSuiteNoAtExit::Initialize() { media::InitializeMediaLibraryForTesting(); CommandLine* cmd_line = CommandLine::ForCurrentProcess(); cmd_line->AppendSwitch(switches::kEnableMP3StreamParser); - - // Enable Opus support for all media tests. - // TODO(vigneshv): Remove this once the Opus flag is removed or negated. - cmd_line->AppendSwitch(switches::kEnableOpusPlayback); } int main(int argc, char** argv) { diff --git a/media/filters/stream_parser_factory.cc b/media/filters/stream_parser_factory.cc index 416136b..229cb43 100644 --- a/media/filters/stream_parser_factory.cc +++ b/media/filters/stream_parser_factory.cc @@ -262,7 +262,7 @@ static bool VerifyCodec( #endif if (codec_info->tag == CodecInfo::HISTOGRAM_OPUS) { const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); - if (!cmd_line->HasSwitch(switches::kEnableOpusPlayback)) + if (cmd_line->HasSwitch(switches::kDisableOpusPlayback)) return false; } if (audio_codecs) |