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

Unified Diff: media/formats/mp4/box_definitions.cc

Issue 2928873002: Enable VP9 in MP4 by default (Closed)
Patch Set: Created 3 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/filters/stream_parser_factory.cc ('k') | media/test/pipeline_integration_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/formats/mp4/box_definitions.cc
diff --git a/media/formats/mp4/box_definitions.cc b/media/formats/mp4/box_definitions.cc
index 329d74e62eaf5a24cd53bc054b4b6c5734d255d6..7e581bc6e2ca460454753a9b28563ef22bfe06e6 100644
--- a/media/formats/mp4/box_definitions.cc
+++ b/media/formats/mp4/box_definitions.cc
@@ -804,21 +804,16 @@ bool VideoSampleEntry::Parse(BoxReader* reader) {
}
#endif // BUILDFLAG(ENABLE_HEVC_DEMUXING)
#endif // BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
- case FOURCC_VP09:
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableVp9InMp4)) {
- DVLOG(2) << __func__ << " parsing VPCodecConfigurationRecord (vpcC)";
- std::unique_ptr<VPCodecConfigurationRecord> vp_config(
- new VPCodecConfigurationRecord());
- RCHECK(reader->ReadChild(vp_config.get()));
- frame_bitstream_converter = nullptr;
- video_codec = kCodecVP9;
- video_codec_profile = vp_config->profile;
- } else {
- MEDIA_LOG(ERROR, reader->media_log()) << "VP9 in MP4 is not enabled.";
- return false;
- }
+ case FOURCC_VP09: {
+ DVLOG(2) << __func__ << " parsing VPCodecConfigurationRecord (vpcC)";
+ std::unique_ptr<VPCodecConfigurationRecord> vp_config(
+ new VPCodecConfigurationRecord());
+ RCHECK(reader->ReadChild(vp_config.get()));
+ frame_bitstream_converter = nullptr;
+ video_codec = kCodecVP9;
+ video_codec_profile = vp_config->profile;
break;
+ }
default:
// Unknown/unsupported format
MEDIA_LOG(ERROR, reader->media_log()) << __func__
@@ -848,10 +843,8 @@ bool VideoSampleEntry::IsFormatValid() const {
case FOURCC_DVA1:
case FOURCC_DVAV:
#endif // BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
- return true;
case FOURCC_VP09:
- return base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableVp9InMp4);
+ return true;
default:
return false;
}
« no previous file with comments | « media/filters/stream_parser_factory.cc ('k') | media/test/pipeline_integration_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698