Implement support for vp9 in ISO-BMFF

media/filters/stream_parser_factory.cc

Index: media/filters/stream_parser_factory.cc
diff --git a/media/filters/stream_parser_factory.cc b/media/filters/stream_parser_factory.cc
index 87b84540bc758053eee8b927e84f07321cfd39b3..1e6a1295774ee68225af8f95bef1626659a95df1 100644
--- a/media/filters/stream_parser_factory.cc
+++ b/media/filters/stream_parser_factory.cc
@@ -48,8 +48,8 @@ struct CodecInfo {
   // Update tools/metrics/histograms/histograms.xml if new values are added.
   enum HistogramTag {
     HISTOGRAM_UNKNOWN,
-    HISTOGRAM_VP8,
-    HISTOGRAM_VP9,
+    HISTOGRAM_WEBM_VP8,
+    HISTOGRAM_WEBM_VP9,
     HISTOGRAM_VORBIS,
     HISTOGRAM_H264,
     HISTOGRAM_MPEG2AAC,
@@ -59,7 +59,10 @@ struct CodecInfo {
     HISTOGRAM_OPUS,
     HISTOGRAM_HEVC,
     HISTOGRAM_AC3,
-    HISTOGRAM_MAX = HISTOGRAM_AC3  // Must be equal to largest logged entry.
+    HISTOGRAM_MPEG4_VP8,
+    HISTOGRAM_MPEG4_VP9,
+    HISTOGRAM_MAX =
+        HISTOGRAM_MPEG4_VP9  // Must be equal to largest logged entry.
   };
 
   const char* pattern;
@@ -79,9 +82,9 @@ struct SupportedTypeInfo {
 };
 
 static const CodecInfo kVP8CodecInfo = { "vp8", CodecInfo::VIDEO, NULL,
-                                         CodecInfo::HISTOGRAM_VP8 };
+                                         CodecInfo::HISTOGRAM_WEBM_VP8 };
 static const CodecInfo kVP9CodecInfo = { "vp9", CodecInfo::VIDEO, NULL,
-                                         CodecInfo::HISTOGRAM_VP9 };
+                                         CodecInfo::HISTOGRAM_WEBM_VP9 };
 static const CodecInfo kVorbisCodecInfo = { "vorbis", CodecInfo::AUDIO, NULL,
                                             CodecInfo::HISTOGRAM_VORBIS };
 static const CodecInfo kOpusCodecInfo = { "opus", CodecInfo::AUDIO, NULL,
@@ -161,6 +164,12 @@ static const CodecInfo kHEVCHEV1CodecInfo = { "hev1.*", CodecInfo::VIDEO, NULL,
 static const CodecInfo kHEVCHVC1CodecInfo = { "hvc1.*", CodecInfo::VIDEO, NULL,
                                               CodecInfo::HISTOGRAM_HEVC };
 #endif
+#if BUILDFLAG(ENABLE_MP4_VP8_VP9_DEMUXING)
+static const CodecInfo kMPEG4VP08CodecInfo = {"vp08.*", CodecInfo::VIDEO, NULL,
+                                              CodecInfo::HISTOGRAM_MPEG4_VP8};
+static const CodecInfo kMPEG4VP09CodecInfo = {"vp09.*", CodecInfo::VIDEO, NULL,
+                                              CodecInfo::HISTOGRAM_MPEG4_VP9};
+#endif
 static const CodecInfo kMPEG4AACCodecInfo = { "mp4a.40.*", CodecInfo::AUDIO,
                                               &ValidateMP4ACodecID,
                                               CodecInfo::HISTOGRAM_MPEG4AAC };
@@ -193,6 +202,9 @@ static const CodecInfo* kVideoMP4Codecs[] = {
 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
     &kHEVCHEV1CodecInfo, &kHEVCHVC1CodecInfo,
 #endif
+#if BUILDFLAG(ENABLE_MP4_VP8_VP9_DEMUXING)
+    &kMPEG4VP08CodecInfo, &kMPEG4VP09CodecInfo,
+#endif
     &kMPEG4AACCodecInfo, &kMPEG2AACLCCodecInfo, NULL};
 
 static const CodecInfo* kAudioMP4Codecs[] = {&kMPEG4AACCodecInfo,