diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-06 00:03:51 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-06 00:03:51 +0000 |
| commit | e90b52da219b438647a373c62f22207df809848c (patch) | |
| tree | 78eb5be06ff52e27fc2bfa7470040fd2332ae244 /third_party/widevine | |
| parent | d0adb95ef4798b3c37fd1345d51c7bfedad8b7d0 (diff) | |
| download | chromium_src-e90b52da219b438647a373c62f22207df809848c.zip chromium_src-e90b52da219b438647a373c62f22207df809848c.tar.gz chromium_src-e90b52da219b438647a373c62f22207df809848c.tar.bz2 | |
Add widevine_cdm_version.h to gyp for android.
- EME API works on Chrome build.
- CanPlayType() is suppressed (returns "") by default.
- User can choose to override the CanPlayType() suppression with a flag
"--override-encrypted-media-canplaytype".
- For Android "video/mp4" is supported, while "video/webm" isn't.
BUG=163552
TEST=Tested all scenarios listed above.
R=ddorwin@chromium.org
Review URL: https://codereview.chromium.org/23975003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221548 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/widevine')
| -rw-r--r-- | third_party/widevine/cdm/android/widevine_cdm_version.h | 25 | ||||
| -rw-r--r-- | third_party/widevine/cdm/widevine_cdm.gyp | 5 |
2 files changed, 30 insertions, 0 deletions
diff --git a/third_party/widevine/cdm/android/widevine_cdm_version.h b/third_party/widevine/cdm/android/widevine_cdm_version.h new file mode 100644 index 0000000..d22411e --- /dev/null +++ b/third_party/widevine/cdm/android/widevine_cdm_version.h @@ -0,0 +1,25 @@ +// 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. + +#ifndef WIDEVINE_CDM_VERSION_H_ +#define WIDEVINE_CDM_VERSION_H_ + +#include "third_party/widevine/cdm/widevine_cdm_common.h" + +// Indicates that the Widevine CDM is available. +#define WIDEVINE_CDM_AVAILABLE + +// TODO(ddorwin): Remove when we have CDM availability detection +// (http://crbug.com/224793). +#define DISABLE_WIDEVINE_CDM_CANPLAYTYPE + +// Indicates that ISO BMFF CENC support is available in the Widevine CDM. +// Must be enabled if any of the codecs below are enabled. +#define WIDEVINE_CDM_CENC_SUPPORT_AVAILABLE +// Indicates that AVC1 decoding is available for ISO BMFF CENC. +#define WIDEVINE_CDM_AVC1_SUPPORT_AVAILABLE +// Indicates that AAC decoding is available for ISO BMFF CENC. +#define WIDEVINE_CDM_AAC_SUPPORT_AVAILABLE + +#endif // WIDEVINE_CDM_VERSION_H_ diff --git a/third_party/widevine/cdm/widevine_cdm.gyp b/third_party/widevine/cdm/widevine_cdm.gyp index a4185e6..d9b7e7e 100644 --- a/third_party/widevine/cdm/widevine_cdm.gyp +++ b/third_party/widevine/cdm/widevine_cdm.gyp @@ -38,6 +38,11 @@ 'binaries/win/<(target_arch)/widevinecdm.dll.lib', ], }], + # TODO(xhwang): Enable this for non-Chrome build if necessary. + [ 'OS == "android"', { + 'widevine_cdm_version_h_file%': + 'android/widevine_cdm_version.h', + }], ], }], ], |