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

Side by Side Diff: components/cdm/browser/cdm_message_filter_android.cc

Issue 2881443002: Add EME contentType checks for mp2t (Closed)
Patch Set: Created 3 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/cdm/browser/cdm_message_filter_android.h" 5 #include "components/cdm/browser/cdm_message_filter_android.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 19 matching lines...) Expand all
30 struct CodecInfo { 30 struct CodecInfo {
31 SupportedCodecs eme_codec; 31 SupportedCodecs eme_codec;
32 CodecType codec; 32 CodecType codec;
33 const char* container_mime_type; 33 const char* container_mime_type;
34 }; 34 };
35 35
36 const CodecInfo<media::VideoCodec> kVideoCodecsToQuery[] = { 36 const CodecInfo<media::VideoCodec> kVideoCodecsToQuery[] = {
37 {media::EME_CODEC_WEBM_VP8, media::kCodecVP8, "video/webm"}, 37 {media::EME_CODEC_WEBM_VP8, media::kCodecVP8, "video/webm"},
38 {media::EME_CODEC_WEBM_VP9, media::kCodecVP9, "video/webm"}, 38 {media::EME_CODEC_WEBM_VP9, media::kCodecVP9, "video/webm"},
39 #if BUILDFLAG(USE_PROPRIETARY_CODECS) 39 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
40 {media::EME_CODEC_MP4_AVC1, media::kCodecH264, "video/mp4"}, 40 {media::EME_CODEC_COMMON_AVC1, media::kCodecH264, "video/mp4"},
41 #if BUILDFLAG(ENABLE_HEVC_DEMUXING) 41 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
42 {media::EME_CODEC_MP4_HEVC, media::kCodecHEVC, "video/mp4"}, 42 {media::EME_CODEC_MP4_HEVC, media::kCodecHEVC, "video/mp4"},
43 #endif 43 #endif
44 #if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING) 44 #if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
45 {media::EME_CODEC_MP4_DV_AVC, media::kCodecDolbyVision, "video/mp4"}, 45 {media::EME_CODEC_MP4_DV_AVC, media::kCodecDolbyVision, "video/mp4"},
46 #if BUILDFLAG(ENABLE_HEVC_DEMUXING) 46 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
47 {media::EME_CODEC_MP4_DV_HEVC, media::kCodecDolbyVision, "video/mp4"}, 47 {media::EME_CODEC_MP4_DV_HEVC, media::kCodecDolbyVision, "video/mp4"},
48 #endif 48 #endif
49 #endif 49 #endif
50 #endif // BUILDFLAG(USE_PROPRIETARY_CODECS) 50 #endif // BUILDFLAG(USE_PROPRIETARY_CODECS)
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 response->is_persistent_license_supported = 141 response->is_persistent_license_supported =
142 MediaDrmBridge::IsPersistentLicenseTypeSupported(request.key_system); 142 MediaDrmBridge::IsPersistentLicenseTypeSupported(request.key_system);
143 } 143 }
144 144
145 void CdmMessageFilterAndroid::OnGetPlatformKeySystemNames( 145 void CdmMessageFilterAndroid::OnGetPlatformKeySystemNames(
146 std::vector<std::string>* key_systems) { 146 std::vector<std::string>* key_systems) {
147 *key_systems = MediaDrmBridge::GetPlatformKeySystemNames(); 147 *key_systems = MediaDrmBridge::GetPlatformKeySystemNames();
148 } 148 }
149 149
150 } // namespace cdm 150 } // namespace cdm
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698