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

Side by Side Diff: content/renderer/media/crypto/key_systems_info.cc

Issue 23975003: Add widevine_cdm_version.h to gyp for android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: minor fix Created 7 years, 3 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/renderer/media/crypto/key_systems_info.h" 5 #include "content/renderer/media/crypto/key_systems_info.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/renderer/media/crypto/key_systems.h" 8 #include "content/renderer/media/crypto/key_systems.h"
9 #include "third_party/WebKit/public/platform/WebString.h" 9 #include "third_party/WebKit/public/platform/WebString.h"
10 10
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 70
71 AddConcreteSupportedKeySystem( 71 AddConcreteSupportedKeySystem(
72 kWidevineKeySystem, 72 kWidevineKeySystem,
73 false, 73 false,
74 #if defined(ENABLE_PEPPER_CDMS) 74 #if defined(ENABLE_PEPPER_CDMS)
75 kWidevineCdmPluginMimeType, 75 kWidevineCdmPluginMimeType,
76 #elif defined(OS_ANDROID) 76 #elif defined(OS_ANDROID)
77 kWidevineUuid, 77 kWidevineUuid,
78 #endif // defined(ENABLE_PEPPER_CDMS) 78 #endif // defined(ENABLE_PEPPER_CDMS)
79 "com.widevine"); 79 "com.widevine");
80 #if !defined(OS_ANDROID)
xhwang 2013/09/05 17:32:38 We could use something like WIDEVINE_CDM_WEBM_SUPP
ddorwin 2013/09/05 17:48:43 This is all changing, so don't worry about it. (If
80 AddSupportedType(kWidevineKeySystem, "video/webm", "vorbis,vp8,vp8.0"); 81 AddSupportedType(kWidevineKeySystem, "video/webm", "vorbis,vp8,vp8.0");
81 AddSupportedType(kWidevineKeySystem, "audio/webm", "vorbis"); 82 AddSupportedType(kWidevineKeySystem, "audio/webm", "vorbis");
83 #endif // !defined(OS_ANDROID)
82 #if defined(USE_PROPRIETARY_CODECS) && \ 84 #if defined(USE_PROPRIETARY_CODECS) && \
83 defined(WIDEVINE_CDM_CENC_SUPPORT_AVAILABLE) 85 defined(WIDEVINE_CDM_CENC_SUPPORT_AVAILABLE)
84 AddSupportedType(kWidevineKeySystem, "video/mp4", kWidevineVideoMp4Codecs); 86 AddSupportedType(kWidevineKeySystem, "video/mp4", kWidevineVideoMp4Codecs);
85 AddSupportedType(kWidevineKeySystem, "audio/mp4", kWidevineAudioMp4Codecs); 87 AddSupportedType(kWidevineKeySystem, "audio/mp4", kWidevineAudioMp4Codecs);
86 #endif // defined(USE_PROPRIETARY_CODECS) && 88 #endif // defined(USE_PROPRIETARY_CODECS) &&
87 // defined(WIDEVINE_CDM_CENC_SUPPORT_AVAILABLE) 89 // defined(WIDEVINE_CDM_CENC_SUPPORT_AVAILABLE)
88 } 90 }
89 #endif // WIDEVINE_CDM_AVAILABLE 91 #endif // WIDEVINE_CDM_AVAILABLE
90 92
91 93
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 if (key_system == kClearKeyKeySystem) 153 if (key_system == kClearKeyKeySystem)
152 return "ClearKey"; 154 return "ClearKey";
153 #if defined(WIDEVINE_CDM_AVAILABLE) 155 #if defined(WIDEVINE_CDM_AVAILABLE)
154 if (key_system == kWidevineKeySystem) 156 if (key_system == kWidevineKeySystem)
155 return "Widevine"; 157 return "Widevine";
156 #endif // WIDEVINE_CDM_AVAILABLE 158 #endif // WIDEVINE_CDM_AVAILABLE
157 return "Unknown"; 159 return "Unknown";
158 } 160 }
159 161
160 } // namespace content 162 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698