From 0861452932b4bd5d8c76f7fba84b337b2c76937e Mon Sep 17 00:00:00 2001
From: KongQun Yang <kqyang@google.com>
Date: Mon, 9 Oct 2017 15:34:20 -0700
Subject: [PATCH] [Test] Rotate key_ids in PSSH as well for key rotation

Note that fixed key / raw key rotation should not be used in production.

Change-Id: I87fca41ebd00f3cadbf157ff129b8e6a9ca04e7c
---
 ...-640x360-a-live-cenc-rotation-golden-2.m4s | Bin 16850 -> 16850 bytes
 ...-640x360-a-live-cenc-rotation-golden-3.m4s | Bin 10472 -> 10472 bytes
 ...-640x360-v-live-cenc-rotation-golden-2.m4s | Bin 122544 -> 122544 bytes
 ...-640x360-v-live-cenc-rotation-golden-3.m4s | Bin 80271 -> 80271 bytes
 packager/media/base/fixed_key_source.cc       |  18 +++++++++++++++---
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/packager/app/test/testdata/bear-640x360-a-live-cenc-rotation-golden-2.m4s b/packager/app/test/testdata/bear-640x360-a-live-cenc-rotation-golden-2.m4s
index 460c2cda5922ec2dcad4aeff05b917c7888f3a9f..b48c322560e05ea4b0dc41dc4a2beff9117c868d 100644
GIT binary patch
delta 31
jcmccA%y_Apaf2_jfRV9@shPQjrGX)sWw<$(xzr8-nk)##

delta 31
icmccA%y_Apaf2_jfT5AGiK&^ng{1+6wK<l#)D8fd`Uu4U

diff --git a/packager/app/test/testdata/bear-640x360-a-live-cenc-rotation-golden-3.m4s b/packager/app/test/testdata/bear-640x360-a-live-cenc-rotation-golden-3.m4s
index ec6f85f521712dbaad1499931e219d26eb1b0f69..dd5d4b9f09a56bde124d14c2605fa5101851b598 100644
GIT binary patch
delta 29
icmaD6_#$w_NhSef6H_yD3rhn-BM{5bX!A`bel-A`><I$^

delta 29
gcmaD6_#$w_NhSe9BV!X&Gjj_|0|;yLO(uRd0GyZ!0{{R3

diff --git a/packager/app/test/testdata/bear-640x360-v-live-cenc-rotation-golden-2.m4s b/packager/app/test/testdata/bear-640x360-v-live-cenc-rotation-golden-2.m4s
index f39ee26d7ed39a1f6212a9b2e23d8bfcb9eeb502..bc4a7695bc3b66d827166ff3862aa45895596c3a 100644
GIT binary patch
delta 35
mcmdn6mwf{eO=J-;GBz<aGq<obFa)y<n-{WdU&zA9e+vN777FeF

delta 35
lcmdn6mwf{eO=J-;G%_|ZH8Z!cG=Q+07qV<$$im2f3jomM3hn>^

diff --git a/packager/app/test/testdata/bear-640x360-v-live-cenc-rotation-golden-3.m4s b/packager/app/test/testdata/bear-640x360-v-live-cenc-rotation-golden-3.m4s
index 4a91b498a4623f678f193a4852bd864b54ef614d..c6ff59c643ae756ac4b187e9ffdb5ff090cabe30 100644
GIT binary patch
delta 35
ocmeDG%+mjvWy3~h0b>(WGjj_|14APa%h0I#AoKQv%#7zu0o!2<i2wiq

delta 35
mcmeDG%+mjvWy3~h0Yf8W6H_yD3rhnCtN9@F_Jhof=S%_H4GW0?

diff --git a/packager/media/base/fixed_key_source.cc b/packager/media/base/fixed_key_source.cc
index 532c73c1bd..b1f30d7871 100644
--- a/packager/media/base/fixed_key_source.cc
+++ b/packager/media/base/fixed_key_source.cc
@@ -62,13 +62,25 @@ Status FixedKeySource::GetCryptoPeriodKey(uint32_t crypto_period_index,
               key->key.begin() + (crypto_period_index % key->key.size()),
               key->key.end());
 
-  for (size_t i = 0; i < key->key_system_info.size(); i++) {
-    std::vector<uint8_t> pssh_data = key->key_system_info[i].pssh_data();
+  for (auto& key_system : key->key_system_info) {
+    std::vector<uint8_t> pssh_data = key_system.pssh_data();
     if (!pssh_data.empty()) {
       std::rotate(pssh_data.begin(),
                   pssh_data.begin() + (crypto_period_index % pssh_data.size()),
                   pssh_data.end());
-      key->key_system_info[i].set_pssh_data(pssh_data);
+      key_system.set_pssh_data(pssh_data);
+    }
+
+    // Rotate the key_ids in pssh as well if exists.
+    // Save a local copy of the key ids before clearing the key ids in
+    // |key_system|. The key ids will be updated and added back later.
+    std::vector<std::vector<uint8_t>> key_ids_copy = key_system.key_ids();
+    key_system.clear_key_ids();
+    for (std::vector<uint8_t>& key_id : key_ids_copy) {
+      std::rotate(key_id.begin(),
+                  key_id.begin() + (crypto_period_index % key_id.size()),
+                  key_id.end());
+      key_system.add_key_id(key_id);
     }
   }