Index: media/filters/stream_parser_factory.cc |
diff --git a/media/filters/stream_parser_factory.cc b/media/filters/stream_parser_factory.cc |
index 1315bd27b2cd50b8ee5559aecda7efb94b3553df..ccf7a17d3f71cd143cc71114a1d6da973f425554 100644 |
--- a/media/filters/stream_parser_factory.cc |
+++ b/media/filters/stream_parser_factory.cc |
@@ -49,7 +49,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,12 @@ 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, |
+ CodecInfo::HISTOGRAM_HEVC }; |
+static const CodecInfo kHEVCHVC1CodecInfo = { "hvc1.*", CodecInfo::VIDEO, NULL, |
+ CodecInfo::HISTOGRAM_HEVC }; |
+#endif |
static const CodecInfo kMPEG4AACCodecInfo = { "mp4a.40.*", CodecInfo::AUDIO, |
&ValidateMP4ACodecID, |
CodecInfo::HISTOGRAM_MPEG4AAC }; |
@@ -154,6 +161,10 @@ static const CodecInfo kMPEG2AACLCCodecInfo = { "mp4a.67", CodecInfo::AUDIO, |
static const CodecInfo* kVideoMP4Codecs[] = { |
&kH264AVC1CodecInfo, |
&kH264AVC3CodecInfo, |
+#if defined(ENABLE_HEVC_DEMUXING) |
+ &kHEVCHEV1CodecInfo, |
+ &kHEVCHVC1CodecInfo, |
+#endif |
&kMPEG4AACCodecInfo, |
&kMPEG2AACLCCodecInfo, |
NULL |
@@ -220,6 +231,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 |
ddorwin
2015/06/12 00:52:27
Remove until we need it. It doesn't sound like we
servolk
2015/06/12 21:57:31
Done.
|
+ //&kHEVCHEV1CodecInfo, |
+ //&kHEVCHVC1CodecInfo, |
+#endif |
&kMPEG4AACCodecInfo, |
&kMPEG2AACLCCodecInfo, |
NULL |