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..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, |
|
ddorwin
2016/03/10 18:16:54
Why the extra spaces?
kqyang
2016/03/10 21:05:13
Generated by "git cl format media". Without it, pr
|
| #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, |