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

Unified Diff: media/filters/stream_parser_factory.cc

Issue 1624703002: Implement support for vp9 in ISO-BMFF (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
Index: media/filters/stream_parser_factory.cc
diff --git a/media/filters/stream_parser_factory.cc b/media/filters/stream_parser_factory.cc
index 92ccbf4fdfc534f3a42f1bcb4cfd0de41a95a281..a4223127a1cad421a9f524a7f478cc68e9f5e380 100644
--- a/media/filters/stream_parser_factory.cc
+++ b/media/filters/stream_parser_factory.cc
@@ -162,6 +162,10 @@ static const CodecInfo kHEVCHEV1CodecInfo = { "hev1.*", CodecInfo::VIDEO, NULL,
static const CodecInfo kHEVCHVC1CodecInfo = { "hvc1.*", CodecInfo::VIDEO, NULL,
CodecInfo::HISTOGRAM_HEVC };
#endif
+#if BUILDFLAG(ENABLE_MP4_VP9_DEMUXING)
+static const CodecInfo kMPEG4VP09CodecInfo = {"vp09.*", CodecInfo::VIDEO, NULL,
+ CodecInfo::HISTOGRAM_VP9};
+#endif
static const CodecInfo kMPEG4AACCodecInfo = { "mp4a.40.*", CodecInfo::AUDIO,
&ValidateMP4ACodecID,
CodecInfo::HISTOGRAM_MPEG4AAC };
@@ -190,11 +194,14 @@ static const CodecInfo kEAC3CodecInfo3 = {"mp4a.A6", CodecInfo::AUDIO, NULL,
#endif
static const CodecInfo* kVideoMP4Codecs[] = {
- &kH264AVC1CodecInfo, &kH264AVC3CodecInfo,
+ &kH264AVC1CodecInfo, &kH264AVC3CodecInfo,
#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
- &kHEVCHEV1CodecInfo, &kHEVCHVC1CodecInfo,
+ &kHEVCHEV1CodecInfo, &kHEVCHVC1CodecInfo,
#endif
- &kMPEG4AACCodecInfo, &kMPEG2AACLCCodecInfo, NULL};
+#if BUILDFLAG(ENABLE_MP4_VP9_DEMUXING)
+ &kMPEG4VP09CodecInfo,
+#endif
+ &kMPEG4AACCodecInfo, &kMPEG2AACLCCodecInfo, NULL};
static const CodecInfo* kAudioMP4Codecs[] = {&kMPEG4AACCodecInfo,
&kMPEG2AACLCCodecInfo,

Powered by Google App Engine
This is Rietveld 408576698