From 36ef7ec945f791be3cb2309724410909343ab324 Mon Sep 17 00:00:00 2001 From: JPeMu Date: Wed, 3 Feb 2021 20:09:07 +0000 Subject: [PATCH] [MPEG-TS] Fix PCR reserved bits not being set correctly Fixes #893. --- .../avc-aac-ts/bear-640x360-audio-1.ts | Bin 23312 -> 23312 bytes .../avc-aac-ts/bear-640x360-audio-2.ts | Bin 24252 -> 24252 bytes .../avc-aac-ts/bear-640x360-audio-3.ts | Bin 17296 -> 17296 bytes .../avc-aac-ts/bear-640x360-video-1.ts | Bin 105280 -> 105280 bytes .../avc-aac-ts/bear-640x360-video-2.ts | Bin 128028 -> 128028 bytes .../avc-aac-ts/bear-640x360-video-3.ts | Bin 84600 -> 84600 bytes .../bear-640x360-ac3-audio-1.ts | Bin 26696 -> 26696 bytes .../bear-640x360-ac3-audio-2.ts | Bin 27636 -> 27636 bytes .../bear-640x360-ac3-audio-3.ts | Bin 21996 -> 21996 bytes .../bear-640x360-ac3-video-1.ts | Bin 105280 -> 105280 bytes .../bear-640x360-ac3-video-2.ts | Bin 128028 -> 128028 bytes .../bear-640x360-ac3-video-3.ts | Bin 84600 -> 84600 bytes .../avc-ac3-ts/bear-640x360-ac3-audio-1.ts | Bin 26696 -> 26696 bytes .../avc-ac3-ts/bear-640x360-ac3-audio-2.ts | Bin 27636 -> 27636 bytes .../avc-ac3-ts/bear-640x360-ac3-audio-3.ts | Bin 21996 -> 21996 bytes .../avc-ac3-ts/bear-640x360-ac3-video-1.ts | Bin 105280 -> 105280 bytes .../avc-ac3-ts/bear-640x360-ac3-video-2.ts | Bin 128028 -> 128028 bytes .../avc-ac3-ts/bear-640x360-ac3-video-3.ts | Bin 84600 -> 84600 bytes .../bear-640x360-video-1.ts | Bin 105280 -> 105280 bytes .../bear-640x360-video-2.ts | Bin 128028 -> 128028 bytes .../bear-640x360-video-3.ts | Bin 84600 -> 84600 bytes .../bear-640x360-ac3-video-1.ts | Bin 105280 -> 105280 bytes .../bear-640x360-ac3-video-2.ts | Bin 128028 -> 128028 bytes .../bear-640x360-ac3-video-3.ts | Bin 84600 -> 84600 bytes .../bear-640x360-audio-1.ts | Bin 23312 -> 23312 bytes .../bear-640x360-audio-2.ts | Bin 24252 -> 24252 bytes .../bear-640x360-audio-3.ts | Bin 17296 -> 17296 bytes .../bear-640x360-video-1.ts | Bin 105280 -> 105280 bytes .../bear-640x360-video-2.ts | Bin 128028 -> 128028 bytes .../bear-640x360-video-3.ts | Bin 84600 -> 84600 bytes .../bear-640x360-audio-1.ts | Bin 23312 -> 23312 bytes .../bear-640x360-audio-2.ts | Bin 24252 -> 24252 bytes .../bear-640x360-audio-3.ts | Bin 17296 -> 17296 bytes .../bear-640x360-video-1.ts | Bin 105280 -> 105280 bytes .../bear-640x360-video-2.ts | Bin 128028 -> 128028 bytes .../bear-640x360-video-3.ts | Bin 84600 -> 84600 bytes .../bear-640x360-audio-1.ts | Bin 23312 -> 23312 bytes .../bear-640x360-audio-2.ts | Bin 24252 -> 24252 bytes .../bear-640x360-audio-3.ts | Bin 17296 -> 17296 bytes .../bear-640x360-video-1.ts | Bin 105280 -> 105280 bytes .../bear-640x360-video-2.ts | Bin 128028 -> 128028 bytes .../bear-640x360-video-3.ts | Bin 84600 -> 84600 bytes .../bear-640x360-audio-1.ts | Bin 23312 -> 23312 bytes .../bear-640x360-audio-2.ts | Bin 24252 -> 24252 bytes .../bear-640x360-audio-3.ts | Bin 17296 -> 17296 bytes .../bear-640x360-video-1.ts | Bin 105280 -> 105280 bytes .../bear-640x360-video-2.ts | Bin 128028 -> 128028 bytes .../bear-640x360-video-3.ts | Bin 84600 -> 84600 bytes .../sintel-1024x436-video-1.ts | Bin 5640 -> 5640 bytes .../sintel-1024x436-video-2.ts | Bin 5076 -> 5076 bytes .../sintel-1024x436-video-3.ts | Bin 46248 -> 46248 bytes .../sintel-1024x436-video-4.ts | Bin 97008 -> 97008 bytes .../sintel-1024x436-video-5.ts | Bin 107912 -> 107912 bytes .../sintel-1024x436-video-6.ts | Bin 30832 -> 30832 bytes .../bear-640x360-audio-1.ts | Bin 23312 -> 23312 bytes .../bear-640x360-audio-2.ts | Bin 24252 -> 24252 bytes .../bear-640x360-audio-3.ts | Bin 17296 -> 17296 bytes .../bear-640x360-video-1.ts | Bin 105280 -> 105280 bytes .../bear-640x360-video-2.ts | Bin 128028 -> 128028 bytes .../bear-640x360-video-3.ts | Bin 84600 -> 84600 bytes .../bear-640x360-ec3-video-1.ts | Bin 99264 -> 99264 bytes .../bear-640x360-ec3-video-2.ts | Bin 128028 -> 128028 bytes .../bear-640x360-ec3-video-3.ts | Bin 84600 -> 84600 bytes .../bear-640x360-audio-1.ts | Bin 25004 -> 25004 bytes .../bear-640x360-audio-2.ts | Bin 24252 -> 24252 bytes .../bear-640x360-audio-3.ts | Bin 15604 -> 15604 bytes .../bear-640x360-video-1.ts | Bin 105280 -> 105280 bytes .../bear-640x360-video-2.ts | Bin 128028 -> 128028 bytes .../bear-640x360-video-3.ts | Bin 84600 -> 84600 bytes .../formats/mp2t/ts_packet_writer_util.cc | 2 +- .../media/formats/mp2t/ts_writer_unittest.cc | 4 ++-- 71 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-1.ts index 5dd10d6c49c74a4d384f4598819483aaef94eec4..142fb332eda79e5b7e3fe5a40dbe85814930f566 100644 GIT binary patch delta 303 zcmW;FK?(tJ6vy%YBT3SvDI=sLX^JKxB}t@7laeHRhnU6GOmP8a;RqHM)T?m>3rDb+ z#VjlwLH&7tt54teUcG%F_JO!=h45%6S_*TEfp^^b4>t)eNyj93q`)`LJ4ud;I%gP< zLJeqHVC8_D2bUrvDJlWI4D1TiB+WpzbF4G#N=|8{bbI)UylJ9!|!6 l;0(Zd2*MH2CX6J@0`3%CY!JNx@H)K z0v+gCVCI2S0A7ia6qZ4*0<0?7*8tTSg(3qK8~A=|q8=^qX)}^qU3|avP_I7F1~{1x mfjt7(F$g9=pD~h56F76=Ss+}1+>%kqT7mr<&;~?XL;V47HB#RI diff --git a/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-2.ts index 2239833e63f3be8148a2a2ff557301278ee92831..780f4ba5e8e8d6342c7ea0a817a7b91d383f2ae1 100644 GIT binary patch delta 310 zcmW;GF$+Oq7zN-yQbMSkB!v*^CP`8fB1uvr5z3D+7}Pf~7z~E{BMb)W9SqzIeulwd zG#CuFFK=ghI?FldYKp5VPAefKtwqiv6rHW$Z3AID=sUp1#Ynoi!N&_?8W{S(*3T%q z1;955k|8jOfL)Z4bdQ5y0_Z6)(}9s*2ySs^I4P=R!8`}{dGIJOk~~FFFM&lF9ID`1 oV-#r(&}@Qb3mn^wq*n*{yP)0US$@_>`VAOG`UuR%z?h~if8$hXX8-^I delta 310 zcmW;GF$+Oq7zN<(BPE2AB!v*^CP`8fB1tzT5~2JE!yPPN3!_EFxAcjrgrlIsehZ_3xFwQ zVK5ag3Z}Zn!PI_9AXT^dvox4emjhGL3Sg>V2}~VU0aE`qe^&!j+L~Z0UK>nJ)&*0? z^?_8~=HG^3O5X%bC7Xe%=@ww>v=xy0xB0&fh?;n?ck%&yJrHB!HR#3Z~>az*I07m}=(%Q@i6?J5WHT@|-2zOVwgOTOoB!K@sEG%ACm*oa12HB}Zg9|oF?c3>ILaY7 TEKYKa3=kzelMlc+1a=8$>Mlf%4 zD_HLI3^31l?tDR@%FFA(JnPNw(bN&J5rT>ihr?p7rK_5g_mMafsX*us-$&%B(Z?iYf2%;oH2KpuDR zeURMiNnqaR6<|5>bzq+S5irmB1E`L~rI z{Bli3ZD}BXu?u53J5c_&HzQd6=M)IvI|rhEcN>H++y~(|uYmAxuV)0=z5Ve~2;cfF Pgzx+q!k_($v5^x1&mmnL delta 235 zcmbR9f_=^l_6<#pj0~Hb8LizJ8#eFvcq{}>*vJV0>N-wX diff --git a/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-3.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-3.ts index ed0773cdcef9bd75ceaa846e62791ee4e0b9246d..5d4aad179ce3d4aed4389ea58aea990b4f41abad 100644 GIT binary patch delta 170 zcmew{h4sf2)(uUJjCGrv8L#^?{@WbwFD?w^6(`MR1M>JY!94XEFz;{^n0I@sGAmH- z|Ey>spvvgAV7c#`!MxyOV7c dF#os|guhxF!ar}oXwD0iXSaj!wVfG#*#WsDLt+2` delta 170 zcmew{h4sf2)(uUJj0~Hb8L#^?Hf)ae7Z(Qdij!uu0eSqHV4ivnn0L4d%)32RnH4Da ze^#^*P-XO5u-x~}U|#Ssuw41+&5}Sl?WgxaD!E_xivW4E|AXYV?`L6rEWpUHeX%Gb dn15Uf!e6Zo;h#5PH0K4%v)e)V+Rlu=>;M|7IF0}S diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-1.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-1.ts index 7bfbd654280f3c8dd961e80a80801cb44c64e9f4..aab439e683efc52b937589faef078d36a6f0f27d 100644 GIT binary patch delta 205 zcmX?cf$_uz#tlu3jCGrv8CNp{DScKT^>6cS4lu8s2TU0YfCcXhgL&QJV9Hz?EcjRs z%;>k{_XAVj bL14k}pxu>hENUl>evi-QHtrNPu= zIWX0)1eUW_1M{A1f~m>6U_pCBFz>Yqn3`?@7Id}&^WNKosoBn8L3ejB@3R+}n(qe| g^bP{^zK4RT#gSk^|5z~ZcLJDNo&pvO&REC{0Px;R=>Px# diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-3.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-3.ts index 244009c82217eebfa2d4b37ef145ffde7c3b7f56..5e192f321b92edb2d150f359e0082ded5afed6b5 100644 GIT binary patch delta 170 zcmaE}n(@tQ#tlu3jQ=(_Gp=R^Qu?ews&4ab4lu8s2TU0YfCcXhgL&QJV9Hz?EcjRs z%d88w diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-1.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-1.ts index 84a65fef8aab216bcb243847dc354f93fcdd508b..898a88817d269a4dfeb8dcd868e51d7c47bde4b6 100644 GIT binary patch delta 231 zcmX@GjqSiTwhc{;jCGrv89&=F{@Yw`cUc(7^A1|g4CH+e6$kP7Gt*f>a=8$>Mlf%4 zD_HLI3^31l?tDR@%FFA(JnPNw(bN&J5rT>ihr?p7rK_5g_mMafsX*us-$&%B(Z?iYf2%;oH2KpuDR zeURMiNnqaR6<|5>bzq+S5irmB1E`L~rI z{Bli3ZD}BXu?u53J5c_&HzQd6=M)IvI|rhEcN>H++y~(|uYmAxuV)0=z5Ve~2;cfF Pgzx+q!k_($v5^x1&mmnL delta 235 zcmbR9f_=^l_6<#pj0~Hb8LizJ8#eFvcq{}>*vJV0>N-wX diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-3.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-3.ts index dfe8812409bd98a11afe965133c8888f96cded51..3d6bb36dee8d9bbb615927d9e73697eb171ccf25 100644 GIT binary patch delta 170 zcmew{h4sf2)(uUJjCGrv8L#^?{@WbwFD?w^6(`MR1M>JY!94XEFz;{^n0I@sGAmH- z|Ey>spvvgAV7c#`!MxyOV7c dF#os|guhxF!ar}oXwD0iXSaj!wVfG#*#WsDLt+2` delta 170 zcmew{h4sf2)(uUJj0~Hb8L#^?Hf)ae7Z(Qdij!uu0eSqHV4ivnn0L4d%)32RnH4Da ze^#^*P-XO5u-x~}U|#Ssuw41+&5}Sl?WgxaD!E_xivW4E|AXYV?`L6rEWpUHeX%Gb dn15Uf!e6Zo;h#5PH0K4%v)e)V+Rlu=>;M|7IF0}S diff --git a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-1.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-1.ts index 7bfbd654280f3c8dd961e80a80801cb44c64e9f4..aab439e683efc52b937589faef078d36a6f0f27d 100644 GIT binary patch delta 205 zcmX?cf$_uz#tlu3jCGrv8CNp{DScKT^>6cS4lu8s2TU0YfCcXhgL&QJV9Hz?EcjRs z%;>k{_XAVj bL14k}pxu>hENUl>evi-QHtrNPu= zIWX0)1eUW_1M{A1f~m>6U_pCBFz>Yqn3`?@7Id}&^WNKosoBn8L3ejB@3R+}n(qe| g^bP{^zK4RT#gSk^|5z~ZcLJDNo&pvO&REC{0Px;R=>Px# diff --git a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-3.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-3.ts index 158af461192bb96dd93f466e5f3bcea5584ef40c..1a8609f3e9e4e8d452e13815e3e4ccfbb9ef292b 100644 GIT binary patch delta 170 zcmaE}n(@tQ#tlu3jQ=(_Gp=R^Qu?ews&4ab4lu8s2TU0YfCcXhgL&QJV9Hz?EcjRs z%d88w diff --git a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-1.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-1.ts index 84a65fef8aab216bcb243847dc354f93fcdd508b..898a88817d269a4dfeb8dcd868e51d7c47bde4b6 100644 GIT binary patch delta 231 zcmX@GjqSiTwhc{;jCGrv89&=F{@Yw`cUc(7^A1|g4CH+e6$kP7Gt*f>a=8$>Mlf%4 zD_HLI3^31l?tDR@%FFA(JnPNw(bN&J5rT>ihr?p7rK_5g_mMafsX*us-$&%B(Z?iYf2%;oH2KpuDR zeURMiNnqaR6<|5>bzq+S5irmB1E`L~rI z{Bli3ZD}BXu?u53J5c_&HzQd6=M)IvI|rhEcN>H++y~(|uYmAxuV)0=z5Ve~2;cfF Pgzx+q!k_($v5^x1&mmnL delta 235 zcmbR9f_=^l_6<#pj0~Hb8LizJ8#eFvcq{}>*vJV0>N-wX diff --git a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-3.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-3.ts index ed0773cdcef9bd75ceaa846e62791ee4e0b9246d..5d4aad179ce3d4aed4389ea58aea990b4f41abad 100644 GIT binary patch delta 170 zcmew{h4sf2)(uUJjCGrv8L#^?{@WbwFD?w^6(`MR1M>JY!94XEFz;{^n0I@sGAmH- z|Ey>spvvgAV7c#`!MxyOV7c dF#os|guhxF!ar}oXwD0iXSaj!wVfG#*#WsDLt+2` delta 170 zcmew{h4sf2)(uUJj0~Hb8L#^?Hf)ae7Z(Qdij!uu0eSqHV4ivnn0L4d%)32RnH4Da ze^#^*P-XO5u-x~}U|#Ssuw41+&5}Sl?WgxaD!E_xivW4E|AXYV?`L6rEWpUHeX%Gb dn15Uf!e6Zo;h#5PH0K4%v)e)V+Rlu=>;M|7IF0}S diff --git a/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-1.ts b/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-1.ts index 84a65fef8aab216bcb243847dc354f93fcdd508b..898a88817d269a4dfeb8dcd868e51d7c47bde4b6 100644 GIT binary patch delta 231 zcmX@GjqSiTwhc{;jCGrv89&=F{@Yw`cUc(7^A1|g4CH+e6$kP7Gt*f>a=8$>Mlf%4 zD_HLI3^31l?tDR@%FFA(JnPNw(bN&J5rT>ihr?p7rK_5g_mMafsX*us-$&%B(Z?iYf2%;oH2KpuDR zeURMiNnqaR6<|5>bzq+S5irmB1E`L~rI z{Bli3ZD}BXu?u53J5c_&HzQd6=M)IvI|rhEcN>H++y~(|uYmAxuV)0=z5Ve~2;cfF Pgzx+q!k_($v5^x1&mmnL delta 235 zcmbR9f_=^l_6<#pj0~Hb8LizJ8#eFvcq{}>*vJV0>N-wX diff --git a/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-3.ts b/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-3.ts index dfe8812409bd98a11afe965133c8888f96cded51..3d6bb36dee8d9bbb615927d9e73697eb171ccf25 100644 GIT binary patch delta 170 zcmew{h4sf2)(uUJjCGrv8L#^?{@WbwFD?w^6(`MR1M>JY!94XEFz;{^n0I@sGAmH- z|Ey>spvvgAV7c#`!MxyOV7c dF#os|guhxF!ar}oXwD0iXSaj!wVfG#*#WsDLt+2` delta 170 zcmew{h4sf2)(uUJj0~Hb8L#^?Hf)ae7Z(Qdij!uu0eSqHV4ivnn0L4d%)32RnH4Da ze^#^*P-XO5u-x~}U|#Ssuw41+&5}Sl?WgxaD!E_xivW4E|AXYV?`L6rEWpUHeX%Gb dn15Uf!e6Zo;h#5PH0K4%v)e)V+Rlu=>;M|7IF0}S diff --git a/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-1.ts b/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-1.ts index 84a65fef8aab216bcb243847dc354f93fcdd508b..898a88817d269a4dfeb8dcd868e51d7c47bde4b6 100644 GIT binary patch delta 231 zcmX@GjqSiTwhc{;jCGrv89&=F{@Yw`cUc(7^A1|g4CH+e6$kP7Gt*f>a=8$>Mlf%4 zD_HLI3^31l?tDR@%FFA(JnPNw(bN&J5rT>ihr?p7rK_5g_mMafsX*us-$&%B(Z?iYf2%;oH2KpuDR zeURMiNnqaR6<|5>bzq+S5irmB1E`L~rI z{Bli3ZD}BXu?u53J5c_&HzQd6=M)IvI|rhEcN>H++y~(|uYmAxuV)0=z5Ve~2;cfF Pgzx+q!k_($v5^x1&mmnL delta 235 zcmbR9f_=^l_6<#pj0~Hb8LizJ8#eFvcq{}>*vJV0>N-wX diff --git a/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-3.ts b/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-3.ts index dfe8812409bd98a11afe965133c8888f96cded51..3d6bb36dee8d9bbb615927d9e73697eb171ccf25 100644 GIT binary patch delta 170 zcmew{h4sf2)(uUJjCGrv8L#^?{@WbwFD?w^6(`MR1M>JY!94XEFz;{^n0I@sGAmH- z|Ey>spvvgAV7c#`!MxyOV7c dF#os|guhxF!ar}oXwD0iXSaj!wVfG#*#WsDLt+2` delta 170 zcmew{h4sf2)(uUJj0~Hb8L#^?Hf)ae7Z(Qdij!uu0eSqHV4ivnn0L4d%)32RnH4Da ze^#^*P-XO5u-x~}U|#Ssuw41+&5}Sl?WgxaD!E_xivW4E|AXYV?`L6rEWpUHeX%Gb dn15Uf!e6Zo;h#5PH0K4%v)e)V+Rlu=>;M|7IF0}S diff --git a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-1.ts index 5dd10d6c49c74a4d384f4598819483aaef94eec4..142fb332eda79e5b7e3fe5a40dbe85814930f566 100644 GIT binary patch delta 303 zcmW;FK?(tJ6vy%YBT3SvDI=sLX^JKxB}t@7laeHRhnU6GOmP8a;RqHM)T?m>3rDb+ z#VjlwLH&7tt54teUcG%F_JO!=h45%6S_*TEfp^^b4>t)eNyj93q`)`LJ4ud;I%gP< zLJeqHVC8_D2bUrvDJlWI4D1TiB+WpzbF4G#N=|8{bbI)UylJ9!|!6 l;0(Zd2*MH2CX6J@0`3%CY!JNx@H)K z0v+gCVCI2S0A7ia6qZ4*0<0?7*8tTSg(3qK8~A=|q8=^qX)}^qU3|avP_I7F1~{1x mfjt7(F$g9=pD~h56F76=Ss+}1+>%kqT7mr<&;~?XL;V47HB#RI diff --git a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-2.ts index 2239833e63f3be8148a2a2ff557301278ee92831..780f4ba5e8e8d6342c7ea0a817a7b91d383f2ae1 100644 GIT binary patch delta 310 zcmW;GF$+Oq7zN-yQbMSkB!v*^CP`8fB1uvr5z3D+7}Pf~7z~E{BMb)W9SqzIeulwd zG#CuFFK=ghI?FldYKp5VPAefKtwqiv6rHW$Z3AID=sUp1#Ynoi!N&_?8W{S(*3T%q z1;955k|8jOfL)Z4bdQ5y0_Z6)(}9s*2ySs^I4P=R!8`}{dGIJOk~~FFFM&lF9ID`1 oV-#r(&}@Qb3mn^wq*n*{yP)0US$@_>`VAOG`UuR%z?h~if8$hXX8-^I delta 310 zcmW;GF$+Oq7zN<(BPE2AB!v*^CP`8fB1tzT5~2JE!yPPN3!_EFxAcjrgrlIsehZ_3xFwQ zVK5ag3Z}Zn!PI_9AXT^dvox4emjhGL3Sg>V2}~VU0aE`qe^&!j+L~Z0UK>nJ)&*0? z^?_8~=HG^3O5X%bC7Xe%=@ww>v=xy0xB0&fh?;n?ck%&yJrHB!HR#3Z~>az*I07m}=(%Q@i6?J5WHT@|-2zOVwgOTOoB!K@sEG%ACm*oa12HB}Zg9|oF?c3>ILaY7 TEKYKa3=kzelMlc+1a=8$>Mlf%4 zD_HLI3^31l?tDR@%FFA(JnPNw(bN&J5rT>ihr?p7rK_5g_mMafsX*us-$&%B(Z?iYf2%;oH2KpuDR zeURMiNnqaR6<|5>bzq+S5irmB1E`L~rI z{Bli3ZD}BXu?u53J5c_&HzQd6=M)IvI|rhEcN>H++y~(|uYmAxuV)0=z5Ve~2;cfF Pgzx+q!k_($v5^x1&mmnL delta 235 zcmbR9f_=^l_6<#pj0~Hb8LizJ8#eFvcq{}>*vJV0>N-wX diff --git a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-3.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-3.ts index ed0773cdcef9bd75ceaa846e62791ee4e0b9246d..5d4aad179ce3d4aed4389ea58aea990b4f41abad 100644 GIT binary patch delta 170 zcmew{h4sf2)(uUJjCGrv8L#^?{@WbwFD?w^6(`MR1M>JY!94XEFz;{^n0I@sGAmH- z|Ey>spvvgAV7c#`!MxyOV7c dF#os|guhxF!ar}oXwD0iXSaj!wVfG#*#WsDLt+2` delta 170 zcmew{h4sf2)(uUJj0~Hb8L#^?Hf)ae7Z(Qdij!uu0eSqHV4ivnn0L4d%)32RnH4Da ze^#^*P-XO5u-x~}U|#Ssuw41+&5}Sl?WgxaD!E_xivW4E|AXYV?`L6rEWpUHeX%Gb dn15Uf!e6Zo;h#5PH0K4%v)e)V+Rlu=>;M|7IF0}S diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-1.ts index 5dd10d6c49c74a4d384f4598819483aaef94eec4..142fb332eda79e5b7e3fe5a40dbe85814930f566 100644 GIT binary patch delta 303 zcmW;FK?(tJ6vy%YBT3SvDI=sLX^JKxB}t@7laeHRhnU6GOmP8a;RqHM)T?m>3rDb+ z#VjlwLH&7tt54teUcG%F_JO!=h45%6S_*TEfp^^b4>t)eNyj93q`)`LJ4ud;I%gP< zLJeqHVC8_D2bUrvDJlWI4D1TiB+WpzbF4G#N=|8{bbI)UylJ9!|!6 l;0(Zd2*MH2CX6J@0`3%CY!JNx@H)K z0v+gCVCI2S0A7ia6qZ4*0<0?7*8tTSg(3qK8~A=|q8=^qX)}^qU3|avP_I7F1~{1x mfjt7(F$g9=pD~h56F76=Ss+}1+>%kqT7mr<&;~?XL;V47HB#RI diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-2.ts index d83b3a56508b339a8d0709c744be64807963bf15..ba236d387a48a6e4b991440ed65ebdffc5f19b18 100644 GIT binary patch delta 310 zcmW;GF$+Oq7zN-yQbMSkB!v*^CP`8fB1uvr5z3D+7}Pf~7z~E{BMb)W9SqzIeulwd zG#CuFFK=ghI?FldYKp5VPAefKtwqiv6rHW$Z3AID=sUp1#Ynoi!N&_?8W{S(*3T%q z1;955k|8jOfL)Z4bdQ5y0_Z6)(}9s*2ySs^I4P=R!8`}{dGIJOk~~FFFM&lF9ID`1 oV-#r(&}@Qb3mn^wq*n*{yP)0US$@_>`VAOG`UuR%z?h~if8$hXX8-^I delta 310 zcmW;GF$+Oq7zN<(BPE2AB!v*^CP`8fB1tzT5~2JE!yPPN3!_EFxAcjrgrlIsehZ_3xFwQ zVK5ag3Z}Zn!PI_9AXT^dvox4emjhGL3Sg>V2}~VU0aE`qe^&!j+L~Z0UK>nJ)&*0? z^?_8~=HG^3O5X%bC7Xe%=@ww>v=xy0xB0&fh?;CD-8=b!y&jk~adLx$7M#U1*~3u| XiO1q3$5;nc4^qW5`2d_(;H&@un+smq delta 277 zcmbQx&N!i+aYGX$W5ecVMq?%*wVfGAF>HR#3Z~>az*I07m}=(%Q@i6?J5WHT@|-2zOVwgOTOoB!K@sL6)Xy^{~v>w#GlCpS1~!C5?$Jsjnb Wcq~qGj0`~aAXPk*55Rc^&I$n4DNY># diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-1.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-1.ts index 84a65fef8aab216bcb243847dc354f93fcdd508b..898a88817d269a4dfeb8dcd868e51d7c47bde4b6 100644 GIT binary patch delta 231 zcmX@GjqSiTwhc{;jCGrv89&=F{@Yw`cUc(7^A1|g4CH+e6$kP7Gt*f>a=8$>Mlf%4 zD_HLI3^31l?tDR@%FFA(JnPNw(bN&J5rT>ihr?p7rK_5g_mMafsX*us-$&%B(Z?iYf2%;oH2KpuDR zeURMiNnqaR6<|5>bzq+S5irmB1E`L~rI z{Bli3ZD}BXu?u53J5c_&HzQd6=M)IvI|rhEcN>H++y~(|uYmAxuV)0=z5Ve~2;cfF Pgzx+q!k_($v5^x1&mmnL delta 235 zcmbR9f_=^l_6<#pj0~Hb8LizJ8#eFvcq{}>*vJV0>N-wX diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-3.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-3.ts index 742b3b1830b1b477518c0a1a79d698ef3ebc417a..77fc2d144a9b505cad0dda6aac278f009ec23299 100644 GIT binary patch delta 170 zcmew{h4sf2)(uUJjCGrv8L#^?{@WbwFD?w^6(`MR1M>JY!94XEFz;{^n0I@sGAmH- z|Ey>spvvgAV7c#`!MxyOV7c dF#os|guhxF!ar}oXwD0iXSaj!wVfG#*#WsDLt+2` delta 170 zcmew{h4sf2)(uUJj0~Hb8L#^?Hf)ae7Z(Qdij!uu0eSqHV4ivnn0L4d%)32RnH4Da ze^#^*P-XO5u-x~}U|#Ssuw41+&5}Sl?WgxaD!E_xivW4E|AXYV?`L6rEWpUHeX%Gb dn15Uf!e6Zo;h#5PH0K4%v)e)V+Rlu=>;M|7IF0}S diff --git a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-1.ts index 5dd10d6c49c74a4d384f4598819483aaef94eec4..142fb332eda79e5b7e3fe5a40dbe85814930f566 100644 GIT binary patch delta 303 zcmW;FK?(tJ6vy%YBT3SvDI=sLX^JKxB}t@7laeHRhnU6GOmP8a;RqHM)T?m>3rDb+ z#VjlwLH&7tt54teUcG%F_JO!=h45%6S_*TEfp^^b4>t)eNyj93q`)`LJ4ud;I%gP< zLJeqHVC8_D2bUrvDJlWI4D1TiB+WpzbF4G#N=|8{bbI)UylJ9!|!6 l;0(Zd2*MH2CX6J@0`3%CY!JNx@H)K z0v+gCVCI2S0A7ia6qZ4*0<0?7*8tTSg(3qK8~A=|q8=^qX)}^qU3|avP_I7F1~{1x mfjt7(F$g9=pD~h56F76=Ss+}1+>%kqT7mr<&;~?XL;V47HB#RI diff --git a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-2.ts index 2239833e63f3be8148a2a2ff557301278ee92831..780f4ba5e8e8d6342c7ea0a817a7b91d383f2ae1 100644 GIT binary patch delta 310 zcmW;GF$+Oq7zN-yQbMSkB!v*^CP`8fB1uvr5z3D+7}Pf~7z~E{BMb)W9SqzIeulwd zG#CuFFK=ghI?FldYKp5VPAefKtwqiv6rHW$Z3AID=sUp1#Ynoi!N&_?8W{S(*3T%q z1;955k|8jOfL)Z4bdQ5y0_Z6)(}9s*2ySs^I4P=R!8`}{dGIJOk~~FFFM&lF9ID`1 oV-#r(&}@Qb3mn^wq*n*{yP)0US$@_>`VAOG`UuR%z?h~if8$hXX8-^I delta 310 zcmW;GF$+Oq7zN<(BPE2AB!v*^CP`8fB1tzT5~2JE!yPPN3!_EFxAcjrgrlIsehZ_3xFwQ zVK5ag3Z}Zn!PI_9AXT^dvox4emjhGL3Sg>V2}~VU0aE`qe^&!j+L~Z0UK>nJ)&*0? z^?_8~=HG^3O5X%bC7Xe%=@ww>v=xy0xB0&fh?;n?ck%&yJrHB!HR#3Z~>az*I07m}=(%Q@i6?J5WHT@|-2zOVwgOTOoB!K@sEG%ACm*oa12HB}Zg9|oF?c3>ILaY7 TEKYKa3=kzelMlc+1a=8$>Mlf%4 zD_HLI3^31l?tDR@%FFA(JnPNw(bN&J5rT>ihr?p7rK_5g_mMafsX*us-$&%B(Z?iYf2%;oH2KpuDR zeURMiNnqaR6<|5>bzq+S5irmB1E`L~rI z{Bli3ZD}BXu?u53J5c_&HzQd6=M)IvI|rhEcN>H++y~(|uYmAxuV)0=z5Ve~2;cfF Pgzx+q!k_($v5^x1&mmnL delta 235 zcmbR9f_=^l_6<#pj0~Hb8LizJ8#eFvcq{}>*vJV0>N-wX diff --git a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-3.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-3.ts index ed0773cdcef9bd75ceaa846e62791ee4e0b9246d..5d4aad179ce3d4aed4389ea58aea990b4f41abad 100644 GIT binary patch delta 170 zcmew{h4sf2)(uUJjCGrv8L#^?{@WbwFD?w^6(`MR1M>JY!94XEFz;{^n0I@sGAmH- z|Ey>spvvgAV7c#`!MxyOV7c dF#os|guhxF!ar}oXwD0iXSaj!wVfG#*#WsDLt+2` delta 170 zcmew{h4sf2)(uUJj0~Hb8L#^?Hf)ae7Z(Qdij!uu0eSqHV4ivnn0L4d%)32RnH4Da ze^#^*P-XO5u-x~}U|#Ssuw41+&5}Sl?WgxaD!E_xivW4E|AXYV?`L6rEWpUHeX%Gb dn15Uf!e6Zo;h#5PH0K4%v)e)V+Rlu=>;M|7IF0}S diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-1.ts index 5dd10d6c49c74a4d384f4598819483aaef94eec4..142fb332eda79e5b7e3fe5a40dbe85814930f566 100644 GIT binary patch delta 303 zcmW;FK?(tJ6vy%YBT3SvDI=sLX^JKxB}t@7laeHRhnU6GOmP8a;RqHM)T?m>3rDb+ z#VjlwLH&7tt54teUcG%F_JO!=h45%6S_*TEfp^^b4>t)eNyj93q`)`LJ4ud;I%gP< zLJeqHVC8_D2bUrvDJlWI4D1TiB+WpzbF4G#N=|8{bbI)UylJ9!|!6 l;0(Zd2*MH2CX6J@0`3%CY!JNx@H)K z0v+gCVCI2S0A7ia6qZ4*0<0?7*8tTSg(3qK8~A=|q8=^qX)}^qU3|avP_I7F1~{1x mfjt7(F$g9=pD~h56F76=Ss+}1+>%kqT7mr<&;~?XL;V47HB#RI diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-2.ts index cd9a366a41eb02a717bf6f14faa1c01cd36ade49..57e05869652b195f2e3f6b5d2f27af6d319ed75f 100644 GIT binary patch delta 310 zcmW;GF$+Oq7zN-yQbMSkB!v*^CP`8fB1uvr5z3D+7}Pf~7z~E{BMb)W9SqzIeulwd zG#CuFFK=ghI?FldYKp5VPAefKtwqiv6rHW$Z3AID=sUp1#Ynoi!N&_?8W{S(*3T%q z1;955k|8jOfL)Z4bdQ5y0_Z6)(}9s*2ySs^I4P=R!8`}{dGIJOk~~FFFM&lF9ID`1 oV-#r(&}@Qb3mn^wq*n*{yP)0US$@_>`VAOG`UuR%z?h~if8$hXX8-^I delta 310 zcmW;GF$+Oq7zN<(BPE2AB!v*^CP`8fB1tzT5~2JE!yPPN3!_EFxAcjrgrlIsehZ_3xFwQ zVK5ag3Z}Zn!PI_9AXT^dvox4emjhGL3Sg>V2}~VU0aE`qe^&!j+L~Z0UK>nJ)&*0? z^?_8~=HG^3O5X%bC7Xe%=@ww>v=xy0xB0&fh?;CD-8=b!y&jk~adLx$7M#U1*~3u| XiO1q3$5;nc4^qW5`2d_(;H&@un+smq delta 277 zcmbQx&N!i+aYGX$W5ecVMq?%*wVfGAF>HR#3Z~>az*I07m}=(%Q@i6?J5WHT@|-2zOVwgOTOoB!K@sL6)Xy^{~v>w#GlCpS1~!C5?$Jsjnb Wcq~qGj0`~aAXPk*55Rc^&I$n4DNY># diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-1.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-1.ts index 84a65fef8aab216bcb243847dc354f93fcdd508b..898a88817d269a4dfeb8dcd868e51d7c47bde4b6 100644 GIT binary patch delta 231 zcmX@GjqSiTwhc{;jCGrv89&=F{@Yw`cUc(7^A1|g4CH+e6$kP7Gt*f>a=8$>Mlf%4 zD_HLI3^31l?tDR@%FFA(JnPNw(bN&J5rT>ihr?p7rK_5g_mMafsX*us-$&%B(Z?iYf2%;oH2KpuDR zeURMiNnqaR6<|5>bzq+S5irmB1E`L~rI z{Bli3ZD}BXu?u53J5c_&HzQd6=M)IvI|rhEcN>H++y~(|uYmAxuV)0=z5Ve~2;cfF Pgzx+q!k_($v5^x1&mmnL delta 235 zcmbR9f_=^l_6<#pj0~Hb8LizJ8#eFvcq{}>*vJV0>N-wX diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-3.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-3.ts index dfe8812409bd98a11afe965133c8888f96cded51..3d6bb36dee8d9bbb615927d9e73697eb171ccf25 100644 GIT binary patch delta 170 zcmew{h4sf2)(uUJjCGrv8L#^?{@WbwFD?w^6(`MR1M>JY!94XEFz;{^n0I@sGAmH- z|Ey>spvvgAV7c#`!MxyOV7c dF#os|guhxF!ar}oXwD0iXSaj!wVfG#*#WsDLt+2` delta 170 zcmew{h4sf2)(uUJj0~Hb8L#^?Hf)ae7Z(Qdij!uu0eSqHV4ivnn0L4d%)32RnH4Da ze^#^*P-XO5u-x~}U|#Ssuw41+&5}Sl?WgxaD!E_xivW4E|AXYV?`L6rEWpUHeX%Gb dn15Uf!e6Zo;h#5PH0K4%v)e)V+Rlu=>;M|7IF0}S diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-1.ts b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-1.ts index 6534c169de8ebbf6eee7a39f78a2cc48b1f35058..1857e63949c38fb285a750726a057b79e62822af 100644 GIT binary patch delta 221 zcmeCs>CoBG#K>5;xtVb_Gh^MvgEf;^v)Y3g^^>#MY(R{L$?ELZ5XNH&qiph24p)#! z?c@kfJBXAx7gWt<2%~IrD>qb)2M<&YJ1Ac-AZOG~mK3#xxaYd4AplQCSuy|s delta 221 zcmeCs>CoBG#K_37xtVb_Gb6*qgEf;^v)Y3g^^>#MY(R{L$?ELZ5XNH&qiph24p)#! z?c@kfJBXAx7gWt<2%~IrD>qb)2M<&YJ1Ac-AZOG~mK3#xxaYd4Apk1hO=185 diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-2.ts b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-2.ts index 4f83164ce9d7f0574b5ecbfb001734722202ca72..70724a802709e8fadfdd23e8901887232782b09b 100644 GIT binary patch delta 293 zcmcbjenovl6C-2Y=4QrnAT{w|&E)m0tdnb)tw5Z5Fvpt39K>k=a(E{HXVHgotU-)2 zu#z-32N0(g%+X}Ggel>f{GJ`Eem)11`Y=u;^^#mr_5IvDlkamu)%SBFsdwW+QqReY zr2afFRDC@kl6o_KB=tY}k<{-OfU3_I1gozAJ6S`>4&>xIFz1z!1;qXNf;^Mg3#$SE D&-QSu delta 293 zcmcbjenovl6C)$T=4QrnAT{w|&E)m0tdnb)tw5Z5Fvpt39K>k=a(E{HXVHgotU-)2 zu#z-32N0(g%+X}Ggel>f{GJ`Eem)11`Y=u;^^#mr_5IvDlkamu)%SBFsdwW+QqReY zr2afFRDC@kl6o_KB=tY}k<{-OfU3_I1gozAJ6S`>4&>xIFz1z!1;qXNf;^Mg3#$SE D-oa$s diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-3.ts b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-3.ts index 708de44a09f250ab32002d154b7fe5e4e1b0637f..0e12016b827df85aaea0ac57e84546e8dbcbc01b 100644 GIT binary patch delta 430 zcmZ4Sl4-?DrVUMujCGrv8Owpx#Dg`H*R!%tu3@$Uaq7VwYZh}5rvb>}p8Su+0LHNf zG0MP7(%2k8oLVqPlid=gglF=5c6|tEJ_nNeFis@(l3YmY?{h)b_j7~QmxGOT=dnka z&&dl_-_Ol6`8+RFeLWvoeFa#(1-~6a{ZD=*_4@^&>hlG`>ZQQyPYKQehC#XzC=52= z7dB=BQo>?jUbi@yw_ox-NN~N(YGxo6tpKLjRg_tQJZ()d<*zrJ4aj?K63z~!oNd6= zY-eE(AaA{QHz$y?4m}UzamVfF22!Up!Mxc;U|w{cI~P!JaR)O}p8Su+0LHNf zG0MP7(%2k8oLVqPlid=gglF=5c6|tEJ_nNeFis@(l3YmY?{h)b_j7~QmxGOT=dnka z&&dl_-_Ol6`8+RFeLWvoeFa#(1-~6a{ZD=*_4@^&>hlG`>ZQQyPYKQehC#XzC=52= z7dB=BQo>?jUbi@yw_ox-NN~N(YGxo6tpKLjRg_tQJZ()d<*zrJ4aj?K63z~!oNd6= zY-eE(AaA{QHz$y?4m}UzamVfF22!Up!Mxc;U|w{cI~P!JaR)Os|Xn8m3R1F9@W}SAYezw}JKX9|s#9eP=x%P>%ccVKK(K?dKU8 jv-yFvwIJhVpgG(5RU!0a3$R1B>-#Z+)qPH3{3{9oO^ZK} delta 169 zcmezHmG#3{)(uUJj0~Hb8NEe;)Oj&?E+8eY$jl9-q;;Z&fK<8NV*wx)?QhNtq$bCJ zsneO_!a&~Rn$IA?>s|Xn8m3R1F9@W}SAYezw}JKX9|s#9eP=x%P>%ccVKGLA?dKU8 jv-yFvwIJhVpgG(5RU!0a3$R1B>-#Z+)qPH3{3{9ow&OIs diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-5.ts b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-5.ts index b0c2de66910c720515c3745b508052b7901c53f8..abbcec53fca8c4c425f65d6dc3d9b9d51374a914 100644 GIT binary patch delta 187 zcmeA;&DL?6Z9@|yW8LOv#$atAbzO&D3`pH~5*G$i-$UmM0;%cgV9LDmu>g=K-36xp z&&uWp^0HS&3jwL)d(3%()c=#}ASLRzz#5Lf-p>u>wSNc6ZQswrco}Hu_Q?{A)jU9& wUzHK0b$hlsg#X-`v0ntpFOOgZY1?j|!U!^KdwdCmZf{`(S-d@aDx<6b0MHplb^rhX delta 187 zcmeA;&DL?6Z9@|yBg5uq#$atAbzO&D3`pH~5*G$i-$UmM0;%cgV9LDmu>g=K-36xp z&&uWp^0HS&3jwL)d(3%()c=#}ASLRzz#5Lf-p>u>wSNc6ZQswrco}Hu_Q?{A)jU9& wUzHK0b$hlsg#X-`v0ntpFOOgZY1?j|!U!^KdwdCmZf{`(S-d@aDx<6b0CF2SrT_o{ diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-6.ts b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-6.ts index 54d6b573bfc6c2215b290a3d45b3d2d6ede8b9f6..10ed0748c1a3ef0870627b75520e3f57feebccff 100644 GIT binary patch delta 44 ucmezHf$_r!#tlu3jCGrv8QXP%6t{k~5RgiDw3Yx;izC$qfYj;CrF;OEh7jZc delta 44 ucmezHf$_r!#tlu3j0~Hb8QXP%6t{k~5RgiDw3Yx;izC$qfYj;CrF;NoP7ZDW diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-1.ts index 5dd10d6c49c74a4d384f4598819483aaef94eec4..142fb332eda79e5b7e3fe5a40dbe85814930f566 100644 GIT binary patch delta 303 zcmW;FK?(tJ6vy%YBT3SvDI=sLX^JKxB}t@7laeHRhnU6GOmP8a;RqHM)T?m>3rDb+ z#VjlwLH&7tt54teUcG%F_JO!=h45%6S_*TEfp^^b4>t)eNyj93q`)`LJ4ud;I%gP< zLJeqHVC8_D2bUrvDJlWI4D1TiB+WpzbF4G#N=|8{bbI)UylJ9!|!6 l;0(Zd2*MH2CX6J@0`3%CY!JNx@H)K z0v+gCVCI2S0A7ia6qZ4*0<0?7*8tTSg(3qK8~A=|q8=^qX)}^qU3|avP_I7F1~{1x mfjt7(F$g9=pD~h56F76=Ss+}1+>%kqT7mr<&;~?XL;V47HB#RI diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-2.ts index cd9a366a41eb02a717bf6f14faa1c01cd36ade49..57e05869652b195f2e3f6b5d2f27af6d319ed75f 100644 GIT binary patch delta 310 zcmW;GF$+Oq7zN-yQbMSkB!v*^CP`8fB1uvr5z3D+7}Pf~7z~E{BMb)W9SqzIeulwd zG#CuFFK=ghI?FldYKp5VPAefKtwqiv6rHW$Z3AID=sUp1#Ynoi!N&_?8W{S(*3T%q z1;955k|8jOfL)Z4bdQ5y0_Z6)(}9s*2ySs^I4P=R!8`}{dGIJOk~~FFFM&lF9ID`1 oV-#r(&}@Qb3mn^wq*n*{yP)0US$@_>`VAOG`UuR%z?h~if8$hXX8-^I delta 310 zcmW;GF$+Oq7zN<(BPE2AB!v*^CP`8fB1tzT5~2JE!yPPN3!_EFxAcjrgrlIsehZ_3xFwQ zVK5ag3Z}Zn!PI_9AXT^dvox4emjhGL3Sg>V2}~VU0aE`qe^&!j+L~Z0UK>nJ)&*0? z^?_8~=HG^3O5X%bC7Xe%=@ww>v=xy0xB0&fh?;CD-8=b!y&jk~adLx$7M#U1*~3u| XiO1q3$5;nc4^qW5`2d_(;H&@un+smq delta 277 zcmbQx&N!i+aYGX$W5ecVMq?%*wVfGAF>HR#3Z~>az*I07m}=(%Q@i6?J5WHT@|-2zOVwgOTOoB!K@sL6)Xy^{~v>w#GlCpS1~!C5?$Jsjnb Wcq~qGj0`~aAXPk*55Rc^&I$n4DNY># diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-1.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-1.ts index 84a65fef8aab216bcb243847dc354f93fcdd508b..898a88817d269a4dfeb8dcd868e51d7c47bde4b6 100644 GIT binary patch delta 231 zcmX@GjqSiTwhc{;jCGrv89&=F{@Yw`cUc(7^A1|g4CH+e6$kP7Gt*f>a=8$>Mlf%4 zD_HLI3^31l?tDR@%FFA(JnPNw(bN&J5rT>ihr?p7rK_5g_mMafsX*us-$&%B(Z?iYf2%;oH2KpuDR zeURMiNnqaR6<|5>bzq+S5irmB1E`L~rI z{Bli3ZD}BXu?u53J5c_&HzQd6=M)IvI|rhEcN>H++y~(|uYmAxuV)0=z5Ve~2;cfF Pgzx+q!k_($v5^x1&mmnL delta 235 zcmbR9f_=^l_6<#pj0~Hb8LizJ8#eFvcq{}>*vJV0>N-wX diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-3.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-3.ts index dfe8812409bd98a11afe965133c8888f96cded51..3d6bb36dee8d9bbb615927d9e73697eb171ccf25 100644 GIT binary patch delta 170 zcmew{h4sf2)(uUJjCGrv8L#^?{@WbwFD?w^6(`MR1M>JY!94XEFz;{^n0I@sGAmH- z|Ey>spvvgAV7c#`!MxyOV7c dF#os|guhxF!ar}oXwD0iXSaj!wVfG#*#WsDLt+2` delta 170 zcmew{h4sf2)(uUJj0~Hb8L#^?Hf)ae7Z(Qdij!uu0eSqHV4ivnn0L4d%)32RnH4Da ze^#^*P-XO5u-x~}U|#Ssuw41+&5}Sl?WgxaD!E_xivW4E|AXYV?`L6rEWpUHeX%Gb dn15Uf!e6Zo;h#5PH0K4%v)e)V+Rlu=>;M|7IF0}S diff --git a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-1.ts b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-1.ts index 4e73a20026e747bb583a9b7d56aa4c60ef8b212c..26f4e38f24f33ea939412e0c1eba6f2aadf360de 100644 GIT binary patch delta 215 zcmX@m&UT=kZ9@|yW8LOv#?Lm4|2CJ~i3uW!u%nCGR^;xjK!wzK;*W7^|hZ+W(AtE`Yc%A;Rj&e^QX~5K$Xrvz`XRoAi3@J z0*oN;_Qj%%+5A90zbYfhpzYZ?iYf2%;oH2KpuDR zeURMiNnqaR6<|5>bzq+S5irmB1E`L~rI z{Bli3ZD}BXu?u53J5c_&HzQd6=M)IvI|rhEcN>H++y~(|uYmAxuV)0=z5Ve~2;cfF Pgzx+q!k_($v5^x1&mmnL delta 235 zcmbR9f_=^l_6<#pj0~Hb8LizJ8#eFvcq{}>*vJV0>N-wX diff --git a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-3.ts b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-3.ts index e4eb714d7e55c0a02e425c35d670c093e15940c2..d65498c1449dcb2b6d12744b1866c88535cb0612 100644 GIT binary patch delta 170 zcmew{h4sf2)(uUJjCGrv8L#^?{@WbwFD?w^6(`MR1M>JY!94XEFz;{^n0I@sGAmH- z|Ey>spvvgAV7c#`!MxyOV7c dF#os|guhxF!ar}oXwD0iXSaj!wVfG#*#WsDLt+2` delta 170 zcmew{h4sf2)(uUJj0~Hb8L#^?Hf)ae7Z(Qdij!uu0eSqHV4ivnn0L4d%)32RnH4Da ze^#^*P-XO5u-x~}U|#Ssuw41+&5}Sl?WgxaD!E_xivW4E|AXYV?`L6rEWpUHeX%Gb dn15Uf!e6Zo;h#5PH0K4%v)e)V+Rlu=>;M|7IF0}S diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-1.ts b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-1.ts index 756660723cb5e1d6e7480b5d18476c7583424cdb..0c813b4d7e2bdebbdadab8b129533bfa50e07529 100644 GIT binary patch delta 324 zcmW;F!Ab&Q7=>YeMI%G~&852ot?o-MxtyuZV1V(wylHSkYE63#T zT)RkuJSi!_!2#z&vEp4qSc1(J94k<)Dv|itu&jaHz^M-9Ti#a}Rt|k|hTwS+KElRVA~}wrI063&mQ#?KV&yc4@-vKIAYRl{|1g(u A761SM delta 324 zcmZ2;m~qWv#tlu3j0~Hb8I75M)OKbd)v)R{@*CYX}e z0oy)V7szYad|V$){Wb(s`X*qx<)&bjx6Q#6zZIBrwgFS+c3^6?1CVOieBTL73A=(R zcXu#V?FpvVdjlzk&5wP-lz0G`@(u!1^&wzta~P0n*!(;KOi4$BDgRh7)f}(M1OQkC BS?~Y= diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-2.ts b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-2.ts index 4acfb4f0d25304e9cbc0eca4b8efc6d678d2ca68..632089df673d3838dc9a082614cb6119a635cb90 100644 GIT binary patch delta 310 zcmW;FzY2j-9Eb4^DIt_3DTMql=}k&Pq&G>DL@1YFFc{Ps7z~DYa0v#3f%**wWN;A% zg9|Vi47QWwJAHbl=X_!33p>mi6SQE8j&VBb!OH-AM$k5ar9~p>WCd?K2s%L5DdDto zfvX#QJRsr)1HVL&767*p_=czd`#6f)#3h{WNnlQaVj4^ou+2yWJ+i=-1C>0O7Qn6~ p;q)v6M-`|lnAO0(j%}nNOVFSRv=+Fv!M7vfl<0v`AFPKl-49^5X!-yE delta 310 zcmW;FzY2j-9Eb69NC~0dBq@aaFG*4oB1w`Y5y~YP3!sFybs0$uo*>lKe^gd&;S4c diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-3.ts b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-3.ts index 09dbdb35234d011a9adbed42b932d57f6af162f7..5b9aba10f64b004c4948df4538f377a4f9b38dc9 100644 GIT binary patch delta 256 zcmexT`K5A06C-2Y=4M7?CLpz)8A$!x{F)U^$#a0IU@kD#&I6`)^8u;4&F=-kl(I0G z3Ks=a-Qr+sza)_QxB0U)m{OMmQ_%`ws$U66)onhk0;ayJfhlcGFcq&2rY7qGsehY~ z>w~G^hG0tH1WYBHfvAZGdnYfjVx6pMsmWM3@!&)thiCE!OF0-v3&!A?oM8Q@3%44V(DfT{0lU`ksPOvP)1smZ!Ps$uhS zeK7Ug5KQTtfT?6N5H;~&@8ktmtdlh@H5nNu9-Ii|@J#+-DF@?d!5BP~GpymFJd;&y JkT?%)L;$a=8$>Mlf%4 zD_HLI3^31l?tDR@%FFA(JnPNw(bN&J5rT>ihr?p7rK_5g_mMafsX*us-$&%B(Z?iYf2%;oH2KpuDR zeURMiNnqaR6<|5>bzq+S5irmB1E`L~rI z{Bli3ZD}BXu?u53J5c_&HzQd6=M)IvI|rhEcN>H++y~(|uYmAxuV)0=z5Ve~2;cfF Pgzx+q!k_($v5^x1&mmnL delta 235 zcmbR9f_=^l_6<#pj0~Hb8LizJ8#eFvcq{}>*vJV0>N-wX diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-3.ts b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-3.ts index 4f6728a0e997850cd868f2acbb6cdc2ef3542265..abf234e9380c82f3613d7d96c1236d140e226695 100644 GIT binary patch delta 170 zcmew{h4sf2)(uUJjCGrv8L#^?{@WbwFD?w^6(`MR1M>JY!94XEFz;{^n0I@sGAmH- z|Ey>spvvgAV7c#`!MxyOV7c dF#os|guhxF!ar}oXwD0iXSaj!wVfG#*#WsDLt+2` delta 170 zcmew{h4sf2)(uUJj0~Hb8L#^?Hf)ae7Z(Qdij!uu0eSqHV4ivnn0L4d%)32RnH4Da ze^#^*P-XO5u-x~}U|#Ssuw41+&5}Sl?WgxaD!E_xivW4E|AXYV?`L6rEWpUHeX%Gb dn15Uf!e6Zo;h#5PH0K4%v)e)V+Rlu=>;M|7IF0}S diff --git a/packager/media/formats/mp2t/ts_packet_writer_util.cc b/packager/media/formats/mp2t/ts_packet_writer_util.cc index 8abf156f56..cb7f507acf 100644 --- a/packager/media/formats/mp2t/ts_packet_writer_util.cc +++ b/packager/media/formats/mp2t/ts_packet_writer_util.cc @@ -97,7 +97,7 @@ void WriteAdaptationField(bool has_pcr, const uint32_t most_significant_32bits_pcr = static_cast(pcr_base >> 1); const uint16_t pcr_last_bit_reserved_and_pcr_extension = - ((pcr_base & 1) << 15); + ((pcr_base & 1) << 15) | 0x7e00; // Set the 6 reserved bits to '1' writer->AppendInt(most_significant_32bits_pcr); writer->AppendInt(pcr_last_bit_reserved_and_pcr_extension); remaining_bytes -= kPcrFieldsSize; diff --git a/packager/media/formats/mp2t/ts_writer_unittest.cc b/packager/media/formats/mp2t/ts_writer_unittest.cc index b2d5582c22..cac05aef8f 100644 --- a/packager/media/formats/mp2t/ts_writer_unittest.cc +++ b/packager/media/formats/mp2t/ts_writer_unittest.cc @@ -319,7 +319,7 @@ TEST_F(TsWriterTest, AddPesPacket) { 0x30, // Adaptation field and payload are both present. counter = 0. 0xA0, // Adaptation Field length. 0x10, // pcr flag. - 0x00, 0x00, 0x04, 0x80, 0x00, 0x00, // PCR. + 0x00, 0x00, 0x04, 0x80, 0x7e, 0x00, // PCR. }; const uint8_t kExpectedPayload[] = { @@ -411,7 +411,7 @@ TEST_F(TsWriterTest, PesPtsZeroNoDts) { 0x30, // Adaptation field and payload are both present. counter = 0. 0xA5, // Adaptation Field length. 0x10, // pcr flag. - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // PCR. + 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, // PCR. }; const uint8_t kExpectedPayload[] = {