Chromium Code Reviews| 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..10510474e8792caa8b677ed85a8968e1ff4948f4 100644 |
| --- a/media/filters/stream_parser_factory.cc |
| +++ b/media/filters/stream_parser_factory.cc |
| @@ -49,8 +49,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, |
| @@ -60,7 +60,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; |
| @@ -80,9 +83,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, |
| @@ -162,6 +165,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, |
|
ddorwin
2016/02/29 23:57:34
Note: None of your parsing code gets called for MS
|
| + CodecInfo::HISTOGRAM_MPEG4_VP9}; |
| +#endif |
| static const CodecInfo kMPEG4AACCodecInfo = { "mp4a.40.*", CodecInfo::AUDIO, |
| &ValidateMP4ACodecID, |
| CodecInfo::HISTOGRAM_MPEG4AAC }; |
| @@ -194,6 +201,9 @@ static const CodecInfo* kVideoMP4Codecs[] = { |
| #if BUILDFLAG(ENABLE_HEVC_DEMUXING) |
| &kHEVCHEV1CodecInfo, &kHEVCHVC1CodecInfo, |
| #endif |
| +#if BUILDFLAG(ENABLE_MP4_VP9_DEMUXING) |
| + &kMPEG4VP09CodecInfo, |
| +#endif |
| &kMPEG4AACCodecInfo, &kMPEG2AACLCCodecInfo, NULL}; |
| static const CodecInfo* kAudioMP4Codecs[] = {&kMPEG4AACCodecInfo, |