Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1088)

Unified Diff: media/filters/stream_parser_factory.cc

Issue 2640113004: Introduce Dolby Vision video codec and Demuxer support (Closed)
Patch Set: fix build break on Android Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/ffmpeg_video_decoder.cc ('k') | media/formats/mp4/avc.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/stream_parser_factory.cc
diff --git a/media/filters/stream_parser_factory.cc b/media/filters/stream_parser_factory.cc
index 9c10e364c116d2496672775476c1a1f8fe9e267b..fa079f1aead406d828478c59610329cf32c29ec7 100644
--- a/media/filters/stream_parser_factory.cc
+++ b/media/filters/stream_parser_factory.cc
@@ -60,7 +60,9 @@ struct CodecInfo {
HISTOGRAM_OPUS,
HISTOGRAM_HEVC,
HISTOGRAM_AC3,
- HISTOGRAM_MAX = HISTOGRAM_AC3 // Must be equal to largest logged entry.
+ HISTOGRAM_DOLBYVISION,
+ HISTOGRAM_MAX =
+ HISTOGRAM_DOLBYVISION // Must be equal to largest logged entry.
};
const char* pattern;
@@ -168,6 +170,18 @@ static const CodecInfo kHEVCHEV1CodecInfo = { "hev1.*", CodecInfo::VIDEO, NULL,
static const CodecInfo kHEVCHVC1CodecInfo = { "hvc1.*", CodecInfo::VIDEO, NULL,
CodecInfo::HISTOGRAM_HEVC };
#endif
+#if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
+static const CodecInfo kDolbyVisionAVCCodecInfo1 = {
+ "dva1.*", CodecInfo::VIDEO, NULL, CodecInfo::HISTOGRAM_DOLBYVISION};
+static const CodecInfo kDolbyVisionAVCCodecInfo2 = {
+ "dvav.*", CodecInfo::VIDEO, NULL, CodecInfo::HISTOGRAM_DOLBYVISION};
+#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
+static const CodecInfo kDolbyVisionHEVCCodecInfo1 = {
+ "dvh1.*", CodecInfo::VIDEO, NULL, CodecInfo::HISTOGRAM_DOLBYVISION};
+static const CodecInfo kDolbyVisionHEVCCodecInfo2 = {
+ "dvhe.*", CodecInfo::VIDEO, NULL, CodecInfo::HISTOGRAM_DOLBYVISION};
+#endif
+#endif
static const CodecInfo kMPEG4VP09CodecInfo = {"vp09.*", CodecInfo::VIDEO,
&CheckIfMp4Vp9DemuxingEnabled,
CodecInfo::HISTOGRAM_VP9};
@@ -199,12 +213,18 @@ static const CodecInfo kEAC3CodecInfo3 = {"mp4a.A6", CodecInfo::AUDIO, NULL,
#endif
static const CodecInfo* kVideoMP4Codecs[] = {
- &kH264AVC1CodecInfo, &kH264AVC3CodecInfo,
+ &kH264AVC1CodecInfo, &kH264AVC3CodecInfo,
#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
- &kHEVCHEV1CodecInfo, &kHEVCHVC1CodecInfo,
+ &kHEVCHEV1CodecInfo, &kHEVCHVC1CodecInfo,
+#endif
+#if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
+ &kDolbyVisionAVCCodecInfo1, &kDolbyVisionAVCCodecInfo2,
+#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
+ &kDolbyVisionHEVCCodecInfo1, &kDolbyVisionHEVCCodecInfo2,
+#endif
#endif
- &kMPEG4VP09CodecInfo,
- &kMPEG4AACCodecInfo, &kMPEG2AACLCCodecInfo, NULL};
+ &kMPEG4VP09CodecInfo, &kMPEG4AACCodecInfo,
+ &kMPEG2AACLCCodecInfo, NULL};
static const CodecInfo* kAudioMP4Codecs[] = {&kMPEG4AACCodecInfo,
&kMPEG2AACLCCodecInfo,
« no previous file with comments | « media/filters/ffmpeg_video_decoder.cc ('k') | media/formats/mp4/avc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698