Merge "Treat the (0,0) Pattern as 'cbcs'" into rvc-dev

libwvdrmengine/cdm/core/src/crypto_session.cpp

@@ -1483,6 +1483,13 @@ CdmResponseType CryptoSession::Decrypt(
   // Convert the pattern descriptor
   OEMCrypto_CENCEncryptPatternDesc oec_pattern{params.pattern.encrypt_blocks,
                                                params.pattern.skip_blocks};
+  // TODO(b/146581957): Remove this workaround once OEMCrypto treats (0,0) as
+  // 'cbcs' instead of 'cbc1'.
+  if (params.cipher_mode == kCipherModeCbc && oec_pattern.encrypt == 0 &&
+      oec_pattern.skip == 0) {
+    // (10, 0) is the preferred pattern for decrypting every block in 'cbcs'
+    oec_pattern.encrypt = 10;
+  }
 
   // Check if a key needs to be selected
   if (is_any_sample_protected) {