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 fd8e92bff0bb56785bcc08ec58e879ddad9d8985..f6514133735e17fa36c8039fc13ffe6967d66c68 100644 |
| --- a/media/filters/stream_parser_factory.cc |
| +++ b/media/filters/stream_parser_factory.cc |
| @@ -50,7 +50,8 @@ struct CodecInfo { |
| HISTOGRAM_EAC3, |
| HISTOGRAM_MP3, |
| HISTOGRAM_OPUS, |
| - HISTOGRAM_MAX = HISTOGRAM_OPUS // Must be equal to largest logged entry. |
| + HISTOGRAM_HEVC, |
| + HISTOGRAM_MAX = HISTOGRAM_HEVC // Must be equal to largest logged entry. |
| }; |
| const char* pattern; |
| @@ -144,6 +145,16 @@ static const CodecInfo kH264AVC1CodecInfo = { "avc1.*", CodecInfo::VIDEO, NULL, |
| CodecInfo::HISTOGRAM_H264 }; |
| static const CodecInfo kH264AVC3CodecInfo = { "avc3.*", CodecInfo::VIDEO, NULL, |
| CodecInfo::HISTOGRAM_H264 }; |
| +#if defined(ENABLE_HEVC_DEMUXING) |
| +static const CodecInfo kHEVCHEV1CodecInfo = { "hev1", CodecInfo::VIDEO, NULL, |
|
ddorwin
2015/02/24 18:07:32
Please don't support the extensionless versions. W
servolk
2015/03/12 19:44:15
Done.
|
| + CodecInfo::HISTOGRAM_HEVC }; |
| +static const CodecInfo kHEVCHEV1CodecInfo2 = { "hev1.*", CodecInfo::VIDEO, NULL, |
| + CodecInfo::HISTOGRAM_HEVC }; |
| +static const CodecInfo kHEVCHVC1CodecInfo = { "hvc1", CodecInfo::VIDEO, NULL, |
| + CodecInfo::HISTOGRAM_HEVC }; |
| +static const CodecInfo kHEVCHVC1CodecInfo2 = { "hvc1.*", CodecInfo::VIDEO, NULL, |
| + CodecInfo::HISTOGRAM_HEVC }; |
| +#endif |
| static const CodecInfo kMPEG4AACCodecInfo = { "mp4a.40.*", CodecInfo::AUDIO, |
| &ValidateMP4ACodecID, |
| CodecInfo::HISTOGRAM_MPEG4AAC }; |
| @@ -154,6 +165,12 @@ static const CodecInfo kMPEG2AACLCCodecInfo = { "mp4a.67", CodecInfo::AUDIO, |
| static const CodecInfo* kVideoMP4Codecs[] = { |
| &kH264AVC1CodecInfo, |
| &kH264AVC3CodecInfo, |
| +#if defined(ENABLE_HEVC_DEMUXING) |
| + &kHEVCHEV1CodecInfo, |
| + &kHEVCHEV1CodecInfo2, |
| + &kHEVCHVC1CodecInfo, |
| + &kHEVCHVC1CodecInfo2, |
| +#endif |
| &kMPEG4AACCodecInfo, |
| &kMPEG2AACLCCodecInfo, |
| NULL |
| @@ -220,6 +237,11 @@ static StreamParser* BuildADTSParser( |
| static const CodecInfo* kVideoMP2TCodecs[] = { |
| &kH264AVC1CodecInfo, |
| &kH264AVC3CodecInfo, |
| +#if defined(ENABLE_HEVC_DEMUXING) |
| + // TODO(servolk): implement ES parser for HEVC in mpeg2ts container |
| + //&kHEVCHEV1CodecInfo, |
| + //&kHEVCHVC1CodecInfo, |
| +#endif |
| &kMPEG4AACCodecInfo, |
| &kMPEG2AACLCCodecInfo, |
| NULL |