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 a4315c32cb..9ea15d763d 100644 Binary files a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.mp4 and b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.mpd b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.mpd index 0be5e0b9ca..a7c74fc568 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,6 +1,6 @@ - + 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 a4315c32cb..9ea15d763d 100644 Binary files a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.mp4 and b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/audio-video-with-language-override/output.mpd b/packager/app/test/testdata/audio-video-with-language-override/output.mpd index 0be5e0b9ca..a7c74fc568 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,6 +1,6 @@ - + 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 60407efb5f..0473a61a76 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 a4315c32cb..9ea15d763d 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 ad49391552..406031e9bc 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,6 +1,6 @@ - + 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 60407efb5f..0473a61a76 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 078bad9cc8..5279433a2b 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 a4315c32cb..9ea15d763d 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 17b7ff9db3..3376c8d0db 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,6 +1,6 @@ - + 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 a4315c32cb..9ea15d763d 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 8ddaf172c8..cc41438310 100644 --- a/packager/app/test/testdata/audio-video/output.mpd +++ b/packager/app/test/testdata/audio-video/output.mpd @@ -1,6 +1,6 @@ - + diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.mp4 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.mp4 index 3c4ec7a4b0..84a7c72c98 100644 Binary files a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.mp4 and b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.mp4 differ diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.m3u8 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.m3u8 index 09e8052f5b..c8d79e5522 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 @@ -4,7 +4,7 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="bear-640x360-ac3-video.mp4",BYTERANGE="823@0" -#EXTINF:1.001, +#EXTINF:1.068, #EXT-X-BYTERANGE:99313@891 bear-640x360-ac3-video.mp4 #EXTINF:1.001, 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 62124d237d..6964da6920 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/bear-320x240-vp9-golden.mp4 b/packager/app/test/testdata/bear-320x240-vp9-golden.mp4 index eb37055756..a7190fb201 100644 Binary files a/packager/app/test/testdata/bear-320x240-vp9-golden.mp4 and b/packager/app/test/testdata/bear-320x240-vp9-golden.mp4 differ diff --git a/packager/app/test/testdata/bear-640x360-av-cbcs-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cbcs-golden.mpd index 99cf60abf2..abbc149629 100644 --- a/packager/app/test/testdata/bear-640x360-av-cbcs-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-cbcs-golden.mpd @@ -1,6 +1,6 @@ - + diff --git a/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd index fd79c082d7..955443b1c6 100644 --- a/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd @@ -1,6 +1,6 @@ - + diff --git a/packager/app/test/testdata/bear-640x360-av-cenc-non-iop-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cenc-non-iop-golden.mpd index e7115967ab..f15e43cd03 100644 --- a/packager/app/test/testdata/bear-640x360-av-cenc-non-iop-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-cenc-non-iop-golden.mpd @@ -1,6 +1,6 @@ - + diff --git a/packager/app/test/testdata/bear-640x360-hevc-golden.mp4 b/packager/app/test/testdata/bear-640x360-hevc-golden.mp4 index 69170b8652..b18ed17f70 100644 Binary files a/packager/app/test/testdata/bear-640x360-hevc-golden.mp4 and b/packager/app/test/testdata/bear-640x360-hevc-golden.mp4 differ diff --git a/packager/app/test/testdata/bear-640x360-v-cbcs-golden.mp4 b/packager/app/test/testdata/bear-640x360-v-cbcs-golden.mp4 index 246a814ab0..59c5ade794 100644 Binary files a/packager/app/test/testdata/bear-640x360-v-cbcs-golden.mp4 and b/packager/app/test/testdata/bear-640x360-v-cbcs-golden.mp4 differ diff --git a/packager/app/test/testdata/bear-640x360-v-cenc-golden.mp4 b/packager/app/test/testdata/bear-640x360-v-cenc-golden.mp4 index 43bfd90f1f..cebb14a0e8 100644 Binary files a/packager/app/test/testdata/bear-640x360-v-cenc-golden.mp4 and b/packager/app/test/testdata/bear-640x360-v-cenc-golden.mp4 differ diff --git a/packager/app/test/testdata/bear-640x360-v-golden.mp4 b/packager/app/test/testdata/bear-640x360-v-golden.mp4 index a4315c32cb..9ea15d763d 100644 Binary files a/packager/app/test/testdata/bear-640x360-v-golden.mp4 and b/packager/app/test/testdata/bear-640x360-v-golden.mp4 differ diff --git a/packager/app/test/testdata/bear-640x360-v-live-cenc-golden-1.m4s b/packager/app/test/testdata/bear-640x360-v-live-cenc-golden-1.m4s index c8e0ec8cfa..eddc48d4b1 100644 Binary files a/packager/app/test/testdata/bear-640x360-v-live-cenc-golden-1.m4s and b/packager/app/test/testdata/bear-640x360-v-live-cenc-golden-1.m4s differ diff --git a/packager/app/test/testdata/bear-640x360-v-trick-1-golden.mp4 b/packager/app/test/testdata/bear-640x360-v-trick-1-golden.mp4 index 60407efb5f..0473a61a76 100644 Binary files a/packager/app/test/testdata/bear-640x360-v-trick-1-golden.mp4 and b/packager/app/test/testdata/bear-640x360-v-trick-1-golden.mp4 differ 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 index 078bad9cc8..5279433a2b 100644 Binary files a/packager/app/test/testdata/bear-640x360-v-trick-2-golden.mp4 and b/packager/app/test/testdata/bear-640x360-v-trick-2-golden.mp4 differ diff --git a/packager/app/test/testdata/bear-640x360-vp8-golden.mp4 b/packager/app/test/testdata/bear-640x360-vp8-golden.mp4 index 8c51125bac..e5033f940a 100644 Binary files a/packager/app/test/testdata/bear-640x360-vp8-golden.mp4 and b/packager/app/test/testdata/bear-640x360-vp8-golden.mp4 differ 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 9841601ae8..cb5c4767d9 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 @@ -5,7 +5,7 @@ #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="bear-640x360-ec3-video.mp4",BYTERANGE="1091@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" -#EXTINF:1.001, +#EXTINF:1.068, #EXT-X-BYTERANGE:93805@1159 bear-640x360-ec3-video.mp4 #EXTINF:1.001, 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 e883a5eac5..ea10e135b3 100644 Binary files a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.mp4 and b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.mp4 index 43bfd90f1f..cebb14a0e8 100644 Binary files a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.mp4 and b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/encryption-and-ad-cues/output.mpd b/packager/app/test/testdata/encryption-and-ad-cues/output.mpd index 8a5dc7d887..652fc0c580 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues/output.mpd +++ b/packager/app/test/testdata/encryption-and-ad-cues/output.mpd @@ -1,7 +1,7 @@ - - + + 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 95418131de..60f4e6f5b3 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/output.mpd b/packager/app/test/testdata/encryption-and-no-clear-lead/output.mpd index 9d72c67203..6c9d0c3d29 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 @@ - + 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 17b831df78..daececa166 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 ffb3292a2d..0f841e15f3 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 @@ - + 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 43bfd90f1f..cebb14a0e8 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-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 c6251150ff..ce0e437d68 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 43bfd90f1f..cebb14a0e8 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/output.mpd b/packager/app/test/testdata/encryption-and-trick-play/output.mpd index 0969c57f85..c890540aa5 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 @@ - + 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 c6251150ff..ce0e437d68 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 e4d1f9556e..09bc5d4668 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 43bfd90f1f..cebb14a0e8 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 072a7b8ba6..629287de1f 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 @@ - + 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 1edc8ecddc..8cbfc316ca 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/output.mpd b/packager/app/test/testdata/encryption-cbc-1/output.mpd index 840d146294..be386623e4 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 @@ - + 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 adee9cfc8c..07f0dc14dc 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/output.mpd b/packager/app/test/testdata/encryption-cens/output.mpd index 2af43b290e..1bad06fde1 100644 --- a/packager/app/test/testdata/encryption-cens/output.mpd +++ b/packager/app/test/testdata/encryption-cens/output.mpd @@ -1,6 +1,6 @@ - + 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 f875a54176..3680c73c32 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 b03313a45e..b93325dba9 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 @@ - + 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 db9f0c3c9f..580d34e67a 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 24841b16ab..135bca7a7e 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 @@ - + 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 43bfd90f1f..cebb14a0e8 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/output.mpd b/packager/app/test/testdata/encryption-of-only-video-stream/output.mpd index 76e5680aa0..aac311031d 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 @@ - + 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 43bfd90f1f..cebb14a0e8 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/output.mpd b/packager/app/test/testdata/encryption-using-fixed-key/output.mpd index fd79c082d7..955443b1c6 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 @@ - + diff --git a/packager/app/test/testdata/encryption/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption/bear-640x360-video.mp4 index 43bfd90f1f..cebb14a0e8 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/output.mpd b/packager/app/test/testdata/encryption/output.mpd index fd79c082d7..955443b1c6 100644 --- a/packager/app/test/testdata/encryption/output.mpd +++ b/packager/app/test/testdata/encryption/output.mpd @@ -1,6 +1,6 @@ - + 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 a4315c32cb..9ea15d763d 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 32906dbcf9..9400a05120 100644 --- a/packager/app/test/testdata/first-stream/output.mpd +++ b/packager/app/test/testdata/first-stream/output.mpd @@ -1,6 +1,6 @@ - + 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 ba921f6214..b98897e81a 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/output.mpd b/packager/app/test/testdata/hevc-with-encryption/output.mpd index 28268e9521..f70db69d40 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 @@ - + 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 e8a21a613c..82605ec2c3 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.m3u8 b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video.m3u8 index 0f3fbe7f5a..2c0c3d4ea0 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.001, +#EXTINF:1.068, video-1.m4s #EXTINF:1.001, video-2.m4s 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 e8a21a613c..82605ec2c3 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/stream_2.m3u8 b/packager/app/test/testdata/hls-segmented-webvtt/stream_2.m3u8 index 19e29dda02..ac2680a454 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.001, +#EXTINF:1.068, 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-video.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video.m3u8 index 50b7e9ddea..f81460f81e 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 @@ -5,7 +5,7 @@ #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1091@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" -#EXTINF:1.001, +#EXTINF:1.068, #EXT-X-BYTERANGE:99313@1159 bear-640x360-video.mp4 #EXTINF:1.001, 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 43bfd90f1f..cebb14a0e8 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/bear-640x360-video.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.m3u8 index 9e1b78afe7..671eef27e7 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 @@ -5,7 +5,7 @@ #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1091@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" -#EXTINF:1.001, +#EXTINF:1.068, #EXT-X-BYTERANGE:99313@1159 bear-640x360-video.mp4 #EXTINF:1.001, 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 43bfd90f1f..cebb14a0e8 100644 Binary files a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.mp4 and b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-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 c8e0ec8cfa..eddc48d4b1 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/output.mpd b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output.mpd index 0a76506d2f..2f573473c8 100644 --- a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output.mpd +++ b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output.mpd @@ -3,14 +3,15 @@ - + AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + + 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 c8e0ec8cfa..eddc48d4b1 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/output.mpd b/packager/app/test/testdata/live-profile-and-encryption/output.mpd index ebd3702b39..416e419b6f 100644 --- a/packager/app/test/testdata/live-profile-and-encryption/output.mpd +++ b/packager/app/test/testdata/live-profile-and-encryption/output.mpd @@ -7,10 +7,11 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + - + + 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 c8e0ec8cfa..eddc48d4b1 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/output.mpd b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output.mpd index be06661a74..d1faca5262 100644 --- a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output.mpd +++ b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output.mpd @@ -5,10 +5,11 @@ - + - + + 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 5ff1a7ced3..6fcbc85250 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/output.mpd b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output.mpd index 4fbecc5254..51a6f3df78 100644 --- a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output.mpd +++ b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output.mpd @@ -3,12 +3,13 @@ - + - + + 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 5ff1a7ced3..6fcbc85250 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/output.mpd b/packager/app/test/testdata/live-profile-and-key-rotation/output.mpd index cb0c0d801b..4c9eb7365c 100644 --- a/packager/app/test/testdata/live-profile-and-key-rotation/output.mpd +++ b/packager/app/test/testdata/live-profile-and-key-rotation/output.mpd @@ -5,10 +5,11 @@ - + - + + 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 e8a21a613c..82605ec2c3 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/output.mpd b/packager/app/test/testdata/live-profile/output.mpd index 8482505bfb..b77da2c78f 100644 --- a/packager/app/test/testdata/live-profile/output.mpd +++ b/packager/app/test/testdata/live-profile/output.mpd @@ -3,10 +3,11 @@ - + - + + 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 e8a21a613c..82605ec2c3 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/output.mpd b/packager/app/test/testdata/live-static-profile-and-ad-cues/output.mpd index 67589ed6f1..6402c84a12 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,12 +1,13 @@ - - + + - + - + + 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 e8a21a613c..82605ec2c3 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/output.mpd b/packager/app/test/testdata/live-static-profile/output.mpd index 6544f9a5bc..5c2a2b0a90 100644 --- a/packager/app/test/testdata/live-static-profile/output.mpd +++ b/packager/app/test/testdata/live-static-profile/output.mpd @@ -1,12 +1,13 @@ - + - + - + + diff --git a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-video.mp4 b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-video.mp4 index 1e611f0a64..199276410d 100644 Binary files a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-video.mp4 and b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-video.mp4 differ diff --git a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/output.mpd b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/output.mpd index 72210e76d3..a593f3f41a 100644 --- a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/output.mpd +++ b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/output.mpd @@ -10,7 +10,7 @@ bear-320x240-vp9-opus-audio.mp4 - + @@ -22,7 +22,7 @@ bear-320x240-vp9-opus-video.mp4 - + 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 a4315c32cb..9ea15d763d 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 bc3952e791..ad7e4a7d4b 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 @@ - + diff --git a/packager/app/test/testdata/vp8-mp4-with-encryption/bear-640x360-video.mp4 b/packager/app/test/testdata/vp8-mp4-with-encryption/bear-640x360-video.mp4 index 8c3c919a13..dbfd1689cc 100644 Binary files a/packager/app/test/testdata/vp8-mp4-with-encryption/bear-640x360-video.mp4 and b/packager/app/test/testdata/vp8-mp4-with-encryption/bear-640x360-video.mp4 differ diff --git a/packager/app/test/testdata/vp8-mp4-with-encryption/output.mpd b/packager/app/test/testdata/vp8-mp4-with-encryption/output.mpd index e2df7f0c9e..f895dbe352 100644 --- a/packager/app/test/testdata/vp8-mp4-with-encryption/output.mpd +++ b/packager/app/test/testdata/vp8-mp4-with-encryption/output.mpd @@ -9,7 +9,7 @@ bear-640x360-video.mp4 - + diff --git a/packager/app/test/testdata/vp8-webm/output.mpd b/packager/app/test/testdata/vp8-webm/output.mpd index e4a1fd8473..665cffa84d 100644 --- a/packager/app/test/testdata/vp8-webm/output.mpd +++ b/packager/app/test/testdata/vp8-webm/output.mpd @@ -5,7 +5,7 @@ bear-640x360-video.webm - + diff --git a/packager/app/test/testdata/vp9-webm/output.mpd b/packager/app/test/testdata/vp9-webm/output.mpd index 7f61377760..2b37025f13 100644 --- a/packager/app/test/testdata/vp9-webm/output.mpd +++ b/packager/app/test/testdata/vp9-webm/output.mpd @@ -6,7 +6,7 @@ bear-320x240-vp9-opus-audio.webm - + @@ -14,7 +14,7 @@ bear-320x240-vp9-opus-video.webm - + diff --git a/packager/app/test/testdata/webm-with-encryption/output.mpd b/packager/app/test/testdata/webm-with-encryption/output.mpd index 2e780a0818..a7c3f5b80c 100644 --- a/packager/app/test/testdata/webm-with-encryption/output.mpd +++ b/packager/app/test/testdata/webm-with-encryption/output.mpd @@ -8,7 +8,7 @@ bear-640x360-video.webm - + 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 5dfff29f96..7c24e9e509 100644 Binary files a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-0.mp4 and b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-0.mp4 differ diff --git a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-1.mp4 b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-1.mp4 index 1de4b6a9e8..372bb7827e 100644 Binary files a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-1.mp4 and b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-1.mp4 differ diff --git a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-2.mp4 b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-2.mp4 index 1c0e5237cf..9553f9bd8d 100644 Binary files a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-2.mp4 and b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-2.mp4 differ diff --git a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-3.mp4 b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-3.mp4 index d7a846f1b8..c5ec848107 100644 Binary files a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-3.mp4 and b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-3.mp4 differ diff --git a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output.mpd b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output.mpd index aaf48a7524..b21f042c4f 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,17 +1,17 @@ - + 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 9e3752e3b3..f2db8721e4 100644 Binary files a/packager/app/test/testdata/wvm-input/bear-multi-configs-0.mp4 and b/packager/app/test/testdata/wvm-input/bear-multi-configs-0.mp4 differ diff --git a/packager/app/test/testdata/wvm-input/bear-multi-configs-1.mp4 b/packager/app/test/testdata/wvm-input/bear-multi-configs-1.mp4 index 1de4b6a9e8..372bb7827e 100644 Binary files a/packager/app/test/testdata/wvm-input/bear-multi-configs-1.mp4 and b/packager/app/test/testdata/wvm-input/bear-multi-configs-1.mp4 differ diff --git a/packager/app/test/testdata/wvm-input/bear-multi-configs-2.mp4 b/packager/app/test/testdata/wvm-input/bear-multi-configs-2.mp4 index ba70a00d9b..11b3f13f93 100644 Binary files a/packager/app/test/testdata/wvm-input/bear-multi-configs-2.mp4 and b/packager/app/test/testdata/wvm-input/bear-multi-configs-2.mp4 differ diff --git a/packager/app/test/testdata/wvm-input/bear-multi-configs-3.mp4 b/packager/app/test/testdata/wvm-input/bear-multi-configs-3.mp4 index d7a846f1b8..c5ec848107 100644 Binary files a/packager/app/test/testdata/wvm-input/bear-multi-configs-3.mp4 and b/packager/app/test/testdata/wvm-input/bear-multi-configs-3.mp4 differ diff --git a/packager/app/test/testdata/wvm-input/output.mpd b/packager/app/test/testdata/wvm-input/output.mpd index 1c0e71ab9d..c6ee7e7779 100644 --- a/packager/app/test/testdata/wvm-input/output.mpd +++ b/packager/app/test/testdata/wvm-input/output.mpd @@ -1,17 +1,17 @@ - + 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/formats/mp4/fragmenter.cc b/packager/media/formats/mp4/fragmenter.cc index 166abb4c79..d637e467ce 100644 --- a/packager/media/formats/mp4/fragmenter.cc +++ b/packager/media/formats/mp4/fragmenter.cc @@ -6,6 +6,7 @@ #include "packager/media/formats/mp4/fragmenter.h" +#include #include #include "packager/media/base/audio_stream_info.h" @@ -150,6 +151,24 @@ Status Fragmenter::FinalizeFragment() { return status; } + if (first_fragment_) { + // 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()); @@ -208,7 +227,7 @@ Status Fragmenter::FinalizeFragment() { return Status::OK; } -void Fragmenter::GenerateSegmentReference(SegmentReference* reference) { +void Fragmenter::GenerateSegmentReference(SegmentReference* reference) const { // NOTE: Daisy chain is not supported currently. reference->reference_type = false; reference->subsegment_duration = fragment_duration_; @@ -275,7 +294,7 @@ Status Fragmenter::FinalizeFragmentForEncryption() { return Status::OK; } -bool Fragmenter::StartsWithSAP() { +bool Fragmenter::StartsWithSAP() const { DCHECK(!traf_->runs.empty()); uint32_t start_sample_flag; if (traf_->runs[0].flags & TrackFragmentRun::kSampleFlagsPresentMask) { diff --git a/packager/media/formats/mp4/fragmenter.h b/packager/media/formats/mp4/fragmenter.h index 8870077754..4edf5c116b 100644 --- a/packager/media/formats/mp4/fragmenter.h +++ b/packager/media/formats/mp4/fragmenter.h @@ -51,7 +51,7 @@ class Fragmenter { Status FinalizeFragment(); /// Fill @a reference with current fragment information. - void GenerateSegmentReference(SegmentReference* reference); + void GenerateSegmentReference(SegmentReference* reference) const; void ClearFragmentFinalized() { fragment_finalized_ = false; } @@ -88,7 +88,7 @@ class Fragmenter { private: Status FinalizeFragmentForEncryption(); // Check if the current fragment starts with SAP. - bool StartsWithSAP(); + bool StartsWithSAP() const; std::shared_ptr stream_info_; bool use_decoding_timestamp_in_timeline_; @@ -98,6 +98,7 @@ class Fragmenter { bool fragment_finalized_; uint64_t fragment_duration_; int64_t earliest_presentation_time_; + bool first_fragment_ = true; int64_t first_sap_time_; std::unique_ptr data_; // Saves key frames information, for Video. diff --git a/packager/media/formats/mp4/single_segment_segmenter.cc b/packager/media/formats/mp4/single_segment_segmenter.cc index 409cdac680..7c54d9235a 100644 --- a/packager/media/formats/mp4/single_segment_segmenter.cc +++ b/packager/media/formats/mp4/single_segment_segmenter.cc @@ -196,25 +196,7 @@ Status SingleSegmentSegmenter::DoFinalizeSegment() { vod_sidx_.reset(new SegmentIndex()); vod_sidx_->reference_id = sidx()->reference_id; vod_sidx_->timescale = sidx()->timescale; - - if (vod_ref.earliest_presentation_time > 0) { - const double starting_time_in_seconds = - static_cast(vod_ref.earliest_presentation_time) / - GetReferenceTimeScale(); - // Give a warning if it is significant. - if (starting_time_in_seconds > 0.5) { - // Note that DASH IF player requires presentationTimeOffset to be set in - // Segment{Base,List,Template} if there is non-zero starting time. Since - // current Chromium's MSE implementation uses DTS, the player expects - // DTS to be used. - LOG(WARNING) << "Warning! Non-zero starting time (in seconds): " - << starting_time_in_seconds - << ". Manual adjustment of presentationTimeOffset in " - "mpd might be necessary."; - } - } - // Force earliest_presentation_time to start from 0 for VOD. - vod_sidx_->earliest_presentation_time = 0; + vod_sidx_->earliest_presentation_time = vod_ref.earliest_presentation_time; } vod_sidx_->references.push_back(vod_ref); diff --git a/packager/mpd/base/mpd_builder.cc b/packager/mpd/base/mpd_builder.cc index 2845ed2517..5b9f940e88 100644 --- a/packager/mpd/base/mpd_builder.cc +++ b/packager/mpd/base/mpd_builder.cc @@ -353,7 +353,6 @@ bool MpdBuilder::GetEarliestTimestamp(double* timestamp_seconds) { void MpdBuilder::UpdatePeriodDurationAndPresentationTimestamp() { DCHECK_EQ(MpdType::kStatic, mpd_options_.mpd_type); - bool first_period = true; for (const auto& period : periods_) { std::list video_representations; std::list non_video_representations; @@ -393,21 +392,6 @@ void MpdBuilder::UpdatePeriodDurationAndPresentationTimestamp() { period->set_duration_seconds(*latest_end_time - *earliest_start_time); double presentation_time_offset = *earliest_start_time; - if (first_period) { - first_period = false; - // Chrome does not like negative dts (https://crbug.com/398141). - // Always set presentationTimeOffset (pto) to 0 for the first period as it - // may result in an error on Chrome v63.0.3239.132 if it sets to a non - // zero value. - // It is fine with subsequent periods as the actual offset applied takes - // Period@start into consideration: - // offset = Period@start - presentationTimeOffset - // The result timestamp with offset applied is close to Period@start, so - // it is unlikely to result in a negative dts value. - // TODO(kqyang): Set the pto to |dts| instead of always setting it to 0 to - // workaround Chrome negative DTS bug. - presentation_time_offset = 0; - } for (const auto& adaptation_set : period->GetAdaptationSets()) { for (const auto& representation : adaptation_set->GetRepresentations()) { representation->SetPresentationTimeOffset(presentation_time_offset); diff --git a/packager/mpd/base/mpd_builder_unittest.cc b/packager/mpd/base/mpd_builder_unittest.cc index 0d26da23da..fd2509812b 100644 --- a/packager/mpd/base/mpd_builder_unittest.cc +++ b/packager/mpd/base/mpd_builder_unittest.cc @@ -174,6 +174,29 @@ TEST_F(OnDemandMpdBuilderTest, MediaInfoMissingBandwidth) { ASSERT_FALSE(mpd_.ToString(&mpd_doc)); } +TEST_F(OnDemandMpdBuilderTest, CheckXmlTest) { + // Disable pto adjustment. + FLAGS_pto_adjustment = 0; + + const double kPeriod1StartTimeSeconds = 0.0; + + // Actual period duration is determined by the segments not by the period + // start time above, which only provides an anchor point. + const double kPeriod1SegmentStartSeconds = 0.2; + const double kPeriod1SegmentDurationSeconds = 3.0; + + Period* period = mpd_.GetOrCreatePeriod(kPeriod1StartTimeSeconds); + AddSegmentToPeriod(kPeriod1SegmentStartSeconds, + kPeriod1SegmentDurationSeconds, period); + + std::string mpd_doc; + ASSERT_TRUE(mpd_.ToString(&mpd_doc)); + EXPECT_THAT(mpd_doc, HasSubstr("\n")); + EXPECT_THAT(mpd_doc, + HasSubstr("")); +} + TEST_F(OnDemandMpdBuilderTest, MultiplePeriodTest) { const double kPeriodStartTimeSeconds = 1.0; Period* period = mpd_.GetOrCreatePeriod(kPeriodStartTimeSeconds); @@ -226,17 +249,19 @@ TEST_F(OnDemandMpdBuilderTest, MultiplePeriodCheckXmlTest) { std::string mpd_doc; ASSERT_TRUE(mpd_.ToString(&mpd_doc)); EXPECT_THAT(mpd_doc, HasSubstr("\n")); + EXPECT_THAT(mpd_doc, + HasSubstr("")); + EXPECT_THAT(mpd_doc, HasSubstr("\n")); EXPECT_THAT( mpd_doc, - HasSubstr("")); - EXPECT_THAT(mpd_doc, HasSubstr("\n")); - EXPECT_THAT(mpd_doc, - HasSubstr("")); + HasSubstr("")); EXPECT_THAT(mpd_doc, HasSubstr("\n")); - EXPECT_THAT(mpd_doc, - HasSubstr("")); + EXPECT_THAT( + mpd_doc, + HasSubstr("")); } TEST_F(LiveMpdBuilderTest, MultiplePeriodCheckXmlTest) {