fix: minor update to exported C interface for decryption

Pluto-tv · Apr 16, 2024 · f3f020b · f3f020b
1 parent 85350b5
commit f3f020b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/include/packager/live_packager_export.h b/include/packager/live_packager_export.h
@@ -65,6 +65,7 @@ typedef struct LivePackagerConfig {
   int64_t timed_text_decode_time;
 
   /// Decryption parameters
+  bool enable_decryption;
   uint8_t decryption_key[KEY_SIZE];
   uint8_t decryption_key_id[KEY_ID_SIZE];
 } LivePackagerConfig_t;

diff --git a/packager/live_packager_export.cc b/packager/live_packager_export.cc
@@ -19,10 +19,8 @@ LivePackager_t livepackager_new(LivePackagerConfig_t cfg) {
       .segment_number = cfg.segment_number,
       .m2ts_offset_ms = cfg.m2ts_offset_ms,
       .timed_text_decode_time = cfg.timed_text_decode_time,
-      .decryption_key =
-          std::vector(cfg.decryption_key, cfg.decryption_key + KEY_SIZE),
-      .decryption_key_id = std::vector(cfg.decryption_key_id,
-                                       cfg.decryption_key_id + KEY_ID_SIZE),
+      .decryption_key = {},
+      .decryption_key_id = {},
   };
 
   if (cfg.protection_scheme != ENCRYPTION_SCHEME_NONE) {
@@ -31,6 +29,13 @@ LivePackager_t livepackager_new(LivePackagerConfig_t cfg) {
     converted.key_id = std::vector(cfg.key_id, cfg.key_id + KEY_ID_SIZE);
   }
 
+  if (cfg.enable_decryption) {
+    converted.decryption_key =
+        std::vector(cfg.decryption_key, cfg.decryption_key + KEY_SIZE);
+    converted.decryption_key_id =
+        std::vector(cfg.decryption_key_id, cfg.decryption_key_id + KEY_ID_SIZE);
+  }
+
   return new (std::nothrow)
       LivePackager_instance_s{std::make_unique<shaka::LivePackager>(converted)};
 }