Add EME contentType checks for mp2t

media/base/key_systems.cc

 // Copyright 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/base/key_systems.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 28 matching lines @@
 
 // Mapping between containers and their codecs.
 // Only audio codecs can belong to a "audio/*" mime_type, and only video codecs
 // can belong to a "video/*" mime_type.
 static const NamedCodec kMimeTypeToCodecMasks[] = {
     {"audio/webm", EME_CODEC_WEBM_AUDIO_ALL},
     {"video/webm", EME_CODEC_WEBM_VIDEO_ALL},
 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
     {"audio/mp4", EME_CODEC_MP4_AUDIO_ALL},
     {"video/mp4", EME_CODEC_MP4_VIDEO_ALL},
+#if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
+    {"video/mp2t", EME_CODEC_MP2T_VIDEO_ALL},
+#endif  // BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
 #endif  // BUILDFLAG(USE_PROPRIETARY_CODECS)
 };
 
 // Mapping between codec names and enum values.
 static const NamedCodec kCodecStrings[] = {
     {"opus", EME_CODEC_WEBM_OPUS},      // Opus.
     {"vorbis", EME_CODEC_WEBM_VORBIS},  // Vorbis.
     {"vp8", EME_CODEC_WEBM_VP8},        // VP8.
     {"vp8.0", EME_CODEC_WEBM_VP8},      // VP8.
     {"vp9", EME_CODEC_WEBM_VP9},        // VP9.
     {"vp9.0", EME_CODEC_WEBM_VP9},      // VP9.
     {"vp09", EME_CODEC_COMMON_VP9},     // New multi-part VP9 for WebM and MP4.
 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
     {"mp4a", EME_CODEC_MP4_AAC},  // AAC.
 #if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
     {"ac-3", EME_CODEC_MP4_AC3},   // AC3.
     {"ec-3", EME_CODEC_MP4_EAC3},  // EAC3.
 #endif
-    {"avc1", EME_CODEC_MP4_AVC1},  // AVC1.
-    {"avc3", EME_CODEC_MP4_AVC1},  // AVC3.
+    {"avc1", EME_CODEC_COMMON_AVC1},  // AVC1 for MP4 and MP2T

[ddorwin, 2017/05/17 16:50:17]

The additional comment text seems unnecessary.

+    {"avc3", EME_CODEC_COMMON_AVC1},  // AVC3 for MP4 and MP2T
 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
     {"hev1", EME_CODEC_MP4_HEVC},  // HEV1.
     {"hvc1", EME_CODEC_MP4_HEVC},  // HVC1.
 #endif
 #if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
     {"dva1", EME_CODEC_MP4_DV_AVC},  // DolbyVision AVC
     {"dvav", EME_CODEC_MP4_DV_AVC},  // DolbyVision AVC
 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
     {"dvh1", EME_CODEC_MP4_DV_HEVC},  // DolbyVision HEVC
     {"dvhe", EME_CODEC_MP4_DV_HEVC},  // DolbyVision HEVC
@@ skipping 656 matching lines @@
                                uint32_t mask) {
   KeySystemsImpl::GetInstance()->AddCodecMask(media_type, codec, mask);
 }
 
 MEDIA_EXPORT void AddMimeTypeCodecMask(const std::string& mime_type,
                                        uint32_t mask) {
   KeySystemsImpl::GetInstance()->AddMimeTypeCodecMask(mime_type, mask);
 }
 
 }  // namespace media