951f08c2da
(This is a merge of https://widevine-internal-review.googlesource.com/9711 from the Widevine CDM repo.) This change updates the CDM's handling of init data types, previously known as MIME types, to comply with the latest version of the EME spec. Following this change, in addition to accepting the deprecated MIME types "video/mp4", "audio/mp4", "video/webm", and "audio/webm", the CDM will accept the new standard: Init data types "cenc" and "webm". Furthermore, this removes the non-PSSH-parsing path from the CDM. All platforms have unified on the CDM being responsible for parsing the concatenated PSSH box list, as outlined in the latest EME spec. As Android has shipped code that expects pre-unwrapped PSSH boxes and must maintain backwards-compatibility, code has been inserted on that platform to detect pre-unwrapped data and re-wrap it with a PSSH header before sending it to the CDM. There are some small changes to unit tests because of this change: 1) The CDM Engine unit test now no longer needs to unwrap the PSSH on any platforms when testing ISO-BMFF. It now pre-caches the unwrapped key ID for use when testing WebM. 2) Several substantially-similar unit tests in the Android code have been rolled into one test. Bug: 13564917 Bug: 13570595 Bug: 9465346 Bug: 13570288 Change-Id: I7f27b16b8503f24a26746b5dce71fb61b6fd1bb2
40 lines
1.4 KiB
C++
40 lines
1.4 KiB
C++
// Copyright 2013 Google Inc. All Rights Reserved.
|
|
|
|
#ifndef CDM_BASE_PROPERTIES_CONFIGURATION_H_
|
|
#define CDM_BASE_PROPERTIES_CONFIGURATION_H_
|
|
|
|
#include "wv_cdm_constants.h"
|
|
#include "properties.h"
|
|
|
|
namespace wvcdm {
|
|
|
|
// If false begin license usage on first playback
|
|
const bool kPropertyBeginLicenseUsageWhenReceived = false;
|
|
|
|
// If false, calls to Generate Key request, after the first one,
|
|
// will result in a renewal request being generated
|
|
const bool kPropertyRequireExplicitRenewRequest = false;
|
|
|
|
// Set only one of the three below to true. If secure buffer
|
|
// is selected, fallback to userspace buffers may occur
|
|
// if L1/L2 OEMCrypto APIs fail
|
|
const bool kPropertyOemCryptoUseSecureBuffers = true;
|
|
const bool kPropertyOemCryptoUseFifo = false;
|
|
const bool kPropertyOemCryptoUseUserSpaceBuffers = false;
|
|
|
|
// If false, keyboxes will be used as client identification
|
|
// and passed as the token in the license request
|
|
const bool kPropertyUseCertificatesAsIdentification = true;
|
|
|
|
// If true, session_id parameter to CdmEngine::Decrypt can be empty; the
|
|
// function will try to find out the session_id from the key_id.
|
|
const bool kDecryptWithEmptySessionSupport = false;
|
|
|
|
// If true, device files will be moved to the directory specified by
|
|
// Properties::GetDeviceFilesBasePath
|
|
const bool kSecurityLevelPathBackwardCompatibilitySupport = true;
|
|
|
|
} // namespace wvcdm
|
|
|
|
#endif // CDM_BASE_WV_PROPERTIES_CONFIGURATION_H_
|