Enable CBCS

Signed-off-by: kkkuangzh <[email protected]>

Author: kkkuangzh

c2_utils/include/mfx_c2_widevine_crypto_defs.h

@@ -36,20 +36,18 @@ typedef enum OEMCryptoCipherMode {
 
 typedef struct {
     size_t block_offset;
-    IV current_iv;
-    size_t data_length;
     size_t clear_bytes;
     size_t encrypted_bytes;
-    size_t pattern_clear;
-    size_t pattern_encrypted;
 } packet_info;
 
 typedef struct {
     uint32_t pr_magic;
-    uint32_t app_id;
     uint32_t session_id;
+    IV current_iv;
     size_t num_packet_data;
     size_t sample_size;
+    size_t pattern_clear;
+    size_t pattern_encrypted;
     OEMCryptoCipherMode cipher_mode;
     uint8_t hw_key_id[16];
     packet_info* packet_data;

c2_utils/src/mfx_frame_constructor.cpp

@@ -225,13 +225,13 @@ mfxStatus MfxC2FrameConstructor::LoadSecure(HUCVideoBuffer *hucBuffer, const mfx
         m_decryptConfig.session = hucBuffer->session_id;
         m_decryptConfig.num_subsamples  = hucBuffer->num_packet_data;
         m_decryptConfig.encryption_scheme = GetEncryptionScheme(hucBuffer->cipher_mode);
+        m_decryptConfig.pattern.clear_byte_block = hucBuffer->pattern_clear;
+        m_decryptConfig.pattern.cypher_byte_block = hucBuffer->pattern_encrypted;
         std::memcpy(m_decryptConfig.hw_key_id, hucBuffer->hw_key_id, sizeof(hucBuffer->hw_key_id));
-
-        char* baseAddress = reinterpret_cast<char*>(hucBuffer);
-        packet_info* packet = reinterpret_cast<packet_info*>(baseAddress + sizeof(HUCVideoBuffer) - 8);
-        std::memcpy(m_decryptConfig.iv, packet->current_iv.data(), packet->current_iv.size());
+        std::memcpy(m_decryptConfig.iv, hucBuffer->current_iv.data(), hucBuffer->current_iv.size());
 
         m_decryptConfig.subsamples  = (SubsampleEntry*)malloc(hucBuffer->num_packet_data * sizeof(SubsampleEntry));
+        char* baseAddress = reinterpret_cast<char*>(hucBuffer);
         for (int i = 0; i < hucBuffer->num_packet_data; i++)
         {
             packet_info* packet = reinterpret_cast<packet_info*>(baseAddress + sizeof(HUCVideoBuffer) - 8 + (i * sizeof(packet_info)));
@@ -244,6 +244,8 @@ mfxStatus MfxC2FrameConstructor::LoadSecure(HUCVideoBuffer *hucBuffer, const mfx
             MFX_DEBUG_TRACE_I32(entry.cypher_bytes);
             MFX_DEBUG_TRACE_I32(packet->clear_bytes);
             MFX_DEBUG_TRACE_I32(packet->encrypted_bytes);
+            MFX_DEBUG_TRACE_I32(packet->pattern_clear);
+            MFX_DEBUG_TRACE_I32(packet->pattern_encrypted);
         }
     }