Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1274)

Unified Diff: media/filters/stream_parser_factory.cc

Issue 16830004: media: Remove VP9 flag, and enable VP9 support by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nit in generated_resources.grd Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/run_all_unittests.cc ('k') | media/filters/vpx_video_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/stream_parser_factory.cc
diff --git a/media/filters/stream_parser_factory.cc b/media/filters/stream_parser_factory.cc
index 2436ef6e37e1eebd327d315ff467ea03288a60f5..c883f967d9e37b6f9ac8d8f94ea9ca95bfddc1ca 100644
--- a/media/filters/stream_parser_factory.cc
+++ b/media/filters/stream_parser_factory.cc
@@ -200,25 +200,19 @@ static bool VerifyCodec(
const CodecInfo* codec_info,
std::vector<CodecInfo::HistogramTag>* audio_codecs,
std::vector<CodecInfo::HistogramTag>* video_codecs) {
- const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
switch (codec_info->type) {
case CodecInfo::AUDIO:
#if defined(ENABLE_EAC3_PLAYBACK)
- if (codec_info->tag == CodecInfo::HISTOGRAM_EAC3 &&
- !cmd_line->HasSwitch(switches::kEnableEac3Playback)) {
- return false;
+ if (codec_info->tag == CodecInfo::HISTOGRAM_EAC3) {
+ const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+ if (!cmd_line->HasSwitch(switches::kEnableEac3Playback))
+ return false;
}
#endif
if (audio_codecs)
audio_codecs->push_back(codec_info->tag);
return true;
case CodecInfo::VIDEO:
- // TODO(tomfinegan): Remove this check (or negate it, if we just
- // negate the flag) when VP9 is enabled by default.
- if (codec_info->tag == CodecInfo::HISTOGRAM_VP9 &&
- !cmd_line->HasSwitch(switches::kEnableVp9Playback)) {
- return false;
- }
if (video_codecs)
video_codecs->push_back(codec_info->tag);
return true;
« no previous file with comments | « media/base/run_all_unittests.cc ('k') | media/filters/vpx_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698