diff --git a/packager/app/test/testdata/acc-he/bear-640x360-aac_he-silent_right-audio.mp4 b/packager/app/test/testdata/acc-he/bear-640x360-aac_he-silent_right-audio.mp4 index 67829e30ff..863fff41ee 100644 Binary files a/packager/app/test/testdata/acc-he/bear-640x360-aac_he-silent_right-audio.mp4 and b/packager/app/test/testdata/acc-he/bear-640x360-aac_he-silent_right-audio.mp4 differ diff --git a/packager/app/test/testdata/acc-he/output.mpd b/packager/app/test/testdata/acc-he/output.mpd index 2f625aa48a..9da35fae0d 100644 --- a/packager/app/test/testdata/acc-he/output.mpd +++ b/packager/app/test/testdata/acc-he/output.mpd @@ -6,8 +6,8 @@ bear-640x360-aac_he-silent_right-audio.mp4 - - + + diff --git a/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/bear-640x360-audio.mp4 index 7128d250eb..a86c776cf5 100644 Binary files a/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/bear-640x360-audio.mp4 and b/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/bear-640x360-video.mp4 b/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/bear-640x360-video.mp4 index 9bc668f8f6..04ed1816fe 100644 Binary files a/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/bear-640x360-video.mp4 and b/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/output.mpd b/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/output.mpd index 43a0b73ab8..8032c02725 100644 --- a/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/output.mpd +++ b/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/output.mpd @@ -11,8 +11,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-1280x720-video-trick_play_factor_1.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-1280x720-video-trick_play_factor_1.mp4 index 936f72e2a7..4dcea28bd0 100644 Binary files a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-1280x720-video-trick_play_factor_1.mp4 and b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-1280x720-video-trick_play_factor_1.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-1280x720-video.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-1280x720-video.mp4 index 7a6ea9ee19..aca7e1cfd5 100644 Binary files a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-1280x720-video.mp4 and b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-1280x720-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-audio.mp4 index 81afce8c79..6a196f333d 100644 Binary files a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-audio.mp4 and b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-hevc-video.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-hevc-video.mp4 index a8c72073be..eb98dd0f7f 100644 Binary files a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-hevc-video.mp4 and b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-hevc-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-video.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-video.mp4 index c82b090d9e..506a9d66ee 100644 Binary files a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-video.mp4 and b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/output.mpd b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/output.mpd index 54d9782cb8..2893b62da0 100644 --- a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/output.mpd +++ b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/output.mpd @@ -11,8 +11,8 @@ bear-640x360-hevc-video.mp4 - - + + @@ -25,40 +25,40 @@ bear-640x360-video.mp4 - - + + bear-1280x720-video.mp4 - - + + - - - - AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - - - - bear-640x360-audio.mp4 - - - - - - + AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + bear-1280x720-video-trick_play_factor_1.mp4 - - + + + + + + + + + AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== + + + + bear-640x360-audio.mp4 + + diff --git a/packager/app/test/testdata/audio-video-with-codec-switching/bear-1280x720-video.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching/bear-1280x720-video.mp4 index fe9098fadc..d7a8e3d411 100644 Binary files a/packager/app/test/testdata/audio-video-with-codec-switching/bear-1280x720-video.mp4 and b/packager/app/test/testdata/audio-video-with-codec-switching/bear-1280x720-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-audio.mp4 index 7128d250eb..a86c776cf5 100644 Binary files a/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-audio.mp4 and b/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-hevc-video.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-hevc-video.mp4 index 298f9532bb..77a649e6ad 100644 Binary files a/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-hevc-video.mp4 and b/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-hevc-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-video.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-video.mp4 index 9bc668f8f6..04ed1816fe 100644 Binary files a/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-video.mp4 and b/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-codec-switching/output.mpd b/packager/app/test/testdata/audio-video-with-codec-switching/output.mpd index 5a7630776d..9241a6c2c8 100644 --- a/packager/app/test/testdata/audio-video-with-codec-switching/output.mpd +++ b/packager/app/test/testdata/audio-video-with-codec-switching/output.mpd @@ -7,8 +7,8 @@ bear-640x360-hevc-video.mp4 - - + + @@ -17,14 +17,14 @@ bear-1280x720-video.mp4 - - + + bear-640x360-video.mp4 - - + + @@ -32,8 +32,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.m3u8 b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.m3u8 index bfb30ce496..4e60022727 100644 --- a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.m3u8 @@ -3,9 +3,9 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="793@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="797@0" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@861 +#EXT-X-BYTERANGE:17028@865 bear-640x360-audio.mp4 #EXTINF:0.998, #EXT-X-BYTERANGE:16285 diff --git a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.mp4 index 50899857d2..fff6904d27 100644 Binary files a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.mp4 and b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video-iframe.m3u8 index 7c16d360b3..909ce88747 100644 --- a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video-iframe.m3u8 @@ -4,14 +4,14 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="863@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@927 +#EXT-X-BYTERANGE:15581@931 bear-640x360-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18221@100240 +#EXT-X-BYTERANGE:18221@100244 bear-640x360-video.mp4 #EXTINF:0.734, -#EXT-X-BYTERANGE:19663@222047 +#EXT-X-BYTERANGE:19663@222051 bear-640x360-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.m3u8 b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.m3u8 index baf17ef66b..4e8bdb5f7f 100644 --- a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.m3u8 @@ -3,9 +3,9 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="863@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@927 +#EXT-X-BYTERANGE:99313@931 bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:121807 diff --git a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.mp4 b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.mp4 index 9bc668f8f6..04ed1816fe 100644 Binary files a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.mp4 and b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.mpd b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.mpd index 5b3b059ac7..f43fd6be8f 100644 --- a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.mpd +++ b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.mpd @@ -5,8 +5,8 @@ bear-640x360-video.mp4 - - + + @@ -14,8 +14,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.m3u8 b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.m3u8 index bfb30ce496..4e60022727 100644 --- a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.m3u8 @@ -3,9 +3,9 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="793@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="797@0" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@861 +#EXT-X-BYTERANGE:17028@865 bear-640x360-audio.mp4 #EXTINF:0.998, #EXT-X-BYTERANGE:16285 diff --git a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.mp4 index 50899857d2..fff6904d27 100644 Binary files a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.mp4 and b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video-iframe.m3u8 index 7c16d360b3..909ce88747 100644 --- a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video-iframe.m3u8 @@ -4,14 +4,14 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="863@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@927 +#EXT-X-BYTERANGE:15581@931 bear-640x360-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18221@100240 +#EXT-X-BYTERANGE:18221@100244 bear-640x360-video.mp4 #EXTINF:0.734, -#EXT-X-BYTERANGE:19663@222047 +#EXT-X-BYTERANGE:19663@222051 bear-640x360-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.m3u8 b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.m3u8 index baf17ef66b..4e8bdb5f7f 100644 --- a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.m3u8 @@ -3,9 +3,9 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="863@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@927 +#EXT-X-BYTERANGE:99313@931 bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:121807 diff --git a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.mp4 b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.mp4 index 9bc668f8f6..04ed1816fe 100644 Binary files a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.mp4 and b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-language-override/output.mpd b/packager/app/test/testdata/audio-video-with-language-override/output.mpd index 8e93172d75..7bbc836fb5 100644 --- a/packager/app/test/testdata/audio-video-with-language-override/output.mpd +++ b/packager/app/test/testdata/audio-video-with-language-override/output.mpd @@ -5,8 +5,8 @@ bear-640x360-video.mp4 - - + + @@ -15,8 +15,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-audio.mp4 index 7128d250eb..a86c776cf5 100644 Binary files a/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-audio.mp4 and b/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-video-trick_play_factor_1.mp4 b/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-video-trick_play_factor_1.mp4 index 17f6db1b74..1d11aed2c8 100644 Binary files a/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-video-trick_play_factor_1.mp4 and b/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-video-trick_play_factor_1.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-video.mp4 b/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-video.mp4 index 9bc668f8f6..04ed1816fe 100644 Binary files a/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-video.mp4 and b/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-trick-play/output.mpd b/packager/app/test/testdata/audio-video-with-trick-play/output.mpd index 3d73826001..2a39ee37ae 100644 --- a/packager/app/test/testdata/audio-video-with-trick-play/output.mpd +++ b/packager/app/test/testdata/audio-video-with-trick-play/output.mpd @@ -5,8 +5,8 @@ bear-640x360-video.mp4 - - + + @@ -14,8 +14,8 @@ bear-640x360-video-trick_play_factor_1.mp4 - - + + @@ -23,8 +23,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-audio.mp4 index 7128d250eb..a86c776cf5 100644 Binary files a/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-audio.mp4 and b/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video-trick_play_factor_1.mp4 b/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video-trick_play_factor_1.mp4 index 17f6db1b74..1d11aed2c8 100644 Binary files a/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video-trick_play_factor_1.mp4 and b/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video-trick_play_factor_1.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video-trick_play_factor_2.mp4 b/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video-trick_play_factor_2.mp4 index 09c0d1b8f7..bb9cd19492 100644 Binary files a/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video-trick_play_factor_2.mp4 and b/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video-trick_play_factor_2.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video.mp4 b/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video.mp4 index 9bc668f8f6..04ed1816fe 100644 Binary files a/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video.mp4 and b/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-two-trick-play/output.mpd b/packager/app/test/testdata/audio-video-with-two-trick-play/output.mpd index 1585bc0a20..cd17866f43 100644 --- a/packager/app/test/testdata/audio-video-with-two-trick-play/output.mpd +++ b/packager/app/test/testdata/audio-video-with-two-trick-play/output.mpd @@ -5,8 +5,8 @@ bear-640x360-video.mp4 - - + + @@ -14,14 +14,14 @@ bear-640x360-video-trick_play_factor_1.mp4 - - + + bear-640x360-video-trick_play_factor_2.mp4 - - + + @@ -29,8 +29,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/audio-video/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video/bear-640x360-audio.mp4 index 7128d250eb..a86c776cf5 100644 Binary files a/packager/app/test/testdata/audio-video/bear-640x360-audio.mp4 and b/packager/app/test/testdata/audio-video/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/audio-video/bear-640x360-video.mp4 b/packager/app/test/testdata/audio-video/bear-640x360-video.mp4 index 9bc668f8f6..04ed1816fe 100644 Binary files a/packager/app/test/testdata/audio-video/bear-640x360-video.mp4 and b/packager/app/test/testdata/audio-video/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video/output.mpd b/packager/app/test/testdata/audio-video/output.mpd index 6937a5b732..06db2544ae 100644 --- a/packager/app/test/testdata/audio-video/output.mpd +++ b/packager/app/test/testdata/audio-video/output.mpd @@ -5,8 +5,8 @@ bear-640x360-video.mp4 - - + + @@ -14,8 +14,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/av1-mp4-with-encryption/bear-av1-video.mp4 b/packager/app/test/testdata/av1-mp4-with-encryption/bear-av1-video.mp4 index ea9660b110..4c0f523b85 100644 Binary files a/packager/app/test/testdata/av1-mp4-with-encryption/bear-av1-video.mp4 and b/packager/app/test/testdata/av1-mp4-with-encryption/bear-av1-video.mp4 differ diff --git a/packager/app/test/testdata/av1-mp4-with-encryption/decrypted-bear-av1-video-0.mp4 b/packager/app/test/testdata/av1-mp4-with-encryption/decrypted-bear-av1-video-0.mp4 index fd64d498e1..8b4a89fbe4 100644 Binary files a/packager/app/test/testdata/av1-mp4-with-encryption/decrypted-bear-av1-video-0.mp4 and b/packager/app/test/testdata/av1-mp4-with-encryption/decrypted-bear-av1-video-0.mp4 differ diff --git a/packager/app/test/testdata/av1-mp4-with-encryption/output.mpd b/packager/app/test/testdata/av1-mp4-with-encryption/output.mpd index 1fb10af8e2..3ee349b51c 100644 --- a/packager/app/test/testdata/av1-mp4-with-encryption/output.mpd +++ b/packager/app/test/testdata/av1-mp4-with-encryption/output.mpd @@ -9,8 +9,8 @@ bear-av1-video.mp4 - - + + diff --git a/packager/app/test/testdata/av1-mp4-with-encryption/stream_0.m3u8 b/packager/app/test/testdata/av1-mp4-with-encryption/stream_0.m3u8 index a36c7d0b9e..5e6e140d8a 100644 --- a/packager/app/test/testdata/av1-mp4-with-encryption/stream_0.m3u8 +++ b/packager/app/test/testdata/av1-mp4-with-encryption/stream_0.m3u8 @@ -3,8 +3,8 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:3 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-av1-video.mp4",BYTERANGE="1041@0" +#EXT-X-MAP:URI="bear-av1-video.mp4",BYTERANGE="1045@0" #EXTINF:2.736, -#EXT-X-BYTERANGE:23864@1085 +#EXT-X-BYTERANGE:23864@1089 bear-av1-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/av1-mp4/bear-av1-video.mp4 b/packager/app/test/testdata/av1-mp4/bear-av1-video.mp4 index fd64d498e1..8b4a89fbe4 100644 Binary files a/packager/app/test/testdata/av1-mp4/bear-av1-video.mp4 and b/packager/app/test/testdata/av1-mp4/bear-av1-video.mp4 differ diff --git a/packager/app/test/testdata/av1-mp4/output.mpd b/packager/app/test/testdata/av1-mp4/output.mpd index c24f476651..87e0a3e155 100644 --- a/packager/app/test/testdata/av1-mp4/output.mpd +++ b/packager/app/test/testdata/av1-mp4/output.mpd @@ -5,8 +5,8 @@ bear-av1-video.mp4 - - + + diff --git a/packager/app/test/testdata/av1-mp4/stream_0.m3u8 b/packager/app/test/testdata/av1-mp4/stream_0.m3u8 index 3ab711063a..d148632a19 100644 --- a/packager/app/test/testdata/av1-mp4/stream_0.m3u8 +++ b/packager/app/test/testdata/av1-mp4/stream_0.m3u8 @@ -3,8 +3,8 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:3 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-av1-video.mp4",BYTERANGE="798@0" +#EXT-X-MAP:URI="bear-av1-video.mp4",BYTERANGE="802@0" #EXTINF:2.736, -#EXT-X-BYTERANGE:23864@842 +#EXT-X-BYTERANGE:23864@846 bear-av1-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/av1-webm/bear-av1-video.mp4 b/packager/app/test/testdata/av1-webm/bear-av1-video.mp4 index 5021b08e92..668913c9c1 100644 Binary files a/packager/app/test/testdata/av1-webm/bear-av1-video.mp4 and b/packager/app/test/testdata/av1-webm/bear-av1-video.mp4 differ diff --git a/packager/app/test/testdata/av1-webm/output.mpd b/packager/app/test/testdata/av1-webm/output.mpd index 7e350c63a1..f1b4a0396b 100644 --- a/packager/app/test/testdata/av1-webm/output.mpd +++ b/packager/app/test/testdata/av1-webm/output.mpd @@ -5,8 +5,8 @@ bear-av1-video.mp4 - - + + diff --git a/packager/app/test/testdata/av1-webm/stream_0.m3u8 b/packager/app/test/testdata/av1-webm/stream_0.m3u8 index 5182dd0c0d..056a78d067 100644 --- a/packager/app/test/testdata/av1-webm/stream_0.m3u8 +++ b/packager/app/test/testdata/av1-webm/stream_0.m3u8 @@ -3,8 +3,8 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:3 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-av1-video.mp4",BYTERANGE="798@0" +#EXT-X-MAP:URI="bear-av1-video.mp4",BYTERANGE="802@0" #EXTINF:2.735, -#EXT-X-BYTERANGE:24188@842 +#EXT-X-BYTERANGE:24188@846 bear-av1-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.m3u8 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.m3u8 index 0afe3072bf..1d2ea45c1d 100644 --- a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.m3u8 @@ -3,9 +3,9 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-ac3-audio.mp4",BYTERANGE="726@0" +#EXT-X-MAP:URI="bear-640x360-ac3-audio.mp4",BYTERANGE="730@0" #EXTINF:0.975, -#EXT-X-BYTERANGE:23728@794 +#EXT-X-BYTERANGE:23728@798 bear-640x360-ac3-audio.mp4 #EXTINF:1.010, #EXT-X-BYTERANGE:24574 diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.mp4 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.mp4 index 84a7c72c98..34679eab6d 100644 Binary files a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.mp4 and b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.mp4 differ diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video-iframe.m3u8 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video-iframe.m3u8 index 7a72360de2..41d333f8f4 100644 --- a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video-iframe.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video-iframe.m3u8 @@ -4,14 +4,14 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY -#EXT-X-MAP:URI="bear-640x360-ac3-video.mp4",BYTERANGE="863@0" +#EXT-X-MAP:URI="bear-640x360-ac3-video.mp4",BYTERANGE="867@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@931 +#EXT-X-BYTERANGE:15581@935 bear-640x360-ac3-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18221@100244 +#EXT-X-BYTERANGE:18221@100248 bear-640x360-ac3-video.mp4 #EXTINF:0.734, -#EXT-X-BYTERANGE:19663@222051 +#EXT-X-BYTERANGE:19663@222055 bear-640x360-ac3-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.m3u8 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.m3u8 index 0faccfd182..03f8e904c4 100644 --- a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.m3u8 @@ -3,9 +3,9 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-ac3-video.mp4",BYTERANGE="863@0" +#EXT-X-MAP:URI="bear-640x360-ac3-video.mp4",BYTERANGE="867@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@931 +#EXT-X-BYTERANGE:99313@935 bear-640x360-ac3-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:121807 diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.mp4 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.mp4 index 97ad3c1e43..d96c841815 100644 Binary files a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.mp4 and b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.mp4 differ diff --git a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-3.m4s b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-3.m4s index 8dcbed3059..4673561522 100644 Binary files a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-3.m4s and b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-3.m4s differ diff --git a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-4.m4s b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-4.m4s index e19520d815..3ec4d1a73f 100644 Binary files a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-4.m4s and b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-4.m4s differ diff --git a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-5.m4s b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-5.m4s index 0f3473d369..cce7bd34a6 100644 Binary files a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-5.m4s and b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-5.m4s differ diff --git a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-6.m4s b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-6.m4s index b187049c54..95e198c19c 100644 Binary files a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-6.m4s and b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-6.m4s differ diff --git a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-init.mp4 index cd5b19acde..e187b71434 100644 Binary files a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.m3u8 index eba3cb65c3..bddefcc45a 100644 --- a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.m3u8 +++ b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.m3u8 @@ -5,5 +5,5 @@ #EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2" -#EXT-X-STREAM-INF:BANDWIDTH=133850,AVERAGE-BANDWIDTH=126393,CODECS="mp4a.40.2",AUDIO="default-audio-group" +#EXT-X-STREAM-INF:BANDWIDTH=133919,AVERAGE-BANDWIDTH=126463,CODECS="mp4a.40.2",AUDIO="default-audio-group" bear-640x360-audio.m3u8 diff --git a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.mpd b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.mpd index 674e7e3232..ed0ce2a00b 100644 --- a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.mpd +++ b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.mpd @@ -3,7 +3,7 @@ - + diff --git a/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.m3u8 b/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.m3u8 index bfb30ce496..4e60022727 100644 --- a/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.m3u8 @@ -3,9 +3,9 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="793@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="797@0" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@861 +#EXT-X-BYTERANGE:17028@865 bear-640x360-audio.mp4 #EXTINF:0.998, #EXT-X-BYTERANGE:16285 diff --git a/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.mp4 b/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.mp4 index 7128d250eb..a86c776cf5 100644 Binary files a/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.mp4 and b/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/bandwidth-override/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/bandwidth-override/bear-640x360-video-iframe.m3u8 index 7c16d360b3..909ce88747 100644 --- a/packager/app/test/testdata/bandwidth-override/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/bandwidth-override/bear-640x360-video-iframe.m3u8 @@ -4,14 +4,14 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="863@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@927 +#EXT-X-BYTERANGE:15581@931 bear-640x360-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18221@100240 +#EXT-X-BYTERANGE:18221@100244 bear-640x360-video.mp4 #EXTINF:0.734, -#EXT-X-BYTERANGE:19663@222047 +#EXT-X-BYTERANGE:19663@222051 bear-640x360-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/bandwidth-override/bear-640x360-video.m3u8 b/packager/app/test/testdata/bandwidth-override/bear-640x360-video.m3u8 index baf17ef66b..4e8bdb5f7f 100644 --- a/packager/app/test/testdata/bandwidth-override/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/bandwidth-override/bear-640x360-video.m3u8 @@ -3,9 +3,9 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="863@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@927 +#EXT-X-BYTERANGE:99313@931 bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:121807 diff --git a/packager/app/test/testdata/bandwidth-override/bear-640x360-video.mp4 b/packager/app/test/testdata/bandwidth-override/bear-640x360-video.mp4 index 9bc668f8f6..04ed1816fe 100644 Binary files a/packager/app/test/testdata/bandwidth-override/bear-640x360-video.mp4 and b/packager/app/test/testdata/bandwidth-override/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/bandwidth-override/output.mpd b/packager/app/test/testdata/bandwidth-override/output.mpd index 76106d2a37..395a7bb785 100644 --- a/packager/app/test/testdata/bandwidth-override/output.mpd +++ b/packager/app/test/testdata/bandwidth-override/output.mpd @@ -5,8 +5,8 @@ bear-640x360-video.mp4 - - + + @@ -14,8 +14,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.mpd b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.mpd index f779b275d4..378a7e7f05 100644 --- a/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.mpd +++ b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.mpd @@ -9,8 +9,8 @@ sparks_dovi_5-video.mp4 - - + + diff --git a/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/sparks_dovi_5-video.mp4 b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/sparks_dovi_5-video.mp4 index 3a036fedd9..6d41a95a68 100644 Binary files a/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/sparks_dovi_5-video.mp4 and b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/sparks_dovi_5-video.mp4 differ diff --git a/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/stream_0.m3u8 b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/stream_0.m3u8 index 413a58dafa..d0721b487e 100644 --- a/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/stream_0.m3u8 +++ b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/stream_0.m3u8 @@ -3,10 +3,10 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:3 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="sparks_dovi_5-video.mp4",BYTERANGE="1355@0" +#EXT-X-MAP:URI="sparks_dovi_5-video.mp4",BYTERANGE="1359@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:2.002, -#EXT-X-BYTERANGE:185521@1435 +#EXT-X-BYTERANGE:185521@1439 sparks_dovi_5-video.mp4 #EXTINF:2.002, #EXT-X-BYTERANGE:197565 diff --git a/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/output.mpd b/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/output.mpd index 9a9057dbb3..6b80ab5e99 100644 --- a/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/output.mpd +++ b/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/output.mpd @@ -9,8 +9,8 @@ sparks_dovi_8-video.mp4 - - + + @@ -21,8 +21,8 @@ sparks_dovi_8-video.mp4 - - + + diff --git a/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/sparks_dovi_8-video.mp4 b/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/sparks_dovi_8-video.mp4 index 9d45d17ada..3d195949a2 100644 Binary files a/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/sparks_dovi_8-video.mp4 and b/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/sparks_dovi_8-video.mp4 differ diff --git a/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/stream_0.m3u8 b/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/stream_0.m3u8 index 6e64c73711..bd6fd0465e 100644 --- a/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/stream_0.m3u8 +++ b/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/stream_0.m3u8 @@ -3,10 +3,10 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:3 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="sparks_dovi_8-video.mp4",BYTERANGE="1355@0" +#EXT-X-MAP:URI="sparks_dovi_8-video.mp4",BYTERANGE="1359@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:2.002, -#EXT-X-BYTERANGE:172013@1435 +#EXT-X-BYTERANGE:172013@1439 sparks_dovi_8-video.mp4 #EXTINF:2.002, #EXT-X-BYTERANGE:189474 diff --git a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.m3u8 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.m3u8 index ba062cde5f..a5933ef15e 100644 --- a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.m3u8 +++ b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.m3u8 @@ -3,10 +3,10 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-ec3-audio.mp4",BYTERANGE="945@0" +#EXT-X-MAP:URI="bear-640x360-ec3-audio.mp4",BYTERANGE="949@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.004, -#EXT-X-BYTERANGE:24460@1013 +#EXT-X-BYTERANGE:24460@1017 bear-640x360-ec3-audio.mp4 #EXTINF:1.010, #EXT-X-BYTERANGE:24747 diff --git a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.mp4 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.mp4 index 3443d7f1b3..1a90fee88b 100644 Binary files a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.mp4 and b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.mp4 differ diff --git a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video-iframe.m3u8 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video-iframe.m3u8 index cbaddab1fa..aad4039d74 100644 --- a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video-iframe.m3u8 +++ b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video-iframe.m3u8 @@ -4,15 +4,15 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY -#EXT-X-MAP:URI="bear-640x360-ec3-video.mp4",BYTERANGE="1127@0" +#EXT-X-MAP:URI="bear-640x360-ec3-video.mp4",BYTERANGE="1131@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:15665@1195 +#EXT-X-BYTERANGE:15665@1199 bear-640x360-ec3-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18754@95000 +#EXT-X-BYTERANGE:18754@95004 bear-640x360-ec3-video.mp4 #EXTINF:0.734, -#EXT-X-BYTERANGE:20068@217340 +#EXT-X-BYTERANGE:20068@217344 bear-640x360-ec3-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.m3u8 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.m3u8 index c9b89504e7..8996c60cb2 100644 --- a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.m3u8 +++ b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.m3u8 @@ -3,10 +3,10 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-ec3-video.mp4",BYTERANGE="1127@0" +#EXT-X-MAP:URI="bear-640x360-ec3-video.mp4",BYTERANGE="1131@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:93805@1195 +#EXT-X-BYTERANGE:93805@1199 bear-640x360-ec3-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:122340 diff --git a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.mp4 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.mp4 index 9aa4624241..e8d6c342da 100644 Binary files a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.mp4 and b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-audio.mp4 index d989336d24..80dde0beea 100644 Binary files a/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-video-trick_play_factor_1.mp4 b/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-video-trick_play_factor_1.mp4 index a71bd09ad1..702b955b01 100644 Binary files a/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-video-trick_play_factor_1.mp4 and b/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-video-trick_play_factor_1.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-video.mp4 index c82b090d9e..506a9d66ee 100644 Binary files a/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/output.mpd b/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/output.mpd index a69aa022e2..bab2e5ac5f 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/output.mpd +++ b/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/output.mpd @@ -10,8 +10,8 @@ bear-640x360-audio.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-video.mp4 - - + + @@ -35,8 +35,8 @@ bear-640x360-video-trick_play_factor_1.mp4 - - + + @@ -50,8 +50,8 @@ bear-640x360-audio.mp4 - - + + @@ -62,8 +62,8 @@ bear-640x360-video.mp4 - - + + @@ -75,8 +75,8 @@ bear-640x360-video-trick_play_factor_1.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio.m3u8 b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio.m3u8 index 4bf434fd7a..cc27914413 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio.m3u8 @@ -3,10 +3,10 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-audio1.mp4",BYTERANGE="1003@0" +#EXT-X-MAP:URI="bear-640x360-audio1.mp4",BYTERANGE="1007@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@1059 +#EXT-X-BYTERANGE:17028@1063 bear-640x360-audio1.mp4 #EXTINF:0.975, #EXT-X-BYTERANGE:16269 @@ -14,6 +14,6 @@ bear-640x360-audio1.mp4 #EXT-X-PLACEMENT-OPPORTUNITY #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:0.743, -#EXT-X-BYTERANGE:10272@1047 +#EXT-X-BYTERANGE:10272@1051 bear-640x360-audio2.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio1.mp4 b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio1.mp4 index 2b97d2fba6..0af2d95343 100644 Binary files a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio1.mp4 and b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio1.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio2.mp4 b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio2.mp4 index 0a7b85b861..66ef12945d 100644 Binary files a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio2.mp4 and b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio2.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video-iframe.m3u8 index 46a7737114..85cd30bce6 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video-iframe.m3u8 @@ -4,17 +4,17 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY -#EXT-X-MAP:URI="bear-640x360-video1.mp4",BYTERANGE="1127@0" +#EXT-X-MAP:URI="bear-640x360-video1.mp4",BYTERANGE="1131@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@1183 +#EXT-X-BYTERANGE:15581@1187 bear-640x360-video1.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18754@100496 +#EXT-X-BYTERANGE:18754@100500 bear-640x360-video1.mp4 #EXT-X-PLACEMENT-OPPORTUNITY #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:0.734, -#EXT-X-BYTERANGE:20068@1171 +#EXT-X-BYTERANGE:20068@1175 bear-640x360-video2.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video.m3u8 b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video.m3u8 index 69086961a8..eccf901cbe 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video.m3u8 @@ -3,10 +3,10 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video1.mp4",BYTERANGE="1127@0" +#EXT-X-MAP:URI="bear-640x360-video1.mp4",BYTERANGE="1131@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@1183 +#EXT-X-BYTERANGE:99313@1187 bear-640x360-video1.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:122340 @@ -14,6 +14,6 @@ bear-640x360-video1.mp4 #EXT-X-PLACEMENT-OPPORTUNITY #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:0.734, -#EXT-X-BYTERANGE:80067@1171 +#EXT-X-BYTERANGE:80067@1175 bear-640x360-video2.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video1.mp4 b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video1.mp4 index 8886a1a02c..74dc52d9d8 100644 Binary files a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video1.mp4 and b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video1.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video2.mp4 b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video2.mp4 index 6c6bf1acb5..f53ce18c45 100644 Binary files a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video2.mp4 and b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video2.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-ad-cues-split-content/output.mpd b/packager/app/test/testdata/encryption-and-ad-cues-split-content/output.mpd index 002796df53..da61e47ec0 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues-split-content/output.mpd +++ b/packager/app/test/testdata/encryption-and-ad-cues-split-content/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video1.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio1.mp4 - - + + @@ -36,8 +36,8 @@ bear-640x360-video2.mp4 - - + + @@ -49,8 +49,8 @@ bear-640x360-audio2.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.m3u8 b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.m3u8 index 074f9ef39a..06f545169f 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.m3u8 @@ -3,10 +3,10 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="1003@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="1007@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@1071 +#EXT-X-BYTERANGE:17028@1075 bear-640x360-audio.mp4 #EXTINF:0.975, #EXT-X-BYTERANGE:16269 diff --git a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.mp4 index d989336d24..80dde0beea 100644 Binary files a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video-iframe.m3u8 index 365f9a2166..f6f3053452 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video-iframe.m3u8 @@ -4,16 +4,16 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1127@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1131@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@1195 +#EXT-X-BYTERANGE:15581@1199 bear-640x360-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18754@100508 +#EXT-X-BYTERANGE:18754@100512 bear-640x360-video.mp4 #EXT-X-PLACEMENT-OPPORTUNITY #EXTINF:0.734, -#EXT-X-BYTERANGE:20068@222848 +#EXT-X-BYTERANGE:20068@222852 bear-640x360-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.m3u8 b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.m3u8 index ee532489b3..5e01d87116 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.m3u8 @@ -3,10 +3,10 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1127@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1131@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@1195 +#EXT-X-BYTERANGE:99313@1199 bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:122340 diff --git a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.mp4 index c82b090d9e..506a9d66ee 100644 Binary files a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-ad-cues/output.mpd b/packager/app/test/testdata/encryption-and-ad-cues/output.mpd index 228bcba980..757464e1c5 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues/output.mpd +++ b/packager/app/test/testdata/encryption-and-ad-cues/output.mpd @@ -10,8 +10,8 @@ bear-640x360-audio.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-video.mp4 - - + + @@ -37,8 +37,8 @@ bear-640x360-audio.mp4 - - + + @@ -49,8 +49,8 @@ bear-640x360-video.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-audio.mp4 index 91b967fb27..5fd86d115a 100644 Binary files a/packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-video.mp4 index 2841b7e2a7..66c33fca7f 100644 Binary files a/packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-no-clear-lead/decrypted-bear-640x360-audio-0.mp4 b/packager/app/test/testdata/encryption-and-no-clear-lead/decrypted-bear-640x360-audio-0.mp4 index 7128d250eb..a86c776cf5 100644 Binary files a/packager/app/test/testdata/encryption-and-no-clear-lead/decrypted-bear-640x360-audio-0.mp4 and b/packager/app/test/testdata/encryption-and-no-clear-lead/decrypted-bear-640x360-audio-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-no-clear-lead/decrypted-bear-640x360-video-0.mp4 b/packager/app/test/testdata/encryption-and-no-clear-lead/decrypted-bear-640x360-video-0.mp4 index 9bc668f8f6..04ed1816fe 100644 Binary files a/packager/app/test/testdata/encryption-and-no-clear-lead/decrypted-bear-640x360-video-0.mp4 and b/packager/app/test/testdata/encryption-and-no-clear-lead/decrypted-bear-640x360-video-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-no-clear-lead/output.mpd b/packager/app/test/testdata/encryption-and-no-clear-lead/output.mpd index a210d1f375..976fb95e33 100644 --- a/packager/app/test/testdata/encryption-and-no-clear-lead/output.mpd +++ b/packager/app/test/testdata/encryption-and-no-clear-lead/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-audio.mp4 index 22d9741b3c..c9e6e3a824 100644 Binary files a/packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-video.mp4 index 81691dafee..638172c5ba 100644 Binary files a/packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-no-pssh-in-stream/output.mpd b/packager/app/test/testdata/encryption-and-no-pssh-in-stream/output.mpd index 8984bb81c5..33c32168a8 100644 --- a/packager/app/test/testdata/encryption-and-no-pssh-in-stream/output.mpd +++ b/packager/app/test/testdata/encryption-and-no-pssh-in-stream/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-non-dash-if-iop/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-non-dash-if-iop/bear-640x360-audio.mp4 index 81afce8c79..6a196f333d 100644 Binary files a/packager/app/test/testdata/encryption-and-non-dash-if-iop/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-and-non-dash-if-iop/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-non-dash-if-iop/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-non-dash-if-iop/bear-640x360-video.mp4 index c82b090d9e..506a9d66ee 100644 Binary files a/packager/app/test/testdata/encryption-and-non-dash-if-iop/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-and-non-dash-if-iop/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-non-dash-if-iop/output.mpd b/packager/app/test/testdata/encryption-and-non-dash-if-iop/output.mpd index 9e57374ebc..2418f1e46d 100644 --- a/packager/app/test/testdata/encryption-and-non-dash-if-iop/output.mpd +++ b/packager/app/test/testdata/encryption-and-non-dash-if-iop/output.mpd @@ -9,8 +9,8 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/bear-640x360-video.mp4 index c82b090d9e..506a9d66ee 100644 Binary files a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/bear-640x360-video.mp4.media_info b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/bear-640x360-video.mp4.media_info index 3dd2d56428..b851ffc019 100644 --- a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/bear-640x360-video.mp4.media_info +++ b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/bear-640x360-video.mp4.media_info @@ -11,11 +11,11 @@ video_info { } init_range { begin: 0 - end: 1126 + end: 1130 } index_range { - begin: 1127 - end: 1194 + begin: 1131 + end: 1198 } media_file_name: "bear-640x360-video.mp4" media_duration_seconds: 2.73606658 diff --git a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/output.mpd b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/output.mpd index 080d441abd..a02fccd37a 100644 --- a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/output.mpd +++ b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4 index 81afce8c79..6a196f333d 100644 Binary files a/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4.media_info b/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4.media_info index 3034f429f3..0e86bf54c6 100644 --- a/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4.media_info +++ b/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4.media_info @@ -8,11 +8,11 @@ audio_info { } init_range { begin: 0 - end: 1002 + end: 1006 } index_range { - begin: 1003 - end: 1070 + begin: 1007 + end: 1074 } media_file_name: "bear-640x360-audio.mp4" media_duration_seconds: 2.76317453 diff --git a/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-video.mp4 index c82b090d9e..506a9d66ee 100644 Binary files a/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-video.mp4.media_info b/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-video.mp4.media_info index 3dd2d56428..b851ffc019 100644 --- a/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-video.mp4.media_info +++ b/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-video.mp4.media_info @@ -11,11 +11,11 @@ video_info { } init_range { begin: 0 - end: 1126 + end: 1130 } index_range { - begin: 1127 - end: 1194 + begin: 1131 + end: 1198 } media_file_name: "bear-640x360-video.mp4" media_duration_seconds: 2.73606658 diff --git a/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-audio.mp4 index 81afce8c79..6a196f333d 100644 Binary files a/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-video-trick_play_factor_1.mp4 b/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-video-trick_play_factor_1.mp4 index a71bd09ad1..702b955b01 100644 Binary files a/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-video-trick_play_factor_1.mp4 and b/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-video-trick_play_factor_1.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-video.mp4 index c82b090d9e..506a9d66ee 100644 Binary files a/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-audio-0.mp4 b/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-audio-0.mp4 index 7128d250eb..a86c776cf5 100644 Binary files a/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-audio-0.mp4 and b/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-audio-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-video-0.mp4 b/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-video-0.mp4 index 9bc668f8f6..04ed1816fe 100644 Binary files a/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-video-0.mp4 and b/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-video-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-video-trick_play_factor_1-0.mp4 b/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-video-trick_play_factor_1-0.mp4 index 17f6db1b74..1d11aed2c8 100644 Binary files a/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-video-trick_play_factor_1-0.mp4 and b/packager/app/test/testdata/encryption-and-trick-play/decrypted-bear-640x360-video-trick_play_factor_1-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-trick-play/output.mpd b/packager/app/test/testdata/encryption-and-trick-play/output.mpd index 9bfc9d648e..70e30abd3f 100644 --- a/packager/app/test/testdata/encryption-and-trick-play/output.mpd +++ b/packager/app/test/testdata/encryption-and-trick-play/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-video-trick_play_factor_1.mp4 - - + + @@ -35,8 +35,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-audio.mp4 index 81afce8c79..6a196f333d 100644 Binary files a/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video-trick_play_factor_1.mp4 b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video-trick_play_factor_1.mp4 index a71bd09ad1..702b955b01 100644 Binary files a/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video-trick_play_factor_1.mp4 and b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video-trick_play_factor_1.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video-trick_play_factor_2.mp4 b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video-trick_play_factor_2.mp4 index 524042168f..490e0acc6d 100644 Binary files a/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video-trick_play_factor_2.mp4 and b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video-trick_play_factor_2.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video.mp4 index c82b090d9e..506a9d66ee 100644 Binary files a/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-two-trick-plays/output.mpd b/packager/app/test/testdata/encryption-and-two-trick-plays/output.mpd index 537a83b450..3f6098f3a0 100644 --- a/packager/app/test/testdata/encryption-and-two-trick-plays/output.mpd +++ b/packager/app/test/testdata/encryption-and-two-trick-plays/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,14 +22,14 @@ bear-640x360-video-trick_play_factor_1.mp4 - - + + bear-640x360-video-trick_play_factor_2.mp4 - - + + @@ -41,8 +41,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-cbc-1/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-cbc-1/bear-640x360-audio.mp4 index 8bac0b7402..d8305188bd 100644 Binary files a/packager/app/test/testdata/encryption-cbc-1/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-cbc-1/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbc-1/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-cbc-1/bear-640x360-video.mp4 index 97167ea5c4..ad9b58594f 100644 Binary files a/packager/app/test/testdata/encryption-cbc-1/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-cbc-1/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbc-1/decrypted-bear-640x360-audio-0.mp4 b/packager/app/test/testdata/encryption-cbc-1/decrypted-bear-640x360-audio-0.mp4 index 7128d250eb..a86c776cf5 100644 Binary files a/packager/app/test/testdata/encryption-cbc-1/decrypted-bear-640x360-audio-0.mp4 and b/packager/app/test/testdata/encryption-cbc-1/decrypted-bear-640x360-audio-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbc-1/decrypted-bear-640x360-video-0.mp4 b/packager/app/test/testdata/encryption-cbc-1/decrypted-bear-640x360-video-0.mp4 index 9bc668f8f6..04ed1816fe 100644 Binary files a/packager/app/test/testdata/encryption-cbc-1/decrypted-bear-640x360-video-0.mp4 and b/packager/app/test/testdata/encryption-cbc-1/decrypted-bear-640x360-video-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbc-1/output.mpd b/packager/app/test/testdata/encryption-cbc-1/output.mpd index cc11fce83a..abd042145b 100644 --- a/packager/app/test/testdata/encryption-cbc-1/output.mpd +++ b/packager/app/test/testdata/encryption-cbc-1/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-cbcs-with-full-protection/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-cbcs-with-full-protection/bear-640x360-audio.mp4 index 8be897b313..2b54a78601 100644 Binary files a/packager/app/test/testdata/encryption-cbcs-with-full-protection/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-cbcs-with-full-protection/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbcs-with-full-protection/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-cbcs-with-full-protection/bear-640x360-video.mp4 index b69276fb27..bbaf346e16 100644 Binary files a/packager/app/test/testdata/encryption-cbcs-with-full-protection/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-cbcs-with-full-protection/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbcs-with-full-protection/decrypted-bear-640x360-audio-0.mp4 b/packager/app/test/testdata/encryption-cbcs-with-full-protection/decrypted-bear-640x360-audio-0.mp4 index 7128d250eb..a86c776cf5 100644 Binary files a/packager/app/test/testdata/encryption-cbcs-with-full-protection/decrypted-bear-640x360-audio-0.mp4 and b/packager/app/test/testdata/encryption-cbcs-with-full-protection/decrypted-bear-640x360-audio-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbcs-with-full-protection/decrypted-bear-640x360-video-0.mp4 b/packager/app/test/testdata/encryption-cbcs-with-full-protection/decrypted-bear-640x360-video-0.mp4 index 9bc668f8f6..04ed1816fe 100644 Binary files a/packager/app/test/testdata/encryption-cbcs-with-full-protection/decrypted-bear-640x360-video-0.mp4 and b/packager/app/test/testdata/encryption-cbcs-with-full-protection/decrypted-bear-640x360-video-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbcs-with-full-protection/output.mpd b/packager/app/test/testdata/encryption-cbcs-with-full-protection/output.mpd index 55d19f794b..5e31c48d69 100644 --- a/packager/app/test/testdata/encryption-cbcs-with-full-protection/output.mpd +++ b/packager/app/test/testdata/encryption-cbcs-with-full-protection/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-cbcs/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-cbcs/bear-640x360-audio.mp4 index 8be897b313..2b54a78601 100644 Binary files a/packager/app/test/testdata/encryption-cbcs/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-cbcs/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbcs/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-cbcs/bear-640x360-video.mp4 index 8c31d6d266..235d502cd9 100644 Binary files a/packager/app/test/testdata/encryption-cbcs/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-cbcs/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbcs/decrypted-bear-640x360-audio-0.mp4 b/packager/app/test/testdata/encryption-cbcs/decrypted-bear-640x360-audio-0.mp4 index 7128d250eb..a86c776cf5 100644 Binary files a/packager/app/test/testdata/encryption-cbcs/decrypted-bear-640x360-audio-0.mp4 and b/packager/app/test/testdata/encryption-cbcs/decrypted-bear-640x360-audio-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbcs/decrypted-bear-640x360-video-0.mp4 b/packager/app/test/testdata/encryption-cbcs/decrypted-bear-640x360-video-0.mp4 index 9bc668f8f6..04ed1816fe 100644 Binary files a/packager/app/test/testdata/encryption-cbcs/decrypted-bear-640x360-video-0.mp4 and b/packager/app/test/testdata/encryption-cbcs/decrypted-bear-640x360-video-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-cbcs/output.mpd b/packager/app/test/testdata/encryption-cbcs/output.mpd index 55d19f794b..5e31c48d69 100644 --- a/packager/app/test/testdata/encryption-cbcs/output.mpd +++ b/packager/app/test/testdata/encryption-cbcs/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-cens/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-cens/bear-640x360-audio.mp4 index 9cc8dba201..d2ffeb9300 100644 Binary files a/packager/app/test/testdata/encryption-cens/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-cens/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-cens/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-cens/bear-640x360-video.mp4 index 6dbe4bf996..50ed6b390c 100644 Binary files a/packager/app/test/testdata/encryption-cens/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-cens/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-cens/decrypted-bear-640x360-audio-0.mp4 b/packager/app/test/testdata/encryption-cens/decrypted-bear-640x360-audio-0.mp4 index 7128d250eb..a86c776cf5 100644 Binary files a/packager/app/test/testdata/encryption-cens/decrypted-bear-640x360-audio-0.mp4 and b/packager/app/test/testdata/encryption-cens/decrypted-bear-640x360-audio-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-cens/decrypted-bear-640x360-video-0.mp4 b/packager/app/test/testdata/encryption-cens/decrypted-bear-640x360-video-0.mp4 index 9bc668f8f6..04ed1816fe 100644 Binary files a/packager/app/test/testdata/encryption-cens/decrypted-bear-640x360-video-0.mp4 and b/packager/app/test/testdata/encryption-cens/decrypted-bear-640x360-video-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-cens/output.mpd b/packager/app/test/testdata/encryption-cens/output.mpd index ff47c4dfd9..68951f7a6b 100644 --- a/packager/app/test/testdata/encryption-cens/output.mpd +++ b/packager/app/test/testdata/encryption-cens/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-audio.mp4 index b18f8880d6..455d58aadd 100644 Binary files a/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-video.mp4 index 91a84082d7..94910f98d5 100644 Binary files a/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-multi-keys-with-stream-label/output.mpd b/packager/app/test/testdata/encryption-multi-keys-with-stream-label/output.mpd index 47756c1e88..b8a44039bb 100644 --- a/packager/app/test/testdata/encryption-multi-keys-with-stream-label/output.mpd +++ b/packager/app/test/testdata/encryption-multi-keys-with-stream-label/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-multi-keys/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-multi-keys/bear-640x360-audio.mp4 index 9a75a53c53..6fa418a5f8 100644 Binary files a/packager/app/test/testdata/encryption-multi-keys/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-multi-keys/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-multi-keys/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-multi-keys/bear-640x360-video.mp4 index bc6db29fd5..c0fde80c34 100644 Binary files a/packager/app/test/testdata/encryption-multi-keys/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-multi-keys/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-multi-keys/output.mpd b/packager/app/test/testdata/encryption-multi-keys/output.mpd index f1ef2fa2ae..b4d6699274 100644 --- a/packager/app/test/testdata/encryption-multi-keys/output.mpd +++ b/packager/app/test/testdata/encryption-multi-keys/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-of-only-video-stream/bear-640x360-audio-skip_encryption.mp4 b/packager/app/test/testdata/encryption-of-only-video-stream/bear-640x360-audio-skip_encryption.mp4 index 7128d250eb..a86c776cf5 100644 Binary files a/packager/app/test/testdata/encryption-of-only-video-stream/bear-640x360-audio-skip_encryption.mp4 and b/packager/app/test/testdata/encryption-of-only-video-stream/bear-640x360-audio-skip_encryption.mp4 differ diff --git a/packager/app/test/testdata/encryption-of-only-video-stream/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-of-only-video-stream/bear-640x360-video.mp4 index c82b090d9e..506a9d66ee 100644 Binary files a/packager/app/test/testdata/encryption-of-only-video-stream/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-of-only-video-stream/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-of-only-video-stream/decrypted-bear-640x360-video-0.mp4 b/packager/app/test/testdata/encryption-of-only-video-stream/decrypted-bear-640x360-video-0.mp4 index 9bc668f8f6..04ed1816fe 100644 Binary files a/packager/app/test/testdata/encryption-of-only-video-stream/decrypted-bear-640x360-video-0.mp4 and b/packager/app/test/testdata/encryption-of-only-video-stream/decrypted-bear-640x360-video-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-of-only-video-stream/output.mpd b/packager/app/test/testdata/encryption-of-only-video-stream/output.mpd index 0f47816fc5..8eed506b95 100644 --- a/packager/app/test/testdata/encryption-of-only-video-stream/output.mpd +++ b/packager/app/test/testdata/encryption-of-only-video-stream/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -18,8 +18,8 @@ bear-640x360-audio-skip_encryption.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-using-explicit-pssh/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-using-explicit-pssh/bear-640x360-audio.mp4 index 40ad67469b..b0e44b946e 100644 Binary files a/packager/app/test/testdata/encryption-using-explicit-pssh/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-using-explicit-pssh/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-using-explicit-pssh/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-using-explicit-pssh/bear-640x360-video.mp4 index 47ae5cb2e9..f2f948fee0 100644 Binary files a/packager/app/test/testdata/encryption-using-explicit-pssh/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-using-explicit-pssh/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-using-explicit-pssh/output.mpd b/packager/app/test/testdata/encryption-using-explicit-pssh/output.mpd index 036da83e1c..690ddb9221 100644 --- a/packager/app/test/testdata/encryption-using-explicit-pssh/output.mpd +++ b/packager/app/test/testdata/encryption-using-explicit-pssh/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-audio.mp4 index 81afce8c79..6a196f333d 100644 Binary files a/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-video.mp4 index c82b090d9e..506a9d66ee 100644 Binary files a/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-using-fixed-key/decrypted-bear-640x360-audio-0.mp4 b/packager/app/test/testdata/encryption-using-fixed-key/decrypted-bear-640x360-audio-0.mp4 index 7128d250eb..a86c776cf5 100644 Binary files a/packager/app/test/testdata/encryption-using-fixed-key/decrypted-bear-640x360-audio-0.mp4 and b/packager/app/test/testdata/encryption-using-fixed-key/decrypted-bear-640x360-audio-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-using-fixed-key/decrypted-bear-640x360-video-0.mp4 b/packager/app/test/testdata/encryption-using-fixed-key/decrypted-bear-640x360-video-0.mp4 index 9bc668f8f6..04ed1816fe 100644 Binary files a/packager/app/test/testdata/encryption-using-fixed-key/decrypted-bear-640x360-video-0.mp4 and b/packager/app/test/testdata/encryption-using-fixed-key/decrypted-bear-640x360-video-0.mp4 differ diff --git a/packager/app/test/testdata/encryption-using-fixed-key/output.mpd b/packager/app/test/testdata/encryption-using-fixed-key/output.mpd index c63c2cb24b..bdfad75bbf 100644 --- a/packager/app/test/testdata/encryption-using-fixed-key/output.mpd +++ b/packager/app/test/testdata/encryption-using-fixed-key/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-with-multi-drms/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-with-multi-drms/bear-640x360-audio.mp4 index d9e4d1b766..061b8eac78 100644 Binary files a/packager/app/test/testdata/encryption-with-multi-drms/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption-with-multi-drms/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption-with-multi-drms/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-with-multi-drms/bear-640x360-video.mp4 index 7b643856d7..709850a7d0 100644 Binary files a/packager/app/test/testdata/encryption-with-multi-drms/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-with-multi-drms/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-with-multi-drms/output.mpd b/packager/app/test/testdata/encryption-with-multi-drms/output.mpd index 042a364134..e95d01930a 100644 --- a/packager/app/test/testdata/encryption-with-multi-drms/output.mpd +++ b/packager/app/test/testdata/encryption-with-multi-drms/output.mpd @@ -18,8 +18,8 @@ bear-640x360-video.mp4 - - + + @@ -40,8 +40,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-with-multi-drms/stream_0.m3u8 b/packager/app/test/testdata/encryption-with-multi-drms/stream_0.m3u8 index af241c654d..e1d9506695 100644 --- a/packager/app/test/testdata/encryption-with-multi-drms/stream_0.m3u8 +++ b/packager/app/test/testdata/encryption-with-multi-drms/stream_0.m3u8 @@ -3,11 +3,11 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="1557@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="1561@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,AAAAOHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABgSEDEyMzQ1Njc4OTAxMjM0NTZI49yVmwY=",KEYID=0x31323334353637383930313233343536,KEYFORMATVERSIONS="1",KEYFORMAT="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="skd://www.license.com/getkey?KeyId=31323334-3536-3738-3930-313233343536",KEYFORMATVERSIONS="1",KEYFORMAT="com.apple.streamingkeydelivery" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@1625 +#EXT-X-BYTERANGE:17028@1629 bear-640x360-audio.mp4 #EXTINF:0.998, #EXT-X-BYTERANGE:16682 diff --git a/packager/app/test/testdata/encryption-with-multi-drms/stream_1.m3u8 b/packager/app/test/testdata/encryption-with-multi-drms/stream_1.m3u8 index 7a42c87ef0..f6bf6c83c1 100644 --- a/packager/app/test/testdata/encryption-with-multi-drms/stream_1.m3u8 +++ b/packager/app/test/testdata/encryption-with-multi-drms/stream_1.m3u8 @@ -3,11 +3,11 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1681@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1685@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,AAAAOHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABgSEDEyMzQ1Njc4OTAxMjM0NTZI49yVmwY=",KEYID=0x31323334353637383930313233343536,KEYFORMATVERSIONS="1",KEYFORMAT="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="skd://www.license.com/getkey?KeyId=31323334-3536-3738-3930-313233343536",KEYFORMATVERSIONS="1",KEYFORMAT="com.apple.streamingkeydelivery" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@1749 +#EXT-X-BYTERANGE:99313@1753 bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:122340 diff --git a/packager/app/test/testdata/encryption/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption/bear-640x360-audio.mp4 index 81afce8c79..6a196f333d 100644 Binary files a/packager/app/test/testdata/encryption/bear-640x360-audio.mp4 and b/packager/app/test/testdata/encryption/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/encryption/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption/bear-640x360-video.mp4 index c82b090d9e..506a9d66ee 100644 Binary files a/packager/app/test/testdata/encryption/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption/decrypted-bear-640x360-audio-0.mp4 b/packager/app/test/testdata/encryption/decrypted-bear-640x360-audio-0.mp4 index 7128d250eb..a86c776cf5 100644 Binary files a/packager/app/test/testdata/encryption/decrypted-bear-640x360-audio-0.mp4 and b/packager/app/test/testdata/encryption/decrypted-bear-640x360-audio-0.mp4 differ diff --git a/packager/app/test/testdata/encryption/decrypted-bear-640x360-video-0.mp4 b/packager/app/test/testdata/encryption/decrypted-bear-640x360-video-0.mp4 index 9bc668f8f6..04ed1816fe 100644 Binary files a/packager/app/test/testdata/encryption/decrypted-bear-640x360-video-0.mp4 and b/packager/app/test/testdata/encryption/decrypted-bear-640x360-video-0.mp4 differ diff --git a/packager/app/test/testdata/encryption/output.mpd b/packager/app/test/testdata/encryption/output.mpd index c63c2cb24b..bdfad75bbf 100644 --- a/packager/app/test/testdata/encryption/output.mpd +++ b/packager/app/test/testdata/encryption/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/first-stream/bear-640x360-0.mp4 b/packager/app/test/testdata/first-stream/bear-640x360-0.mp4 index 9bc668f8f6..04ed1816fe 100644 Binary files a/packager/app/test/testdata/first-stream/bear-640x360-0.mp4 and b/packager/app/test/testdata/first-stream/bear-640x360-0.mp4 differ diff --git a/packager/app/test/testdata/first-stream/output.mpd b/packager/app/test/testdata/first-stream/output.mpd index 180f196cc9..cde5a8f34d 100644 --- a/packager/app/test/testdata/first-stream/output.mpd +++ b/packager/app/test/testdata/first-stream/output.mpd @@ -5,8 +5,8 @@ bear-640x360-0.mp4 - - + + diff --git a/packager/app/test/testdata/flac-with-encryption/bear-flac-audio.mp4 b/packager/app/test/testdata/flac-with-encryption/bear-flac-audio.mp4 index 0a51c057d8..4b092ae0bd 100644 Binary files a/packager/app/test/testdata/flac-with-encryption/bear-flac-audio.mp4 and b/packager/app/test/testdata/flac-with-encryption/bear-flac-audio.mp4 differ diff --git a/packager/app/test/testdata/flac-with-encryption/decrypted-bear-flac-audio-0.mp4 b/packager/app/test/testdata/flac-with-encryption/decrypted-bear-flac-audio-0.mp4 index d9caf18d8a..114f3a8cd6 100644 Binary files a/packager/app/test/testdata/flac-with-encryption/decrypted-bear-flac-audio-0.mp4 and b/packager/app/test/testdata/flac-with-encryption/decrypted-bear-flac-audio-0.mp4 differ diff --git a/packager/app/test/testdata/flac-with-encryption/output.mpd b/packager/app/test/testdata/flac-with-encryption/output.mpd index 6ef77687de..ae290944cf 100644 --- a/packager/app/test/testdata/flac-with-encryption/output.mpd +++ b/packager/app/test/testdata/flac-with-encryption/output.mpd @@ -10,8 +10,8 @@ bear-flac-audio.mp4 - - + + diff --git a/packager/app/test/testdata/flac-with-encryption/stream_0.m3u8 b/packager/app/test/testdata/flac-with-encryption/stream_0.m3u8 index 591b5ae26d..1479d23b4e 100644 --- a/packager/app/test/testdata/flac-with-encryption/stream_0.m3u8 +++ b/packager/app/test/testdata/flac-with-encryption/stream_0.m3u8 @@ -3,10 +3,10 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-flac-audio.mp4",BYTERANGE="983@0" +#EXT-X-MAP:URI="bear-flac-audio.mp4",BYTERANGE="987@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.045, -#EXT-X-BYTERANGE:85277@1051 +#EXT-X-BYTERANGE:85277@1055 bear-flac-audio.mp4 #EXTINF:1.045, #EXT-X-BYTERANGE:87892 diff --git a/packager/app/test/testdata/hdr10-with-encryption/bear-640x360-hevc-hdr10-video.mp4 b/packager/app/test/testdata/hdr10-with-encryption/bear-640x360-hevc-hdr10-video.mp4 index 63e0042f29..2cda9b6d6f 100644 Binary files a/packager/app/test/testdata/hdr10-with-encryption/bear-640x360-hevc-hdr10-video.mp4 and b/packager/app/test/testdata/hdr10-with-encryption/bear-640x360-hevc-hdr10-video.mp4 differ diff --git a/packager/app/test/testdata/hdr10-with-encryption/output.mpd b/packager/app/test/testdata/hdr10-with-encryption/output.mpd index 4a76f34309..0c6cc1a3cb 100644 --- a/packager/app/test/testdata/hdr10-with-encryption/output.mpd +++ b/packager/app/test/testdata/hdr10-with-encryption/output.mpd @@ -9,8 +9,8 @@ bear-640x360-hevc-hdr10-video.mp4 - - + + diff --git a/packager/app/test/testdata/hdr10-with-encryption/stream_0.m3u8 b/packager/app/test/testdata/hdr10-with-encryption/stream_0.m3u8 index 63762cbc6b..328432ec8c 100644 --- a/packager/app/test/testdata/hdr10-with-encryption/stream_0.m3u8 +++ b/packager/app/test/testdata/hdr10-with-encryption/stream_0.m3u8 @@ -3,8 +3,8 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:3 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-hevc-hdr10-video.mp4",BYTERANGE="5227@0" +#EXT-X-MAP:URI="bear-640x360-hevc-hdr10-video.mp4",BYTERANGE="5231@0" #EXTINF:2.803, -#EXT-X-BYTERANGE:111139@5271 +#EXT-X-BYTERANGE:111139@5275 bear-640x360-hevc-hdr10-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/hevc-with-encryption/bear-640x360-hevc-video.mp4 b/packager/app/test/testdata/hevc-with-encryption/bear-640x360-hevc-video.mp4 index a8c72073be..eb98dd0f7f 100644 Binary files a/packager/app/test/testdata/hevc-with-encryption/bear-640x360-hevc-video.mp4 and b/packager/app/test/testdata/hevc-with-encryption/bear-640x360-hevc-video.mp4 differ diff --git a/packager/app/test/testdata/hevc-with-encryption/decrypted-bear-640x360-hevc-video-0.mp4 b/packager/app/test/testdata/hevc-with-encryption/decrypted-bear-640x360-hevc-video-0.mp4 index 298f9532bb..77a649e6ad 100644 Binary files a/packager/app/test/testdata/hevc-with-encryption/decrypted-bear-640x360-hevc-video-0.mp4 and b/packager/app/test/testdata/hevc-with-encryption/decrypted-bear-640x360-hevc-video-0.mp4 differ diff --git a/packager/app/test/testdata/hevc-with-encryption/output.mpd b/packager/app/test/testdata/hevc-with-encryption/output.mpd index db5775be46..0fad79e843 100644 --- a/packager/app/test/testdata/hevc-with-encryption/output.mpd +++ b/packager/app/test/testdata/hevc-with-encryption/output.mpd @@ -9,8 +9,8 @@ bear-640x360-hevc-video.mp4 - - + + diff --git a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-1.m4s b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-1.m4s index 55ee417db1..6e56dd8555 100644 Binary files a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-1.m4s and b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-1.m4s differ diff --git a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-2.m4s b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-2.m4s index 3e151a7d97..74163d0b7b 100644 Binary files a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-2.m4s and b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-2.m4s differ diff --git a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-3.m4s b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-3.m4s index e86f365d7f..03b9029c21 100644 Binary files a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-3.m4s and b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-3.m4s differ diff --git a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-init.mp4 index 825a8072d2..2b143225fa 100644 Binary files a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-1.m4s b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-1.m4s index 4dbca6653f..2c90c46883 100644 Binary files a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-1.m4s and b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-1.m4s differ diff --git a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-2.m4s b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-2.m4s index da2f00a606..c6b356a8e9 100644 Binary files a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-2.m4s and b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-2.m4s differ diff --git a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-3.m4s b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-3.m4s index 8dfe74ca5b..4edeba974e 100644 Binary files a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-3.m4s and b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-3.m4s differ diff --git a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-iframe.m3u8 index 756a032739..e3961bbcaf 100644 --- a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-iframe.m3u8 @@ -6,13 +6,13 @@ #EXT-X-I-FRAMES-ONLY #EXT-X-MAP:URI="bear-640x360-video-init.mp4" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@80 +#EXT-X-BYTERANGE:15581@84 bear-640x360-video-1.m4s #EXTINF:1.001, -#EXT-X-BYTERANGE:18221@80 +#EXT-X-BYTERANGE:18221@84 bear-640x360-video-2.m4s #EXT-X-PLACEMENT-OPPORTUNITY #EXTINF:0.734, -#EXT-X-BYTERANGE:19663@80 +#EXT-X-BYTERANGE:19663@84 bear-640x360-video-3.m4s #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-init.mp4 b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-init.mp4 index aa3f67b37c..c9553addb5 100644 Binary files a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/output.m3u8 b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/output.m3u8 index d0ecedb6ff..2f8252e4f9 100644 --- a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/output.m3u8 +++ b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/output.m3u8 @@ -7,7 +7,7 @@ #EXT-X-MEDIA:TYPE=SUBTITLES,URI="bear-english-text.m3u8",GROUP-ID="default-text-group",NAME="stream_0",AUTOSELECT=YES -#EXT-X-STREAM-INF:BANDWIDTH=1108051,AVERAGE-BANDWIDTH=1005999,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",SUBTITLES="default-text-group" +#EXT-X-STREAM-INF:BANDWIDTH=1108115,AVERAGE-BANDWIDTH=1006069,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",SUBTITLES="default-text-group" bear-640x360-video.m3u8 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=214292,AVERAGE-BANDWIDTH=156327,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-video-iframe.m3u8" diff --git a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-1.m4s b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-1.m4s index 55ee417db1..6e56dd8555 100644 Binary files a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-1.m4s and b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-1.m4s differ diff --git a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-2.m4s b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-2.m4s index 1ddbee3bdd..5bf76aa0d1 100644 Binary files a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-2.m4s and b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-2.m4s differ diff --git a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-3.m4s b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-3.m4s index a7100e5c24..d6bcbb5de8 100644 Binary files a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-3.m4s and b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-3.m4s differ diff --git a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-init.mp4 b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-init.mp4 index 825a8072d2..2b143225fa 100644 Binary files a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-init.mp4 and b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-init.mp4 differ diff --git a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/output.m3u8 b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/output.m3u8 index 4afd3b2540..ff61b452ca 100644 --- a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/output.m3u8 +++ b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/output.m3u8 @@ -5,5 +5,5 @@ #EXT-X-MEDIA:TYPE=AUDIO,URI="audio/audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2" -#EXT-X-STREAM-INF:BANDWIDTH=1108051,AVERAGE-BANDWIDTH=1005999,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group" +#EXT-X-STREAM-INF:BANDWIDTH=1108115,AVERAGE-BANDWIDTH=1006069,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group" video/video.m3u8 diff --git a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video-1.m4s b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video-1.m4s index 4dbca6653f..2c90c46883 100644 Binary files a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video-1.m4s and b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video-1.m4s differ diff --git a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video-2.m4s b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video-2.m4s index da2f00a606..c6b356a8e9 100644 Binary files a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video-2.m4s and b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video-2.m4s differ diff --git a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video-3.m4s b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video-3.m4s index 8dfe74ca5b..4edeba974e 100644 Binary files a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video-3.m4s and b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video-3.m4s differ diff --git a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video-init.mp4 b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video-init.mp4 index aa3f67b37c..c9553addb5 100644 Binary files a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video-init.mp4 and b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video-init.mp4 differ diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-1.m4s b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-1.m4s index 55ee417db1..6e56dd8555 100644 Binary files a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-1.m4s and b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-1.m4s differ diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-2.m4s b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-2.m4s index 1ddbee3bdd..5bf76aa0d1 100644 Binary files a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-2.m4s and b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-2.m4s differ diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-3.m4s b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-3.m4s index a7100e5c24..d6bcbb5de8 100644 Binary files a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-3.m4s and b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-3.m4s differ diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-init.mp4 index 825a8072d2..2b143225fa 100644 Binary files a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-1.m4s b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-1.m4s index 4dbca6653f..2c90c46883 100644 Binary files a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-1.m4s and b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-1.m4s differ diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-2.m4s b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-2.m4s index da2f00a606..c6b356a8e9 100644 Binary files a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-2.m4s and b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-2.m4s differ diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-3.m4s b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-3.m4s index 8dfe74ca5b..4edeba974e 100644 Binary files a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-3.m4s and b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-3.m4s differ diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-init.mp4 b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-init.mp4 index aa3f67b37c..c9553addb5 100644 Binary files a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-1.m4s b/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-1.m4s index 577826f3fa..7f6fea5f03 100644 Binary files a/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-1.m4s and b/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-1.m4s differ diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-2.m4s b/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-2.m4s index 806b3320da..a59e2a79ad 100644 Binary files a/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-2.m4s and b/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-2.m4s differ diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-3.m4s b/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-3.m4s index 22368c5f30..08140209f9 100644 Binary files a/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-3.m4s and b/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-3.m4s differ diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-4.m4s b/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-4.m4s index a4abbbe1de..666cbc3c1e 100644 Binary files a/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-4.m4s and b/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-4.m4s differ diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-5.m4s b/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-5.m4s index 904dea7dbe..5c8f82c5da 100644 Binary files a/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-5.m4s and b/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-5.m4s differ diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-init.mp4 b/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-init.mp4 index 0ec4fa9c16..8d60268521 100644 Binary files a/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-init.mp4 and b/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-init.mp4 differ diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/output.m3u8 b/packager/app/test/testdata/hls-only-dash-only-captions/output.m3u8 index 718bd865b5..075fa4f659 100644 --- a/packager/app/test/testdata/hls-only-dash-only-captions/output.m3u8 +++ b/packager/app/test/testdata/hls-only-dash-only-captions/output.m3u8 @@ -7,5 +7,5 @@ #EXT-X-MEDIA:TYPE=SUBTITLES,URI="stream_1.m3u8",GROUP-ID="default-text-group",NAME="stream_1",AUTOSELECT=YES -#EXT-X-STREAM-INF:BANDWIDTH=1108051,AVERAGE-BANDWIDTH=1005999,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",SUBTITLES="default-text-group" +#EXT-X-STREAM-INF:BANDWIDTH=1108115,AVERAGE-BANDWIDTH=1006069,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",SUBTITLES="default-text-group" stream_3.m3u8 diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/output.mpd b/packager/app/test/testdata/hls-only-dash-only-captions/output.mpd index bf21bef5d6..6bb2ccbbd3 100644 --- a/packager/app/test/testdata/hls-only-dash-only-captions/output.mpd +++ b/packager/app/test/testdata/hls-only-dash-only-captions/output.mpd @@ -3,7 +3,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -23,7 +23,7 @@ - + diff --git a/packager/app/test/testdata/hls-only-dash-only/bear-640x360-audio.mp4 b/packager/app/test/testdata/hls-only-dash-only/bear-640x360-audio.mp4 index 7128d250eb..a86c776cf5 100644 Binary files a/packager/app/test/testdata/hls-only-dash-only/bear-640x360-audio.mp4 and b/packager/app/test/testdata/hls-only-dash-only/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/hls-only-dash-only/bear-640x360-video.mp4 b/packager/app/test/testdata/hls-only-dash-only/bear-640x360-video.mp4 index 9bc668f8f6..04ed1816fe 100644 Binary files a/packager/app/test/testdata/hls-only-dash-only/bear-640x360-video.mp4 and b/packager/app/test/testdata/hls-only-dash-only/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/hls-only-dash-only/output.mpd b/packager/app/test/testdata/hls-only-dash-only/output.mpd index 8326573a5a..34698a3cd2 100644 --- a/packager/app/test/testdata/hls-only-dash-only/output.mpd +++ b/packager/app/test/testdata/hls-only-dash-only/output.mpd @@ -6,8 +6,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/hls-only-dash-only/stream_1.m3u8 b/packager/app/test/testdata/hls-only-dash-only/stream_1.m3u8 index baf17ef66b..4e8bdb5f7f 100644 --- a/packager/app/test/testdata/hls-only-dash-only/stream_1.m3u8 +++ b/packager/app/test/testdata/hls-only-dash-only/stream_1.m3u8 @@ -3,9 +3,9 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="863@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@927 +#EXT-X-BYTERANGE:99313@931 bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:121807 diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.m3u8 index da4fa92b55..1714a25c7a 100644 --- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.m3u8 @@ -3,10 +3,10 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="1003@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="1007@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@1071 +#EXT-X-BYTERANGE:17028@1075 bear-640x360-audio.mp4 #EXTINF:0.998, #EXT-X-BYTERANGE:16682 diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.mp4 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.mp4 index 81afce8c79..6a196f333d 100644 Binary files a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.mp4 and b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video-iframe.m3u8 index 38e6359066..c0c92aecc6 100644 --- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video-iframe.m3u8 @@ -4,15 +4,15 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1127@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1131@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@1195 +#EXT-X-BYTERANGE:15581@1199 bear-640x360-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18754@100508 +#EXT-X-BYTERANGE:18754@100512 bear-640x360-video.mp4 #EXTINF:0.734, -#EXT-X-BYTERANGE:20068@222848 +#EXT-X-BYTERANGE:20068@222852 bear-640x360-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.m3u8 index 1c32fdfbfb..0d032347c1 100644 --- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.m3u8 @@ -3,10 +3,10 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1127@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1131@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@1195 +#EXT-X-BYTERANGE:99313@1199 bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:122340 diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.mp4 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.mp4 index c82b090d9e..506a9d66ee 100644 Binary files a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.mp4 and b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-audio-1.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-audio-1.m4s index badadb49a1..d24e94440c 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-audio-1.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-audio-1.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-audio-2.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-audio-2.m4s index 4f898961fb..0293ce9045 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-audio-2.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-audio-2.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-audio-3.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-audio-3.m4s index 08f022c924..3b18cda1d2 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-audio-3.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-audio-3.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-audio-init.mp4 index 5b46a8a3ba..41a0f5d53a 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-audio-init.mp4 and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-video-1.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-video-1.m4s index 5e673cb829..131628625f 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-video-1.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-video-1.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-video-2.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-video-2.m4s index c2d8240e94..7ce8ccba26 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-video-2.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-video-2.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-video-3.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-video-3.m4s index df7c5a353d..cc0d760255 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-video-3.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-video-3.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-video-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-video-init.mp4 index 75f5517b4d..7dc02ef574 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-video-init.mp4 and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-1.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-1.m4s index f336d41dd2..ea72612f12 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-1.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-1.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-2.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-2.m4s index e285304cbf..ff7a97f469 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-2.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-2.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-3.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-3.m4s index 65868cc919..4a33c09402 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-3.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-3.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-init.mp4 index c5319cf20f..76353f8f95 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-init.mp4 and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-video-1.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-video-1.m4s index fe9ac78315..254c3f5757 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-video-1.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-video-1.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-video-2.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-video-2.m4s index 5e7a94e45a..a5029e3d39 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-video-2.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-video-2.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-video-3.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-video-3.m4s index 2e50a20245..bc2f2c88ae 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-video-3.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-video-3.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-video-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-video-init.mp4 index 599e13cd9d..f708ee9357 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-video-init.mp4 and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-audio-1.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-audio-1.m4s index badadb49a1..d24e94440c 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-audio-1.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-audio-1.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-audio-2.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-audio-2.m4s index 4f898961fb..0293ce9045 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-audio-2.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-audio-2.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-audio-3.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-audio-3.m4s index 08f022c924..3b18cda1d2 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-audio-3.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-audio-3.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-audio-init.mp4 index 5b46a8a3ba..41a0f5d53a 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-video-1.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-video-1.m4s index b43a5cf3cd..9172dcef1b 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-video-1.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-video-1.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-video-2.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-video-2.m4s index a2c2bde515..bae9063c25 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-video-2.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-video-2.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-video-3.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-video-3.m4s index f6aa9281a2..f479464a40 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-video-3.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-video-3.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-video-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-video-init.mp4 index 29968aaa64..1cdecbbb48 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/output.mpd b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/output.mpd index a233a9be50..bdf40745c9 100644 --- a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/output.mpd +++ b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/output.mpd @@ -7,7 +7,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + @@ -15,15 +15,7 @@ - - - - - - - - - + @@ -31,23 +23,21 @@ + + + + + + + + AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - - - - - - - - - - - + @@ -57,7 +47,7 @@ - + @@ -67,6 +57,16 @@ + + + + + + + + + + diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-1.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-1.m4s index badadb49a1..d24e94440c 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-1.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-1.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-2.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-2.m4s index 4f898961fb..0293ce9045 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-2.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-2.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-3.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-3.m4s index 08f022c924..3b18cda1d2 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-3.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-3.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-init.mp4 index 5b46a8a3ba..41a0f5d53a 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-1.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-1.m4s index b43a5cf3cd..9172dcef1b 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-1.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-1.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-2.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-2.m4s index a2c2bde515..bae9063c25 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-2.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-2.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-3.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-3.m4s index f6aa9281a2..f479464a40 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-3.m4s and b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-3.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-init.mp4 index 29968aaa64..1cdecbbb48 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output.mpd b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output.mpd index 24b5e67416..2dbe4ccd2b 100644 --- a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output.mpd +++ b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output.mpd @@ -3,7 +3,7 @@ - + AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== @@ -17,7 +17,7 @@ - + diff --git a/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-1.m4s b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-1.m4s index badadb49a1..d24e94440c 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-1.m4s and b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-1.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-2.m4s b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-2.m4s index 4f898961fb..0293ce9045 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-2.m4s and b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-2.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-3.m4s b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-3.m4s index 08f022c924..3b18cda1d2 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-3.m4s and b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-3.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-init.mp4 index 5b46a8a3ba..41a0f5d53a 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-1.m4s b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-1.m4s index b43a5cf3cd..9172dcef1b 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-1.m4s and b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-1.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-2.m4s b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-2.m4s index a2c2bde515..bae9063c25 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-2.m4s and b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-2.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-3.m4s b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-3.m4s index f6aa9281a2..f479464a40 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-3.m4s and b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-3.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-init.mp4 index 29968aaa64..1cdecbbb48 100644 Binary files a/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-encryption/output.mpd b/packager/app/test/testdata/live-profile-and-encryption/output.mpd index cd7abd5883..2c92b7dd6a 100644 --- a/packager/app/test/testdata/live-profile-and-encryption/output.mpd +++ b/packager/app/test/testdata/live-profile-and-encryption/output.mpd @@ -7,7 +7,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + @@ -21,7 +21,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-1.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-1.m4s index badadb49a1..d24e94440c 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-1.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-1.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-2.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-2.m4s index 7225f42cfd..f462b51435 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-2.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-2.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-3.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-3.m4s index fd65b0219e..dc578a1b71 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-3.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-3.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-init.mp4 index 2b138e6923..68d3e3c978 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-1.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-1.m4s index b43a5cf3cd..9172dcef1b 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-1.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-1.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-2.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-2.m4s index cdf91c9ef1..7aeae18dfa 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-2.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-2.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-3.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-3.m4s index 6edb281273..5c7c77253b 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-3.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-3.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-init.mp4 index b6d8683a49..5476e932c7 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output.mpd b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output.mpd index 834b2af16d..13dfe0bf32 100644 --- a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output.mpd +++ b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output.mpd @@ -5,7 +5,7 @@ - + @@ -17,7 +17,7 @@ - + diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-1.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-1.m4s index f88b004a5e..9bf4381128 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-1.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-1.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-2.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-2.m4s index bb9fca908f..81e95aa152 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-2.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-2.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-3.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-3.m4s index 2aac646b7a..f83ad44a86 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-3.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-3.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-init.mp4 index 2b138e6923..68d3e3c978 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-1.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-1.m4s index 5c18184d26..d111baa752 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-1.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-1.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-2.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-2.m4s index 6033d3393e..140a9007cd 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-2.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-2.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-3.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-3.m4s index c6594c8d95..848de8e384 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-3.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-3.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-init.mp4 index b6d8683a49..5476e932c7 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output.mpd b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output.mpd index a3e7a483f7..240a4247f3 100644 --- a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output.mpd +++ b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output.mpd @@ -3,7 +3,7 @@ - + @@ -15,7 +15,7 @@ - + diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-1.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-1.m4s index f88b004a5e..9bf4381128 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-1.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-1.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-2.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-2.m4s index 8ce5fdb11b..7a8459bce1 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-2.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-2.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-3.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-3.m4s index 49c6767ad7..040dbae8c3 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-3.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-3.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-init.mp4 index 056b2ef832..9989085206 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-1.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-1.m4s index 5c18184d26..d111baa752 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-1.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-1.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-2.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-2.m4s index 2a2982dac4..a3f8b6ebc9 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-2.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-2.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-3.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-3.m4s index 789a556256..32c8e3b953 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-3.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-3.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-init.mp4 index 4df1c9fb42..0009d91335 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/output.mpd b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/output.mpd index 80c25d20db..d66effc16e 100644 --- a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/output.mpd +++ b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/output.mpd @@ -5,7 +5,7 @@ - + @@ -17,7 +17,7 @@ - + diff --git a/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-1.m4s b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-1.m4s index f88b004a5e..9bf4381128 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-1.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-1.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-2.m4s b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-2.m4s index bb9fca908f..81e95aa152 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-2.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-2.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-3.m4s b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-3.m4s index 2aac646b7a..f83ad44a86 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-3.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-3.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-init.mp4 index 2b138e6923..68d3e3c978 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-1.m4s b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-1.m4s index 5c18184d26..d111baa752 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-1.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-1.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-2.m4s b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-2.m4s index 6033d3393e..140a9007cd 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-2.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-2.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-3.m4s b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-3.m4s index c6594c8d95..848de8e384 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-3.m4s and b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-3.m4s differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-init.mp4 index b6d8683a49..5476e932c7 100644 Binary files a/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation/output.mpd b/packager/app/test/testdata/live-profile-and-key-rotation/output.mpd index 0dfd5c1afe..c8cf36ad11 100644 --- a/packager/app/test/testdata/live-profile-and-key-rotation/output.mpd +++ b/packager/app/test/testdata/live-profile-and-key-rotation/output.mpd @@ -5,7 +5,7 @@ - + @@ -17,7 +17,7 @@ - + diff --git a/packager/app/test/testdata/live-profile/bear-640x360-audio-1.m4s b/packager/app/test/testdata/live-profile/bear-640x360-audio-1.m4s index 55ee417db1..6e56dd8555 100644 Binary files a/packager/app/test/testdata/live-profile/bear-640x360-audio-1.m4s and b/packager/app/test/testdata/live-profile/bear-640x360-audio-1.m4s differ diff --git a/packager/app/test/testdata/live-profile/bear-640x360-audio-2.m4s b/packager/app/test/testdata/live-profile/bear-640x360-audio-2.m4s index 1ddbee3bdd..5bf76aa0d1 100644 Binary files a/packager/app/test/testdata/live-profile/bear-640x360-audio-2.m4s and b/packager/app/test/testdata/live-profile/bear-640x360-audio-2.m4s differ diff --git a/packager/app/test/testdata/live-profile/bear-640x360-audio-3.m4s b/packager/app/test/testdata/live-profile/bear-640x360-audio-3.m4s index a7100e5c24..d6bcbb5de8 100644 Binary files a/packager/app/test/testdata/live-profile/bear-640x360-audio-3.m4s and b/packager/app/test/testdata/live-profile/bear-640x360-audio-3.m4s differ diff --git a/packager/app/test/testdata/live-profile/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-profile/bear-640x360-audio-init.mp4 index 825a8072d2..2b143225fa 100644 Binary files a/packager/app/test/testdata/live-profile/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/live-profile/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile/bear-640x360-video-1.m4s b/packager/app/test/testdata/live-profile/bear-640x360-video-1.m4s index 4dbca6653f..2c90c46883 100644 Binary files a/packager/app/test/testdata/live-profile/bear-640x360-video-1.m4s and b/packager/app/test/testdata/live-profile/bear-640x360-video-1.m4s differ diff --git a/packager/app/test/testdata/live-profile/bear-640x360-video-2.m4s b/packager/app/test/testdata/live-profile/bear-640x360-video-2.m4s index da2f00a606..c6b356a8e9 100644 Binary files a/packager/app/test/testdata/live-profile/bear-640x360-video-2.m4s and b/packager/app/test/testdata/live-profile/bear-640x360-video-2.m4s differ diff --git a/packager/app/test/testdata/live-profile/bear-640x360-video-3.m4s b/packager/app/test/testdata/live-profile/bear-640x360-video-3.m4s index 8dfe74ca5b..4edeba974e 100644 Binary files a/packager/app/test/testdata/live-profile/bear-640x360-video-3.m4s and b/packager/app/test/testdata/live-profile/bear-640x360-video-3.m4s differ diff --git a/packager/app/test/testdata/live-profile/bear-640x360-video-init.mp4 b/packager/app/test/testdata/live-profile/bear-640x360-video-init.mp4 index aa3f67b37c..c9553addb5 100644 Binary files a/packager/app/test/testdata/live-profile/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/live-profile/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-profile/output.mpd b/packager/app/test/testdata/live-profile/output.mpd index c68a2c59d7..a972a41fa3 100644 --- a/packager/app/test/testdata/live-profile/output.mpd +++ b/packager/app/test/testdata/live-profile/output.mpd @@ -3,7 +3,7 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-0.m4s b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-0.m4s index 55ee417db1..6e56dd8555 100644 Binary files a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-0.m4s and b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-0.m4s differ diff --git a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-45056.m4s b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-45056.m4s index 1ddbee3bdd..5bf76aa0d1 100644 Binary files a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-45056.m4s and b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-45056.m4s differ diff --git a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-89088.m4s b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-89088.m4s index a7100e5c24..d6bcbb5de8 100644 Binary files a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-89088.m4s and b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-89088.m4s differ diff --git a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-init.mp4 index 825a8072d2..2b143225fa 100644 Binary files a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-0.m4s b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-0.m4s index 4dbca6653f..2c90c46883 100644 Binary files a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-0.m4s and b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-0.m4s differ diff --git a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-30030.m4s b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-30030.m4s index da2f00a606..c6b356a8e9 100644 Binary files a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-30030.m4s and b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-30030.m4s differ diff --git a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-60060.m4s b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-60060.m4s index 8dfe74ca5b..4edeba974e 100644 Binary files a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-60060.m4s and b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-60060.m4s differ diff --git a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-init.mp4 b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-init.mp4 index aa3f67b37c..c9553addb5 100644 Binary files a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/output.mpd b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/output.mpd index 67cd9e16af..4090157956 100644 --- a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/output.mpd +++ b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/output.mpd @@ -3,7 +3,7 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/packager/app/test/testdata/live-static-profile/bear-640x360-audio-1.m4s b/packager/app/test/testdata/live-static-profile/bear-640x360-audio-1.m4s index 55ee417db1..6e56dd8555 100644 Binary files a/packager/app/test/testdata/live-static-profile/bear-640x360-audio-1.m4s and b/packager/app/test/testdata/live-static-profile/bear-640x360-audio-1.m4s differ diff --git a/packager/app/test/testdata/live-static-profile/bear-640x360-audio-2.m4s b/packager/app/test/testdata/live-static-profile/bear-640x360-audio-2.m4s index 1ddbee3bdd..5bf76aa0d1 100644 Binary files a/packager/app/test/testdata/live-static-profile/bear-640x360-audio-2.m4s and b/packager/app/test/testdata/live-static-profile/bear-640x360-audio-2.m4s differ diff --git a/packager/app/test/testdata/live-static-profile/bear-640x360-audio-3.m4s b/packager/app/test/testdata/live-static-profile/bear-640x360-audio-3.m4s index a7100e5c24..d6bcbb5de8 100644 Binary files a/packager/app/test/testdata/live-static-profile/bear-640x360-audio-3.m4s and b/packager/app/test/testdata/live-static-profile/bear-640x360-audio-3.m4s differ diff --git a/packager/app/test/testdata/live-static-profile/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-static-profile/bear-640x360-audio-init.mp4 index 825a8072d2..2b143225fa 100644 Binary files a/packager/app/test/testdata/live-static-profile/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/live-static-profile/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-static-profile/bear-640x360-video-1.m4s b/packager/app/test/testdata/live-static-profile/bear-640x360-video-1.m4s index 4dbca6653f..2c90c46883 100644 Binary files a/packager/app/test/testdata/live-static-profile/bear-640x360-video-1.m4s and b/packager/app/test/testdata/live-static-profile/bear-640x360-video-1.m4s differ diff --git a/packager/app/test/testdata/live-static-profile/bear-640x360-video-2.m4s b/packager/app/test/testdata/live-static-profile/bear-640x360-video-2.m4s index da2f00a606..c6b356a8e9 100644 Binary files a/packager/app/test/testdata/live-static-profile/bear-640x360-video-2.m4s and b/packager/app/test/testdata/live-static-profile/bear-640x360-video-2.m4s differ diff --git a/packager/app/test/testdata/live-static-profile/bear-640x360-video-3.m4s b/packager/app/test/testdata/live-static-profile/bear-640x360-video-3.m4s index 8dfe74ca5b..4edeba974e 100644 Binary files a/packager/app/test/testdata/live-static-profile/bear-640x360-video-3.m4s and b/packager/app/test/testdata/live-static-profile/bear-640x360-video-3.m4s differ diff --git a/packager/app/test/testdata/live-static-profile/bear-640x360-video-init.mp4 b/packager/app/test/testdata/live-static-profile/bear-640x360-video-init.mp4 index aa3f67b37c..c9553addb5 100644 Binary files a/packager/app/test/testdata/live-static-profile/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/live-static-profile/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-static-profile/output.mpd b/packager/app/test/testdata/live-static-profile/output.mpd index 5bb9dacec3..606f454b33 100644 --- a/packager/app/test/testdata/live-static-profile/output.mpd +++ b/packager/app/test/testdata/live-static-profile/output.mpd @@ -3,7 +3,7 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/packager/app/test/testdata/mp4-trailing-moov/bear-640x360-trailing-moov-audio.mp4 b/packager/app/test/testdata/mp4-trailing-moov/bear-640x360-trailing-moov-audio.mp4 index 7128d250eb..a86c776cf5 100644 Binary files a/packager/app/test/testdata/mp4-trailing-moov/bear-640x360-trailing-moov-audio.mp4 and b/packager/app/test/testdata/mp4-trailing-moov/bear-640x360-trailing-moov-audio.mp4 differ diff --git a/packager/app/test/testdata/mp4-trailing-moov/bear-640x360-trailing-moov-video.mp4 b/packager/app/test/testdata/mp4-trailing-moov/bear-640x360-trailing-moov-video.mp4 index 9bc668f8f6..04ed1816fe 100644 Binary files a/packager/app/test/testdata/mp4-trailing-moov/bear-640x360-trailing-moov-video.mp4 and b/packager/app/test/testdata/mp4-trailing-moov/bear-640x360-trailing-moov-video.mp4 differ diff --git a/packager/app/test/testdata/mp4-trailing-moov/output.mpd b/packager/app/test/testdata/mp4-trailing-moov/output.mpd index b1a395497f..ee1f06bab2 100644 --- a/packager/app/test/testdata/mp4-trailing-moov/output.mpd +++ b/packager/app/test/testdata/mp4-trailing-moov/output.mpd @@ -5,8 +5,8 @@ bear-640x360-trailing-moov-video.mp4 - - + + @@ -14,8 +14,8 @@ bear-640x360-trailing-moov-audio.mp4 - - + + diff --git a/packager/app/test/testdata/mp4-trailing-moov/stream_0.m3u8 b/packager/app/test/testdata/mp4-trailing-moov/stream_0.m3u8 index 66c3b375a1..b09c6ea13a 100644 --- a/packager/app/test/testdata/mp4-trailing-moov/stream_0.m3u8 +++ b/packager/app/test/testdata/mp4-trailing-moov/stream_0.m3u8 @@ -3,9 +3,9 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-trailing-moov-audio.mp4",BYTERANGE="793@0" +#EXT-X-MAP:URI="bear-640x360-trailing-moov-audio.mp4",BYTERANGE="797@0" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@861 +#EXT-X-BYTERANGE:17028@865 bear-640x360-trailing-moov-audio.mp4 #EXTINF:0.998, #EXT-X-BYTERANGE:16285 diff --git a/packager/app/test/testdata/mp4-trailing-moov/stream_1.m3u8 b/packager/app/test/testdata/mp4-trailing-moov/stream_1.m3u8 index 08568d3384..d86af4e3c4 100644 --- a/packager/app/test/testdata/mp4-trailing-moov/stream_1.m3u8 +++ b/packager/app/test/testdata/mp4-trailing-moov/stream_1.m3u8 @@ -3,9 +3,9 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-trailing-moov-video.mp4",BYTERANGE="859@0" +#EXT-X-MAP:URI="bear-640x360-trailing-moov-video.mp4",BYTERANGE="863@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@927 +#EXT-X-BYTERANGE:99313@931 bear-640x360-trailing-moov-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:121807 diff --git a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-audio.mp4 b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-audio.mp4 index db1cc3a4ae..c5c3748137 100644 Binary files a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-audio.mp4 and b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-audio.mp4 differ diff --git a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-video.mp4 b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-video.mp4 index eca0bdb0f2..ea0447f779 100644 Binary files a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-video.mp4 and b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-video.mp4 differ diff --git a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/decrypted-bear-320x240-vp9-opus-audio-0.mp4 b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/decrypted-bear-320x240-vp9-opus-audio-0.mp4 index 4332c1ac88..92eb026049 100644 Binary files a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/decrypted-bear-320x240-vp9-opus-audio-0.mp4 and b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/decrypted-bear-320x240-vp9-opus-audio-0.mp4 differ diff --git a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/decrypted-bear-320x240-vp9-opus-video-0.mp4 b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/decrypted-bear-320x240-vp9-opus-video-0.mp4 index 987cf6ed2d..ce95f11641 100644 Binary files a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/decrypted-bear-320x240-vp9-opus-video-0.mp4 and b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/decrypted-bear-320x240-vp9-opus-video-0.mp4 differ diff --git a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/output.mpd b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/output.mpd index 283e00ab9e..53e657b9b4 100644 --- a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/output.mpd +++ b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/output.mpd @@ -10,8 +10,8 @@ bear-320x240-vp9-opus-audio.mp4 - - + + @@ -22,8 +22,8 @@ bear-320x240-vp9-opus-video.mp4 - - + + diff --git a/packager/app/test/testdata/video-audio-ttml/bear-640x360-audio.mp4 b/packager/app/test/testdata/video-audio-ttml/bear-640x360-audio.mp4 index 7128d250eb..a86c776cf5 100644 Binary files a/packager/app/test/testdata/video-audio-ttml/bear-640x360-audio.mp4 and b/packager/app/test/testdata/video-audio-ttml/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/video-audio-ttml/bear-640x360-video.mp4 b/packager/app/test/testdata/video-audio-ttml/bear-640x360-video.mp4 index 9bc668f8f6..04ed1816fe 100644 Binary files a/packager/app/test/testdata/video-audio-ttml/bear-640x360-video.mp4 and b/packager/app/test/testdata/video-audio-ttml/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/video-audio-ttml/output.mpd b/packager/app/test/testdata/video-audio-ttml/output.mpd index b7ffc8f999..094090f62b 100644 --- a/packager/app/test/testdata/video-audio-ttml/output.mpd +++ b/packager/app/test/testdata/video-audio-ttml/output.mpd @@ -10,8 +10,8 @@ bear-640x360-video.mp4 - - + + @@ -19,8 +19,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/video-audio-webvtt/bear-640x360-audio.mp4 b/packager/app/test/testdata/video-audio-webvtt/bear-640x360-audio.mp4 index 7128d250eb..a86c776cf5 100644 Binary files a/packager/app/test/testdata/video-audio-webvtt/bear-640x360-audio.mp4 and b/packager/app/test/testdata/video-audio-webvtt/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/video-audio-webvtt/bear-640x360-video.mp4 b/packager/app/test/testdata/video-audio-webvtt/bear-640x360-video.mp4 index 9bc668f8f6..04ed1816fe 100644 Binary files a/packager/app/test/testdata/video-audio-webvtt/bear-640x360-video.mp4 and b/packager/app/test/testdata/video-audio-webvtt/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/video-audio-webvtt/output.mpd b/packager/app/test/testdata/video-audio-webvtt/output.mpd index 69b162968b..1d7eb4173f 100644 --- a/packager/app/test/testdata/video-audio-webvtt/output.mpd +++ b/packager/app/test/testdata/video-audio-webvtt/output.mpd @@ -10,8 +10,8 @@ bear-640x360-video.mp4 - - + + @@ -19,8 +19,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/video-no-edit-list/bear-640x360-no_edit_list-video.mp4 b/packager/app/test/testdata/video-no-edit-list/bear-640x360-no_edit_list-video.mp4 index 37528cb505..93a5b5ff88 100644 Binary files a/packager/app/test/testdata/video-no-edit-list/bear-640x360-no_edit_list-video.mp4 and b/packager/app/test/testdata/video-no-edit-list/bear-640x360-no_edit_list-video.mp4 differ diff --git a/packager/app/test/testdata/video-no-edit-list/output.mpd b/packager/app/test/testdata/video-no-edit-list/output.mpd index d2b6ba4b5f..16cc109f7c 100644 --- a/packager/app/test/testdata/video-no-edit-list/output.mpd +++ b/packager/app/test/testdata/video-no-edit-list/output.mpd @@ -5,8 +5,8 @@ bear-640x360-no_edit_list-video.mp4 - - + + diff --git a/packager/app/test/testdata/video-non-square-pixel/bear-640x360-non_square_pixel-with_pasp-video.mp4 b/packager/app/test/testdata/video-non-square-pixel/bear-640x360-non_square_pixel-with_pasp-video.mp4 index e6b93fdeb9..f739c96719 100644 Binary files a/packager/app/test/testdata/video-non-square-pixel/bear-640x360-non_square_pixel-with_pasp-video.mp4 and b/packager/app/test/testdata/video-non-square-pixel/bear-640x360-non_square_pixel-with_pasp-video.mp4 differ diff --git a/packager/app/test/testdata/video-non-square-pixel/output.mpd b/packager/app/test/testdata/video-non-square-pixel/output.mpd index b9629931ce..2d050479f8 100644 --- a/packager/app/test/testdata/video-non-square-pixel/output.mpd +++ b/packager/app/test/testdata/video-non-square-pixel/output.mpd @@ -5,8 +5,8 @@ bear-640x360-non_square_pixel-with_pasp-video.mp4 - - + + diff --git a/packager/app/test/testdata/video-non-square-pixel/stream_0.m3u8 b/packager/app/test/testdata/video-non-square-pixel/stream_0.m3u8 index dd7f673065..322b0b6f0b 100644 --- a/packager/app/test/testdata/video-non-square-pixel/stream_0.m3u8 +++ b/packager/app/test/testdata/video-non-square-pixel/stream_0.m3u8 @@ -3,8 +3,8 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-non_square_pixel-with_pasp-video.mp4",BYTERANGE="879@0" +#EXT-X-MAP:URI="bear-640x360-non_square_pixel-with_pasp-video.mp4",BYTERANGE="883@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:95246@923 +#EXT-X-BYTERANGE:95246@927 bear-640x360-non_square_pixel-with_pasp-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/vp8-mp4-with-encryption/bear-640x360-video.mp4 b/packager/app/test/testdata/vp8-mp4-with-encryption/bear-640x360-video.mp4 index dbfd1689cc..6ee51d7436 100644 Binary files a/packager/app/test/testdata/vp8-mp4-with-encryption/bear-640x360-video.mp4 and b/packager/app/test/testdata/vp8-mp4-with-encryption/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/vp8-mp4-with-encryption/decrypted-bear-640x360-video-0.mp4 b/packager/app/test/testdata/vp8-mp4-with-encryption/decrypted-bear-640x360-video-0.mp4 index e5033f940a..6083064548 100644 Binary files a/packager/app/test/testdata/vp8-mp4-with-encryption/decrypted-bear-640x360-video-0.mp4 and b/packager/app/test/testdata/vp8-mp4-with-encryption/decrypted-bear-640x360-video-0.mp4 differ diff --git a/packager/app/test/testdata/vp8-mp4-with-encryption/output.mpd b/packager/app/test/testdata/vp8-mp4-with-encryption/output.mpd index 1fe1015889..18c65a5d1a 100644 --- a/packager/app/test/testdata/vp8-mp4-with-encryption/output.mpd +++ b/packager/app/test/testdata/vp8-mp4-with-encryption/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-1.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-1.m4s index 55ee417db1..6e56dd8555 100644 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-1.m4s and b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-1.m4s differ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-2.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-2.m4s index 3e151a7d97..74163d0b7b 100644 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-2.m4s and b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-2.m4s differ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-3.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-3.m4s index e86f365d7f..03b9029c21 100644 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-3.m4s and b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-3.m4s differ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-init.mp4 index 825a8072d2..2b143225fa 100644 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-1.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-1.m4s index 4dbca6653f..2c90c46883 100644 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-1.m4s and b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-1.m4s differ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-2.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-2.m4s index da2f00a606..c6b356a8e9 100644 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-2.m4s and b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-2.m4s differ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-3.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-3.m4s index 8dfe74ca5b..4edeba974e 100644 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-3.m4s and b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-3.m4s differ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-iframe.m3u8 index 756a032739..e3961bbcaf 100644 --- a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-iframe.m3u8 @@ -6,13 +6,13 @@ #EXT-X-I-FRAMES-ONLY #EXT-X-MAP:URI="bear-640x360-video-init.mp4" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@80 +#EXT-X-BYTERANGE:15581@84 bear-640x360-video-1.m4s #EXTINF:1.001, -#EXT-X-BYTERANGE:18221@80 +#EXT-X-BYTERANGE:18221@84 bear-640x360-video-2.m4s #EXT-X-PLACEMENT-OPPORTUNITY #EXTINF:0.734, -#EXT-X-BYTERANGE:19663@80 +#EXT-X-BYTERANGE:19663@84 bear-640x360-video-3.m4s #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-init.mp4 b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-init.mp4 index aa3f67b37c..c9553addb5 100644 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-1.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-1.m4s index 577826f3fa..7f6fea5f03 100644 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-1.m4s and b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-1.m4s differ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-2.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-2.m4s index 806b3320da..a59e2a79ad 100644 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-2.m4s and b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-2.m4s differ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-3.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-3.m4s index c07be53447..0f434e3d9b 100644 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-3.m4s and b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-3.m4s differ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-4.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-4.m4s index 23386a8e95..a03dd2653e 100644 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-4.m4s and b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-4.m4s differ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-5.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-5.m4s index 10f932a22b..14d335f2d9 100644 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-5.m4s and b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-5.m4s differ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-6.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-6.m4s index eea8e784d0..c39fd9adff 100644 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-6.m4s and b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-6.m4s differ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-init.mp4 b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-init.mp4 index 6e32428639..56d2ac6ca3 100644 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-init.mp4 and b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-init.mp4 differ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.m3u8 b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.m3u8 index d0ecedb6ff..2f8252e4f9 100644 --- a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.m3u8 +++ b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.m3u8 @@ -7,7 +7,7 @@ #EXT-X-MEDIA:TYPE=SUBTITLES,URI="bear-english-text.m3u8",GROUP-ID="default-text-group",NAME="stream_0",AUTOSELECT=YES -#EXT-X-STREAM-INF:BANDWIDTH=1108051,AVERAGE-BANDWIDTH=1005999,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",SUBTITLES="default-text-group" +#EXT-X-STREAM-INF:BANDWIDTH=1108115,AVERAGE-BANDWIDTH=1006069,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",SUBTITLES="default-text-group" bear-640x360-video.m3u8 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=214292,AVERAGE-BANDWIDTH=156327,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-video-iframe.m3u8" diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.mpd b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.mpd index e51298416e..6e663cde8b 100644 --- a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.mpd +++ b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.mpd @@ -2,18 +2,9 @@ - - - - - - - - - - + - + @@ -22,8 +13,17 @@ + + + + + + + + + - + @@ -35,18 +35,9 @@ - - - - - - - - - - + - + @@ -54,8 +45,17 @@ + + + + + + + + + - + diff --git a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-0.mp4 b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-0.mp4 index d104284403..d22aa64cbe 100644 Binary files a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-0.mp4 and b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-0.mp4 differ diff --git a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-1.mp4 b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-1.mp4 index 0127cfffbb..50a7ff5d18 100644 Binary files a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-1.mp4 and b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-1.mp4 differ diff --git a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-2.mp4 b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-2.mp4 index a182d049f7..5ef69733c1 100644 Binary files a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-2.mp4 and b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-2.mp4 differ diff --git a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-3.mp4 b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-3.mp4 index ec42c301b6..b80f762b32 100644 Binary files a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-3.mp4 and b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-3.mp4 differ diff --git a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output.mpd b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output.mpd index d80c0fdbba..71b96ec2a8 100644 --- a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output.mpd +++ b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output.mpd @@ -5,14 +5,14 @@ bear-multi-configs-0.mp4 - - + + bear-multi-configs-2.mp4 - - + + @@ -20,15 +20,15 @@ bear-multi-configs-1.mp4 - - + + bear-multi-configs-3.mp4 - - + + diff --git a/packager/app/test/testdata/wvm-input/bear-multi-configs-0.mp4 b/packager/app/test/testdata/wvm-input/bear-multi-configs-0.mp4 index 9e83554870..75c89080ac 100644 Binary files a/packager/app/test/testdata/wvm-input/bear-multi-configs-0.mp4 and b/packager/app/test/testdata/wvm-input/bear-multi-configs-0.mp4 differ diff --git a/packager/app/test/testdata/wvm-input/bear-multi-configs-1.mp4 b/packager/app/test/testdata/wvm-input/bear-multi-configs-1.mp4 index 0127cfffbb..50a7ff5d18 100644 Binary files a/packager/app/test/testdata/wvm-input/bear-multi-configs-1.mp4 and b/packager/app/test/testdata/wvm-input/bear-multi-configs-1.mp4 differ diff --git a/packager/app/test/testdata/wvm-input/bear-multi-configs-2.mp4 b/packager/app/test/testdata/wvm-input/bear-multi-configs-2.mp4 index b881781967..2cae9528a9 100644 Binary files a/packager/app/test/testdata/wvm-input/bear-multi-configs-2.mp4 and b/packager/app/test/testdata/wvm-input/bear-multi-configs-2.mp4 differ diff --git a/packager/app/test/testdata/wvm-input/bear-multi-configs-3.mp4 b/packager/app/test/testdata/wvm-input/bear-multi-configs-3.mp4 index ec42c301b6..b80f762b32 100644 Binary files a/packager/app/test/testdata/wvm-input/bear-multi-configs-3.mp4 and b/packager/app/test/testdata/wvm-input/bear-multi-configs-3.mp4 differ diff --git a/packager/app/test/testdata/wvm-input/output.mpd b/packager/app/test/testdata/wvm-input/output.mpd index cd5677f847..3c2b7cc015 100644 --- a/packager/app/test/testdata/wvm-input/output.mpd +++ b/packager/app/test/testdata/wvm-input/output.mpd @@ -5,14 +5,14 @@ bear-multi-configs-0.mp4 - - + + bear-multi-configs-2.mp4 - - + + @@ -20,15 +20,15 @@ bear-multi-configs-1.mp4 - - + + bear-multi-configs-3.mp4 - - + + diff --git a/packager/media/formats/mp4/mp4_muxer.cc b/packager/media/formats/mp4/mp4_muxer.cc index 356d7a9e9b..6af6b38aab 100644 --- a/packager/media/formats/mp4/mp4_muxer.cc +++ b/packager/media/formats/mp4/mp4_muxer.cc @@ -206,8 +206,9 @@ Status MP4Muxer::DelayInitializeMuxer() { std::unique_ptr ftyp(new FileType); std::unique_ptr moov(new Movie); - ftyp->major_brand = FOURCC_isom; + ftyp->major_brand = FOURCC_mp41; ftyp->compatible_brands.push_back(FOURCC_iso8); + ftyp->compatible_brands.push_back(FOURCC_isom); ftyp->compatible_brands.push_back(FOURCC_mp41); ftyp->compatible_brands.push_back(FOURCC_dash);