From e0c5874d31f12c2accc14111f9a1d898c9e1cffd Mon Sep 17 00:00:00 2001
From: Kongqun Yang <kqyang@google.com>
Date: Thu, 30 Jun 2016 17:19:21 -0700
Subject: [PATCH] Update encrypted testing content to use common system id

- Also fix a bug in fixed key rotation with empty pssh_data.

Change-Id: I1110b839fc821c5c4778854c0b29032d3ee2d384
---
 packager/app/test/packager_test.py            |   6 ------
 .../bear-320x240-opus-cenc-golden.mp4         | Bin 28343 -> 28347 bytes
 .../bear-320x240-opus-vp9-cenc-golden.mpd     |  20 +++++++++---------
 .../testdata/bear-320x240-vp9-cenc-golden.mp4 | Bin 71874 -> 71878 bytes
 .../testdata/bear-640x360-a-cbc1-golden.mp4   | Bin 44600 -> 44604 bytes
 .../testdata/bear-640x360-a-cbcs-golden.mp4   | Bin 43935 -> 43939 bytes
 .../testdata/bear-640x360-a-cenc-golden.mp4   | Bin 44600 -> 44604 bytes
 .../bear-640x360-a-cenc-golden.mp4.media_info |  12 +++++------
 .../testdata/bear-640x360-a-cens-golden.mp4   | Bin 44600 -> 44604 bytes
 .../bear-640x360-a-live-cenc-golden-init.mp4  | Bin 939 -> 943 bytes
 ...-640x360-a-live-cenc-rotation-golden-1.m4s | Bin 16771 -> 16775 bytes
 ...-640x360-a-live-cenc-rotation-golden-2.m4s | Bin 17251 -> 17255 bytes
 ...-640x360-a-live-cenc-rotation-golden-3.m4s | Bin 10047 -> 10051 bytes
 .../testdata/bear-640x360-av-cbc1-golden.mpd  |  20 +++++++++---------
 .../testdata/bear-640x360-av-cbcs-golden.mpd  |  20 +++++++++---------
 .../testdata/bear-640x360-av-cenc-golden.mpd  |  20 +++++++++---------
 .../bear-640x360-av-cenc-iop-golden.mpd       |  20 +++++++++---------
 .../testdata/bear-640x360-av-cens-golden.mpd  |  20 +++++++++---------
 .../bear-640x360-av-live-cenc-golden.mpd      |   8 +++----
 .../bear-640x360-av-live-cenc-iop-golden.mpd  |   8 +++----
 ...r-640x360-av-live-cenc-rotation-golden.mpd |   8 +++----
 ...0x360-av-live-cenc-rotation-iop-golden.mpd |   8 +++----
 .../bear-640x360-hevc-cenc-golden.mp4         | Bin 92793 -> 92797 bytes
 .../bear-640x360-hevc-cenc-golden.mpd         |  10 ++++-----
 .../testdata/bear-640x360-v-cbc1-golden.mp4   | Bin 302867 -> 302871 bytes
 .../testdata/bear-640x360-v-cbcs-golden.mp4   | Bin 302460 -> 302464 bytes
 .../testdata/bear-640x360-v-cenc-golden.mp4   | Bin 302867 -> 302871 bytes
 .../bear-640x360-v-cenc-golden.mp4.media_info |  12 +++++------
 .../testdata/bear-640x360-v-cens-golden.mp4   | Bin 302867 -> 302871 bytes
 .../bear-640x360-v-live-cenc-golden-init.mp4  | Bin 1063 -> 1067 bytes
 ...-640x360-v-live-cenc-rotation-golden-1.m4s | Bin 99433 -> 99437 bytes
 ...-640x360-v-live-cenc-rotation-golden-2.m4s | Bin 122532 -> 122536 bytes
 ...-640x360-v-live-cenc-rotation-golden-3.m4s | Bin 80259 -> 80263 bytes
 .../testdata/bear-640x360-vp8-cenc-golden.mp4 | Bin 117028 -> 117032 bytes
 .../testdata/bear-640x360-vp8-cenc-golden.mpd |  10 ++++-----
 .../bear-640x360-vp8-cenc-webm-golden.mpd     |   4 ++--
 packager/media/base/fixed_key_source.cc       |  10 +++++----
 37 files changed, 106 insertions(+), 110 deletions(-)

diff --git a/packager/app/test/packager_test.py b/packager/app/test/packager_test.py
index 10e2c092b8..8957a8de4b 100755
--- a/packager/app/test/packager_test.py
+++ b/packager/app/test/packager_test.py
@@ -473,12 +473,6 @@ class PackagerAppTest(unittest.TestCase):
       flags += ['--enable_fixed_key_encryption',
                 '--key_id=31323334353637383930313233343536',
                 '--key=32333435363738393021323334353637', '--clear_lead=1']
-      if not output_hls:
-        pssh_box = ('000000307073736800000000'  # PSSH header
-                    'edef8ba979d64acea3c827dcd51d21ed'  # Widevine system ID
-                    '00000010'  # Data size
-                    '31323334353637383930313233343536')  # Data
-        flags.append('--pssh=' + pssh_box)
 
       if not random_iv:
         flags.append('--iv=3334353637383930')
diff --git a/packager/app/test/testdata/bear-320x240-opus-cenc-golden.mp4 b/packager/app/test/testdata/bear-320x240-opus-cenc-golden.mp4
index 396d04163322175f14b859066bd9d5c11770e84d..913f861695352945b56e9b3ee3693ba299a406bc 100644
GIT binary patch
delta 69
zcmdmfmvQ%9#tG7l>o>|&F&ml`6c=YOGB7X*l)ry-V3RM?n#VSBL63fW1BDn3jf_o9
T&CD$<4InI_7{lhn%wMtqWRDh@

delta 65
zcmdmemvQ@D#tG7lt2fG2G3y!>6c=YO0Kwb$-771vd7WE)LjBHFS;e<NApt`pV-r&|
Pa|=rY2y63k<}X<QNVFII

