Introduce Dolby Vision video codec and Demuxer support

media/filters/stream_parser_factory.cc

Index: media/filters/stream_parser_factory.cc
diff --git a/media/filters/stream_parser_factory.cc b/media/filters/stream_parser_factory.cc
index 0b836dea01a6219b9a582d6dea7add3c5b87d27c..2d17179e7b423c9084484db7577dcb4e47a55296 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,12 @@ 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 kDolbyVisionAVCCodecInfo = {
+    "dvav.*", CodecInfo::VIDEO, NULL, CodecInfo::HISTOGRAM_DOLBYVISION};

[wolenetz, 2017/01/25 23:42:41]

Hmm. Does Dolby Vision support require HEVC support? This doesn't appear to be
enforced, for instance, in BUILD.gn.

[erickung1, 2017/02/03 18:18:31]

Done.

+static const CodecInfo kDolbyVisionHEVCCodecInfo = {
+    "dvhe.*", CodecInfo::VIDEO, NULL, CodecInfo::HISTOGRAM_DOLBYVISION};

[wolenetz, 2017/01/25 23:42:41]

Hmm. Does part of Dolby Vision support also require HEVC support? This doesn't
appear to be enforced, for instance, in BUILD.gn. Or can the two be varied
independently of each other (e.g. dvhe support, but no plain HEVC support)?

[erickung1, 2017/02/03 18:18:31]

Dolby Vision profile 0 requires AVC support
Dolby Vision profile 4 5 7 require HEVC support.

per discussion offline, I'll use #if BUILDFLAG(ENABLE_HEVC_DEMUXING) to protect
dolby vision profiles which are encoded using HEVC

+#endif
 static const CodecInfo kMPEG4VP09CodecInfo = {"vp09.*", CodecInfo::VIDEO,
                                               &CheckIfMp4Vp9DemuxingEnabled,
                                               CodecInfo::HISTOGRAM_VP9};
@@ -199,12 +207,15 @@ 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)
+    &kDolbyVisionAVCCodecInfo, &kDolbyVisionHEVCCodecInfo,
 #endif
-    &kMPEG4VP09CodecInfo,
-    &kMPEG4AACCodecInfo,  &kMPEG2AACLCCodecInfo, NULL};
+    &kMPEG4VP09CodecInfo,      &kMPEG4AACCodecInfo,
+    &kMPEG2AACLCCodecInfo,     NULL};
 
 static const CodecInfo* kAudioMP4Codecs[] = {&kMPEG4AACCodecInfo,
                                              &kMPEG2AACLCCodecInfo,