Source release v2.1.1-0-738 + third_party libs

Change-Id: I76e298f8092951d4214c776d6bbcad6b763eb5b2

cdm/include/cdm_host_file.h

@@ -8,13 +8,7 @@
 
 namespace wvcdm {
 
-class IFileFactory {
- protected:
-  IFileFactory(){}
-  virtual ~IFileFactory(){}
- public:
-  virtual File::Impl* NewFileImpl () = 0;
-};
+class IFileFactory;
 
 class File::Impl {
  public:
@@ -38,6 +32,14 @@ class File::Impl {
   std::string fname_;
 };
 
+class IFileFactory {
+ protected:
+  IFileFactory(){File::Impl::RegisterFileFactory(this);}
+  virtual ~IFileFactory(){}
+ public:
+  virtual File::Impl* NewFileImpl () = 0;
+};
+
 } // namespace wvcdm
 
 #endif // WVCDM_CDM_CDM_HOST_FILE_H_

cdm/include/properties_configuration.h

@@ -8,19 +8,16 @@
 
 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
+// Set only one of the two below to true. If secure buffer
 // is selected, fallback to userspace buffers may occur
-// if L1/L2 OEMCrypto APIs fail
-const bool kPropertyOemCryptoUseSecureBuffers = false;
+// if L1/L2 OEMCrypto APIs fail.
+// Note: This is managed in the build configuration.
+const bool kPropertyOemCryptoUseSecureBuffers = PLATFORM_REQUIRES_SECURE_BUFFERS;
 const bool kPropertyOemCryptoUseFifo = true;
-const bool kPropertyOemCryptoUseUserSpaceBuffers = true;
+const bool kPropertyOemCryptoUseUserSpaceBuffers = PLATFORM_USES_CLEAR_BUFFERS;
+
+// If true, the unit tests require OEMCrypto to support usage tables.
+const bool kPropertyOemCryptoRequireUsageTable = false;
 
 // If false, keyboxes will be used as client identification
 // and passed as the token in the license request.
@@ -29,15 +26,6 @@ const bool kPropertyOemCryptoUseUserSpaceBuffers = true;
 // .gypi files if you want your device to use certificates for provisioning.
 const bool kPropertyUseCertificatesAsIdentification = PLATFORM_CERTIFICATE_PROV;
 
-// If false, extraction of widevine PSSH information from the PSSH box
-// takes place external to the CDM. This will become the default behaviour
-// once all platforms support it.
-const bool kExtractPsshData = 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 = true;
-
 // If true, device files will be moved to the directory specified by
 // Properties::GetDeviceFilesBasePath
 const bool kSecurityLevelPathBackwardCompatibilitySupport = false;

cdm/include/wv_cdm_version.h

@@ -1,3 +1,3 @@
 // Widevine CDM Kit Version
- #define WV_CDM_VERSION "v2.0.8-0-679"
+ #define WV_CDM_VERSION "v2.1.1-0-738"
 

cdm/include/wv_content_decryption_module.h

@@ -82,7 +82,6 @@ class WvContentDecryptionModule : public cdm::ContentDecryptionModule,
  public:
   explicit WvContentDecryptionModule(cdm::Host* host)
       : host_(host), host_event_listener_(host, &cdm_engine_) {
-    File::Impl::RegisterFileFactory(this);
     HostClock::SetClockInterface(this);
   }
   virtual ~WvContentDecryptionModule();
@@ -144,8 +143,7 @@ class WvContentDecryptionModule : public cdm::ContentDecryptionModule,
   virtual int64_t GetCurrentTimeInSeconds() {
     return host_->GetCurrentWallTimeInSeconds();
   }
-  cdm::Status DoSubsampleDecrypt(CdmSessionId& session_id,
-                                 CdmDecryptionParameters& parameters,
+  cdm::Status DoSubsampleDecrypt(CdmDecryptionParameters& parameters,
                                  std::vector<uint8_t>& iv,
                                  const cdm::InputBuffer& encrypted_buffer,
                                  cdm::DecryptedBlock* decrypted_block);