diff --git a/packager/app/test/testdata/bear-320x240-opus-vp9-cenc-golden.mpd b/packager/app/test/testdata/bear-320x240-opus-vp9-cenc-golden.mpd
index a7f82b57ba..7b14eb85b8 100644
--- a/packager/app/test/testdata/bear-320x240-opus-vp9-cenc-golden.mpd
+++ b/packager/app/test/testdata/bear-320x240-opus-vp9-cenc-golden.mpd
@@ -3,27 +3,27 @@
 <MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" xmlns:cenc="urn:mpeg:cenc:2013" minBufferTime="PT2S" type="static" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" mediaPresentationDuration="PT2.7809998989105225S">
   <Period id="0">
     <AdaptationSet id="0" contentType="audio" subsegmentAlignment="true">
-      <Representation id="0" bandwidth="81534" codecs="opus" mimeType="audio/mp4" audioSamplingRate="48000">
+      <Representation id="0" bandwidth="81545" codecs="opus" mimeType="audio/mp4" audioSamplingRate="48000">
         <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
         <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
-        <ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed">
-          <cenc:pssh>AAAAMHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABAxMjM0NTY3ODkwMTIzNDU2</cenc:pssh>
+        <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+          <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
         </ContentProtection>
         <BaseURL>output_audio.mp4</BaseURL>
-        <SegmentBase indexRange="963-1030" timescale="1000000">
-          <Initialization range="0-962"/>
+        <SegmentBase indexRange="967-1034" timescale="1000000">
+          <Initialization range="0-966"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
     <AdaptationSet id="1" contentType="video" width="320" height="240" frameRate="1000000/34000" subsegmentAlignment="true" par="16:9">
-      <Representation id="1" bandwidth="210158" codecs="vp09.00.00.08.00.01.00.00" mimeType="video/mp4" sar="427:320">
+      <Representation id="1" bandwidth="210170" codecs="vp09.00.00.08.00.01.00.00" mimeType="video/mp4" sar="427:320">
         <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
-        <ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed">
-          <cenc:pssh>AAAAMHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABAxMjM0NTY3ODkwMTIzNDU2</cenc:pssh>
+        <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+          <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
         </ContentProtection>
         <BaseURL>output_video.mp4</BaseURL>
-        <SegmentBase indexRange="1047-1114" timescale="1000000">
-          <Initialization range="0-1046"/>
+        <SegmentBase indexRange="1051-1118" timescale="1000000">
+          <Initialization range="0-1050"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
diff --git a/packager/app/test/testdata/bear-320x240-vp9-cenc-golden.mp4 b/packager/app/test/testdata/bear-320x240-vp9-cenc-golden.mp4
index 88eae2cfab4fc0aa73453dbf1ec379a8d3adf1a3..5563a0bcff5448c08eb5e26b0e78ecd1cd34bbd1 100644
GIT binary patch
delta 73
zcmX@Kk>%J%mI?BV|2Ha}Vm34>C@#)mWME(rD1ZOvz$Ra&HIHrNf*$?$1`0768X23I
XnweWz8bDY;F@|PwmhIv!jH^We&hQpp

delta 69
zcmX@Mk>$`vmI?BVzc(tJV%9Y%C@#)m0D`ygyH{3T^E$Wqg!-MUvWjnkLIQ?H#wMm_
T<`$L)5LUA^%XVoN#?>MKw+$D@

diff --git a/packager/app/test/testdata/bear-640x360-a-cbc1-golden.mp4 b/packager/app/test/testdata/bear-640x360-a-cbc1-golden.mp4
index 7d646ea6ba46961507cfa577dc3c1fbf624b59af..72a64d7631d79100e4644151febec7a912e25e4f 100644
GIT binary patch
delta 69
zcmdmShiT6prU}xF%QwmtF&ml`6c=YOGB7X*l)ry-V3RM?n#VSBL63fW1BDn3jf_o9
T&CD$<4InI_7{lh>%(bfkV4fCB

delta 65
zcmdmUhiS(hrU}xFi#N&?G3y!>6c=YO0Kwb$-771vd7WE)LjBHFS;e<NApt`pV-r&|
Pa|=rY2y63x=Gs*NMEe)8

diff --git a/packager/app/test/testdata/bear-640x360-a-cbcs-golden.mp4 b/packager/app/test/testdata/bear-640x360-a-cbcs-golden.mp4
index 313271ea5800be682d8139eb84fee77a452a83f5..0e8a01563ba34c1738841110cd854953f515f761 100644
GIT binary patch
delta 69
zcmbP#ooVrPrU}xF8#c;RGaH%|6c=YOGB7X*l)ry-V3RM?n#VSBL63fW1BDn3jf_o9
U&CD$<4InI_7{lfx%(s^V09DWyg#Z8m

delta 65
zcmZ2{ooW7crU}xFYc|SMGwT`@6c=YO0Kwb$-771vd7WE)LjBHFS;e<NApt`pV-r&|
Pa|=rY2y62R=G)5wI@K5I

diff --git a/packager/app/test/testdata/bear-640x360-a-cenc-golden.mp4 b/packager/app/test/testdata/bear-640x360-a-cenc-golden.mp4
index 8f27d2f2fdcfefe9b40202d0d177a92e89506666..e0b1c3c07e73d67026add0ff447f143aab106d30 100644
GIT binary patch
delta 69
zcmdmShiT6prU}xF%QwmtF&ml`6c=YOGB7X*l)ry-V3RM?n#VSBL63fW1BDn3jf_o9
T&CD$<4InI_7{lh>%(bfkV4fCB

delta 65
zcmdmUhiS(hrU}xFi#N&?G3y!>6c=YO0Kwb$-771vd7WE)LjBHFS;e<NApt`pV-r&|
Pa|=rY2y63x=Gs*NMEe)8

