Introduce Dolby Vision video codec and Demuxer support

media/filters/stream_parser_factory.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/stream_parser_factory.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 42 matching lines @@
     HISTOGRAM_VP9,
     HISTOGRAM_VORBIS,
     HISTOGRAM_H264,
     HISTOGRAM_MPEG2AAC,
     HISTOGRAM_MPEG4AAC,
     HISTOGRAM_EAC3,
     HISTOGRAM_MP3,
     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;
   Type type;
   CodecIDValidatorFunction validator;
   HistogramTag tag;
 };
 
 typedef StreamParser* (*ParserFactoryFunction)(
     const std::vector<std::string>& codecs,
@@ skipping 87 matching lines @@
 static const CodecInfo kH264AVC1CodecInfo = { "avc1.*", CodecInfo::VIDEO, NULL,
                                               CodecInfo::HISTOGRAM_H264 };
 static const CodecInfo kH264AVC3CodecInfo = { "avc3.*", CodecInfo::VIDEO, NULL,
                                               CodecInfo::HISTOGRAM_H264 };
 #if BUILDFLAG(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
+#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};
 static const CodecInfo kMPEG4AACCodecInfo = { "mp4a.40.*", CodecInfo::AUDIO,
                                               &ValidateMP4ACodecID,
                                               CodecInfo::HISTOGRAM_MPEG4AAC };
 static const CodecInfo kMPEG2AACLCCodecInfo = { "mp4a.67", CodecInfo::AUDIO,
                                                 NULL,
                                                 CodecInfo::HISTOGRAM_MPEG2AAC };
 #if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
@@ skipping 11 matching lines @@
                                          CodecInfo::HISTOGRAM_AC3};
 static const CodecInfo kEAC3CodecInfo1 = {"ec-3", CodecInfo::AUDIO, NULL,
                                           CodecInfo::HISTOGRAM_EAC3};
 static const CodecInfo kEAC3CodecInfo2 = {"mp4a.a6", CodecInfo::AUDIO, NULL,
                                           CodecInfo::HISTOGRAM_EAC3};
 static const CodecInfo kEAC3CodecInfo3 = {"mp4a.A6", CodecInfo::AUDIO, NULL,
                                           CodecInfo::HISTOGRAM_EAC3};
 #endif
 
 static const CodecInfo* kVideoMP4Codecs[] = {
-    &kH264AVC1CodecInfo,  &kH264AVC3CodecInfo,
+    &kH264AVC1CodecInfo,         &kH264AVC3CodecInfo,
 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
-    &kHEVCHEV1CodecInfo,  &kHEVCHVC1CodecInfo,
+    &kHEVCHEV1CodecInfo,         &kHEVCHVC1CodecInfo,
 #endif
-    &kMPEG4VP09CodecInfo,
-    &kMPEG4AACCodecInfo,  &kMPEG2AACLCCodecInfo, NULL};
+#if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
+    &kDolbyVisionAVCCodecInfo1,  &kDolbyVisionAVCCodecInfo2,
+#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
+    &kDolbyVisionHEVCCodecInfo1, &kDolbyVisionHEVCCodecInfo2,
+#endif
+#endif
+    &kMPEG4VP09CodecInfo,        &kMPEG4AACCodecInfo,
+    &kMPEG2AACLCCodecInfo,       NULL};
 
 static const CodecInfo* kAudioMP4Codecs[] = {&kMPEG4AACCodecInfo,
                                              &kMPEG2AACLCCodecInfo,
 #if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
                                              &kAC3CodecInfo1,
                                              &kAC3CodecInfo2,
                                              &kAC3CodecInfo3,
                                              &kEAC3CodecInfo1,
                                              &kEAC3CodecInfo2,
                                              &kEAC3CodecInfo3,
@@ skipping 246 matching lines @@
                                 CodecInfo::HISTOGRAM_MAX + 1);
     }
 
     stream_parser.reset(factory_function(codecs, media_log));
   }
 
   return stream_parser;
 }
 
 }  // namespace media