From a21f8945989e2869de09214629e8b7c96e1341ba Mon Sep 17 00:00:00 2001 From: Romain Bouqueau Date: Fri, 7 Aug 2026 21:39:41 -0400 Subject: [PATCH 1/3] modify PlayReady -> MSPR 2.0 for compatibility --- hash_refs/dash-cenc-pssh-mpd.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hash_refs/dash-cenc-pssh-mpd.hash b/hash_refs/dash-cenc-pssh-mpd.hash index 7dd40604..11442f1d 100644 --- a/hash_refs/dash-cenc-pssh-mpd.hash +++ b/hash_refs/dash-cenc-pssh-mpd.hash @@ -1 +1 @@ -LY҂V- \ No newline at end of file +lNM)f7K7 \ No newline at end of file From 9ffca7d8600559533d3f8a03110f80d1bb1e2f40 Mon Sep 17 00:00:00 2001 From: Romain Bouqueau Date: Sat, 8 Aug 2026 08:20:53 -0400 Subject: [PATCH 2/3] add cpix test --- hash_refs/encryption-cpix-encrypt-cpix.hash | 1 + media/encryption/cpix.xml | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 hash_refs/encryption-cpix-encrypt-cpix.hash create mode 100644 media/encryption/cpix.xml diff --git a/hash_refs/encryption-cpix-encrypt-cpix.hash b/hash_refs/encryption-cpix-encrypt-cpix.hash new file mode 100644 index 00000000..fdf4fd3c --- /dev/null +++ b/hash_refs/encryption-cpix-encrypt-cpix.hash @@ -0,0 +1 @@ +\5I\R|C^ \ No newline at end of file diff --git a/media/encryption/cpix.xml b/media/encryption/cpix.xml new file mode 100644 index 00000000..fa2f87b6 --- /dev/null +++ b/media/encryption/cpix.xml @@ -0,0 +1,19 @@ + + + + + Fzsa6fC/yLr6IPmeug0H2Q== + + + + + AAAAP3Bzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAAB8SEAEjRWeJASNFZ4kBI0VniQEaBWV6ZHJtSOPclZsG + + + I0VYVC1YLUtFWTpNRVRIT0Q9U0FNUExFLUFFUyxVUkk9InNrZDovLzAxMjM0NTY3LTg5MDEtMjM0NS02Nzg5LTAxMjM0NTY3ODkwMTowMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMSIsS0VZRk9STUFUPSJjb20uYXBwbGUuc3RyZWFtaW5na2V5ZGVsaXZlcnkiLEtFWUZPUk1BVFZFUlNJT05TPSIxIg== + + + + + + From 644be31697c8713113af8b86872151c3e3a0dad0 Mon Sep 17 00:00:00 2001 From: Romain Bouqueau Date: Sun, 9 Aug 2026 21:43:40 -0400 Subject: [PATCH 3/3] improve cpix tests --- media/encryption/cpix.xml | 4 ++-- scripts/encryption.sh | 2 ++ scripts/encryption_exotic.sh | 18 ++++++++++++++++++ scripts/iff_crypt.sh | 2 ++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/media/encryption/cpix.xml b/media/encryption/cpix.xml index fa2f87b6..1711896a 100644 --- a/media/encryption/cpix.xml +++ b/media/encryption/cpix.xml @@ -2,12 +2,12 @@ - Fzsa6fC/yLr6IPmeug0H2Q== + Dw4NDAsKCQgHBgUEAwIBAA== - AAAAP3Bzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAAB8SEAEjRWeJASNFZ4kBI0VniQEaBWV6ZHJtSOPclZsG + AAAAP3Bzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAAB8SEAEjRWeJASNFZ4kBI0VniQEaBWFiY2RlSOPclZsG I0VYVC1YLUtFWTpNRVRIT0Q9U0FNUExFLUFFUyxVUkk9InNrZDovLzAxMjM0NTY3LTg5MDEtMjM0NS02Nzg5LTAxMjM0NTY3ODkwMTowMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMSIsS0VZRk9STUFUPSJjb20uYXBwbGUuc3RyZWFtaW5na2V5ZGVsaXZlcnkiLEtFWUZPUk1BVFZFUlNJT05TPSIxIg== diff --git a/scripts/encryption.sh b/scripts/encryption.sh index 4fbd0e3e..ac0b1e23 100755 --- a/scripts/encryption.sh +++ b/scripts/encryption.sh @@ -69,6 +69,8 @@ case $drm in continue ;; *hls_saes* ) continue ;; +*cpix* ) + continue ;; *mkey* ) continue ;; *subs* ) diff --git a/scripts/encryption_exotic.sh b/scripts/encryption_exotic.sh index 116b0af2..f5b7c272 100755 --- a/scripts/encryption_exotic.sh +++ b/scripts/encryption_exotic.sh @@ -24,6 +24,24 @@ test_end test_encrypt_subs +#CPIX DRM configuration +test_encrypt_cpix() +{ +test_begin "encryption-cpix" +if [ $test_skip = 1 ] ; then + return +fi + +cfile=$TEMP_DIR/cpix-crypt.mp4 + +do_test "$GPAC -i $src cecrypt:cfile=$MEDIA_DIR/encryption/cpix.xml @ -o $cfile" "encrypt-cpix" +do_hash_test $cfile "encrypt-cpix" + +test_end +} + +test_encrypt_cpix + #test encryption and decryption of a subset of the subsamples diff --git a/scripts/iff_crypt.sh b/scripts/iff_crypt.sh index e574f02d..7bfe2091 100755 --- a/scripts/iff_crypt.sh +++ b/scripts/iff_crypt.sh @@ -55,6 +55,8 @@ case $drm in continue ;; *clearbytes* ) continue ;; +*cpix* ) + continue ;; *forceclear* ) continue ;; *clear_stsd* )