diff --git a/packager/app/test/testdata/bear-640x360-a-cenc-golden.mp4.media_info b/packager/app/test/testdata/bear-640x360-a-cenc-golden.mp4.media_info
index 71fef03aa9..3510bbf031 100644
--- a/packager/app/test/testdata/bear-640x360-a-cenc-golden.mp4.media_info
+++ b/packager/app/test/testdata/bear-640x360-a-cenc-golden.mp4.media_info
@@ -1,4 +1,4 @@
-bandwidth: 129127
+bandwidth: 129139
 audio_info {
   codec: "mp4a.40.2"
   sampling_frequency: 44100
@@ -8,11 +8,11 @@ audio_info {
 }
 init_range {
   begin: 0
-  end: 954
+  end: 958
 }
 index_range {
-  begin: 955
-  end: 1022
+  begin: 959
+  end: 1026
 }
 media_file_name: "place_holder"
 media_duration_seconds: 2.7631745
@@ -21,8 +21,8 @@ container_type: CONTAINER_MP4
 protected_content {
   default_key_id: "1234567890123456"
   content_protection_entry {
-    uuid: "edef8ba9-79d6-4ace-a3c8-27dcd51d21ed"
-    pssh: "\000\000\0000pssh\000\000\000\000\355\357\213\251y\326J\316\243\310\'\334\325\035!\355\000\000\000\0201234567890123456"
+    uuid: "1077efec-c0b2-4d02-ace3-3c1e52e2fb4b"
+    pssh: "\000\000\0004pssh\001\000\000\000\020w\357\354\300\262M\002\254\343<\036R\342\373K\000\000\000\0011234567890123456\000\000\000\000"
   }
   protection_scheme: "cenc"
 }
diff --git a/packager/app/test/testdata/bear-640x360-a-cens-golden.mp4 b/packager/app/test/testdata/bear-640x360-a-cens-golden.mp4
index fe06b5ac9d8be9b6b46157bb79ec38f7a9744663..bf6c5b590896532349adf5bf185fdbb81cdce3ad 100644
GIT binary patch
delta 69
zcmdmShiT6prU}xF%QwmtF&ml`6c=YOGB7X*l)ry-V3RM?n#VSBL63fW1BDn3jf_o9
T&CD$<4InI_7{lh>%(bfkV4fCB

delta 65
zcmdmUhiS(hrU}xFi#N&?G3y!>6c=YO0Kwb$-771vd7WE)LjBHFS;e<NApt`pV-r&|
Pa|=rY2y63x=Gs*NMEe)8

