Implemented HEVC video demuxing and parsing

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 "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 32 matching lines @@
     HISTOGRAM_UNKNOWN,
     HISTOGRAM_VP8,
     HISTOGRAM_VP9,
     HISTOGRAM_VORBIS,
     HISTOGRAM_H264,
     HISTOGRAM_MPEG2AAC,
     HISTOGRAM_MPEG4AAC,
     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;
   Type type;
   CodecIDValidatorFunction validator;
   HistogramTag tag;
 };
 
 typedef StreamParser* (*ParserFactoryFunction)(
     const std::vector<std::string>& codecs,
@@ skipping 69 matching lines @@
       audio_object_type == kAACSBRObjectType ||
       audio_object_type == kAACPSObjectType) {
     return true;
   }
 
   MEDIA_LOG(log_cb) << "Unsupported audio object type " << audio_object_type
                     << " in codec '" << codec_id << "'";
   return false;
 }
 
 static const CodecInfo kH264AVC1CodecInfo = { "avc1.*", CodecInfo::VIDEO, NULL,

[ddorwin, 2015/03/25 01:21:59]

wolenetz: Do we check these against mime_util to make sure it is a valid
supported codec?

[servolk, 2015/03/25 02:20:20]

Unfortunately we don't at the moment. I think we need to unify codec checking,
but first we have to extract media mime type checking from net/.

                                               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 };
 static const CodecInfo kMPEG2AACLCCodecInfo = { "mp4a.67", CodecInfo::AUDIO,
                                                 NULL,
                                                 CodecInfo::HISTOGRAM_MPEG2AAC };
 
 static const CodecInfo* kVideoMP4Codecs[] = {
   &kH264AVC1CodecInfo,
   &kH264AVC3CodecInfo,
+#if defined(ENABLE_HEVC_DEMUXING)
+  &kHEVCHEV1CodecInfo,
+  &kHEVCHVC1CodecInfo,
+#endif
   &kMPEG4AACCodecInfo,
   &kMPEG2AACLCCodecInfo,
   NULL
 };
 
 static const CodecInfo* kAudioMP4Codecs[] = {
   &kMPEG4AACCodecInfo,
   &kMPEG2AACLCCodecInfo,
   NULL
 };
@@ skipping 46 matching lines @@
 
 static StreamParser* BuildADTSParser(
     const std::vector<std::string>& codecs, const LogCB& log_cb) {
   return new ADTSStreamParser();
 }
 
 #if defined(ENABLE_MPEG2TS_STREAM_PARSER)
 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
 };
 
 static StreamParser* BuildMP2TParser(
     const std::vector<std::string>& codecs, const media::LogCB& log_cb) {
   bool has_sbr = false;
   for (size_t i = 0; i < codecs.size(); ++i) {
     std::string codec_id = codecs[i];
@@ skipping 184 matching lines @@
                                 CodecInfo::HISTOGRAM_MAX + 1);
     }
 
     stream_parser.reset(factory_function(codecs, log_cb));
   }
 
   return stream_parser.Pass();
 }
 
 }  // namespace media