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 3cb2dcdf44..4bfebf3a61 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 930f5157a9..8248a5dce5 100644 --- a/packager/app/test/testdata/acc-he/output.mpd +++ b/packager/app/test/testdata/acc-he/output.mpd @@ -1,13 +1,13 @@ - + - + bear-640x360-aac_he-silent_right-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 c74b3c4fe8..bfb30ce496 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,14 +3,14 @@ ## 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="757@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="793@0" #EXTINF:1.022, -#EXT-X-BYTERANGE:16655@825 +#EXT-X-BYTERANGE:17028@861 bear-640x360-audio.mp4 #EXTINF:0.998, -#EXT-X-BYTERANGE:16253 +#EXT-X-BYTERANGE:16285 bear-640x360-audio.mp4 -#EXTINF:0.743, -#EXT-X-BYTERANGE:9963 +#EXTINF:0.720, +#EXT-X-BYTERANGE:9558 bear-640x360-audio.mp4 #EXT-X-ENDLIST 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 a66d3bfd1a..42857986c7 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 51f3772ba6..7c16d360b3 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="823@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@891 +#EXT-X-BYTERANGE:15581@927 bear-640x360-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18221@100204 +#EXT-X-BYTERANGE:18221@100240 bear-640x360-video.mp4 #EXTINF:0.734, -#EXT-X-BYTERANGE:19663@222011 +#EXT-X-BYTERANGE:19663@222047 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 8e86067e42..baf17ef66b 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="823@0" -#EXTINF:1.068, -#EXT-X-BYTERANGE:99313@891 +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0" +#EXTINF:1.001, +#EXT-X-BYTERANGE:99313@927 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 9ea15d763d..9bc668f8f6 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.m3u8 b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.m3u8 index f6106994c1..bdb0aefddb 100644 --- a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.m3u8 +++ b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.m3u8 @@ -3,7 +3,7 @@ #EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",LANGUAGE="pt-BR",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2" -#EXT-X-STREAM-INF:BANDWIDTH=1103896,AVERAGE-BANDWIDTH=982641,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group" +#EXT-X-STREAM-INF:BANDWIDTH=1106817,AVERAGE-BANDWIDTH=1004632,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-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/audio-video-with-language-override-with-subtag/output.mpd b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.mpd index b3c34985fc..59c68c6cd1 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 @@ -1,21 +1,21 @@ - + bear-640x360-video.mp4 - - + + - + 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 c74b3c4fe8..bfb30ce496 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,14 +3,14 @@ ## 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="757@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="793@0" #EXTINF:1.022, -#EXT-X-BYTERANGE:16655@825 +#EXT-X-BYTERANGE:17028@861 bear-640x360-audio.mp4 #EXTINF:0.998, -#EXT-X-BYTERANGE:16253 +#EXT-X-BYTERANGE:16285 bear-640x360-audio.mp4 -#EXTINF:0.743, -#EXT-X-BYTERANGE:9963 +#EXTINF:0.720, +#EXT-X-BYTERANGE:9558 bear-640x360-audio.mp4 #EXT-X-ENDLIST 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 a66d3bfd1a..42857986c7 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 51f3772ba6..7c16d360b3 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="823@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@891 +#EXT-X-BYTERANGE:15581@927 bear-640x360-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18221@100204 +#EXT-X-BYTERANGE:18221@100240 bear-640x360-video.mp4 #EXTINF:0.734, -#EXT-X-BYTERANGE:19663@222011 +#EXT-X-BYTERANGE:19663@222047 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 8e86067e42..baf17ef66b 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="823@0" -#EXTINF:1.068, -#EXT-X-BYTERANGE:99313@891 +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0" +#EXTINF:1.001, +#EXT-X-BYTERANGE:99313@927 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 9ea15d763d..9bc668f8f6 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.m3u8 b/packager/app/test/testdata/audio-video-with-language-override/output.m3u8 index 68679aaf8f..3954bb5791 100644 --- a/packager/app/test/testdata/audio-video-with-language-override/output.m3u8 +++ b/packager/app/test/testdata/audio-video-with-language-override/output.m3u8 @@ -3,7 +3,7 @@ #EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",LANGUAGE="pt",NAME="stream_0",DEFAULT=YES,AUTOSELECT=YES,CHANNELS="2" -#EXT-X-STREAM-INF:BANDWIDTH=1103896,AVERAGE-BANDWIDTH=982641,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group" +#EXT-X-STREAM-INF:BANDWIDTH=1106817,AVERAGE-BANDWIDTH=1004632,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-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/audio-video-with-language-override/output.mpd b/packager/app/test/testdata/audio-video-with-language-override/output.mpd index 6e10d55a2f..8f310ea022 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 @@ -1,22 +1,22 @@ - + bear-640x360-video.mp4 - - + + - + 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 1cc7fbb5f5..87f89a93c0 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 0473a61a76..17f6db1b74 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 9ea15d763d..9bc668f8f6 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 6bc1290825..e7bb25ac23 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 @@ -1,12 +1,12 @@ - + bear-640x360-video.mp4 - - + + @@ -14,17 +14,17 @@ bear-640x360-video-trick_play_factor_1.mp4 - - + + - + 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 1cc7fbb5f5..87f89a93c0 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 0473a61a76..17f6db1b74 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 5279433a2b..09c0d1b8f7 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 9ea15d763d..9bc668f8f6 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 f58f1cc09e..785c185548 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 @@ -1,12 +1,12 @@ - + bear-640x360-video.mp4 - - + + @@ -14,23 +14,23 @@ bear-640x360-video-trick_play_factor_2.mp4 - - + + bear-640x360-video-trick_play_factor_1.mp4 - - + + - + 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 1cc7fbb5f5..87f89a93c0 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 9ea15d763d..9bc668f8f6 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 7b011f19a2..37b639e703 100644 --- a/packager/app/test/testdata/audio-video/output.mpd +++ b/packager/app/test/testdata/audio-video/output.mpd @@ -1,21 +1,21 @@ - + bear-640x360-video.mp4 - - + + - + bear-640x360-audio.mp4 - - + + 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 bc076ae417..751f42ff59 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="823@0" +#EXT-X-MAP:URI="bear-640x360-ac3-video.mp4",BYTERANGE="859@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@891 +#EXT-X-BYTERANGE:15581@927 bear-640x360-ac3-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18221@100204 +#EXT-X-BYTERANGE:18221@100240 bear-640x360-ac3-video.mp4 #EXTINF:0.734, -#EXT-X-BYTERANGE:19663@222011 +#EXT-X-BYTERANGE:19663@222047 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 c8d79e5522..0ba1c17eaf 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="823@0" -#EXTINF:1.068, -#EXT-X-BYTERANGE:99313@891 +#EXT-X-MAP:URI="bear-640x360-ac3-video.mp4",BYTERANGE="859@0" +#EXTINF:1.001, +#EXT-X-BYTERANGE:99313@927 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 6964da6920..f3c1337bde 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-ac3-ts-to-mp4/output.m3u8 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/output.m3u8 index 058e06c241..5460b26ebf 100644 --- a/packager/app/test/testdata/avc-ac3-ts-to-mp4/output.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts-to-mp4/output.m3u8 @@ -3,7 +3,7 @@ #EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-ac3-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2" -#EXT-X-STREAM-INF:BANDWIDTH=1168321,AVERAGE-BANDWIDTH=1053216,CODECS="avc1.64001e,ac-3",RESOLUTION=640x360,AUDIO="default-audio-group" +#EXT-X-STREAM-INF:BANDWIDTH=1168321,AVERAGE-BANDWIDTH=1074156,CODECS="avc1.64001e,ac-3",RESOLUTION=640x360,AUDIO="default-audio-group" bear-640x360-ac3-video.m3u8 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=214292,AVERAGE-BANDWIDTH=156327,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-ac3-video-iframe.m3u8" diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output.m3u8 index 7718f93b18..8860f9a75f 100644 --- a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output.m3u8 +++ b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output.m3u8 @@ -1,7 +1,7 @@ #EXTM3U ## Generated with https://github.com/google/shaka-packager version -- -#EXT-X-STREAM-INF:BANDWIDTH=1183949,AVERAGE-BANDWIDTH=390289,CODECS="avc1.64001f",RESOLUTION=1024x436 +#EXT-X-STREAM-INF:BANDWIDTH=1183949,AVERAGE-BANDWIDTH=390288,CODECS="avc1.64001f",RESOLUTION=1024x436 sintel-1024x436-video.m3u8 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=447591,AVERAGE-BANDWIDTH=40358,CODECS="avc1.64001f",RESOLUTION=1024x436,URI="sintel-1024x436-video-iframe.m3u8" diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-1.ts b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-1.ts index 9a71ce2969..aa01e5c8f6 100644 Binary files a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-1.ts and b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-1.ts differ diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-2.ts b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-2.ts index fe440e9b5d..788e8d3f34 100644 Binary files a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-2.ts and b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-2.ts differ diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-3.ts b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-3.ts index 28f3d0877b..1f7ae51acf 100644 Binary files a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-3.ts and b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-3.ts differ diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-4.ts b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-4.ts index 26b66ae426..d7e34bc875 100644 Binary files a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-4.ts and b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-4.ts differ diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-5.ts b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-5.ts index 384788ad1d..098f57f64a 100644 Binary files a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-5.ts and b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-5.ts differ diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-6.ts b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-6.ts index 63fbee9a00..408f9a4674 100644 Binary files a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-6.ts and b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-6.ts differ diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-iframe.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-iframe.m3u8 index 5d90f2f86b..1faf9001fe 100644 --- a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-iframe.m3u8 +++ b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-iframe.m3u8 @@ -16,10 +16,10 @@ sintel-1024x436-video-2.ts #EXT-X-BYTERANGE:376@376 sintel-1024x436-video-3.ts #EXTINF:0.958, -#EXT-X-BYTERANGE:376@376 -sintel-1024x436-video-4.ts +#EXT-X-BYTERANGE:376@4700 +sintel-1024x436-video-3.ts #EXTINF:0.917, -#EXT-X-BYTERANGE:5452@41924 +#EXT-X-BYTERANGE:5452@376 sintel-1024x436-video-4.ts #EXTINF:1.000, #EXT-X-BYTERANGE:11092@376 diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video.m3u8 index 0af4d22527..005069d849 100644 --- a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video.m3u8 +++ b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video.m3u8 @@ -9,9 +9,9 @@ sintel-1024x436-video-1.ts #EXT-X-KEY:METHOD=SAMPLE-AES,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",IV=0x3334353637383930,KEYFORMAT="identity" #EXTINF:1.000, sintel-1024x436-video-2.ts -#EXTINF:0.917, -sintel-1024x436-video-3.ts #EXTINF:1.875, +sintel-1024x436-video-3.ts +#EXTINF:0.917, sintel-1024x436-video-4.ts #EXTINF:1.000, sintel-1024x436-video-5.ts 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 c74b3c4fe8..bfb30ce496 100644 --- a/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.m3u8 @@ -3,14 +3,14 @@ ## 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="757@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="793@0" #EXTINF:1.022, -#EXT-X-BYTERANGE:16655@825 +#EXT-X-BYTERANGE:17028@861 bear-640x360-audio.mp4 #EXTINF:0.998, -#EXT-X-BYTERANGE:16253 +#EXT-X-BYTERANGE:16285 bear-640x360-audio.mp4 -#EXTINF:0.743, -#EXT-X-BYTERANGE:9963 +#EXTINF:0.720, +#EXT-X-BYTERANGE:9558 bear-640x360-audio.mp4 #EXT-X-ENDLIST 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 1cc7fbb5f5..87f89a93c0 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 51f3772ba6..7c16d360b3 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="823@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@891 +#EXT-X-BYTERANGE:15581@927 bear-640x360-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18221@100204 +#EXT-X-BYTERANGE:18221@100240 bear-640x360-video.mp4 #EXTINF:0.734, -#EXT-X-BYTERANGE:19663@222011 +#EXT-X-BYTERANGE:19663@222047 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 8e86067e42..baf17ef66b 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="823@0" -#EXTINF:1.068, -#EXT-X-BYTERANGE:99313@891 +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0" +#EXTINF:1.001, +#EXT-X-BYTERANGE:99313@927 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 9ea15d763d..9bc668f8f6 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.m3u8 b/packager/app/test/testdata/bandwidth-override/output.m3u8 index 5046e63538..e9de42ef3f 100644 --- a/packager/app/test/testdata/bandwidth-override/output.m3u8 +++ b/packager/app/test/testdata/bandwidth-override/output.m3u8 @@ -3,7 +3,7 @@ #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=55555,AVERAGE-BANDWIDTH=982641,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group" +#EXT-X-STREAM-INF:BANDWIDTH=55555,AVERAGE-BANDWIDTH=1004632,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group" bear-640x360-video.m3u8 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=44444,AVERAGE-BANDWIDTH=156327,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-video-iframe.m3u8" diff --git a/packager/app/test/testdata/bandwidth-override/output.mpd b/packager/app/test/testdata/bandwidth-override/output.mpd index f4f60aba84..17eef65808 100644 --- a/packager/app/test/testdata/bandwidth-override/output.mpd +++ b/packager/app/test/testdata/bandwidth-override/output.mpd @@ -1,12 +1,12 @@ - + bear-640x360-video.mp4 - - + + @@ -14,8 +14,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd new file mode 100644 index 0000000000..5fbc0ace45 --- /dev/null +++ b/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd @@ -0,0 +1,31 @@ + + + + + + + + AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== + + + bear-640x360-video.mp4 + + + + + + + + + AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== + + + + bear-640x360-audio.mp4 + + + + + + + diff --git a/packager/app/test/testdata/bear-640x360-v-trick-2-golden.mp4 b/packager/app/test/testdata/bear-640x360-v-trick-2-golden.mp4 new file mode 100644 index 0000000000..09c0d1b8f7 Binary files /dev/null and b/packager/app/test/testdata/bear-640x360-v-trick-2-golden.mp4 differ diff --git a/packager/app/test/testdata/dash-with-bandwidth-override/bear-640x360-audio.mp4 b/packager/app/test/testdata/dash-with-bandwidth-override/bear-640x360-audio.mp4 index 1cc7fbb5f5..87f89a93c0 100644 Binary files a/packager/app/test/testdata/dash-with-bandwidth-override/bear-640x360-audio.mp4 and b/packager/app/test/testdata/dash-with-bandwidth-override/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/dash-with-bandwidth-override/bear-640x360-video.mp4 b/packager/app/test/testdata/dash-with-bandwidth-override/bear-640x360-video.mp4 index 9ea15d763d..9bc668f8f6 100644 Binary files a/packager/app/test/testdata/dash-with-bandwidth-override/bear-640x360-video.mp4 and b/packager/app/test/testdata/dash-with-bandwidth-override/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/dash-with-bandwidth-override/output.mpd b/packager/app/test/testdata/dash-with-bandwidth-override/output.mpd index f4f60aba84..17eef65808 100644 --- a/packager/app/test/testdata/dash-with-bandwidth-override/output.mpd +++ b/packager/app/test/testdata/dash-with-bandwidth-override/output.mpd @@ -1,12 +1,12 @@ - + bear-640x360-video.mp4 - - + + @@ -14,8 +14,8 @@ bear-640x360-audio.mp4 - - + + 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 27323b31bf..ba062cde5f 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="909@0" +#EXT-X-MAP:URI="bear-640x360-ec3-audio.mp4",BYTERANGE="945@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" -#EXTINF:1.010, -#EXT-X-BYTERANGE:24460@977 +#EXTINF:1.004, +#EXT-X-BYTERANGE:24460@1013 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 3c04593b4a..3443d7f1b3 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 95c9bb2c8a..cbaddab1fa 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="1091@0" +#EXT-X-MAP:URI="bear-640x360-ec3-video.mp4",BYTERANGE="1127@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:15665@1159 +#EXT-X-BYTERANGE:15665@1195 bear-640x360-ec3-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18754@94964 +#EXT-X-BYTERANGE:18754@95000 bear-640x360-ec3-video.mp4 #EXTINF:0.734, -#EXT-X-BYTERANGE:20068@217304 +#EXT-X-BYTERANGE:20068@217340 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 cb5c4767d9..c9b89504e7 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="1091@0" +#EXT-X-MAP:URI="bear-640x360-ec3-video.mp4",BYTERANGE="1127@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" -#EXTINF:1.068, -#EXT-X-BYTERANGE:93805@1159 +#EXTINF:1.001, +#EXT-X-BYTERANGE:93805@1195 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 ea10e135b3..9aa4624241 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/ec3-and-hls-single-segment-mp4-encrypted/output.m3u8 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output.m3u8 index 8780295fcf..4df168191d 100644 --- a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output.m3u8 +++ b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output.m3u8 @@ -3,7 +3,7 @@ #EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-ec3-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2" -#EXT-X-STREAM-INF:BANDWIDTH=1174214,AVERAGE-BANDWIDTH=1040768,CODECS="avc1.64001e,ec-3",RESOLUTION=640x360,AUDIO="default-audio-group" +#EXT-X-STREAM-INF:BANDWIDTH=1174214,AVERAGE-BANDWIDTH=1061802,CODECS="avc1.64001e,ec-3",RESOLUTION=640x360,AUDIO="default-audio-group" bear-640x360-ec3-video.m3u8 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=218705,AVERAGE-BANDWIDTH=159315,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-ec3-video-iframe.m3u8" diff --git a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-audio-1.ec3 b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-audio-1.ec3 index c0a4ebc021..72e1047a5d 100644 Binary files a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-audio-1.ec3 and b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-audio-1.ec3 differ diff --git a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-audio-2.ec3 b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-audio-2.ec3 index d9f80c70cf..3a7855c6f5 100644 Binary files a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-audio-2.ec3 and b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-audio-2.ec3 differ diff --git a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-audio-3.ec3 b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-audio-3.ec3 index c1aa0c9199..f56cb30bc5 100644 Binary files a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-audio-3.ec3 and b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-audio-3.ec3 differ diff --git a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-1.ts b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-1.ts index 9421516d5b..385eb722c9 100644 Binary files a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-1.ts and b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-1.ts differ diff --git a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-2.ts b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-2.ts index 80d082525f..f8745b5e15 100644 Binary files a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-2.ts and b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-2.ts differ diff --git a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-3.ts b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-3.ts index 679ea2f35b..8e717ae5a6 100644 Binary files a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-3.ts and b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-3.ts differ 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 003ff27778..4bf434fd7a 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,20 +3,17 @@ ## 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="967@0" +#EXT-X-MAP:URI="bear-640x360-audio1.mp4",BYTERANGE="1003@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.022, -#EXT-X-BYTERANGE:16655@1035 +#EXT-X-BYTERANGE:17028@1059 bear-640x360-audio1.mp4 -#EXTINF:0.998, -#EXT-X-BYTERANGE:16650 -bear-640x360-audio1.mp4 -#EXTINF:0.046, -#EXT-X-BYTERANGE:1014 +#EXTINF:0.975, +#EXT-X-BYTERANGE:16269 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.697, -#EXT-X-BYTERANGE:9415@1011 +#EXTINF:0.743, +#EXT-X-BYTERANGE:10272@1047 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 eddee2bb72..c9ad4cd161 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 5dd3d06aa1..c9c14f2f18 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 86730bc97c..46a7737114 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="1091@0" +#EXT-X-MAP:URI="bear-640x360-video1.mp4",BYTERANGE="1127@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@1147 +#EXT-X-BYTERANGE:15581@1183 bear-640x360-video1.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18754@100460 +#EXT-X-BYTERANGE:18754@100496 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@1135 +#EXT-X-BYTERANGE:20068@1171 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 f27353ae67..69086961a8 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="1091@0" +#EXT-X-MAP:URI="bear-640x360-video1.mp4",BYTERANGE="1127@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" -#EXTINF:1.068, -#EXT-X-BYTERANGE:99313@1147 +#EXTINF:1.001, +#EXT-X-BYTERANGE:99313@1183 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@1135 +#EXT-X-BYTERANGE:80067@1171 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 e76c07f45b..8886a1a02c 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 85d67d0d46..6c6bf1acb5 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.m3u8 b/packager/app/test/testdata/encryption-and-ad-cues-split-content/output.m3u8 index 5e64e17586..9bf414f3f9 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues-split-content/output.m3u8 +++ b/packager/app/test/testdata/encryption-and-ad-cues-split-content/output.m3u8 @@ -3,7 +3,7 @@ #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=1152421,AVERAGE-BANDWIDTH=987816,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group" +#EXT-X-STREAM-INF:BANDWIDTH=1111200,AVERAGE-BANDWIDTH=1009412,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group" bear-640x360-video.m3u8 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=218705,AVERAGE-BANDWIDTH=159070,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-video-iframe.m3u8" 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 7ef0acc944..8379ae13a6 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 @@ -1,7 +1,7 @@ - - + + @@ -9,8 +9,8 @@ bear-640x360-video1.mp4 - - + + @@ -19,16 +19,16 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + bear-640x360-audio1.mp4 - - + + - + @@ -36,8 +36,8 @@ bear-640x360-video2.mp4 - - + + @@ -46,11 +46,11 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + 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 987ccd02d9..074f9ef39a 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,19 +3,16 @@ ## 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="967@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="1003@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.022, -#EXT-X-BYTERANGE:16655@1047 +#EXT-X-BYTERANGE:17028@1071 bear-640x360-audio.mp4 -#EXTINF:0.998, -#EXT-X-BYTERANGE:16650 -bear-640x360-audio.mp4 -#EXTINF:0.046, -#EXT-X-BYTERANGE:1014 +#EXTINF:0.975, +#EXT-X-BYTERANGE:16269 bear-640x360-audio.mp4 #EXT-X-PLACEMENT-OPPORTUNITY -#EXTINF:0.697, -#EXT-X-BYTERANGE:9415 +#EXTINF:0.743, +#EXT-X-BYTERANGE:10272 bear-640x360-audio.mp4 #EXT-X-ENDLIST 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 23bb6c742c..1941c3bec3 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 be3f071a9c..365f9a2166 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="1091@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1127@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@1159 +#EXT-X-BYTERANGE:15581@1195 bear-640x360-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18754@100472 +#EXT-X-BYTERANGE:18754@100508 bear-640x360-video.mp4 #EXT-X-PLACEMENT-OPPORTUNITY #EXTINF:0.734, -#EXT-X-BYTERANGE:20068@222812 +#EXT-X-BYTERANGE:20068@222848 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 f81460f81e..ee532489b3 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="1091@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1127@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" -#EXTINF:1.068, -#EXT-X-BYTERANGE:99313@1159 +#EXTINF:1.001, +#EXT-X-BYTERANGE:99313@1195 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 cebb14a0e8..c82b090d9e 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.m3u8 b/packager/app/test/testdata/encryption-and-ad-cues/output.m3u8 index 5e64e17586..9bf414f3f9 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues/output.m3u8 +++ b/packager/app/test/testdata/encryption-and-ad-cues/output.m3u8 @@ -3,7 +3,7 @@ #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=1152421,AVERAGE-BANDWIDTH=987816,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group" +#EXT-X-STREAM-INF:BANDWIDTH=1111200,AVERAGE-BANDWIDTH=1009412,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group" bear-640x360-video.m3u8 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=218705,AVERAGE-BANDWIDTH=159070,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-video-iframe.m3u8" 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 a8711aab5a..9e79670160 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues/output.mpd +++ b/packager/app/test/testdata/encryption-and-ad-cues/output.mpd @@ -1,17 +1,17 @@ - - + + AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + bear-640x360-audio.mp4 - - + + @@ -22,23 +22,23 @@ bear-640x360-video.mp4 - - + + - + AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + 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 ea6d9b5bb0..9cf72047ef 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 60f4e6f5b3..2841b7e2a7 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 1cc7fbb5f5..87f89a93c0 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 9ea15d763d..9bc668f8f6 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 a406c368eb..1d851b73df 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 @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -19,11 +19,11 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + 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 9291a9d97a..22fcb0a3ac 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 daececa166..81691dafee 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 db8a9ddfec..c5effb88ad 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 @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -19,11 +19,11 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + 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 afaf9595fb..b82b25f618 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 cebb14a0e8..c82b090d9e 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 c78bebd1f9..62181cb275 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 @@ -1,6 +1,6 @@ - + @@ -9,21 +9,21 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== bear-640x360-video.mp4 - - + + - + 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 cebb14a0e8..c82b090d9e 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 bcdeea3035..3dd2d56428 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: 1090 + end: 1126 } index_range { - begin: 1091 - end: 1158 + begin: 1127 + end: 1194 } 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 8c1f7f723b..e3089005c4 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 afaf9595fb..b82b25f618 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 78fb2c7769..3034f429f3 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 @@ -1,4 +1,4 @@ -bandwidth: 133406 +bandwidth: 133663 audio_info { codec: "mp4a.40.2" sampling_frequency: 44100 @@ -8,11 +8,11 @@ audio_info { } init_range { begin: 0 - end: 966 + end: 1002 } index_range { - begin: 967 - end: 1034 + begin: 1003 + end: 1070 } 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 cebb14a0e8..c82b090d9e 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 bcdeea3035..3dd2d56428 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: 1090 + end: 1126 } index_range { - begin: 1091 - end: 1158 + begin: 1127 + end: 1194 } 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 afaf9595fb..b82b25f618 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 ce0e437d68..a71bd09ad1 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 cebb14a0e8..c82b090d9e 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 1cc7fbb5f5..87f89a93c0 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 9ea15d763d..9bc668f8f6 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 0473a61a76..17f6db1b74 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 40251c3e18..803f5b9d1b 100644 --- a/packager/app/test/testdata/encryption-and-trick-play/output.mpd +++ b/packager/app/test/testdata/encryption-and-trick-play/output.mpd @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-video-trick_play_factor_1.mp4 - - + + @@ -32,11 +32,11 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + 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 afaf9595fb..b82b25f618 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 ce0e437d68..a71bd09ad1 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 09bc5d4668..524042168f 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 cebb14a0e8..c82b090d9e 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 41b09094f3..f2cb141877 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 @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,14 +22,14 @@ bear-640x360-video-trick_play_factor_2.mp4 - - + + bear-640x360-video-trick_play_factor_1.mp4 - - + + @@ -38,11 +38,11 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + 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 fc019bf12e..cedd5fbc52 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 8cbfc316ca..97167ea5c4 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 1cc7fbb5f5..87f89a93c0 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 9ea15d763d..9bc668f8f6 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 98b44c9d6f..576d07bcf0 100644 --- a/packager/app/test/testdata/encryption-cbc-1/output.mpd +++ b/packager/app/test/testdata/encryption-cbc-1/output.mpd @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -19,11 +19,11 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + 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 2f2a91d12d..05fe6fa48c 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 59c5ade794..8c31d6d266 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 1cc7fbb5f5..87f89a93c0 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 9ea15d763d..9bc668f8f6 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 aab95f3265..ac84f39e58 100644 --- a/packager/app/test/testdata/encryption-cbcs/output.mpd +++ b/packager/app/test/testdata/encryption-cbcs/output.mpd @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -19,11 +19,11 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + 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 587a1291d8..5f0e489582 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 07f0dc14dc..6dbe4bf996 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 1cc7fbb5f5..87f89a93c0 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 9ea15d763d..9bc668f8f6 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 7b1e637eea..d525881a43 100644 --- a/packager/app/test/testdata/encryption-cens/output.mpd +++ b/packager/app/test/testdata/encryption-cens/output.mpd @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -19,11 +19,11 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + 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 4d4ba6c5e9..09c04bf62e 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 3680c73c32..91a84082d7 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 6598851047..a2d29602e2 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 @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -19,11 +19,11 @@ AAAARHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAIQERITFBUWFxgZICEiIyQlICEiIyQlJicoKTAxMjM0NQAAAAA= - + 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 c372dd5815..a5e112bcc5 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 580d34e67a..bc6db29fd5 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 5d4d105dfd..501e0a1fcc 100644 --- a/packager/app/test/testdata/encryption-multi-keys/output.mpd +++ b/packager/app/test/testdata/encryption-multi-keys/output.mpd @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -19,11 +19,11 @@ AAAARHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAIQERITFBUWFxgZICEiIyQlICEiIyQlJicoKTAxMjM0NQAAAAA= - + 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 1cc7fbb5f5..87f89a93c0 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 cebb14a0e8..c82b090d9e 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 9ea15d763d..9bc668f8f6 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 09783656aa..687304d53a 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 @@ -1,6 +1,6 @@ - + @@ -9,17 +9,17 @@ bear-640x360-video.mp4 - - + + - + bear-640x360-audio-skip_encryption.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 afaf9595fb..b82b25f618 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 cebb14a0e8..c82b090d9e 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 1cc7fbb5f5..87f89a93c0 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 9ea15d763d..9bc668f8f6 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 90522e074a..5fbc0ace45 100644 --- a/packager/app/test/testdata/encryption-using-fixed-key/output.mpd +++ b/packager/app/test/testdata/encryption-using-fixed-key/output.mpd @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -19,11 +19,11 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption/bear-640x360-audio.mp4 index afaf9595fb..b82b25f618 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 cebb14a0e8..c82b090d9e 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 1cc7fbb5f5..87f89a93c0 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 9ea15d763d..9bc668f8f6 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 90522e074a..5fbc0ace45 100644 --- a/packager/app/test/testdata/encryption/output.mpd +++ b/packager/app/test/testdata/encryption/output.mpd @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -19,11 +19,11 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + 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 9ea15d763d..9bc668f8f6 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 7f60529716..5364783c93 100644 --- a/packager/app/test/testdata/first-stream/output.mpd +++ b/packager/app/test/testdata/first-stream/output.mpd @@ -1,12 +1,12 @@ - + bear-640x360-0.mp4 - - + + 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 e838224228..a8c72073be 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 b18ed17f70..298f9532bb 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 568659f8b9..e752e46cbf 100644 --- a/packager/app/test/testdata/hevc-with-encryption/output.mpd +++ b/packager/app/test/testdata/hevc-with-encryption/output.mpd @@ -1,6 +1,6 @@ - + @@ -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 c4b4ac03d9..55ee417db1 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 8504387c99..3e151a7d97 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 692408ca70..e86f365d7f 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-4.m4s b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-4.m4s deleted file mode 100644 index cd5f00f50c..0000000000 Binary files a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-4.m4s and /dev/null 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 8f7a647e00..1ba3d9abb9 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-audio.m3u8 b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio.m3u8 index 5e114bac78..9959ee79c7 100644 --- a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio.m3u8 @@ -6,11 +6,9 @@ #EXT-X-MAP:URI="bear-640x360-audio-init.mp4" #EXTINF:1.022, bear-640x360-audio-1.m4s -#EXTINF:0.998, +#EXTINF:0.975, bear-640x360-audio-2.m4s -#EXTINF:0.046, -bear-640x360-audio-3.m4s #EXT-X-PLACEMENT-OPPORTUNITY -#EXTINF:0.697, -bear-640x360-audio-4.m4s +#EXTINF:0.743, +bear-640x360-audio-3.m4s #EXT-X-ENDLIST 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 82605ec2c3..4dbca6653f 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 311f93260e..da2f00a606 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 71e371e17a..8dfe74ca5b 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-init.mp4 b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-init.mp4 index 5ed12ec053..aa3f67b37c 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/bear-640x360-video.m3u8 b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video.m3u8 index ed69bc21bf..2942fee317 100644 --- a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video.m3u8 @@ -4,7 +4,7 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="bear-640x360-video-init.mp4" -#EXTINF:1.068, +#EXTINF:1.001, bear-640x360-video-1.m4s #EXTINF:1.001, bear-640x360-video-2.m4s diff --git a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-subtitle-english-text.m3u8 b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-subtitle-english-text.m3u8 index e4c4708d94..368f877f60 100644 --- a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-subtitle-english-text.m3u8 +++ b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-subtitle-english-text.m3u8 @@ -7,7 +7,7 @@ bear-subtitle-english-text-1.vtt #EXTINF:1.000, bear-subtitle-english-text-2.vtt -#EXTINF:0.068, +#EXTINF:0.001, bear-subtitle-english-text-3.vtt #EXT-X-PLACEMENT-OPPORTUNITY #EXTINF:1.000, 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 51885b603a..0f2d607b4a 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 @@ -5,7 +5,7 @@ #EXT-X-MEDIA:TYPE=SUBTITLES,URI="bear-subtitle-english-text.m3u8",GROUP-ID="default-text-group",NAME="stream_0",AUTOSELECT=YES -#EXT-X-STREAM-INF:BANDWIDTH=1150006,AVERAGE-BANDWIDTH=984507,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group",SUBTITLES="default-text-group" +#EXT-X-STREAM-INF:BANDWIDTH=1108051,AVERAGE-BANDWIDTH=1005999,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,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 c4b4ac03d9..55ee417db1 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 8504387c99..1ddbee3bdd 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 99af31e503..a7100e5c24 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 8f7a647e00..1ba3d9abb9 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/audio/audio.m3u8 b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio.m3u8 index c9719d6f6f..8c0bbb4276 100644 --- a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio.m3u8 +++ b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio.m3u8 @@ -8,6 +8,6 @@ audio-1.m4s #EXTINF:0.998, audio-2.m4s -#EXTINF:0.743, +#EXTINF:0.720, audio-3.m4s #EXT-X-ENDLIST 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 055c4fb285..982739adbb 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 @@ -3,5 +3,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=1105131,AVERAGE-BANDWIDTH=983986,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group" +#EXT-X-STREAM-INF:BANDWIDTH=1108051,AVERAGE-BANDWIDTH=1005999,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,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 82605ec2c3..4dbca6653f 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 311f93260e..da2f00a606 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 71e371e17a..8dfe74ca5b 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 5ed12ec053..aa3f67b37c 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-multi-segment-mp4-with-custom-path/video/video.m3u8 b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video.m3u8 index 2c0c3d4ea0..0f3fbe7f5a 100644 --- a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video.m3u8 +++ b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video.m3u8 @@ -4,7 +4,7 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="video-init.mp4" -#EXTINF:1.068, +#EXTINF:1.001, video-1.m4s #EXTINF:1.001, video-2.m4s diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-1.m4s b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-1.m4s index c4b4ac03d9..55ee417db1 100644 Binary files a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-1.m4s and b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-1.m4s differ diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-2.m4s b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-2.m4s index 8504387c99..1ddbee3bdd 100644 Binary files a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-2.m4s and b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-2.m4s differ diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-3.m4s b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-3.m4s index 99af31e503..a7100e5c24 100644 Binary files a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-3.m4s and b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-3.m4s differ diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-init.mp4 index 8f7a647e00..1ba3d9abb9 100644 Binary files a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-1.m4s b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-1.m4s index 82605ec2c3..4dbca6653f 100644 Binary files a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-1.m4s and b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-1.m4s differ diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-2.m4s b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-2.m4s index 311f93260e..da2f00a606 100644 Binary files a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-2.m4s and b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-2.m4s differ diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-3.m4s b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-3.m4s index 71e371e17a..8dfe74ca5b 100644 Binary files a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-3.m4s and b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-3.m4s differ diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-init.mp4 b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-init.mp4 index 5ed12ec053..aa3f67b37c 100644 Binary files a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/hls-segmented-webvtt/output.m3u8 b/packager/app/test/testdata/hls-segmented-webvtt/output.m3u8 index 4f212a179a..bd31185e96 100644 --- a/packager/app/test/testdata/hls-segmented-webvtt/output.m3u8 +++ b/packager/app/test/testdata/hls-segmented-webvtt/output.m3u8 @@ -5,5 +5,5 @@ #EXT-X-MEDIA:TYPE=SUBTITLES,URI="stream_0.m3u8",GROUP-ID="default-text-group",NAME="stream_0",AUTOSELECT=YES -#EXT-X-STREAM-INF:BANDWIDTH=1105131,AVERAGE-BANDWIDTH=983986,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group",SUBTITLES="default-text-group" +#EXT-X-STREAM-INF:BANDWIDTH=1108051,AVERAGE-BANDWIDTH=1005999,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group",SUBTITLES="default-text-group" stream_2.m3u8 diff --git a/packager/app/test/testdata/hls-segmented-webvtt/stream_1.m3u8 b/packager/app/test/testdata/hls-segmented-webvtt/stream_1.m3u8 index 08bbbd7c84..a717606102 100644 --- a/packager/app/test/testdata/hls-segmented-webvtt/stream_1.m3u8 +++ b/packager/app/test/testdata/hls-segmented-webvtt/stream_1.m3u8 @@ -8,6 +8,6 @@ bear-640x360-audio-1.m4s #EXTINF:0.998, bear-640x360-audio-2.m4s -#EXTINF:0.743, +#EXTINF:0.720, bear-640x360-audio-3.m4s #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/hls-segmented-webvtt/stream_2.m3u8 b/packager/app/test/testdata/hls-segmented-webvtt/stream_2.m3u8 index ac2680a454..19e29dda02 100644 --- a/packager/app/test/testdata/hls-segmented-webvtt/stream_2.m3u8 +++ b/packager/app/test/testdata/hls-segmented-webvtt/stream_2.m3u8 @@ -4,7 +4,7 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="bear-640x360-video-init.mp4" -#EXTINF:1.068, +#EXTINF:1.001, bear-640x360-video-1.m4s #EXTINF:1.001, bear-640x360-video-2.m4s diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-audio.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-audio.m3u8 index 987ccd02d9..074f9ef39a 100644 --- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-audio.m3u8 @@ -3,19 +3,16 @@ ## 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="967@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="1003@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.022, -#EXT-X-BYTERANGE:16655@1047 +#EXT-X-BYTERANGE:17028@1071 bear-640x360-audio.mp4 -#EXTINF:0.998, -#EXT-X-BYTERANGE:16650 -bear-640x360-audio.mp4 -#EXTINF:0.046, -#EXT-X-BYTERANGE:1014 +#EXTINF:0.975, +#EXT-X-BYTERANGE:16269 bear-640x360-audio.mp4 #EXT-X-PLACEMENT-OPPORTUNITY -#EXTINF:0.697, -#EXT-X-BYTERANGE:9415 +#EXTINF:0.743, +#EXT-X-BYTERANGE:10272 bear-640x360-audio.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-audio.mp4 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-audio.mp4 index 23bb6c742c..1941c3bec3 100644 Binary files a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-audio.mp4 and b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video-iframe.m3u8 index be3f071a9c..365f9a2166 100644 --- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-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="1091@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1127@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@1159 +#EXT-X-BYTERANGE:15581@1195 bear-640x360-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18754@100472 +#EXT-X-BYTERANGE:18754@100508 bear-640x360-video.mp4 #EXT-X-PLACEMENT-OPPORTUNITY #EXTINF:0.734, -#EXT-X-BYTERANGE:20068@222812 +#EXT-X-BYTERANGE:20068@222848 bear-640x360-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video.m3u8 index f81460f81e..ee532489b3 100644 --- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-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="1091@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1127@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" -#EXTINF:1.068, -#EXT-X-BYTERANGE:99313@1159 +#EXTINF:1.001, +#EXT-X-BYTERANGE:99313@1195 bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:122340 diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video.mp4 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video.mp4 index cebb14a0e8..c82b090d9e 100644 Binary files a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video.mp4 and b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output.m3u8 index 5e64e17586..9bf414f3f9 100644 --- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output.m3u8 +++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output.m3u8 @@ -3,7 +3,7 @@ #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=1152421,AVERAGE-BANDWIDTH=987816,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group" +#EXT-X-STREAM-INF:BANDWIDTH=1111200,AVERAGE-BANDWIDTH=1009412,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group" bear-640x360-video.m3u8 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=218705,AVERAGE-BANDWIDTH=159070,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-video-iframe.m3u8" 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 b860a1cd36..da4fa92b55 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,15 +3,15 @@ ## 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="967@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="1003@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.022, -#EXT-X-BYTERANGE:16655@1035 +#EXT-X-BYTERANGE:17028@1071 bear-640x360-audio.mp4 #EXTINF:0.998, -#EXT-X-BYTERANGE:16650 +#EXT-X-BYTERANGE:16682 bear-640x360-audio.mp4 -#EXTINF:0.743, -#EXT-X-BYTERANGE:10272 +#EXTINF:0.720, +#EXT-X-BYTERANGE:9859 bear-640x360-audio.mp4 #EXT-X-ENDLIST 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 afaf9595fb..b82b25f618 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 a6adbcc3c9..38e6359066 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="1091@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1127@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@1159 +#EXT-X-BYTERANGE:15581@1195 bear-640x360-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18754@100472 +#EXT-X-BYTERANGE:18754@100508 bear-640x360-video.mp4 #EXTINF:0.734, -#EXT-X-BYTERANGE:20068@222812 +#EXT-X-BYTERANGE:20068@222848 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 671eef27e7..1c32fdfbfb 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="1091@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1127@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" -#EXTINF:1.068, -#EXT-X-BYTERANGE:99313@1159 +#EXTINF:1.001, +#EXT-X-BYTERANGE:99313@1195 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 cebb14a0e8..c82b090d9e 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/hls-single-segment-mp4-encrypted/output.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/output.m3u8 index bee37fae7a..6d8aee36e8 100644 --- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/output.m3u8 +++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/output.m3u8 @@ -3,7 +3,7 @@ #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=1111149,AVERAGE-BANDWIDTH=987362,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group" +#EXT-X-STREAM-INF:BANDWIDTH=1111406,AVERAGE-BANDWIDTH=1009412,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group" bear-640x360-video.m3u8 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=218705,AVERAGE-BANDWIDTH=159070,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-video-iframe.m3u8" diff --git a/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-audio-1.m4s b/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-audio-1.m4s index c4b4ac03d9..55ee417db1 100644 Binary files a/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-audio-1.m4s and b/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-audio-1.m4s differ diff --git a/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-audio-2.m4s b/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-audio-2.m4s index 8504387c99..1ddbee3bdd 100644 Binary files a/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-audio-2.m4s and b/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-audio-2.m4s differ diff --git a/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-audio-3.m4s b/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-audio-3.m4s index 99af31e503..a7100e5c24 100644 Binary files a/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-audio-3.m4s and b/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-audio-3.m4s differ diff --git a/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-audio-init.mp4 index 8f7a647e00..1ba3d9abb9 100644 Binary files a/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-video-1.m4s b/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-video-1.m4s index 82605ec2c3..4dbca6653f 100644 Binary files a/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-video-1.m4s and b/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-video-1.m4s differ diff --git a/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-video-2.m4s b/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-video-2.m4s index 311f93260e..da2f00a606 100644 Binary files a/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-video-2.m4s and b/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-video-2.m4s differ diff --git a/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-video-3.m4s b/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-video-3.m4s index 71e371e17a..8dfe74ca5b 100644 Binary files a/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-video-3.m4s and b/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-video-3.m4s differ diff --git a/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-video-init.mp4 b/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-video-init.mp4 index 5ed12ec053..aa3f67b37c 100644 Binary files a/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/hls-with-bandwidth-override/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/hls-with-bandwidth-override/stream_0.m3u8 b/packager/app/test/testdata/hls-with-bandwidth-override/stream_0.m3u8 index 08bbbd7c84..a717606102 100644 --- a/packager/app/test/testdata/hls-with-bandwidth-override/stream_0.m3u8 +++ b/packager/app/test/testdata/hls-with-bandwidth-override/stream_0.m3u8 @@ -8,6 +8,6 @@ bear-640x360-audio-1.m4s #EXTINF:0.998, bear-640x360-audio-2.m4s -#EXTINF:0.743, +#EXTINF:0.720, bear-640x360-audio-3.m4s #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/hls-with-bandwidth-override/stream_1.m3u8 b/packager/app/test/testdata/hls-with-bandwidth-override/stream_1.m3u8 index ac2680a454..19e29dda02 100644 --- a/packager/app/test/testdata/hls-with-bandwidth-override/stream_1.m3u8 +++ b/packager/app/test/testdata/hls-with-bandwidth-override/stream_1.m3u8 @@ -4,7 +4,7 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="bear-640x360-video-init.mp4" -#EXTINF:1.068, +#EXTINF:1.001, bear-640x360-video-1.m4s #EXTINF:1.001, bear-640x360-video-2.m4s 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 f336d41dd2..badadb49a1 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 e285304cbf..4f898961fb 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 f197652913..08f022c924 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 7130994633..bb4986496e 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 c230e10fb7..5e673cb829 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 b8b2e09ff2..c2d8240e94 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 c90529e159..df7c5a353d 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 1c782174c2..75f5517b4d 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-video-1.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-video-1.m4s index 3c1a490c25..fe9ac78315 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 4ece84dbf4..5e7a94e45a 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 29570c7d2a..2e50a20245 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 d3f7c9435d..599e13cd9d 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 f336d41dd2..badadb49a1 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 e285304cbf..4f898961fb 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 f197652913..08f022c924 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 7130994633..bb4986496e 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 eddc48d4b1..b43a5cf3cd 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 0643459854..a2c2bde515 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 c14b44bcf0..f6aa9281a2 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 243f4297ec..29968aaa64 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 9c99427031..5f6ea3d243 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,30 +7,27 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - - + + - - - + + - - - + + - - + + - - - + + @@ -50,23 +47,23 @@ - + - + - + - + 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 f336d41dd2..badadb49a1 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 e285304cbf..4f898961fb 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 f197652913..08f022c924 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 7130994633..bb4986496e 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 eddc48d4b1..b43a5cf3cd 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 0643459854..a2c2bde515 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 c14b44bcf0..f6aa9281a2 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 243f4297ec..29968aaa64 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 bea52dd9fd..6fa1e6a8be 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 @@ -10,15 +10,14 @@ - - - + + - + @@ -28,7 +27,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 f336d41dd2..badadb49a1 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 e285304cbf..4f898961fb 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 f197652913..08f022c924 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 7130994633..bb4986496e 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 eddc48d4b1..b43a5cf3cd 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 0643459854..a2c2bde515 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 c14b44bcf0..f6aa9281a2 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 243f4297ec..29968aaa64 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 af3716c67c..76a8c1b6b0 100644 --- a/packager/app/test/testdata/live-profile-and-encryption/output.mpd +++ b/packager/app/test/testdata/live-profile-and-encryption/output.mpd @@ -10,9 +10,8 @@ - - - + + @@ -22,13 +21,13 @@ 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 f336d41dd2..badadb49a1 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 39468e7e43..7225f42cfd 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 e179f1c7e3..fd65b0219e 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 1556766b65..06cbf09f13 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 eddc48d4b1..b43a5cf3cd 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 954d3fffbd..cdf91c9ef1 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 ef6de1a4b8..6edb281273 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 36cf45c94f..b6d8683a49 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 363a07f620..2a5b14c401 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 @@ -8,9 +8,8 @@ - - - + + @@ -18,13 +17,13 @@ - + - + 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 50e3c1afc8..9996ce2afd 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 b48c322560..bb9fca908f 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 dd5d4b9f09..2aac646b7a 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 1556766b65..06cbf09f13 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 6fcbc85250..b27575a8b2 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 bc4a7695bc..6033d3393e 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 c6ff59c643..c6594c8d95 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 36cf45c94f..b6d8683a49 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 ce87c5b9e2..5edcd69f0b 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 @@ -8,15 +8,14 @@ - - - + + - + @@ -24,7 +23,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 50e3c1afc8..9996ce2afd 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 b48c322560..bb9fca908f 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 dd5d4b9f09..2aac646b7a 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 1556766b65..06cbf09f13 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 6fcbc85250..b27575a8b2 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 bc4a7695bc..6033d3393e 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 c6ff59c643..c6594c8d95 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 36cf45c94f..b6d8683a49 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 73d35287c2..ae8c6c28e5 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 @@ -8,9 +8,8 @@ - - - + + @@ -18,13 +17,13 @@ - + - + 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 c4b4ac03d9..55ee417db1 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 8504387c99..1ddbee3bdd 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 99af31e503..a7100e5c24 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 8f7a647e00..1ba3d9abb9 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 82605ec2c3..4dbca6653f 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 311f93260e..da2f00a606 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 71e371e17a..8dfe74ca5b 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 5ed12ec053..aa3f67b37c 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 a0f2f0ccf1..5ceca2cb9b 100644 --- a/packager/app/test/testdata/live-profile/output.mpd +++ b/packager/app/test/testdata/live-profile/output.mpd @@ -6,21 +6,20 @@ - - - + + - + - + diff --git a/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-1.m4s b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-1.m4s index c4b4ac03d9..55ee417db1 100644 Binary files a/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-1.m4s and b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-1.m4s differ diff --git a/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-2.m4s b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-2.m4s index 8504387c99..3e151a7d97 100644 Binary files a/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-2.m4s and b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-2.m4s differ diff --git a/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-3.m4s b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-3.m4s index 692408ca70..e86f365d7f 100644 Binary files a/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-3.m4s and b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-3.m4s differ diff --git a/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-4.m4s b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-4.m4s deleted file mode 100644 index cd5f00f50c..0000000000 Binary files a/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-4.m4s and /dev/null differ diff --git a/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-init.mp4 index 8f7a647e00..1ba3d9abb9 100644 Binary files a/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-init.mp4 and b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-init.mp4 differ diff --git a/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-1.m4s b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-1.m4s index 82605ec2c3..4dbca6653f 100644 Binary files a/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-1.m4s and b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-1.m4s differ diff --git a/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-2.m4s b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-2.m4s index 311f93260e..da2f00a606 100644 Binary files a/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-2.m4s and b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-2.m4s differ diff --git a/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-3.m4s b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-3.m4s index 71e371e17a..8dfe74ca5b 100644 Binary files a/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-3.m4s and b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-3.m4s differ diff --git a/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-init.mp4 b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-init.mp4 index 5ed12ec053..aa3f67b37c 100644 Binary files a/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-init.mp4 and b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-init.mp4 differ diff --git a/packager/app/test/testdata/live-static-profile-and-ad-cues/output.mpd b/packager/app/test/testdata/live-static-profile-and-ad-cues/output.mpd index b65833f3ac..5a712d2b1c 100644 --- a/packager/app/test/testdata/live-static-profile-and-ad-cues/output.mpd +++ b/packager/app/test/testdata/live-static-profile-and-ad-cues/output.mpd @@ -1,46 +1,44 @@ - - + + - - + - + - - + - + - + - + - + - + - + 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 c4b4ac03d9..55ee417db1 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 8504387c99..1ddbee3bdd 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 99af31e503..a7100e5c24 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 8f7a647e00..1ba3d9abb9 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 82605ec2c3..4dbca6653f 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 311f93260e..da2f00a606 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 71e371e17a..8dfe74ca5b 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 5ed12ec053..aa3f67b37c 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 72137159c4..741f02f243 100644 --- a/packager/app/test/testdata/live-static-profile/output.mpd +++ b/packager/app/test/testdata/live-static-profile/output.mpd @@ -1,26 +1,25 @@ - + - - - + + - + - + diff --git a/packager/app/test/testdata/video-audio-text/bear-640x360-audio.mp4 b/packager/app/test/testdata/video-audio-text/bear-640x360-audio.mp4 index 1cc7fbb5f5..87f89a93c0 100644 Binary files a/packager/app/test/testdata/video-audio-text/bear-640x360-audio.mp4 and b/packager/app/test/testdata/video-audio-text/bear-640x360-audio.mp4 differ diff --git a/packager/app/test/testdata/video-audio-text/bear-640x360-video.mp4 b/packager/app/test/testdata/video-audio-text/bear-640x360-video.mp4 index 9ea15d763d..9bc668f8f6 100644 Binary files a/packager/app/test/testdata/video-audio-text/bear-640x360-video.mp4 and b/packager/app/test/testdata/video-audio-text/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/video-audio-text/output.mpd b/packager/app/test/testdata/video-audio-text/output.mpd index 7aea0acb6f..530ea83a97 100644 --- a/packager/app/test/testdata/video-audio-text/output.mpd +++ b/packager/app/test/testdata/video-audio-text/output.mpd @@ -1,6 +1,6 @@ - + @@ -10,17 +10,17 @@ bear-640x360-video.mp4 - - + + - + bear-640x360-audio.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 c4b4ac03d9..55ee417db1 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 8504387c99..3e151a7d97 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 692408ca70..e86f365d7f 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-4.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-4.m4s deleted file mode 100644 index cd5f00f50c..0000000000 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-4.m4s and /dev/null 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 8f7a647e00..1ba3d9abb9 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-audio.m3u8 b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio.m3u8 index 5e114bac78..9959ee79c7 100644 --- a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio.m3u8 @@ -6,11 +6,9 @@ #EXT-X-MAP:URI="bear-640x360-audio-init.mp4" #EXTINF:1.022, bear-640x360-audio-1.m4s -#EXTINF:0.998, +#EXTINF:0.975, bear-640x360-audio-2.m4s -#EXTINF:0.046, -bear-640x360-audio-3.m4s #EXT-X-PLACEMENT-OPPORTUNITY -#EXTINF:0.697, -bear-640x360-audio-4.m4s +#EXTINF:0.743, +bear-640x360-audio-3.m4s #EXT-X-ENDLIST 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 82605ec2c3..4dbca6653f 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 311f93260e..da2f00a606 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 71e371e17a..8dfe74ca5b 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-init.mp4 b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-init.mp4 index 5ed12ec053..aa3f67b37c 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-640x360-video.m3u8 b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video.m3u8 index ed69bc21bf..2942fee317 100644 --- a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video.m3u8 @@ -4,7 +4,7 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="bear-640x360-video-init.mp4" -#EXTINF:1.068, +#EXTINF:1.001, bear-640x360-video-1.m4s #EXTINF:1.001, bear-640x360-video-2.m4s diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text-3.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text-3.m4s index 8c94e9149d..c07be53447 100644 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text-3.m4s and b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text-3.m4s differ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text-4.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text-4.m4s index 635b90fd6b..23386a8e95 100644 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text-4.m4s and b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text-4.m4s differ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text-5.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text-5.m4s index 706143b94e..10f932a22b 100644 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text-5.m4s and b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text-5.m4s differ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text-6.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text-6.m4s index 1f56626de2..eea8e784d0 100644 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text-6.m4s and b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text-6.m4s differ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text-init.mp4 b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text-init.mp4 index 8c9238168e..675b33331f 100644 Binary files a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text-init.mp4 and b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text-init.mp4 differ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text.m3u8 b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text.m3u8 index ed76d2c784..e54d0e85e4 100644 --- a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text.m3u8 +++ b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-subtitle-english-text.m3u8 @@ -8,7 +8,7 @@ bear-subtitle-english-text-1.m4s #EXTINF:1.000, bear-subtitle-english-text-2.m4s -#EXTINF:0.068, +#EXTINF:0.001, bear-subtitle-english-text-3.m4s #EXT-X-PLACEMENT-OPPORTUNITY #EXTINF:1.000, 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 51885b603a..0f2d607b4a 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 @@ -5,7 +5,7 @@ #EXT-X-MEDIA:TYPE=SUBTITLES,URI="bear-subtitle-english-text.m3u8",GROUP-ID="default-text-group",NAME="stream_0",AUTOSELECT=YES -#EXT-X-STREAM-INF:BANDWIDTH=1150006,AVERAGE-BANDWIDTH=984507,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group",SUBTITLES="default-text-group" +#EXT-X-STREAM-INF:BANDWIDTH=1108051,AVERAGE-BANDWIDTH=1005999,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,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 7fd32e26d7..f627e6a0bc 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 @@ -1,14 +1,14 @@ - - + + - + - + @@ -17,51 +17,49 @@ - - + - + - - + - + - + - + - + - + - + - + - + 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 7c24e9e509..d104284403 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-2.mp4 b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-2.mp4 index 9553f9bd8d..a182d049f7 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/output.mpd b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output.mpd index e3ebb1f1df..4ac84c125e 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 @@ -1,18 +1,18 @@ - + bear-multi-configs-0.mp4 - - + + bear-multi-configs-2.mp4 - - + + @@ -20,14 +20,14 @@ 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 f2db8721e4..9e83554870 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-2.mp4 b/packager/app/test/testdata/wvm-input/bear-multi-configs-2.mp4 index 11b3f13f93..b881781967 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/output.mpd b/packager/app/test/testdata/wvm-input/output.mpd index f9c0852c52..a0d7fdd818 100644 --- a/packager/app/test/testdata/wvm-input/output.mpd +++ b/packager/app/test/testdata/wvm-input/output.mpd @@ -1,18 +1,18 @@ - + bear-multi-configs-0.mp4 - - + + bear-multi-configs-2.mp4 - - + + @@ -20,14 +20,14 @@ bear-multi-configs-1.mp4 - + bear-multi-configs-3.mp4 - + diff --git a/packager/media/base/muxer.cc b/packager/media/base/muxer.cc index 7fe7918374..cf8212d75f 100644 --- a/packager/media/base/muxer.cc +++ b/packager/media/base/muxer.cc @@ -110,9 +110,8 @@ Status Muxer::ReinitializeMuxer(int64_t timestamp) { current_key_id_ = encryption_config.key_id; } if (!output_file_template_.empty()) { - // Update |output_file_index| and |output_file_name| with an actual file - // name, which will be used by the subclasses. - options_.output_file_index = output_file_index_; + // Update |output_file_name| with an actual file name, which will be used by + // the subclasses. options_.output_file_name = GetSegmentName(output_file_template_, timestamp, output_file_index_++, options_.bandwidth); diff --git a/packager/media/base/muxer_options.h b/packager/media/base/muxer_options.h index e591710543..f409e19fdf 100644 --- a/packager/media/base/muxer_options.h +++ b/packager/media/base/muxer_options.h @@ -29,13 +29,6 @@ struct MuxerOptions { /// Otherwise, it specifies the init segment name. std::string output_file_name; - /// Output file index. With one file per Representation per Period, there - /// could be more than one file generated with Ad Cues present. This is the - /// 0-based index of the output file. - /// TODO(kqyang): Remove when the EPT adjustment logic in - /// Fragmenter::FinalizeFragment is removed. - size_t output_file_index = 0; - /// Specify output segment name pattern for generated segments. It can /// furthermore be configured by using a subset of the SegmentTemplate /// identifiers: $RepresentationID$, $Number$, $Bandwidth$ and $Time. diff --git a/packager/media/formats/mp4/fragmenter.cc b/packager/media/formats/mp4/fragmenter.cc index 1295124eb4..a7075e949e 100644 --- a/packager/media/formats/mp4/fragmenter.cc +++ b/packager/media/formats/mp4/fragmenter.cc @@ -14,6 +14,7 @@ #include "packager/media/base/media_sample.h" #include "packager/media/formats/mp4/box_definitions.h" #include "packager/media/formats/mp4/key_frame_info.h" +#include "packager/status_macros.h" namespace shaka { namespace media { @@ -22,7 +23,7 @@ namespace mp4 { namespace { const int64_t kInvalidTime = std::numeric_limits::max(); -uint64_t GetSeekPreroll(const StreamInfo& stream_info) { +int64_t GetSeekPreroll(const StreamInfo& stream_info) { if (stream_info.stream_type() != kStreamAudio) return 0; const AudioStreamInfo& audio_stream_info = @@ -47,13 +48,12 @@ void NewSampleEncryptionEntry(const DecryptConfig& decrypt_config, } // namespace Fragmenter::Fragmenter(std::shared_ptr stream_info, - TrackFragment* traf) + TrackFragment* traf, + int64_t edit_list_offset) : stream_info_(std::move(stream_info)), traf_(traf), + edit_list_offset_(edit_list_offset), seek_preroll_(GetSeekPreroll(*stream_info_)), - fragment_initialized_(false), - fragment_finalized_(false), - fragment_duration_(0), earliest_presentation_time_(kInvalidTime), first_sap_time_(kInvalidTime) { DCHECK(stream_info_); @@ -63,16 +63,14 @@ Fragmenter::Fragmenter(std::shared_ptr stream_info, Fragmenter::~Fragmenter() {} Status Fragmenter::AddSample(const MediaSample& sample) { - if (sample.duration() == 0) { - LOG(WARNING) << "Unexpected sample with zero duration @ dts " - << sample.dts(); - } + const int64_t pts = sample.pts(); + const int64_t dts = sample.dts(); + const int64_t duration = sample.duration(); + if (duration == 0) + LOG(WARNING) << "Unexpected sample with zero duration @ dts " << dts; - if (!fragment_initialized_) { - Status status = InitializeFragment(sample.dts()); - if (!status.ok()) - return status; - } + if (!fragment_initialized_) + RETURN_IF_ERROR(InitializeFragment(dts)); if (sample.side_data_size() > 0) LOG(WARNING) << "MP4 samples do not support side data. Side data ignored."; @@ -80,7 +78,7 @@ Status Fragmenter::AddSample(const MediaSample& sample) { // Fill in sample parameters. It will be optimized later. traf_->runs[0].sample_sizes.push_back( static_cast(sample.data_size())); - traf_->runs[0].sample_durations.push_back(sample.duration()); + traf_->runs[0].sample_durations.push_back(duration); traf_->runs[0].sample_flags.push_back( sample.is_key_frame() ? 0 : TrackFragmentHeader::kNonKeySampleMask); @@ -92,29 +90,38 @@ Status Fragmenter::AddSample(const MediaSample& sample) { if (stream_info_->stream_type() == StreamType::kStreamVideo && sample.is_key_frame()) { - key_frame_infos_.push_back({static_cast(sample.pts()), - data_->Size(), sample.data_size()}); + key_frame_infos_.push_back( + {static_cast(pts), data_->Size(), sample.data_size()}); } data_->AppendArray(sample.data(), sample.data_size()); - fragment_duration_ += sample.duration(); - - const int64_t pts = sample.pts(); - const int64_t dts = sample.dts(); - - const int64_t timestamp = pts; - // Set |earliest_presentation_time_| to |timestamp| if |timestamp| is smaller - // or if it is not yet initialized (kInvalidTime > timestamp is always true). - if (earliest_presentation_time_ > timestamp) - earliest_presentation_time_ = timestamp; traf_->runs[0].sample_composition_time_offsets.push_back(pts - dts); if (pts != dts) traf_->runs[0].flags |= TrackFragmentRun::kSampleCompTimeOffsetsPresentMask; - if (sample.is_key_frame()) { - if (first_sap_time_ == kInvalidTime) - first_sap_time_ = pts; + // Exclude the part of sample with negative pts out of duration calculation as + // they are not presented. + if (pts < 0) { + const int64_t end_pts = pts + duration; + if (end_pts > 0) { + // Include effective presentation duration. + fragment_duration_ += end_pts; + + earliest_presentation_time_ = 0; + if (sample.is_key_frame()) + first_sap_time_ = 0; + } + } else { + fragment_duration_ += duration; + + if (earliest_presentation_time_ > pts) + earliest_presentation_time_ = pts; + + if (sample.is_key_frame()) { + if (first_sap_time_ == kInvalidTime) + first_sap_time_ = pts; + } } return Status::OK; } @@ -122,7 +129,13 @@ Status Fragmenter::AddSample(const MediaSample& sample) { Status Fragmenter::InitializeFragment(int64_t first_sample_dts) { fragment_initialized_ = true; fragment_finalized_ = false; - traf_->decode_time.decode_time = first_sample_dts; + + // |first_sample_dts| is adjusted by the edit list offset. The offset should + // be un-applied in |decode_time|, so when applying the Edit List, the result + // dts is |first_sample_dts|. + const int64_t dts_before_edit = first_sample_dts + edit_list_offset_; + traf_->decode_time.decode_time = dts_before_edit; + traf_->runs.clear(); traf_->runs.resize(1); traf_->runs[0].flags = TrackFragmentRun::kDataOffsetPresentMask; @@ -150,26 +163,6 @@ Status Fragmenter::FinalizeFragment() { return status; } - if (first_fragment_) { - if (allow_adjust_earliest_presentation_time_) { - // Chrome (as of v66 https://crbug.com/398141) does not like negative - // values for adjusted dts = dts + Period@start (0 for first Period) - // - presentationTimeOffset - // Since |earliest_presentation_time| of the first fragment will be used - // to set presentationTimeOffset, the adjusted dts can become negative for - // the frames in the first segment in the first Period. To avoid seeing - // that, |earliest_presentation_time| is adjusted so it is not larger than - // the dts. - const int64_t dts = traf_->decode_time.decode_time; - if (earliest_presentation_time_ > dts) { - const uint64_t delta = earliest_presentation_time_ - dts; - earliest_presentation_time_ = dts; - fragment_duration_ += delta; - } - } - first_fragment_ = false; - } - // Optimize trun box. traf_->runs[0].sample_count = static_cast(traf_->runs[0].sample_sizes.size()); diff --git a/packager/media/formats/mp4/fragmenter.h b/packager/media/formats/mp4/fragmenter.h index 16daeb102f..f9a627036a 100644 --- a/packager/media/formats/mp4/fragmenter.h +++ b/packager/media/formats/mp4/fragmenter.h @@ -32,7 +32,11 @@ class Fragmenter { public: /// @param info contains stream information. /// @param traf points to a TrackFragment box. - Fragmenter(std::shared_ptr info, TrackFragment* traf); + /// @param edit_list_offset is the edit list offset that is encoded in Edit + /// List. It should be 0 if there is no EditList. + Fragmenter(std::shared_ptr info, + TrackFragment* traf, + int64_t edit_list_offset); ~Fragmenter(); @@ -67,15 +71,6 @@ class Fragmenter { return key_frame_infos_; } - /// Set the flag allow_use_adjust_earliest_presentation_time, which if set to - /// true, earlist_presentation_time (EPT) may be adjusted not to be smaller - /// than the decoding timestamp (dts) for the first fragment. - void set_allow_adjust_earliest_presentation_time( - bool allow_adjust_earliest_presentation_time) { - allow_adjust_earliest_presentation_time_ = - allow_adjust_earliest_presentation_time; - } - protected: TrackFragment* traf() { return traf_; } @@ -91,15 +86,14 @@ class Fragmenter { bool StartsWithSAP() const; std::shared_ptr stream_info_; - TrackFragment* traf_; - uint64_t seek_preroll_; - bool fragment_initialized_; - bool fragment_finalized_; - uint64_t fragment_duration_; - int64_t earliest_presentation_time_; - bool first_fragment_ = true; - bool allow_adjust_earliest_presentation_time_ = false; - int64_t first_sap_time_; + TrackFragment* traf_ = nullptr; + int64_t edit_list_offset_ = 0; + int64_t seek_preroll_ = 0; + bool fragment_initialized_ = false; + bool fragment_finalized_ = false; + int64_t fragment_duration_ = 0; + int64_t earliest_presentation_time_ = 0; + int64_t first_sap_time_ = 0; std::unique_ptr data_; // Saves key frames information, for Video. std::vector key_frame_infos_; diff --git a/packager/media/formats/mp4/mp4_muxer.cc b/packager/media/formats/mp4/mp4_muxer.cc index f1c1446700..6267727183 100644 --- a/packager/media/formats/mp4/mp4_muxer.cc +++ b/packager/media/formats/mp4/mp4_muxer.cc @@ -6,6 +6,8 @@ #include "packager/media/formats/mp4/mp4_muxer.h" +#include + #include "packager/base/time/clock.h" #include "packager/base/time/time.h" #include "packager/file/file.h" @@ -21,6 +23,7 @@ #include "packager/media/formats/mp4/box_definitions.h" #include "packager/media/formats/mp4/multi_segment_segmenter.h" #include "packager/media/formats/mp4/single_segment_segmenter.h" +#include "packager/status_macros.h" namespace shaka { namespace media { @@ -138,6 +141,43 @@ MP4Muxer::MP4Muxer(const MuxerOptions& options) : Muxer(options) {} MP4Muxer::~MP4Muxer() {} Status MP4Muxer::InitializeMuxer() { + // Muxer will be delay-initialized after seeing the first sample. + to_be_initialized_ = true; + return Status::OK; +} + +Status MP4Muxer::Finalize() { + DCHECK(segmenter_); + Status segmenter_finalized = segmenter_->Finalize(); + + if (!segmenter_finalized.ok()) + return segmenter_finalized; + + FireOnMediaEndEvent(); + LOG(INFO) << "MP4 file '" << options().output_file_name << "' finalized."; + return Status::OK; +} + +Status MP4Muxer::AddSample(size_t stream_id, const MediaSample& sample) { + if (to_be_initialized_) { + RETURN_IF_ERROR(UpdateEditListOffsetFromSample(sample)); + RETURN_IF_ERROR(DelayInitializeMuxer()); + to_be_initialized_ = false; + } + DCHECK(segmenter_); + return segmenter_->AddSample(stream_id, sample); +} + +Status MP4Muxer::FinalizeSegment(size_t stream_id, + const SegmentInfo& segment_info) { + DCHECK(segmenter_); + VLOG(3) << "Finalizing " << (segment_info.is_subsegment ? "sub" : "") + << "segment " << segment_info.start_timestamp << " duration " + << segment_info.duration; + return segmenter_->FinalizeSegment(stream_id, segment_info); +} + +Status MP4Muxer::DelayInitializeMuxer() { DCHECK(!streams().empty()); std::unique_ptr ftyp(new FileType); @@ -204,6 +244,15 @@ Status MP4Muxer::InitializeMuxer() { if (!generate_trak_result) return Status(error::MUXER_FAILURE, "Failed to generate trak."); + // Generate EditList if needed. See UpdateEditListOffsetFromSample() for + // more information. + if (edit_list_offset_.value() > 0) { + EditListEntry entry; + entry.media_time = edit_list_offset_.value(); + entry.media_rate_integer = 1; + trak.edit.list.edits.push_back(entry); + } + if (stream->is_encrypted() && options().mp4_params.include_pssh_in_stream) { const auto& key_system_info = stream->encryption_config().key_system_info; moov->pssh.resize(key_system_info.size()); @@ -229,32 +278,67 @@ Status MP4Muxer::InitializeMuxer() { return Status::OK; } -Status MP4Muxer::Finalize() { - DCHECK(segmenter_); - Status segmenter_finalized = segmenter_->Finalize(); +Status MP4Muxer::UpdateEditListOffsetFromSample(const MediaSample& sample) { + if (edit_list_offset_) + return Status::OK; - if (!segmenter_finalized.ok()) - return segmenter_finalized; - - FireOnMediaEndEvent(); - LOG(INFO) << "MP4 file '" << options().output_file_name << "' finalized."; + const int64_t pts = sample.pts(); + const int64_t dts = sample.dts(); + // An EditList entry is inserted if one of the below conditions occur [4]: + // (1) pts > dts for the first sample. Due to Chrome's dts bug [1], dts is + // used in buffered range API, while pts is used elsewhere (players, + // manifests, and Chrome's own appendWindow check etc.), this + // inconsistency creates various problems, including possible stalls + // during playback. Since Chrome adjusts pts only when seeing EditList + // [2], we can insert an EditList with the time equal to difference of pts + // and dts to make aligned buffered ranges using pts and dts. This + // effectively workarounds the dts bug. It is also recommended by ISO-BMFF + // specification [3]. + // (2) pts == dts and with pts < 0. This happens for some audio codecs where a + // negative presentation timestamp signals that the sample is not supposed + // to be shown, i.e. for audio priming. EditList is needed to encode + // negative timestamps. + // [1] https://crbug.com/718641, fixed but behind MseBufferByPts, still not + // enabled as of M67. + // [2] This is actually a bug, see https://crbug.com/354518. It looks like + // Chrome is planning to enable the fix for [1] before addressing this + // bug, so we are safe. + // [3] ISO 14496-12:2015 8.6.6.1 + // It is recommended that such an edit be used to establish a presentation + // time of 0 for the first presented sample, when composition offsets are + // used. + // [4] ISO 23009-19:2018 7.5.13 + // In two cases, an EditBox containing a single EditListBox with the + // following constraints may be present in the CMAF header of a CMAF track + // to adjust the presentation time of all media samples in the CMAF track. + // a) The first case is a video CMAF track file using v0 TrackRunBoxes + // with positive composition offsets to reorder video media samples. + // b) The second case is an audio CMAF track where each media sample's + // presentation time does not equal its composition time. + const int64_t pts_dts_offset = pts - dts; + if (pts_dts_offset > 0) { + if (pts < 0) { + LOG(ERROR) << "Negative presentation timestamp (" << pts + << ") is not supported when there is an offset between " + "presentation timestamp and decoding timestamp (" + << dts << ")."; + return Status(error::MUXER_FAILURE, + "Unsupported negative pts when there is an offset between " + "pts and dts."); + } + edit_list_offset_ = pts_dts_offset; + return Status::OK; + } + if (pts_dts_offset < 0) { + LOG(ERROR) << "presentation timestamp (" << pts + << ") is not supposed to be greater than decoding timestamp (" + << dts << ")."; + return Status(error::MUXER_FAILURE, "Not expecting pts < dts."); + } + edit_list_offset_ = std::max(-sample.pts(), static_cast(0)); return Status::OK; } -Status MP4Muxer::AddSample(size_t stream_id, const MediaSample& sample) { - DCHECK(segmenter_); - return segmenter_->AddSample(stream_id, sample); -} - -Status MP4Muxer::FinalizeSegment(size_t stream_id, - const SegmentInfo& segment_info) { - DCHECK(segmenter_); - VLOG(3) << "Finalize " << (segment_info.is_subsegment ? "sub" : "") - << "segment " << segment_info.start_timestamp << " duration " - << segment_info.duration; - return segmenter_->FinalizeSegment(stream_id, segment_info); -} - void MP4Muxer::InitializeTrak(const StreamInfo* info, Track* trak) { int64_t now = IsoTimeNow(); trak->header.creation_time = now; diff --git a/packager/media/formats/mp4/mp4_muxer.h b/packager/media/formats/mp4/mp4_muxer.h index 65cfeec4cf..58d1bb3dee 100644 --- a/packager/media/formats/mp4/mp4_muxer.h +++ b/packager/media/formats/mp4/mp4_muxer.h @@ -43,6 +43,9 @@ class MP4Muxer : public Muxer { Status FinalizeSegment(size_t stream_id, const SegmentInfo& segment_info) override; + Status DelayInitializeMuxer(); + Status UpdateEditListOffsetFromSample(const MediaSample& sample); + // Generate Audio/Video Track box. void InitializeTrak(const StreamInfo* info, Track* trak); bool GenerateAudioTrak(const AudioStreamInfo* audio_info, @@ -70,6 +73,10 @@ class MP4Muxer : public Muxer { // Get time in seconds since midnight, Jan. 1, 1904, in UTC Time. uint64_t IsoTimeNow(); + // Assumes single stream (multiplexed a/v not supported yet). + bool to_be_initialized_ = true; + base::Optional edit_list_offset_; + std::unique_ptr segmenter_; DISALLOW_COPY_AND_ASSIGN(MP4Muxer); diff --git a/packager/media/formats/mp4/segmenter.cc b/packager/media/formats/mp4/segmenter.cc index 5115fadecf..c9fcefc6ee 100644 --- a/packager/media/formats/mp4/segmenter.cc +++ b/packager/media/formats/mp4/segmenter.cc @@ -68,13 +68,16 @@ Status Segmenter::Initialize( if (sidx_->reference_id == 0) sidx_->reference_id = i + 1; } - fragmenters_[i].reset(new Fragmenter(streams[i], &moof_->tracks[i])); - } - // Only allow |EPT| to be adjusted for the first file. - if (options_.output_file_index == 0) { - for (uint32_t i = 0; i < streams.size(); ++i) - fragmenters_[i]->set_allow_adjust_earliest_presentation_time(true); + const EditList& edit_list = moov_->tracks[i].edit.list; + int64_t edit_list_offset = 0; + if (edit_list.edits.size() > 0) { + DCHECK_EQ(edit_list.edits.size(), 1u); + edit_list_offset = edit_list.edits.front().media_time; + } + + fragmenters_[i].reset( + new Fragmenter(streams[i], &moof_->tracks[i], edit_list_offset)); } // Choose the first stream if there is no VIDEO. diff --git a/packager/media/formats/mp4/track_run_iterator.cc b/packager/media/formats/mp4/track_run_iterator.cc index a1949fdf20..dde7ebdb33 100644 --- a/packager/media/formats/mp4/track_run_iterator.cc +++ b/packager/media/formats/mp4/track_run_iterator.cc @@ -17,6 +17,13 @@ namespace { const int64_t kInvalidOffset = std::numeric_limits::max(); + +int64_t Rescale(int64_t time_in_old_scale, + uint32_t old_scale, + uint32_t new_scale) { + return (static_cast(time_in_old_scale) / old_scale) * new_scale; +} + } // namespace namespace shaka { @@ -154,19 +161,6 @@ bool TrackRunIterator::Init() { continue; } - // Edit list is ignored. - // We may consider supporting the single edit with a nonnegative media time - // if it is required. Just need to pass the media_time to Muxer and - // generate the edit list. - const std::vector& edits = trak->edit.list.edits; - if (!edits.empty()) { - if (edits.size() > 1) - DVLOG(1) << "Multi-entry edit box detected."; - - DLOG(INFO) << "Edit list with media time " << edits[0].media_time - << " ignored."; - } - DecodingTimeIterator decoding_time( trak->media.information.sample_table.decoding_time_to_sample); CompositionOffsetIterator composition_offset( @@ -184,7 +178,9 @@ bool TrackRunIterator::Init() { const std::vector& chunk_offset_vector = trak->media.information.sample_table.chunk_large_offset.offsets; - int64_t run_start_dts = 0; + // dts is directly adjusted, which then propagates to pts as pts is encoded + // as difference (composition offset) to dts in mp4. + int64_t run_start_dts = GetTimestampAdjustment(*moov_, *trak); uint32_t num_samples = sample_size.sample_count; uint32_t num_chunks = static_cast(chunk_offset_vector.size()); @@ -350,6 +346,11 @@ bool TrackRunIterator::Init(const MovieFragment& moof) { int64_t run_start_dts = traf.decode_time_absent ? next_fragment_start_dts_[i] : traf.decode_time.decode_time; + + // dts is directly adjusted, which then propagates to pts as pts is encoded + // as difference (composition offset) to dts in mp4. + run_start_dts += GetTimestampAdjustment(*moov_, *trak); + int sample_count_sum = 0; for (size_t j = 0; j < traf.runs.size(); j++) { @@ -412,8 +413,7 @@ bool TrackRunIterator::Init(const MovieFragment& moof) { tri.samples.resize(trun.sample_count); for (size_t k = 0; k < trun.sample_count; k++) { - PopulateSampleInfo(*trex, traf.header, trun, k, - &tri.samples[k]); + PopulateSampleInfo(*trex, traf.header, trun, k, &tri.samples[k]); run_start_dts += tri.samples[k].duration; } runs_.push_back(tri); @@ -633,6 +633,33 @@ std::unique_ptr TrackRunIterator::GetDecryptConfig() { track_encryption().default_skip_byte_block)); } +int64_t TrackRunIterator::GetTimestampAdjustment(const Movie& movie, + const Track& track) { + int64_t edit_list_offset = 0; + const std::vector& edits = track.edit.list.edits; + if (!edits.empty()) { + // ISO/IEC 14496-12:2015 8.6.6 Edit List Box. + for (const EditListEntry& edit : edits) { + if (edit.media_rate_integer != 1) { + LOG(INFO) << "dwell EditListEntry is ignored."; + continue; + } + + if (edit.media_time < 0) { + // This is an empty edit. |segment_duration| is in movie's timescale + // instead of track's timescale. + const int64_t scaled_time = + Rescale(edit.segment_duration, movie.header.timescale, + track.media.header.timescale); + edit_list_offset += scaled_time; + } else { + edit_list_offset -= edit.media_time; + } + } + } + return edit_list_offset; +} + } // namespace mp4 } // namespace media } // namespace shaka diff --git a/packager/media/formats/mp4/track_run_iterator.h b/packager/media/formats/mp4/track_run_iterator.h index 5629678679..15cdf84080 100644 --- a/packager/media/formats/mp4/track_run_iterator.h +++ b/packager/media/formats/mp4/track_run_iterator.h @@ -103,6 +103,7 @@ class TrackRunIterator { private: void ResetRun(); const TrackEncryption& track_encryption() const; + int64_t GetTimestampAdjustment(const Movie& movie, const Track& track); const Movie* moov_;