diff --git a/packager/app/test/testdata/bear-640x360-a-live-cenc-golden-init.mp4 b/packager/app/test/testdata/bear-640x360-a-live-cenc-golden-init.mp4
index 37a1632ab6e212d54893d9a1a3113e4cdc041ce7..2b347d1361bd7dfe7cddc90727d9f040bdf52988 100644
GIT binary patch
delta 62
zcmZ3@zMg%8G~@J*GD*yaCI!XC8H@}J3<Blv-yGQF%e3aPja<;9-`+qWMnfZG6H_yD
M3rhnC3n<0_0Dp=R%K!iX

delta 58
zcmZ3_zM6f4G~?urGD*z31_i~%84N)1_I>xt%4=Td7N1bRb5&OHEl^0n(8$=t)Xdz%
I(g4B&0A!96EC2ui

diff --git a/packager/app/test/testdata/bear-640x360-a-live-cenc-rotation-golden-1.m4s b/packager/app/test/testdata/bear-640x360-a-live-cenc-rotation-golden-1.m4s
index 0bd517fb721fab4a02e13cfcb746b76865319c96..83e0dd46b042d54fef2944b3d7ecc26196b7dba4 100644
GIT binary patch
delta 85
zcmZo}W^8X}oM6rC%)qdLVFCjPFuF|ih-UPexMZ`TNkMUO1|v{Rp#1%t1DkxA);zY6
e3wre18>Gz8$k@cx%-q7#0Kx+4-Q2?X-yQ%b1sHz-

delta 81
zcmZo~W^8U|oM6ps&%m&OVFCjPFgi^1h-UPdxMZ`gK|yhG21xAf`|g#M*SyXxKB0c+
cs;uH$ppbx}k+F%XnYo3f0fe==gYmyT0RQh9+yDRo

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 e73d1c4e891c91cadf5631b46c2afc24cbdcdfed..23b514c520cea88ee1ef75bec7fc8715e20a6598 100644
GIT binary patch
delta 86
zcmaFd#`wIAae_6kG6TZ~h6xNHz^pjYBbrfj<B|zXh9(8Y#Tkr1L4or3Zw_qoWm@yt
gMlR^lZ*QOwqoI+piK&^ng{1+61=74Zk(tQ>08_~q!vFvP

delta 82
zcmaFf#`w66ae_6kJOjf9h6xNHz$`n_Bbrfl<B|zXx&{Ts#Tg*Mx9_`GR$lWuxA=tm
eovX5nZ-GJrM#d(lX66=_28Ljk;pS9kCI<j3WEmg;

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 0d638b35f120692bbb04c1ac757b9daeea27c95b..d924e4bcad2305c5fc3a5441d8fc1622f03bb085 100644
GIT binary patch
delta 84
zcmdn*ci3-&HSd20h8l(m3?RVNI?*GVv3KK=FN}sJ1;xb~j6gww^7n5JZ1QDV^Vmi%
e=+SR)pb(>>k+F%XnYo3f0fYt8y!j|ol?nil&Ka5j

delta 80
zcmX@?x8HAqHScc*h8l(m3?RVNIME}Tv2){+FO0ed1;xb~Ai=lqyH{3T^E$Wqg!-MU
dvWjnkLITDnre@|AmIj7KAeN!g=95fSDga|A8utJI

diff --git a/packager/app/test/testdata/bear-640x360-av-cbc1-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cbc1-golden.mpd
index 86ccf953a4..637d857bb5 100644
--- a/packager/app/test/testdata/bear-640x360-av-cbc1-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-cbc1-golden.mpd
@@ -3,27 +3,27 @@
 <MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" xmlns:cenc="urn:mpeg:cenc:2013" minBufferTime="PT2S" type="static" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" mediaPresentationDuration="PT2.763174533843994S">
   <Period id="0">
     <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
-      <Representation id="0" bandwidth="885555" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+      <Representation id="0" bandwidth="885567" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
         <ContentProtection value="cbc1" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
-        <ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed">
-          <cenc:pssh>AAAAMHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABAxMjM0NTY3ODkwMTIzNDU2</cenc:pssh>
+        <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+          <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
         </ContentProtection>
         <BaseURL>output_video.mp4</BaseURL>
-        <SegmentBase indexRange="1079-1146" timescale="30000">
-          <Initialization range="0-1078"/>
+        <SegmentBase indexRange="1083-1150" timescale="30000">
+          <Initialization range="0-1082"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
     <AdaptationSet id="1" contentType="audio" subsegmentAlignment="true">
-      <Representation id="1" bandwidth="129127" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="1" bandwidth="129139" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
         <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
         <ContentProtection value="cbc1" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
-        <ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed">
-          <cenc:pssh>AAAAMHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABAxMjM0NTY3ODkwMTIzNDU2</cenc:pssh>
+        <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+          <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
         </ContentProtection>
         <BaseURL>output_audio.mp4</BaseURL>
-        <SegmentBase indexRange="955-1022" timescale="44100">
-          <Initialization range="0-954"/>
+        <SegmentBase indexRange="959-1026" timescale="44100">
+          <Initialization range="0-958"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
diff --git a/packager/app/test/testdata/bear-640x360-av-cbcs-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cbcs-golden.mpd
index 119988cfc5..0902dc5c82 100644
--- a/packager/app/test/testdata/bear-640x360-av-cbcs-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-cbcs-golden.mpd
@@ -3,27 +3,27 @@
 <MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" xmlns:cenc="urn:mpeg:cenc:2013" minBufferTime="PT2S" type="static" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" mediaPresentationDuration="PT2.763174533843994S">
   <Period id="0">
     <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
-      <Representation id="0" bandwidth="884365" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+      <Representation id="0" bandwidth="884377" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
         <ContentProtection value="cbcs" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
-        <ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed">
-          <cenc:pssh>AAAAMHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABAxMjM0NTY3ODkwMTIzNDU2</cenc:pssh>
+        <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+          <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
         </ContentProtection>
         <BaseURL>output_video.mp4</BaseURL>
-        <SegmentBase indexRange="1088-1155" timescale="30000">
-          <Initialization range="0-1087"/>
+        <SegmentBase indexRange="1092-1159" timescale="30000">
+          <Initialization range="0-1091"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
     <AdaptationSet id="1" contentType="audio" subsegmentAlignment="true">
-      <Representation id="1" bandwidth="127202" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="1" bandwidth="127214" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
         <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
         <ContentProtection value="cbcs" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
-        <ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed">
-          <cenc:pssh>AAAAMHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABAxMjM0NTY3ODkwMTIzNDU2</cenc:pssh>
+        <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+          <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
         </ContentProtection>
         <BaseURL>output_audio.mp4</BaseURL>
-        <SegmentBase indexRange="964-1031" timescale="44100">
-          <Initialization range="0-963"/>
+        <SegmentBase indexRange="968-1035" timescale="44100">
+          <Initialization range="0-967"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
diff --git a/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd
index 88ff403d96..c5e6118775 100644
--- a/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd
@@ -3,27 +3,27 @@
 <MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" xmlns:cenc="urn:mpeg:cenc:2013" minBufferTime="PT2S" type="static" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" mediaPresentationDuration="PT2.763174533843994S">
   <Period id="0">
     <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
-      <Representation id="0" bandwidth="885555" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+      <Representation id="0" bandwidth="885567" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
         <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
-        <ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed">
-          <cenc:pssh>AAAAMHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABAxMjM0NTY3ODkwMTIzNDU2</cenc:pssh>
+        <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+          <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
         </ContentProtection>
         <BaseURL>output_video.mp4</BaseURL>
-        <SegmentBase indexRange="1079-1146" timescale="30000">
-          <Initialization range="0-1078"/>
+        <SegmentBase indexRange="1083-1150" timescale="30000">
+          <Initialization range="0-1082"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
     <AdaptationSet id="1" contentType="audio" subsegmentAlignment="true">
-      <Representation id="1" bandwidth="129127" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="1" bandwidth="129139" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
         <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
         <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
-        <ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed">
-          <cenc:pssh>AAAAMHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABAxMjM0NTY3ODkwMTIzNDU2</cenc:pssh>
+        <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+          <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
         </ContentProtection>
         <BaseURL>output_audio.mp4</BaseURL>
-        <SegmentBase indexRange="955-1022" timescale="44100">
-          <Initialization range="0-954"/>
+        <SegmentBase indexRange="959-1026" timescale="44100">
+          <Initialization range="0-958"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
diff --git a/packager/app/test/testdata/bear-640x360-av-cenc-iop-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cenc-iop-golden.mpd
index eb7dc7d94d..6b24d20039 100644
--- a/packager/app/test/testdata/bear-640x360-av-cenc-iop-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-cenc-iop-golden.mpd
@@ -4,26 +4,26 @@
   <Period id="0">
     <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
       <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
-      <ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed">
-        <cenc:pssh>AAAAMHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABAxMjM0NTY3ODkwMTIzNDU2</cenc:pssh>
+      <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+        <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
       </ContentProtection>
-      <Representation id="0" bandwidth="885555" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+      <Representation id="0" bandwidth="885567" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
         <BaseURL>output_video.mp4</BaseURL>
-        <SegmentBase indexRange="1079-1146" timescale="30000">
-          <Initialization range="0-1078"/>
+        <SegmentBase indexRange="1083-1150" timescale="30000">
+          <Initialization range="0-1082"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
     <AdaptationSet id="1" contentType="audio" subsegmentAlignment="true">
       <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
-      <ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed">
-        <cenc:pssh>AAAAMHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABAxMjM0NTY3ODkwMTIzNDU2</cenc:pssh>
+      <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+        <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
       </ContentProtection>
-      <Representation id="1" bandwidth="129127" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="1" bandwidth="129139" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
         <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
         <BaseURL>output_audio.mp4</BaseURL>
-        <SegmentBase indexRange="955-1022" timescale="44100">
-          <Initialization range="0-954"/>
+        <SegmentBase indexRange="959-1026" timescale="44100">
+          <Initialization range="0-958"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
diff --git a/packager/app/test/testdata/bear-640x360-av-cens-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cens-golden.mpd
index cbd0e46067..34d4015453 100644
--- a/packager/app/test/testdata/bear-640x360-av-cens-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-cens-golden.mpd
@@ -3,27 +3,27 @@
 <MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" xmlns:cenc="urn:mpeg:cenc:2013" minBufferTime="PT2S" type="static" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" mediaPresentationDuration="PT2.763174533843994S">
   <Period id="0">
     <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
-      <Representation id="0" bandwidth="885555" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+      <Representation id="0" bandwidth="885567" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
         <ContentProtection value="cens" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
-        <ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed">
-          <cenc:pssh>AAAAMHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABAxMjM0NTY3ODkwMTIzNDU2</cenc:pssh>
+        <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+          <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
         </ContentProtection>
         <BaseURL>output_video.mp4</BaseURL>
-        <SegmentBase indexRange="1079-1146" timescale="30000">
-          <Initialization range="0-1078"/>
+        <SegmentBase indexRange="1083-1150" timescale="30000">
+          <Initialization range="0-1082"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
     <AdaptationSet id="1" contentType="audio" subsegmentAlignment="true">
-      <Representation id="1" bandwidth="129127" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="1" bandwidth="129139" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
         <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
         <ContentProtection value="cens" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
-        <ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed">
-          <cenc:pssh>AAAAMHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABAxMjM0NTY3ODkwMTIzNDU2</cenc:pssh>
+        <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+          <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
         </ContentProtection>
         <BaseURL>output_audio.mp4</BaseURL>
-        <SegmentBase indexRange="955-1022" timescale="44100">
-          <Initialization range="0-954"/>
+        <SegmentBase indexRange="959-1026" timescale="44100">
+          <Initialization range="0-958"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
diff --git a/packager/app/test/testdata/bear-640x360-av-live-cenc-golden.mpd b/packager/app/test/testdata/bear-640x360-av-live-cenc-golden.mpd
index 4302e87a18..be89be88dd 100644
--- a/packager/app/test/testdata/bear-640x360-av-live-cenc-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-live-cenc-golden.mpd
@@ -5,8 +5,8 @@
     <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" segmentAlignment="true" par="16:9">
       <Representation id="0" bandwidth="875620" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
         <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
-        <ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed">
-          <cenc:pssh>AAAAMHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABAxMjM0NTY3ODkwMTIzNDU2</cenc:pssh>
+        <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+          <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
         </ContentProtection>
         <SegmentTemplate timescale="30000" initialization="output_video-init.mp4" media="output_video-$Number$.m4s" startNumber="1">
           <SegmentTimeline>
@@ -20,8 +20,8 @@
       <Representation id="1" bandwidth="124195" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
         <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
         <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
-        <ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed">
-          <cenc:pssh>AAAAMHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABAxMjM0NTY3ODkwMTIzNDU2</cenc:pssh>
+        <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+          <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
         </ContentProtection>
         <SegmentTemplate timescale="44100" initialization="output_audio-init.mp4" media="output_audio-$Number$.m4s" startNumber="1">
           <SegmentTimeline>
diff --git a/packager/app/test/testdata/bear-640x360-av-live-cenc-iop-golden.mpd b/packager/app/test/testdata/bear-640x360-av-live-cenc-iop-golden.mpd
index 0b8c39c6b9..09b3a9465c 100644
--- a/packager/app/test/testdata/bear-640x360-av-live-cenc-iop-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-live-cenc-iop-golden.mpd
@@ -4,8 +4,8 @@
   <Period id="0" start="PT0S">
     <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" segmentAlignment="true" par="16:9">
       <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
-      <ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed">
-        <cenc:pssh>AAAAMHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABAxMjM0NTY3ODkwMTIzNDU2</cenc:pssh>
+      <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+        <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
       </ContentProtection>
       <Representation id="0" bandwidth="875620" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
         <SegmentTemplate timescale="30000" initialization="output_video-init.mp4" media="output_video-$Number$.m4s" startNumber="1">
@@ -18,8 +18,8 @@
     </AdaptationSet>
     <AdaptationSet id="1" contentType="audio" segmentAlignment="true">
       <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
-      <ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed">
-        <cenc:pssh>AAAAMHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABAxMjM0NTY3ODkwMTIzNDU2</cenc:pssh>
+      <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+        <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
       </ContentProtection>
       <Representation id="1" bandwidth="124195" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
         <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
diff --git a/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-golden.mpd b/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-golden.mpd
index c197360e90..57cf0d914f 100644
--- a/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-golden.mpd
@@ -3,9 +3,9 @@
 <MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" xmlns:cenc="urn:mpeg:cenc:2013" minBufferTime="PT2S" type="dynamic" profiles="urn:mpeg:dash:profile:isoff-live:2011" publishTime="some_publish_time" availabilityStartTime="some_availability_start_time" minimumUpdatePeriod="PT5S" timeShiftBufferDepth="PT1800S">
   <Period id="0" start="PT0S">
     <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" segmentAlignment="true" par="16:9">
-      <Representation id="0" bandwidth="876470" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+      <Representation id="0" bandwidth="876506" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
         <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="00000000-0000-0000-0000-000000000000"/>
-        <ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed"/>
+        <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b"/>
         <SegmentTemplate timescale="30000" initialization="output_video-init.mp4" media="output_video-$Number$.m4s" startNumber="1">
           <SegmentTimeline>
             <S t="2002" d="30030" r="1"/>
@@ -15,10 +15,10 @@
       </Representation>
     </AdaptationSet>
     <AdaptationSet id="1" contentType="audio" segmentAlignment="true">
-      <Representation id="1" bandwidth="125138" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="1" bandwidth="125175" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
         <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
         <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="00000000-0000-0000-0000-000000000000"/>
-        <ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed"/>
+        <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b"/>
         <SegmentTemplate timescale="44100" initialization="output_audio-init.mp4" media="output_audio-$Number$.m4s" startNumber="1">
           <SegmentTimeline>
             <S t="0" d="45056" r="1"/>
diff --git a/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-iop-golden.mpd b/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-iop-golden.mpd
index c7a08aa0ae..ba89d8e04d 100644
--- a/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-iop-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-iop-golden.mpd
@@ -4,8 +4,8 @@
   <Period id="0" start="PT0S">
     <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" segmentAlignment="true" par="16:9">
       <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="00000000-0000-0000-0000-000000000000"/>
-      <ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed"/>
-      <Representation id="0" bandwidth="876470" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+      <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b"/>
+      <Representation id="0" bandwidth="876506" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
         <SegmentTemplate timescale="30000" initialization="output_video-init.mp4" media="output_video-$Number$.m4s" startNumber="1">
           <SegmentTimeline>
             <S t="2002" d="30030" r="1"/>
@@ -16,8 +16,8 @@
     </AdaptationSet>
     <AdaptationSet id="1" contentType="audio" segmentAlignment="true">
       <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="00000000-0000-0000-0000-000000000000"/>
-      <ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed"/>
-      <Representation id="1" bandwidth="125138" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b"/>
+      <Representation id="1" bandwidth="125175" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
         <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
         <SegmentTemplate timescale="44100" initialization="output_audio-init.mp4" media="output_audio-$Number$.m4s" startNumber="1">
           <SegmentTimeline>
diff --git a/packager/app/test/testdata/bear-640x360-hevc-cenc-golden.mp4 b/packager/app/test/testdata/bear-640x360-hevc-cenc-golden.mp4
index 810680cb51999f7b02a0500d1af31f44b91872ea..13e09541d00d7f5c4e186d74997c4c372e7e005d 100644
GIT binary patch
delta 73
zcmex)h4t?h)(P^A?i&?^cnnPnii<NC85kG@%HO{^u*sKc&0`z6phv&GfkKRiM#d(l
XX66=_1`rldjG;N6XL~#kqf{IKtmhU5

delta 69
zcmex+h4tqZ)(P^A&KnhkcytX4ii<NCfZ*->?v<6-yv{8?p?>G8tm0dskbt3)v5Bdf
TxrL<xgw>qPvpt!IQ7R4qm&g}x

diff --git a/packager/app/test/testdata/bear-640x360-hevc-cenc-golden.mpd b/packager/app/test/testdata/bear-640x360-hevc-cenc-golden.mpd
index 549bd6261f..92286c92b7 100644
--- a/packager/app/test/testdata/bear-640x360-hevc-cenc-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-hevc-cenc-golden.mpd
@@ -3,14 +3,14 @@
 <MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" xmlns:cenc="urn:mpeg:cenc:2013" minBufferTime="PT2S" type="static" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" mediaPresentationDuration="PT2.802799940109253S">
   <Period id="0">
     <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
-      <Representation id="0" bandwidth="264858" codecs="hev1.1.6.L63.90" mimeType="video/mp4" sar="1:1">
+      <Representation id="0" bandwidth="264870" codecs="hev1.1.6.L63.90" mimeType="video/mp4" sar="1:1">
         <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
-        <ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed">
-          <cenc:pssh>AAAAMHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABAxMjM0NTY3ODkwMTIzNDU2</cenc:pssh>
+        <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+          <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
         </ContentProtection>
         <BaseURL>output_video.mp4</BaseURL>
-        <SegmentBase indexRange="3167-3234" timescale="30000">
-          <Initialization range="0-3166"/>
+        <SegmentBase indexRange="3171-3238" timescale="30000">
+          <Initialization range="0-3170"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
diff --git a/packager/app/test/testdata/bear-640x360-v-cbc1-golden.mp4 b/packager/app/test/testdata/bear-640x360-v-cbc1-golden.mp4
index ea3cb097bdf45572c422ec74b460efead711974a..363097dac14e2cd8519efa974da2e75c123211d9 100644
GIT binary patch
delta 85
zcmbQdPiXo+p$YPg@*5RiF&ml`6c=YOGB7X*l)ry-V3RM?n#VSBL63fW1BDn3jf_o9
g&CD$<4InI_7(=r;OS?G>BM>tIG4pnF7M44+0Hr4wy8r+H

delta 81
zcmbQfPiXQ!p$YPg(i;_CG3y!>6c=YO0Kwb$-771vd7WE)LjBHFS;e<NApt`pV-r&|
ca|=rY2&>terQMo^5r~<9n0dQ33(K8Z0HQn^FaQ7m

diff --git a/packager/app/test/testdata/bear-640x360-v-cbcs-golden.mp4 b/packager/app/test/testdata/bear-640x360-v-cbcs-golden.mp4
index c336b9f1d6e4489e4525e074fe0f83d3a1c30221..235101a4b26beddade88a0e898c8920f4278d425 100644
GIT binary patch
delta 85
zcmeyfOQ>PD&;)r#jg1PQnGH<}ii<NC85kG@%HO{^u*sKc&0`z6phv&GfkKRiM#d(l
gX66=_1`rldjG@_qrQLyr5r~<9n0dPc3yaN60K}gdqyPW_

delta 81
zcmZqJE%axX&;)r#m5mCYnRN{cii<NCfZ*->?v<6-yv{8?p?>G8tm0dskbt3)v5Bdf
cxrL<xgw^cA((b~-2*gZ4%)H%&g~etj0KUT-82|tP

diff --git a/packager/app/test/testdata/bear-640x360-v-cenc-golden.mp4 b/packager/app/test/testdata/bear-640x360-v-cenc-golden.mp4
index 19f2f5416b5524c1e818dbc3cfb16cc6f25433af..9b75ee0e421604c954d4310deb8bf161763c3c64 100644
GIT binary patch
delta 85
zcmbQdPiXo+p$YPg@*5RiF&ml`6c=YOGB7X*l)ry-V3RM?n#VSBL63fW1BDn3jf_o9
g&CD$<4InI_7(=r;OS?G>BM>tIG4pnF7M44+0Hr4wy8r+H

delta 81
zcmbQfPiXQ!p$YPg(i;_CG3y!>6c=YO0Kwb$-771vd7WE)LjBHFS;e<NApt`pV-r&|
ca|=rY2&>terQMo^5r~<9n0dQ33(K8Z0HQn^FaQ7m

diff --git a/packager/app/test/testdata/bear-640x360-v-cenc-golden.mp4.media_info b/packager/app/test/testdata/bear-640x360-v-cenc-golden.mp4.media_info
index 541a1241cb..fc9e2d2d9b 100644
--- a/packager/app/test/testdata/bear-640x360-v-cenc-golden.mp4.media_info
+++ b/packager/app/test/testdata/bear-640x360-v-cenc-golden.mp4.media_info
@@ -1,4 +1,4 @@
-bandwidth: 885555
+bandwidth: 885567
 video_info {
   codec: "avc1.64001e"
   width: 640
@@ -11,11 +11,11 @@ video_info {
 }
 init_range {
   begin: 0
-  end: 1078
+  end: 1082
 }
 index_range {
-  begin: 1079
-  end: 1146
+  begin: 1083
+  end: 1150
 }
 media_file_name: "place_holder"
 media_duration_seconds: 2.7360666
@@ -24,8 +24,8 @@ container_type: CONTAINER_MP4
 protected_content {
   default_key_id: "1234567890123456"
   content_protection_entry {
-    uuid: "edef8ba9-79d6-4ace-a3c8-27dcd51d21ed"
-    pssh: "\000\000\0000pssh\000\000\000\000\355\357\213\251y\326J\316\243\310\'\334\325\035!\355\000\000\000\0201234567890123456"
+    uuid: "1077efec-c0b2-4d02-ace3-3c1e52e2fb4b"
+    pssh: "\000\000\0004pssh\001\000\000\000\020w\357\354\300\262M\002\254\343<\036R\342\373K\000\000\000\0011234567890123456\000\000\000\000"
   }
   protection_scheme: "cenc"
 }
diff --git a/packager/app/test/testdata/bear-640x360-v-cens-golden.mp4 b/packager/app/test/testdata/bear-640x360-v-cens-golden.mp4
index 195a9dfd4f7c489d179d9dbd1467ab48496bcb1d..f0e5832eb29973641c62c4b2a44a89fdbbafb449 100644
GIT binary patch
delta 85
zcmbQdPiXo+p$YPg@*5RiF&ml`6c=YOGB7X*l)ry-V3RM?n#VSBL63fW1BDn3jf_o9
g&CD$<4InI_7(=r;OS?G>BM>tIG4pnF7M44+0Hr4wy8r+H

delta 81
zcmbQfPiXQ!p$YPg(i;_CG3y!>6c=YO0Kwb$-771vd7WE)LjBHFS;e<NApt`pV-r&|
ca|=rY2&>terQMo^5r~<9n0dQ33(K8Z0HQn^FaQ7m

diff --git a/packager/app/test/testdata/bear-640x360-v-live-cenc-golden-init.mp4 b/packager/app/test/testdata/bear-640x360-v-live-cenc-golden-init.mp4
index 6a7e8af709102440e935f1ab6bb53c78cf432f75..bb28541bdc72f3b332b209dbe26385075f9ab128 100644
GIT binary patch
delta 62
zcmZ3^v6^FoJR|=`g<H&qCI!XC8H@}J3<Blv-yGQF%e3aPja<;9-`+qWMnfZG6H_yD
M3rhnC3n<0_0DAfny#N3J

delta 58
zcmZ3@v7BRqJR|o;g<H(J1_i~%84N)1_I>xt%4=Td7N1bRb5&OHEl^0n(8$=t)Xdz%
I(g4B&0AMx~9smFU

diff --git a/packager/app/test/testdata/bear-640x360-v-live-cenc-rotation-golden-1.m4s b/packager/app/test/testdata/bear-640x360-v-live-cenc-rotation-golden-1.m4s
index 773f22f6934d70ab029c44f0709df240ccfb64da..51af483cb615fc88e81f999161e4cf524da6a56e 100644
GIT binary patch
delta 91
zcmaFa!S=R;ZGt_oDg#5Q-vkB_VEi%BCya@SVdIi)MnjW=;^GWOpr}Ck`!@$R`7*6}
kY$F%+=(jgWp`nqniK&^ng{1+61=8JY!?fLoiBY!+0P|`YivR!s

delta 87
zcmaFc!S=F)ZGt_oA_GII-vkB_VEi)CCya^l&&DO$jJgH|#l;yQ(YNorS5{v0I=A?Q
i`kkw?if@5J0)|G$CZ=ZQ7M2DOR<i@sb_XU#-6jADIUDN$

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 3b9620c5544c97da19444f960f20d30e4ecb511f..d488ecd05028db1552892e1e5664586d88d9721d 100644
GIT binary patch
delta 90
zcmZ3omwm-v_6hd92@DLSeiIl#fF*RIPdH=j#w9114NVG)i!&I3f&%65-yGQF%e3aP
kja<;9-`+qWMnfZG6H_yD3rhnC3#7SuCd>AjER5W@0Q&hFwg3PC

delta 86
zcmZ3nmwm}z_6hd9F$@f)eiIl#fF*FEPdH=b#w911bqxxNi!(riZ{K&Xti0xRZt)5A
jJ6B~D-vWgMjEqf8&CD$<4Gh67!{)gx+vl<{a^C^~)KnZ7

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 5b12cf215b559768c73a5a06a361ae9e67e1bf42..f9d475d4a8629f6655b320e4723ecf60dc3824c2 100644
GIT binary patch
delta 90
zcmZqv%+mguWr97gJp)4++XMy>U@o2L6V6z>amfoNLz9By;tWQhpg{TiHwQNPGOc-R
kBNz1Ow>MCT(a^})#MI2(!qNc30%>mE$-I3hGvg^!0QamL2mk;8

delta 86
zcmZqw%+masWr97gH3LH!+XMy>U@n~K6V6z<amfoNU4w$+;tY`B+xOioE3bK-TYN(O
j&Q)2(w?H8QV-r&|a|=rYLn9E&(5QJY^Y*>WjHgTi(Lo$(

diff --git a/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mp4 b/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mp4
index d66f449f2468b242dadc821446f96166d31709d1..3e22310eb5b10edf51b6d22422c790b093877480 100644
GIT binary patch
delta 73
zcmZ27iG9T+_6hQg_cto6Vm34>C@#)mWME(rD1ZOvz$Ra&HIHrNf*$?$1`0768X23I
YnweWz8bDY;F^1;v%-g>+GwL1%0IDVzng9R*

delta 69
zcmZ26iG9f=_6hQgw>K)RV%9Y%C@#)m0D`ygyH{3T^E$Wqg!-MUvWjnkLIQ?H#wMm_
U<`$L)5LWYV=Iy_k8Fh~W0F@IN0{{R3

diff --git a/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mpd b/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mpd
index 9a31932a27..271f9c4b6c 100644
--- a/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mpd
@@ -3,14 +3,14 @@
 <MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" xmlns:cenc="urn:mpeg:cenc:2013" minBufferTime="PT2S" type="static" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" mediaPresentationDuration="PT2.7360000610351562S">
   <Period id="0">
     <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="1000000/33000" subsegmentAlignment="true" par="16:9">
-      <Representation id="0" bandwidth="342188" codecs="vp08.00.00.08.01.01.00.00" mimeType="video/mp4" sar="1:1">
+      <Representation id="0" bandwidth="342199" codecs="vp08.00.00.08.01.01.00.00" mimeType="video/mp4" sar="1:1">
         <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
-        <ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed">
-          <cenc:pssh>AAAAMHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABAxMjM0NTY3ODkwMTIzNDU2</cenc:pssh>
+        <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+          <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
         </ContentProtection>
         <BaseURL>output_video.mp4</BaseURL>
-        <SegmentBase indexRange="1015-1082" timescale="1000000">
-          <Initialization range="0-1014"/>
+        <SegmentBase indexRange="1019-1086" timescale="1000000">
+          <Initialization range="0-1018"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
diff --git a/packager/app/test/testdata/bear-640x360-vp8-cenc-webm-golden.mpd b/packager/app/test/testdata/bear-640x360-vp8-cenc-webm-golden.mpd
index ef10280cbf..8a135e93f5 100644
--- a/packager/app/test/testdata/bear-640x360-vp8-cenc-webm-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-vp8-cenc-webm-golden.mpd
@@ -4,8 +4,8 @@
   <Period id="0">
     <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="1000000/33000" par="16:9">
       <Representation id="0" bandwidth="337062" codecs="vp8" mimeType="video/webm" sar="1:1">
-        <ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed" cenc:default_KID="31323334-3536-3738-3930-313233343536">
-          <cenc:pssh>AAAAMHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABAxMjM0NTY3ODkwMTIzNDU2</cenc:pssh>
+        <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b" cenc:default_KID="31323334-3536-3738-3930-313233343536">
+          <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
         </ContentProtection>
         <BaseURL>output_video.webm</BaseURL>
         <SegmentBase indexRange="115225-115274" timescale="1000000">
diff --git a/packager/media/base/fixed_key_source.cc b/packager/media/base/fixed_key_source.cc
index 5a2e064d44..c57282e823 100644
--- a/packager/media/base/fixed_key_source.cc
+++ b/packager/media/base/fixed_key_source.cc
@@ -72,10 +72,12 @@ Status FixedKeySource::GetCryptoPeriodKey(uint32_t crypto_period_index,
 
   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();
-    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);
+    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);
+    }
   }
 
   return Status::OK;