From 5b9fd409a5de502e8af2e46ee12840bd2226874d Mon Sep 17 00:00:00 2001 From: koln67 <67125539+koln67@users.noreply.github.com> Date: Tue, 8 Sep 2020 22:45:21 +0000 Subject: [PATCH] [MP4] Change major brand from isom to mp41 This fixes warnings that 'isom' can only be a compatible instead of major brand. Issue #755. --- ...bear-640x360-aac_he-silent_right-audio.mp4 | Bin 24567 -> 24571 bytes packager/app/test/testdata/acc-he/output.mpd | 4 +- .../bear-640x360-audio.mp4 | Bin 43732 -> 43736 bytes .../bear-640x360-video.mp4 | Bin 301709 -> 301713 bytes .../output.mpd | 8 +-- ...ear-1280x720-video-trick_play_factor_1.mp4 | Bin 112880 -> 112884 bytes .../bear-1280x720-video.mp4 | Bin 818421 -> 818425 bytes .../bear-640x360-audio.mp4 | Bin 44640 -> 44644 bytes .../bear-640x360-hevc-video.mp4 | Bin 92837 -> 92841 bytes .../bear-640x360-video.mp4 | Bin 302915 -> 302919 bytes .../output.mpd | 46 ++++++++--------- .../bear-1280x720-video.mp4 | Bin 817216 -> 817220 bytes .../bear-640x360-audio.mp4 | Bin 43732 -> 43736 bytes .../bear-640x360-hevc-video.mp4 | Bin 90555 -> 90559 bytes .../bear-640x360-video.mp4 | Bin 301709 -> 301713 bytes .../output.mpd | 16 +++--- .../bear-640x360-audio.m3u8 | 4 +- .../bear-640x360-audio.mp4 | Bin 43732 -> 43736 bytes .../bear-640x360-video-iframe.m3u8 | 8 +-- .../bear-640x360-video.m3u8 | 4 +- .../bear-640x360-video.mp4 | Bin 301709 -> 301713 bytes .../output.mpd | 8 +-- .../bear-640x360-audio.m3u8 | 4 +- .../bear-640x360-audio.mp4 | Bin 43732 -> 43736 bytes .../bear-640x360-video-iframe.m3u8 | 8 +-- .../bear-640x360-video.m3u8 | 4 +- .../bear-640x360-video.mp4 | Bin 301709 -> 301713 bytes .../output.mpd | 8 +-- .../bear-640x360-audio.mp4 | Bin 43732 -> 43736 bytes ...bear-640x360-video-trick_play_factor_1.mp4 | Bin 53444 -> 53448 bytes .../bear-640x360-video.mp4 | Bin 301709 -> 301713 bytes .../audio-video-with-trick-play/output.mpd | 12 ++--- .../bear-640x360-audio.mp4 | Bin 43732 -> 43736 bytes ...bear-640x360-video-trick_play_factor_1.mp4 | Bin 53444 -> 53448 bytes ...bear-640x360-video-trick_play_factor_2.mp4 | Bin 35559 -> 35563 bytes .../bear-640x360-video.mp4 | Bin 301709 -> 301713 bytes .../output.mpd | 16 +++--- .../audio-video/bear-640x360-audio.mp4 | Bin 43732 -> 43736 bytes .../audio-video/bear-640x360-video.mp4 | Bin 301709 -> 301713 bytes .../app/test/testdata/audio-video/output.mpd | 8 +-- .../bear-av1-video.mp4 | Bin 24949 -> 24953 bytes .../decrypted-bear-av1-video-0.mp4 | Bin 24706 -> 24710 bytes .../av1-mp4-with-encryption/output.mpd | 4 +- .../av1-mp4-with-encryption/stream_0.m3u8 | 4 +- .../test/testdata/av1-mp4/bear-av1-video.mp4 | Bin 24706 -> 24710 bytes packager/app/test/testdata/av1-mp4/output.mpd | 4 +- .../app/test/testdata/av1-mp4/stream_0.m3u8 | 4 +- .../test/testdata/av1-webm/bear-av1-video.mp4 | Bin 25030 -> 25034 bytes .../app/test/testdata/av1-webm/output.mpd | 4 +- .../app/test/testdata/av1-webm/stream_0.m3u8 | 4 +- .../bear-640x360-ac3-audio.m3u8 | 4 +- .../bear-640x360-ac3-audio.mp4 | Bin 68606 -> 68610 bytes .../bear-640x360-ac3-video-iframe.m3u8 | 8 +-- .../bear-640x360-ac3-video.m3u8 | 4 +- .../bear-640x360-ac3-video.mp4 | Bin 301713 -> 301717 bytes .../bear-640x360-audio-3.m4s | Bin 8088 -> 8092 bytes .../bear-640x360-audio-4.m4s | Bin 8462 -> 8466 bytes .../bear-640x360-audio-5.m4s | Bin 8086 -> 8090 bytes .../bear-640x360-audio-6.m4s | Bin 2851 -> 2855 bytes .../bear-640x360-audio-init.mp4 | Bin 754 -> 758 bytes .../output.m3u8 | 2 +- .../output.mpd | 2 +- .../bear-640x360-audio.m3u8 | 4 +- .../bandwidth-override/bear-640x360-audio.mp4 | Bin 43732 -> 43736 bytes .../bear-640x360-video-iframe.m3u8 | 8 +-- .../bear-640x360-video.m3u8 | 4 +- .../bandwidth-override/bear-640x360-video.mp4 | Bin 301709 -> 301713 bytes .../testdata/bandwidth-override/output.mpd | 8 +-- .../output.mpd | 4 +- .../sparks_dovi_5-video.mp4 | Bin 592616 -> 592620 bytes .../stream_0.m3u8 | 4 +- .../output.mpd | 8 +-- .../sparks_dovi_8-video.mp4 | Bin 570072 -> 570076 bytes .../stream_0.m3u8 | 4 +- .../bear-640x360-ec3-audio.m3u8 | 4 +- .../bear-640x360-ec3-audio.mp4 | Bin 68183 -> 68187 bytes .../bear-640x360-ec3-video-iframe.m3u8 | 8 +-- .../bear-640x360-ec3-video.m3u8 | 4 +- .../bear-640x360-ec3-video.mp4 | Bin 297407 -> 297411 bytes .../bear-640x360-audio.mp4 | Bin 44640 -> 44644 bytes ...bear-640x360-video-trick_play_factor_1.mp4 | Bin 53850 -> 53854 bytes .../bear-640x360-video.mp4 | Bin 302915 -> 302919 bytes .../output.mpd | 24 ++++----- .../bear-640x360-audio.m3u8 | 6 +-- .../bear-640x360-audio1.mp4 | Bin 34356 -> 34360 bytes .../bear-640x360-audio2.mp4 | Bin 11319 -> 11323 bytes .../bear-640x360-video-iframe.m3u8 | 8 +-- .../bear-640x360-video.m3u8 | 6 +-- .../bear-640x360-video1.mp4 | Bin 222836 -> 222840 bytes .../bear-640x360-video2.mp4 | Bin 81238 -> 81242 bytes .../output.mpd | 16 +++--- .../bear-640x360-audio.m3u8 | 4 +- .../bear-640x360-audio.mp4 | Bin 44640 -> 44644 bytes .../bear-640x360-video-iframe.m3u8 | 8 +-- .../bear-640x360-video.m3u8 | 4 +- .../bear-640x360-video.mp4 | Bin 302915 -> 302919 bytes .../encryption-and-ad-cues/output.mpd | 16 +++--- .../bear-640x360-audio.mp4 | Bin 44975 -> 44979 bytes .../bear-640x360-video.mp4 | Bin 303312 -> 303316 bytes .../decrypted-bear-640x360-audio-0.mp4 | Bin 43732 -> 43736 bytes .../decrypted-bear-640x360-video-0.mp4 | Bin 301709 -> 301713 bytes .../encryption-and-no-clear-lead/output.mpd | 8 +-- .../bear-640x360-audio.mp4 | Bin 44588 -> 44592 bytes .../bear-640x360-video.mp4 | Bin 302863 -> 302867 bytes .../output.mpd | 8 +-- .../bear-640x360-audio.mp4 | Bin 44640 -> 44644 bytes .../bear-640x360-video.mp4 | Bin 302915 -> 302919 bytes .../encryption-and-non-dash-if-iop/output.mpd | 8 +-- .../bear-640x360-video.mp4 | Bin 302915 -> 302919 bytes .../bear-640x360-video.mp4.media_info | 6 +-- .../output.mpd | 4 +- .../bear-640x360-audio.mp4 | Bin 44640 -> 44644 bytes .../bear-640x360-audio.mp4.media_info | 6 +-- .../bear-640x360-video.mp4 | Bin 302915 -> 302919 bytes .../bear-640x360-video.mp4.media_info | 6 +-- .../bear-640x360-audio.mp4 | Bin 44640 -> 44644 bytes ...bear-640x360-video-trick_play_factor_1.mp4 | Bin 53850 -> 53854 bytes .../bear-640x360-video.mp4 | Bin 302915 -> 302919 bytes .../decrypted-bear-640x360-audio-0.mp4 | Bin 43732 -> 43736 bytes .../decrypted-bear-640x360-video-0.mp4 | Bin 301709 -> 301713 bytes ...ar-640x360-video-trick_play_factor_1-0.mp4 | Bin 53444 -> 53448 bytes .../encryption-and-trick-play/output.mpd | 12 ++--- .../bear-640x360-audio.mp4 | Bin 44640 -> 44644 bytes ...bear-640x360-video-trick_play_factor_1.mp4 | Bin 53850 -> 53854 bytes ...bear-640x360-video-trick_play_factor_2.mp4 | Bin 35896 -> 35900 bytes .../bear-640x360-video.mp4 | Bin 302915 -> 302919 bytes .../encryption-and-two-trick-plays/output.mpd | 16 +++--- .../encryption-cbc-1/bear-640x360-audio.mp4 | Bin 44640 -> 44644 bytes .../encryption-cbc-1/bear-640x360-video.mp4 | Bin 302915 -> 302919 bytes .../decrypted-bear-640x360-audio-0.mp4 | Bin 43732 -> 43736 bytes .../decrypted-bear-640x360-video-0.mp4 | Bin 301709 -> 301713 bytes .../test/testdata/encryption-cbc-1/output.mpd | 8 +-- .../bear-640x360-audio.mp4 | Bin 43983 -> 43987 bytes .../bear-640x360-video.mp4 | Bin 302508 -> 302512 bytes .../decrypted-bear-640x360-audio-0.mp4 | Bin 43732 -> 43736 bytes .../decrypted-bear-640x360-video-0.mp4 | Bin 301709 -> 301713 bytes .../output.mpd | 8 +-- .../encryption-cbcs/bear-640x360-audio.mp4 | Bin 43983 -> 43987 bytes .../encryption-cbcs/bear-640x360-video.mp4 | Bin 302508 -> 302512 bytes .../decrypted-bear-640x360-audio-0.mp4 | Bin 43732 -> 43736 bytes .../decrypted-bear-640x360-video-0.mp4 | Bin 301709 -> 301713 bytes .../test/testdata/encryption-cbcs/output.mpd | 8 +-- .../encryption-cens/bear-640x360-audio.mp4 | Bin 44640 -> 44644 bytes .../encryption-cens/bear-640x360-video.mp4 | Bin 302915 -> 302919 bytes .../decrypted-bear-640x360-audio-0.mp4 | Bin 43732 -> 43736 bytes .../decrypted-bear-640x360-video-0.mp4 | Bin 301709 -> 301713 bytes .../test/testdata/encryption-cens/output.mpd | 8 +-- .../bear-640x360-audio.mp4 | Bin 44656 -> 44660 bytes .../bear-640x360-video.mp4 | Bin 302931 -> 302935 bytes .../output.mpd | 8 +-- .../bear-640x360-audio.mp4 | Bin 44656 -> 44660 bytes .../bear-640x360-video.mp4 | Bin 302931 -> 302935 bytes .../testdata/encryption-multi-keys/output.mpd | 8 +-- .../bear-640x360-audio-skip_encryption.mp4 | Bin 43732 -> 43736 bytes .../bear-640x360-video.mp4 | Bin 302915 -> 302919 bytes .../decrypted-bear-640x360-video-0.mp4 | Bin 301709 -> 301713 bytes .../output.mpd | 8 +-- .../bear-640x360-audio.mp4 | Bin 44620 -> 44624 bytes .../bear-640x360-video.mp4 | Bin 302895 -> 302899 bytes .../encryption-using-explicit-pssh/output.mpd | 8 +-- .../bear-640x360-audio.mp4 | Bin 44640 -> 44644 bytes .../bear-640x360-video.mp4 | Bin 302915 -> 302919 bytes .../decrypted-bear-640x360-audio-0.mp4 | Bin 43732 -> 43736 bytes .../decrypted-bear-640x360-video-0.mp4 | Bin 301709 -> 301713 bytes .../encryption-using-fixed-key/output.mpd | 8 +-- .../bear-640x360-audio.mp4 | Bin 45194 -> 45198 bytes .../bear-640x360-video.mp4 | Bin 303469 -> 303473 bytes .../encryption-with-multi-drms/output.mpd | 8 +-- .../encryption-with-multi-drms/stream_0.m3u8 | 4 +- .../encryption-with-multi-drms/stream_1.m3u8 | 4 +- .../encryption/bear-640x360-audio.mp4 | Bin 44640 -> 44644 bytes .../encryption/bear-640x360-video.mp4 | Bin 302915 -> 302919 bytes .../decrypted-bear-640x360-audio-0.mp4 | Bin 43732 -> 43736 bytes .../decrypted-bear-640x360-video-0.mp4 | Bin 301709 -> 301713 bytes .../app/test/testdata/encryption/output.mpd | 8 +-- .../testdata/first-stream/bear-640x360-0.mp4 | Bin 301709 -> 301713 bytes .../app/test/testdata/first-stream/output.mpd | 4 +- .../flac-with-encryption/bear-flac-audio.mp4 | Bin 217295 -> 217299 bytes .../decrypted-bear-flac-audio-0.mp4 | Bin 216835 -> 216839 bytes .../testdata/flac-with-encryption/output.mpd | 4 +- .../flac-with-encryption/stream_0.m3u8 | 4 +- .../bear-640x360-hevc-hdr10-video.mp4 | Bin 116410 -> 116414 bytes .../testdata/hdr10-with-encryption/output.mpd | 4 +- .../hdr10-with-encryption/stream_0.m3u8 | 4 +- .../bear-640x360-hevc-video.mp4 | Bin 92837 -> 92841 bytes .../decrypted-bear-640x360-hevc-video-0.mp4 | Bin 90555 -> 90559 bytes .../testdata/hevc-with-encryption/output.mpd | 4 +- .../bear-640x360-audio-1.m4s | Bin 17104 -> 17108 bytes .../bear-640x360-audio-2.m4s | Bin 15956 -> 15960 bytes .../bear-640x360-audio-3.m4s | Bin 10039 -> 10043 bytes .../bear-640x360-audio-init.mp4 | Bin 793 -> 797 bytes .../bear-640x360-video-1.m4s | Bin 99393 -> 99397 bytes .../bear-640x360-video-2.m4s | Bin 121887 -> 121891 bytes .../bear-640x360-video-3.m4s | Bin 79742 -> 79746 bytes .../bear-640x360-video-iframe.m3u8 | 6 +-- .../bear-640x360-video-init.mp4 | Bin 859 -> 863 bytes .../output.m3u8 | 2 +- .../audio/audio-1.m4s | Bin 17104 -> 17108 bytes .../audio/audio-2.m4s | Bin 16361 -> 16365 bytes .../audio/audio-3.m4s | Bin 9634 -> 9638 bytes .../audio/audio-init.mp4 | Bin 793 -> 797 bytes .../output.m3u8 | 2 +- .../video/video-1.m4s | Bin 99393 -> 99397 bytes .../video/video-2.m4s | Bin 121887 -> 121891 bytes .../video/video-3.m4s | Bin 79742 -> 79746 bytes .../video/video-init.mp4 | Bin 859 -> 863 bytes .../bear-640x360-audio-1.m4s | Bin 17104 -> 17108 bytes .../bear-640x360-audio-2.m4s | Bin 16361 -> 16365 bytes .../bear-640x360-audio-3.m4s | Bin 9634 -> 9638 bytes .../bear-640x360-audio-init.mp4 | Bin 793 -> 797 bytes .../bear-640x360-video-1.m4s | Bin 99393 -> 99397 bytes .../bear-640x360-video-2.m4s | Bin 121887 -> 121891 bytes .../bear-640x360-video-3.m4s | Bin 79742 -> 79746 bytes .../bear-640x360-video-init.mp4 | Bin 859 -> 863 bytes .../bear-english-text-1.m4s | Bin 239 -> 243 bytes .../bear-english-text-2.m4s | Bin 237 -> 241 bytes .../bear-english-text-3.m4s | Bin 237 -> 241 bytes .../bear-english-text-4.m4s | Bin 237 -> 241 bytes .../bear-english-text-5.m4s | Bin 253 -> 257 bytes .../bear-english-text-init.mp4 | Bin 724 -> 728 bytes .../hls-only-dash-only-captions/output.m3u8 | 2 +- .../hls-only-dash-only-captions/output.mpd | 6 +-- .../hls-only-dash-only/bear-640x360-audio.mp4 | Bin 43732 -> 43736 bytes .../hls-only-dash-only/bear-640x360-video.mp4 | Bin 301709 -> 301713 bytes .../testdata/hls-only-dash-only/output.mpd | 4 +- .../testdata/hls-only-dash-only/stream_1.m3u8 | 4 +- .../bear-640x360-audio.m3u8 | 4 +- .../bear-640x360-audio.mp4 | Bin 44640 -> 44644 bytes .../bear-640x360-video-iframe.m3u8 | 8 +-- .../bear-640x360-video.m3u8 | 4 +- .../bear-640x360-video.mp4 | Bin 302915 -> 302919 bytes .../bear-1280x720-audio-1.m4s | Bin 17104 -> 17108 bytes .../bear-1280x720-audio-2.m4s | Bin 16758 -> 16762 bytes .../bear-1280x720-audio-3.m4s | Bin 9935 -> 9939 bytes .../bear-1280x720-audio-init.mp4 | Bin 1003 -> 1007 bytes .../bear-1280x720-video-1.m4s | Bin 267391 -> 267395 bytes .../bear-1280x720-video-2.m4s | Bin 329352 -> 329356 bytes .../bear-1280x720-video-3.m4s | Bin 220725 -> 220729 bytes .../bear-1280x720-video-init.mp4 | Bin 1125 -> 1129 bytes .../bear-320x180-audio-1.m4s | Bin 16731 -> 16735 bytes .../bear-320x180-audio-2.m4s | Bin 16726 -> 16730 bytes .../bear-320x180-audio-3.m4s | Bin 10472 -> 10476 bytes .../bear-320x180-audio-init.mp4 | Bin 967 -> 971 bytes .../bear-320x180-video-1.m4s | Bin 39901 -> 39905 bytes .../bear-320x180-video-2.m4s | Bin 47997 -> 48001 bytes .../bear-320x180-video-3.m4s | Bin 33952 -> 33956 bytes .../bear-320x180-video-init.mp4 | Bin 1125 -> 1129 bytes .../bear-640x360-audio-1.m4s | Bin 17104 -> 17108 bytes .../bear-640x360-audio-2.m4s | Bin 16758 -> 16762 bytes .../bear-640x360-audio-3.m4s | Bin 9935 -> 9939 bytes .../bear-640x360-audio-init.mp4 | Bin 1003 -> 1007 bytes .../bear-640x360-video-1.m4s | Bin 99393 -> 99397 bytes .../bear-640x360-video-2.m4s | Bin 122420 -> 122424 bytes .../bear-640x360-video-3.m4s | Bin 80147 -> 80151 bytes .../bear-640x360-video-init.mp4 | Bin 1127 -> 1131 bytes .../output.mpd | 44 ++++++++-------- .../bear-640x360-audio-1.m4s | Bin 17104 -> 17108 bytes .../bear-640x360-audio-2.m4s | Bin 16758 -> 16762 bytes .../bear-640x360-audio-3.m4s | Bin 9935 -> 9939 bytes .../bear-640x360-audio-init.mp4 | Bin 1003 -> 1007 bytes .../bear-640x360-video-1.m4s | Bin 99393 -> 99397 bytes .../bear-640x360-video-2.m4s | Bin 122420 -> 122424 bytes .../bear-640x360-video-3.m4s | Bin 80147 -> 80151 bytes .../bear-640x360-video-init.mp4 | Bin 1127 -> 1131 bytes .../output.mpd | 4 +- .../bear-640x360-audio-1.m4s | Bin 17104 -> 17108 bytes .../bear-640x360-audio-2.m4s | Bin 16758 -> 16762 bytes .../bear-640x360-audio-3.m4s | Bin 9935 -> 9939 bytes .../bear-640x360-audio-init.mp4 | Bin 1003 -> 1007 bytes .../bear-640x360-video-1.m4s | Bin 99393 -> 99397 bytes .../bear-640x360-video-2.m4s | Bin 122420 -> 122424 bytes .../bear-640x360-video-3.m4s | Bin 80147 -> 80151 bytes .../bear-640x360-video-init.mp4 | Bin 1127 -> 1131 bytes .../live-profile-and-encryption/output.mpd | 4 +- .../bear-640x360-audio-1.m4s | Bin 17104 -> 17108 bytes .../bear-640x360-audio-2.m4s | Bin 16830 -> 16834 bytes .../bear-640x360-audio-3.m4s | Bin 10007 -> 10011 bytes .../bear-640x360-audio-init.mp4 | Bin 951 -> 955 bytes .../bear-640x360-video-1.m4s | Bin 99393 -> 99397 bytes .../bear-640x360-video-2.m4s | Bin 122492 -> 122496 bytes .../bear-640x360-video-3.m4s | Bin 80219 -> 80223 bytes .../bear-640x360-video-init.mp4 | Bin 1075 -> 1079 bytes .../output.mpd | 4 +- .../bear-640x360-audio-1.m4s | Bin 17156 -> 17160 bytes .../bear-640x360-audio-2.m4s | Bin 16882 -> 16886 bytes .../bear-640x360-audio-3.m4s | Bin 10059 -> 10063 bytes .../bear-640x360-audio-init.mp4 | Bin 951 -> 955 bytes .../bear-640x360-video-1.m4s | Bin 99445 -> 99449 bytes .../bear-640x360-video-2.m4s | Bin 122544 -> 122548 bytes .../bear-640x360-video-3.m4s | Bin 80271 -> 80275 bytes .../bear-640x360-video-init.mp4 | Bin 1075 -> 1079 bytes .../output.mpd | 4 +- .../bear-640x360-audio-1.m4s | Bin 17156 -> 17160 bytes .../bear-640x360-audio-2.m4s | Bin 16510 -> 16514 bytes .../bear-640x360-audio-3.m4s | Bin 9783 -> 9787 bytes .../bear-640x360-audio-init.mp4 | Bin 960 -> 964 bytes .../bear-640x360-video-1.m4s | Bin 99445 -> 99449 bytes .../bear-640x360-video-2.m4s | Bin 122313 -> 122317 bytes .../bear-640x360-video-3.m4s | Bin 80104 -> 80108 bytes .../bear-640x360-video-init.mp4 | Bin 1084 -> 1088 bytes .../output.mpd | 4 +- .../bear-640x360-audio-1.m4s | Bin 17156 -> 17160 bytes .../bear-640x360-audio-2.m4s | Bin 16882 -> 16886 bytes .../bear-640x360-audio-3.m4s | Bin 10059 -> 10063 bytes .../bear-640x360-audio-init.mp4 | Bin 951 -> 955 bytes .../bear-640x360-video-1.m4s | Bin 99445 -> 99449 bytes .../bear-640x360-video-2.m4s | Bin 122544 -> 122548 bytes .../bear-640x360-video-3.m4s | Bin 80271 -> 80275 bytes .../bear-640x360-video-init.mp4 | Bin 1075 -> 1079 bytes .../live-profile-and-key-rotation/output.mpd | 4 +- .../live-profile/bear-640x360-audio-1.m4s | Bin 17104 -> 17108 bytes .../live-profile/bear-640x360-audio-2.m4s | Bin 16361 -> 16365 bytes .../live-profile/bear-640x360-audio-3.m4s | Bin 9634 -> 9638 bytes .../live-profile/bear-640x360-audio-init.mp4 | Bin 793 -> 797 bytes .../live-profile/bear-640x360-video-1.m4s | Bin 99393 -> 99397 bytes .../live-profile/bear-640x360-video-2.m4s | Bin 121887 -> 121891 bytes .../live-profile/bear-640x360-video-3.m4s | Bin 79742 -> 79746 bytes .../live-profile/bear-640x360-video-init.mp4 | Bin 859 -> 863 bytes .../app/test/testdata/live-profile/output.mpd | 4 +- .../bear-640x360-audio-0.m4s | Bin 17104 -> 17108 bytes .../bear-640x360-audio-45056.m4s | Bin 16361 -> 16365 bytes .../bear-640x360-audio-89088.m4s | Bin 9634 -> 9638 bytes .../bear-640x360-audio-init.mp4 | Bin 793 -> 797 bytes .../bear-640x360-video-0.m4s | Bin 99393 -> 99397 bytes .../bear-640x360-video-30030.m4s | Bin 121887 -> 121891 bytes .../bear-640x360-video-60060.m4s | Bin 79742 -> 79746 bytes .../bear-640x360-video-init.mp4 | Bin 859 -> 863 bytes .../output.mpd | 4 +- .../bear-640x360-audio-1.m4s | Bin 17104 -> 17108 bytes .../bear-640x360-audio-2.m4s | Bin 16361 -> 16365 bytes .../bear-640x360-audio-3.m4s | Bin 9634 -> 9638 bytes .../bear-640x360-audio-init.mp4 | Bin 793 -> 797 bytes .../bear-640x360-video-1.m4s | Bin 99393 -> 99397 bytes .../bear-640x360-video-2.m4s | Bin 121887 -> 121891 bytes .../bear-640x360-video-3.m4s | Bin 79742 -> 79746 bytes .../bear-640x360-video-init.mp4 | Bin 859 -> 863 bytes .../testdata/live-static-profile/output.mpd | 4 +- .../bear-640x360-trailing-moov-audio.mp4 | Bin 43732 -> 43736 bytes .../bear-640x360-trailing-moov-video.mp4 | Bin 301709 -> 301713 bytes .../testdata/mp4-trailing-moov/output.mpd | 8 +-- .../testdata/mp4-trailing-moov/stream_0.m3u8 | 4 +- .../testdata/mp4-trailing-moov/stream_1.m3u8 | 4 +- .../bear-320x240-vp9-opus-audio.mp4 | Bin 28327 -> 28331 bytes .../bear-320x240-vp9-opus-video.mp4 | Bin 71890 -> 71894 bytes ...ecrypted-bear-320x240-vp9-opus-audio-0.mp4 | Bin 27322 -> 27326 bytes ...ecrypted-bear-320x240-vp9-opus-video-0.mp4 | Bin 70698 -> 70702 bytes .../opus-vp9-mp4-with-encryption/output.mpd | 8 +-- .../video-audio-ttml/bear-640x360-audio.mp4 | Bin 43732 -> 43736 bytes .../video-audio-ttml/bear-640x360-video.mp4 | Bin 301709 -> 301713 bytes .../test/testdata/video-audio-ttml/output.mpd | 8 +-- .../video-audio-webvtt/bear-640x360-audio.mp4 | Bin 43732 -> 43736 bytes .../video-audio-webvtt/bear-640x360-video.mp4 | Bin 301709 -> 301713 bytes .../testdata/video-audio-webvtt/output.mpd | 8 +-- .../bear-640x360-no_edit_list-video.mp4 | Bin 300072 -> 300076 bytes .../testdata/video-no-edit-list/output.mpd | 4 +- ...0x360-non_square_pixel-with_pasp-video.mp4 | Bin 96169 -> 96173 bytes .../video-non-square-pixel/output.mpd | 4 +- .../video-non-square-pixel/stream_0.m3u8 | 4 +- .../bear-640x360-video.mp4 | Bin 116628 -> 116632 bytes .../decrypted-bear-640x360-video-0.mp4 | Bin 115868 -> 115872 bytes .../vp8-mp4-with-encryption/output.mpd | 4 +- .../bear-640x360-audio-1.m4s | Bin 17104 -> 17108 bytes .../bear-640x360-audio-2.m4s | Bin 15956 -> 15960 bytes .../bear-640x360-audio-3.m4s | Bin 10039 -> 10043 bytes .../bear-640x360-audio-init.mp4 | Bin 793 -> 797 bytes .../bear-640x360-video-1.m4s | Bin 99393 -> 99397 bytes .../bear-640x360-video-2.m4s | Bin 121887 -> 121891 bytes .../bear-640x360-video-3.m4s | Bin 79742 -> 79746 bytes .../bear-640x360-video-iframe.m3u8 | 6 +-- .../bear-640x360-video-init.mp4 | Bin 859 -> 863 bytes .../bear-english-text-1.m4s | Bin 239 -> 243 bytes .../bear-english-text-2.m4s | Bin 237 -> 241 bytes .../bear-english-text-3.m4s | Bin 237 -> 241 bytes .../bear-english-text-4.m4s | Bin 237 -> 241 bytes .../bear-english-text-5.m4s | Bin 237 -> 241 bytes .../bear-english-text-6.m4s | Bin 253 -> 257 bytes .../bear-english-text-init.mp4 | Bin 724 -> 728 bytes .../vtt-text-to-mp4-with-ad-cues/output.m3u8 | 2 +- .../vtt-text-to-mp4-with-ad-cues/output.mpd | 48 +++++++++--------- .../bear-multi-configs-0.mp4 | Bin 121189 -> 121193 bytes .../bear-multi-configs-1.mp4 | Bin 44949 -> 44953 bytes .../bear-multi-configs-2.mp4 | Bin 300185 -> 300189 bytes .../bear-multi-configs-3.mp4 | Bin 46061 -> 46065 bytes .../output.mpd | 16 +++--- .../wvm-input/bear-multi-configs-0.mp4 | Bin 121079 -> 121083 bytes .../wvm-input/bear-multi-configs-1.mp4 | Bin 44949 -> 44953 bytes .../wvm-input/bear-multi-configs-2.mp4 | Bin 300072 -> 300076 bytes .../wvm-input/bear-multi-configs-3.mp4 | Bin 46061 -> 46065 bytes .../app/test/testdata/wvm-input/output.mpd | 16 +++--- packager/media/formats/mp4/mp4_muxer.cc | 3 +- 390 files changed, 409 insertions(+), 408 deletions(-) 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 67829e30ffbe3353ba97126567fcad3f73d7776e..863fff41ee0f6a1673b9709777ca0c89c67707a9 100644 GIT binary patch delta 35 ocmeyqpYiv8MhON629>mu%7WYi6GI@IA+tE&0*G@riad@70N4o&_5c6? delta 31 kcmeyppYi*CMiB-E28Fbe%7V<|{9GWL0Z3bHlz1Eu0I`?~umAu6 diff --git a/packager/app/test/testdata/acc-he/output.mpd b/packager/app/test/testdata/acc-he/output.mpd index 2f625aa48a..9da35fae0d 100644 --- a/packager/app/test/testdata/acc-he/output.mpd +++ b/packager/app/test/testdata/acc-he/output.mpd @@ -6,8 +6,8 @@ bear-640x360-aac_he-silent_right-audio.mp4 - - + + diff --git a/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/bear-640x360-audio.mp4 index 7128d250eb373f0b00e24787f724b1d5adf87dd1..a86c776cf5fecb8e5f63e59d2104906e8b1fdfb2 100644 GIT binary patch delta 35 ocmca|mFdP+CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riX2!40Mxn+1^@s6 delta 31 kcmca{mFdb=CJ_b(28Fbe%7V<|{9GWL0Z3bHlsK>o0IsPDzyJUM diff --git a/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/bear-640x360-video.mp4 b/packager/app/test/testdata/audio-video-with-accessibilities-and-roles/bear-640x360-video.mp4 index 9bc668f8f67f4b86d9a97d1c0da8016d31dedff1..04ed1816fe8b874d83fe6973d42405a0d569603c 100644 GIT binary patch delta 47 zcmeC(Dl~DckOTt*gGO3OWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSSn`$07 bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-1280x720-video-trick_play_factor_1.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-1280x720-video-trick_play_factor_1.mp4 index 936f72e2a76eada2aecc27cac3d20157dcd9213a..4dcea28bd0008f481f3fc86a9b13febe779444a2 100644 GIT binary patch delta 38 rcmezHk?qSzHVFm>2930m%7WYi6GI@IA+tE&0*G@PMYf7C-q`^F2(t}F delta 34 ncmezJk?q4rHW3B}29>mu%7V<|{9GWL0Z3akN^F&2yt4xU+~Eua diff --git a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-1280x720-video.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-1280x720-video.mp4 index 7a6ea9ee1929f7bb8a1d59a4f4bfe9008201c2b3..aca7e1cfd52f11ecfb889ed53cf4fc6caf339a43 100644 GIT binary patch delta 71 zcmezR)9~j{LkR{32930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVMPfSXxC`TSeGf YMc7+KI9f$GTSd59MYy+$@I0&m04U8AUjP6A delta 67 zcmezQ)9~w0LlFiB29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-(!du(V3Bwo0(IO0c&| UaI{Krwn}idN^ozL;CWaB0Mz{xNdN!< diff --git a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-audio.mp4 index 81afce8c79e42d06cc52e1fac291b7d4de1fd525..6a196f333d4927841218aca7c7255f45145a8bb6 100644 GIT binary patch delta 35 ocmaEGhv~^3CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riukMp0NB9`yZ`_I delta 31 kcmaEIhv~r`CJ_b(28Fbe%7V<|{9GWL0Z3bHl<-*x0J0bgb^rhX diff --git a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-hevc-video.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-hevc-video.mp4 index a8c72073bec6aa2927417270480585ea19d888d9..eb98dd0f7f8ba72a47b143920b4520b6a09f86b2 100644 GIT binary patch delta 38 rcmZ2_m38G+RtW|M29>mu%7WYi6GI@IA+tE&0*G@PMYf7CPRs%T>EsL9 delta 34 ncmZ2^m38S=RuKjU28Fbe%7V<|{9GWL0Z3akN^F&2oR|dw!Ep+g diff --git a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-video.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/bear-640x360-video.mp4 index c82b090d9eb1f7ea145388920f53aeafac31a77a..506a9d66ee46f0d4fe3bb65572e12c5df6e375ec 100644 GIT binary patch delta 47 zcmX@SPw4nQAqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWu;|YR0AF|w AtN;K2 delta 43 wcmX@UPw4PIArS@!29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgV9}os04rAvb^rhX diff --git a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/output.mpd b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/output.mpd index 54d9782cb8..2893b62da0 100644 --- a/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/output.mpd +++ b/packager/app/test/testdata/audio-video-with-codec-switching-encryption-trick-play/output.mpd @@ -11,8 +11,8 @@ bear-640x360-hevc-video.mp4 - - + + @@ -25,40 +25,40 @@ bear-640x360-video.mp4 - - + + bear-1280x720-video.mp4 - - + + - - - - AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - - - - bear-640x360-audio.mp4 - - - - - - + AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + bear-1280x720-video-trick_play_factor_1.mp4 - - + + + + + + + + + AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== + + + + bear-640x360-audio.mp4 + + diff --git a/packager/app/test/testdata/audio-video-with-codec-switching/bear-1280x720-video.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching/bear-1280x720-video.mp4 index fe9098fadc70f02114885e08ee87e8daae6fd4b3..d7a8e3d4116a224e527bfa5364bc2367c81d083d 100644 GIT binary patch delta 71 zcmX@`!SKijLkR{32930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVMPfSXxC`TSeGf YMc7+KI9f$GTSd59MYy+$@aR+k00qYrDgXcg delta 67 zcmX@|!SKKbLlFiB29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-(!du(V3Bwo0(IO0c&| UaI{Krwn}idN^ozL;L)i70JG;36aWAK diff --git a/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-audio.mp4 index 7128d250eb373f0b00e24787f724b1d5adf87dd1..a86c776cf5fecb8e5f63e59d2104906e8b1fdfb2 100644 GIT binary patch delta 35 ocmca|mFdP+CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riX2!40Mxn+1^@s6 delta 31 kcmca{mFdb=CJ_b(28Fbe%7V<|{9GWL0Z3bHlsK>o0IsPDzyJUM diff --git a/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-hevc-video.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-hevc-video.mp4 index 298f9532bba40d3a0b213a034be2db277bf78a43..77a649e6ad6385d4b8812794794c20caebe17008 100644 GIT binary patch delta 38 rcmdmen05bQRtW|M29>mu%7WYi6GI@IA+tE&0*G@PMYf7CE>8pi>rV^r delta 34 ncmdmgn05DIRuKjU28Fbe%7V<|{9GWL0Z3akN^F&2T%HI3!n_Ks diff --git a/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-video.mp4 b/packager/app/test/testdata/audio-video-with-codec-switching/bear-640x360-video.mp4 index 9bc668f8f67f4b86d9a97d1c0da8016d31dedff1..04ed1816fe8b874d83fe6973d42405a0d569603c 100644 GIT binary patch delta 47 zcmeC(Dl~DckOTt*gGO3OWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSSn`$07 bear-640x360-hevc-video.mp4 - - + + @@ -17,14 +17,14 @@ bear-1280x720-video.mp4 - - + + bear-640x360-video.mp4 - - + + @@ -32,8 +32,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.m3u8 b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.m3u8 index bfb30ce496..4e60022727 100644 --- a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.m3u8 @@ -3,9 +3,9 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="793@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="797@0" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@861 +#EXT-X-BYTERANGE:17028@865 bear-640x360-audio.mp4 #EXTINF:0.998, #EXT-X-BYTERANGE:16285 diff --git a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.mp4 index 50899857d2ff39021d05e80f23d8f85b5de6c1dc..fff6904d2710fd51fa8ba87d0c0bee52785da67e 100644 GIT binary patch delta 35 ocmca|mFdP+CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riX2!40Mxn+1^@s6 delta 31 kcmca{mFdb=CJ_b(28Fbe%7V<|{9GWL0Z3bHlsK>o0IsPDzyJUM diff --git a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video-iframe.m3u8 index 7c16d360b3..909ce88747 100644 --- a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video-iframe.m3u8 @@ -4,14 +4,14 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="863@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@927 +#EXT-X-BYTERANGE:15581@931 bear-640x360-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18221@100240 +#EXT-X-BYTERANGE:18221@100244 bear-640x360-video.mp4 #EXTINF:0.734, -#EXT-X-BYTERANGE:19663@222047 +#EXT-X-BYTERANGE:19663@222051 bear-640x360-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.m3u8 b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.m3u8 index baf17ef66b..4e8bdb5f7f 100644 --- a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.m3u8 @@ -3,9 +3,9 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="863@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@927 +#EXT-X-BYTERANGE:99313@931 bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:121807 diff --git a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.mp4 b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.mp4 index 9bc668f8f67f4b86d9a97d1c0da8016d31dedff1..04ed1816fe8b874d83fe6973d42405a0d569603c 100644 GIT binary patch delta 47 zcmeC(Dl~DckOTt*gGO3OWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSSn`$07 bear-640x360-video.mp4 - - + + @@ -14,8 +14,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.m3u8 b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.m3u8 index bfb30ce496..4e60022727 100644 --- a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.m3u8 @@ -3,9 +3,9 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="793@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="797@0" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@861 +#EXT-X-BYTERANGE:17028@865 bear-640x360-audio.mp4 #EXTINF:0.998, #EXT-X-BYTERANGE:16285 diff --git a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.mp4 index 50899857d2ff39021d05e80f23d8f85b5de6c1dc..fff6904d2710fd51fa8ba87d0c0bee52785da67e 100644 GIT binary patch delta 35 ocmca|mFdP+CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riX2!40Mxn+1^@s6 delta 31 kcmca{mFdb=CJ_b(28Fbe%7V<|{9GWL0Z3bHlsK>o0IsPDzyJUM diff --git a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video-iframe.m3u8 index 7c16d360b3..909ce88747 100644 --- a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video-iframe.m3u8 @@ -4,14 +4,14 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="863@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@927 +#EXT-X-BYTERANGE:15581@931 bear-640x360-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18221@100240 +#EXT-X-BYTERANGE:18221@100244 bear-640x360-video.mp4 #EXTINF:0.734, -#EXT-X-BYTERANGE:19663@222047 +#EXT-X-BYTERANGE:19663@222051 bear-640x360-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.m3u8 b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.m3u8 index baf17ef66b..4e8bdb5f7f 100644 --- a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.m3u8 @@ -3,9 +3,9 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="863@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@927 +#EXT-X-BYTERANGE:99313@931 bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:121807 diff --git a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.mp4 b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.mp4 index 9bc668f8f67f4b86d9a97d1c0da8016d31dedff1..04ed1816fe8b874d83fe6973d42405a0d569603c 100644 GIT binary patch delta 47 zcmeC(Dl~DckOTt*gGO3OWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSSn`$07 bear-640x360-video.mp4 - - + + @@ -15,8 +15,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-audio.mp4 index 7128d250eb373f0b00e24787f724b1d5adf87dd1..a86c776cf5fecb8e5f63e59d2104906e8b1fdfb2 100644 GIT binary patch delta 35 ocmca|mFdP+CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riX2!40Mxn+1^@s6 delta 31 kcmca{mFdb=CJ_b(28Fbe%7V<|{9GWL0Z3bHlsK>o0IsPDzyJUM 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 17f6db1b74172ba113770b3ad0ebf2536ad75a09..1d11aed2c8f45f0189705530eaa6c88478c65b31 100644 GIT binary patch delta 35 ocmX@Ikom+yW(fuc2930m%7WYi6GI@IA+tE&0*G@rifp(50K@+ang9R* delta 31 kcmX@Hkom|$W)TJk29>mu%7V<|{9GWL0Z3bHl-O_q0H5{>Q~&?~ 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 9bc668f8f67f4b86d9a97d1c0da8016d31dedff1..04ed1816fe8b874d83fe6973d42405a0d569603c 100644 GIT binary patch delta 47 zcmeC(Dl~DckOTt*gGO3OWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSSn`$07 bear-640x360-video.mp4 - - + + @@ -14,8 +14,8 @@ bear-640x360-video-trick_play_factor_1.mp4 - - + + @@ -23,8 +23,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-audio.mp4 index 7128d250eb373f0b00e24787f724b1d5adf87dd1..a86c776cf5fecb8e5f63e59d2104906e8b1fdfb2 100644 GIT binary patch delta 35 ocmca|mFdP+CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riX2!40Mxn+1^@s6 delta 31 kcmca{mFdb=CJ_b(28Fbe%7V<|{9GWL0Z3bHlsK>o0IsPDzyJUM 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 17f6db1b74172ba113770b3ad0ebf2536ad75a09..1d11aed2c8f45f0189705530eaa6c88478c65b31 100644 GIT binary patch delta 35 ocmX@Ikom+yW(fuc2930m%7WYi6GI@IA+tE&0*G@rifp(50K@+ang9R* delta 31 kcmX@Hkom|$W)TJk29>mu%7V<|{9GWL0Z3bHl-O_q0H5{>Q~&?~ 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 09c0d1b8f7821400d517b00d92c0e83a2c06c4c3..bb9cd19492bedbbc0d39926f5590bd3f1d5fdaed 100644 GIT binary patch delta 35 ocmaDpmFe|VCJ6=x2930m%7WYi6GI@IA+tE&0*G@rid^mj0Lk48qW}N^ delta 31 kcmaDomFf9ZCJ_b(29>mu%7V<|{9GWL0Z3bHl(^gl0Hq`fT>t<8 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 9bc668f8f67f4b86d9a97d1c0da8016d31dedff1..04ed1816fe8b874d83fe6973d42405a0d569603c 100644 GIT binary patch delta 47 zcmeC(Dl~DckOTt*gGO3OWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSSn`$07 bear-640x360-video.mp4 - - + + @@ -14,14 +14,14 @@ bear-640x360-video-trick_play_factor_1.mp4 - - + + bear-640x360-video-trick_play_factor_2.mp4 - - + + @@ -29,8 +29,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/audio-video/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video/bear-640x360-audio.mp4 index 7128d250eb373f0b00e24787f724b1d5adf87dd1..a86c776cf5fecb8e5f63e59d2104906e8b1fdfb2 100644 GIT binary patch delta 35 ocmca|mFdP+CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riX2!40Mxn+1^@s6 delta 31 kcmca{mFdb=CJ_b(28Fbe%7V<|{9GWL0Z3bHlsK>o0IsPDzyJUM 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 9bc668f8f67f4b86d9a97d1c0da8016d31dedff1..04ed1816fe8b874d83fe6973d42405a0d569603c 100644 GIT binary patch delta 47 zcmeC(Dl~DckOTt*gGO3OWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSSn`$07 bear-640x360-video.mp4 - - + + @@ -14,8 +14,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/av1-mp4-with-encryption/bear-av1-video.mp4 b/packager/app/test/testdata/av1-mp4-with-encryption/bear-av1-video.mp4 index ea9660b1108736b5dc156c0614728bc7f9fc91e7..4c0f523b85860a139faa2935bc11384883c38311 100644 GIT binary patch delta 35 ocmex*i1FtkMhON62930m%7WYi6GI@IA+tE&0*G@riXmu%7V<|{9GWL0Z3bHlt@ej0I?qmHUIzs diff --git a/packager/app/test/testdata/av1-mp4-with-encryption/decrypted-bear-av1-video-0.mp4 b/packager/app/test/testdata/av1-mp4-with-encryption/decrypted-bear-av1-video-0.mp4 index fd64d498e116043a0b151a8ff168d6eae7d5d77b..8b4a89fbe478e093e4e2d031a6b475d56292e117 100644 GIT binary patch delta 35 ncmZoV$k=v}QG$ViK_jiCvLLs>#1P14$Slsc0OH(@B6$e_xn~NX delta 31 jcmZoW$k=p{QG|hkK_#uEvLLfKKNrYm0MZs4CGrvgmVOCZ diff --git a/packager/app/test/testdata/av1-mp4-with-encryption/output.mpd b/packager/app/test/testdata/av1-mp4-with-encryption/output.mpd index 1fb10af8e2..3ee349b51c 100644 --- a/packager/app/test/testdata/av1-mp4-with-encryption/output.mpd +++ b/packager/app/test/testdata/av1-mp4-with-encryption/output.mpd @@ -9,8 +9,8 @@ bear-av1-video.mp4 - - + + diff --git a/packager/app/test/testdata/av1-mp4-with-encryption/stream_0.m3u8 b/packager/app/test/testdata/av1-mp4-with-encryption/stream_0.m3u8 index a36c7d0b9e..5e6e140d8a 100644 --- a/packager/app/test/testdata/av1-mp4-with-encryption/stream_0.m3u8 +++ b/packager/app/test/testdata/av1-mp4-with-encryption/stream_0.m3u8 @@ -3,8 +3,8 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:3 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-av1-video.mp4",BYTERANGE="1041@0" +#EXT-X-MAP:URI="bear-av1-video.mp4",BYTERANGE="1045@0" #EXTINF:2.736, -#EXT-X-BYTERANGE:23864@1085 +#EXT-X-BYTERANGE:23864@1089 bear-av1-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/av1-mp4/bear-av1-video.mp4 b/packager/app/test/testdata/av1-mp4/bear-av1-video.mp4 index fd64d498e116043a0b151a8ff168d6eae7d5d77b..8b4a89fbe478e093e4e2d031a6b475d56292e117 100644 GIT binary patch delta 35 ncmZoV$k=v}QG$ViK_jiCvLLs>#1P14$Slsc0OH(@B6$e_xn~NX delta 31 jcmZoW$k=p{QG|hkK_#uEvLLfKKNrYm0MZs4CGrvgmVOCZ diff --git a/packager/app/test/testdata/av1-mp4/output.mpd b/packager/app/test/testdata/av1-mp4/output.mpd index c24f476651..87e0a3e155 100644 --- a/packager/app/test/testdata/av1-mp4/output.mpd +++ b/packager/app/test/testdata/av1-mp4/output.mpd @@ -5,8 +5,8 @@ bear-av1-video.mp4 - - + + diff --git a/packager/app/test/testdata/av1-mp4/stream_0.m3u8 b/packager/app/test/testdata/av1-mp4/stream_0.m3u8 index 3ab711063a..d148632a19 100644 --- a/packager/app/test/testdata/av1-mp4/stream_0.m3u8 +++ b/packager/app/test/testdata/av1-mp4/stream_0.m3u8 @@ -3,8 +3,8 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:3 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-av1-video.mp4",BYTERANGE="798@0" +#EXT-X-MAP:URI="bear-av1-video.mp4",BYTERANGE="802@0" #EXTINF:2.736, -#EXT-X-BYTERANGE:23864@842 +#EXT-X-BYTERANGE:23864@846 bear-av1-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/av1-webm/bear-av1-video.mp4 b/packager/app/test/testdata/av1-webm/bear-av1-video.mp4 index 5021b08e92599ce30c63187213c2522a23552933..668913c9c1ba9a544c95bd926fce6e7897f43434 100644 GIT binary patch delta 35 ocmX?hnDNwMMhON62930m%7WYi6GI@IA+tE&0*G@rifl>*0L(rMaR2}S delta 31 kcmX?gnDN+QMiB-E29>mu%7V<|{9GWL0Z3bHl-QIA0H-AiD*ylh diff --git a/packager/app/test/testdata/av1-webm/output.mpd b/packager/app/test/testdata/av1-webm/output.mpd index 7e350c63a1..f1b4a0396b 100644 --- a/packager/app/test/testdata/av1-webm/output.mpd +++ b/packager/app/test/testdata/av1-webm/output.mpd @@ -5,8 +5,8 @@ bear-av1-video.mp4 - - + + diff --git a/packager/app/test/testdata/av1-webm/stream_0.m3u8 b/packager/app/test/testdata/av1-webm/stream_0.m3u8 index 5182dd0c0d..056a78d067 100644 --- a/packager/app/test/testdata/av1-webm/stream_0.m3u8 +++ b/packager/app/test/testdata/av1-webm/stream_0.m3u8 @@ -3,8 +3,8 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:3 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-av1-video.mp4",BYTERANGE="798@0" +#EXT-X-MAP:URI="bear-av1-video.mp4",BYTERANGE="802@0" #EXTINF:2.735, -#EXT-X-BYTERANGE:24188@842 +#EXT-X-BYTERANGE:24188@846 bear-av1-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.m3u8 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.m3u8 index 0afe3072bf..1d2ea45c1d 100644 --- a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.m3u8 @@ -3,9 +3,9 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-ac3-audio.mp4",BYTERANGE="726@0" +#EXT-X-MAP:URI="bear-640x360-ac3-audio.mp4",BYTERANGE="730@0" #EXTINF:0.975, -#EXT-X-BYTERANGE:23728@794 +#EXT-X-BYTERANGE:23728@798 bear-640x360-ac3-audio.mp4 #EXTINF:1.010, #EXT-X-BYTERANGE:24574 diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.mp4 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.mp4 index 84a7c72c985f3042fdbdaff0af11f78176ad3e9b..34679eab6deeb3f3b7b1829fcd4f528c2d28cdd6 100644 GIT binary patch delta 38 rcmex2ouz38iv$A$gGyRSWkGI%i6M~9kXf8>0mQkDB3nfmUvUEf;KK`u delta 34 ncmZpg!SZi9iwFY)gF;$KWkF_felC#B0HiG%CALa1zTyS|xBm)8 diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video-iframe.m3u8 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video-iframe.m3u8 index 7a72360de2..41d333f8f4 100644 --- a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video-iframe.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video-iframe.m3u8 @@ -4,14 +4,14 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY -#EXT-X-MAP:URI="bear-640x360-ac3-video.mp4",BYTERANGE="863@0" +#EXT-X-MAP:URI="bear-640x360-ac3-video.mp4",BYTERANGE="867@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@931 +#EXT-X-BYTERANGE:15581@935 bear-640x360-ac3-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18221@100244 +#EXT-X-BYTERANGE:18221@100248 bear-640x360-ac3-video.mp4 #EXTINF:0.734, -#EXT-X-BYTERANGE:19663@222051 +#EXT-X-BYTERANGE:19663@222055 bear-640x360-ac3-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.m3u8 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.m3u8 index 0faccfd182..03f8e904c4 100644 --- a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.m3u8 @@ -3,9 +3,9 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-ac3-video.mp4",BYTERANGE="863@0" +#EXT-X-MAP:URI="bear-640x360-ac3-video.mp4",BYTERANGE="867@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@931 +#EXT-X-BYTERANGE:99313@935 bear-640x360-ac3-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:121807 diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.mp4 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.mp4 index 97ad3c1e4327289ae279140d82000e1eb5c3f755..d96c841815be3a5ab4ce207d2123aebe45353b38 100644 GIT binary patch delta 47 zcmbQZRcPu~AqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWu++{1081zh Ae*gdg delta 43 wcmbQbRcPW?ArS@!29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgV5yx202tp4NdN!< diff --git a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-3.m4s b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-3.m4s index 8dcbed305912340fa3cbfa1bb3968a8d1ef2361d..467356152205c9ba6e3340318e3ce0580745de1d 100644 GIT binary patch delta 33 lcmbPXKgV8zfq_A#xTLZmx4^^@$Y#ha&bI*K+>IhF@&KG138Vl3 delta 29 hcmbPZKf_*xfq_AxxTLZmvp7E&$Yuc278@m6WHSJ1i;WV$6aahD2*&^b diff --git a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-5.m4s b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-5.m4s index 0f3473d3693d0831eb8e687fc019a87fdaec3263..cce7bd34a6683b487f80875ad446d52cad6de8e7 100644 GIT binary patch delta 33 lcmbPcKg(W%fq_A#xTLZmx4^^@$Y#ha&bI*K+>Ihl@&KEd37!A| delta 29 hcmbPbKh0i*fq_AxxTLZmvp7E&$Yuc278@m+htfq_A#xTLZmx4^^@$Y#ha&bI*K+>Ijq+yImC2;Tqz delta 29 hcmZ23wpdJrfq_AxxTLZmvp7E&$Yuc278@n_xdC-I2bll> diff --git a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/bear-640x360-audio-init.mp4 index cd5b19acde42a392e59f02f75d82093f1eb39f11..e187b7143465405b2f887b03e61d148c9caeb010 100644 GIT binary patch delta 33 lcmeyw`i)hBfq_9Kt)#Lbx4^^@$Y#ha&bI*K+>Ijlm;j^i3KReU delta 29 icmeyy`iWJ9fq_9Gt)#Lbvp7E&$Yuc278@n*F#!OBdI-({ diff --git a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.m3u8 index eba3cb65c3..bddefcc45a 100644 --- a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.m3u8 +++ b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.m3u8 @@ -5,5 +5,5 @@ #EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2" -#EXT-X-STREAM-INF:BANDWIDTH=133850,AVERAGE-BANDWIDTH=126393,CODECS="mp4a.40.2",AUDIO="default-audio-group" +#EXT-X-STREAM-INF:BANDWIDTH=133919,AVERAGE-BANDWIDTH=126463,CODECS="mp4a.40.2",AUDIO="default-audio-group" bear-640x360-audio.m3u8 diff --git a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.mpd b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.mpd index 674e7e3232..ed0ce2a00b 100644 --- a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.mpd +++ b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.mpd @@ -3,7 +3,7 @@ - + diff --git a/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.m3u8 b/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.m3u8 index bfb30ce496..4e60022727 100644 --- a/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.m3u8 @@ -3,9 +3,9 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="793@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="797@0" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@861 +#EXT-X-BYTERANGE:17028@865 bear-640x360-audio.mp4 #EXTINF:0.998, #EXT-X-BYTERANGE:16285 diff --git a/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.mp4 b/packager/app/test/testdata/bandwidth-override/bear-640x360-audio.mp4 index 7128d250eb373f0b00e24787f724b1d5adf87dd1..a86c776cf5fecb8e5f63e59d2104906e8b1fdfb2 100644 GIT binary patch delta 35 ocmca|mFdP+CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riX2!40Mxn+1^@s6 delta 31 kcmca{mFdb=CJ_b(28Fbe%7V<|{9GWL0Z3bHlsK>o0IsPDzyJUM diff --git a/packager/app/test/testdata/bandwidth-override/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/bandwidth-override/bear-640x360-video-iframe.m3u8 index 7c16d360b3..909ce88747 100644 --- a/packager/app/test/testdata/bandwidth-override/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/bandwidth-override/bear-640x360-video-iframe.m3u8 @@ -4,14 +4,14 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="863@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@927 +#EXT-X-BYTERANGE:15581@931 bear-640x360-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18221@100240 +#EXT-X-BYTERANGE:18221@100244 bear-640x360-video.mp4 #EXTINF:0.734, -#EXT-X-BYTERANGE:19663@222047 +#EXT-X-BYTERANGE:19663@222051 bear-640x360-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/bandwidth-override/bear-640x360-video.m3u8 b/packager/app/test/testdata/bandwidth-override/bear-640x360-video.m3u8 index baf17ef66b..4e8bdb5f7f 100644 --- a/packager/app/test/testdata/bandwidth-override/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/bandwidth-override/bear-640x360-video.m3u8 @@ -3,9 +3,9 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="863@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@927 +#EXT-X-BYTERANGE:99313@931 bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:121807 diff --git a/packager/app/test/testdata/bandwidth-override/bear-640x360-video.mp4 b/packager/app/test/testdata/bandwidth-override/bear-640x360-video.mp4 index 9bc668f8f67f4b86d9a97d1c0da8016d31dedff1..04ed1816fe8b874d83fe6973d42405a0d569603c 100644 GIT binary patch delta 47 zcmeC(Dl~DckOTt*gGO3OWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSSn`$07 bear-640x360-video.mp4 - - + + @@ -14,8 +14,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.mpd b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.mpd index f779b275d4..378a7e7f05 100644 --- a/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.mpd +++ b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.mpd @@ -9,8 +9,8 @@ sparks_dovi_5-video.mp4 - - + + diff --git a/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/sparks_dovi_5-video.mp4 b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/sparks_dovi_5-video.mp4 index 3a036fedd94d750488b2a7fe3a28df89db8d088c..6d41a95a68be7a94373ccf04d69a995fb1789816 100644 GIT binary patch delta 62 zcmaDcRprf86$u6g2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVMPfSXxC`TSeGf PMc7+KIJSy#Uf}`&My?R} delta 58 zcmaDeRprH06%hso29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-(!du(V3Bwo0(IO0c&| LaBP*}yut+l0J{&? diff --git a/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/stream_0.m3u8 b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/stream_0.m3u8 index 413a58dafa..d0721b487e 100644 --- a/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/stream_0.m3u8 +++ b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/stream_0.m3u8 @@ -3,10 +3,10 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:3 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="sparks_dovi_5-video.mp4",BYTERANGE="1355@0" +#EXT-X-MAP:URI="sparks_dovi_5-video.mp4",BYTERANGE="1359@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:2.002, -#EXT-X-BYTERANGE:185521@1435 +#EXT-X-BYTERANGE:185521@1439 sparks_dovi_5-video.mp4 #EXTINF:2.002, #EXT-X-BYTERANGE:197565 diff --git a/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/output.mpd b/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/output.mpd index 9a9057dbb3..6b80ab5e99 100644 --- a/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/output.mpd +++ b/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/output.mpd @@ -9,8 +9,8 @@ sparks_dovi_8-video.mp4 - - + + @@ -21,8 +21,8 @@ sparks_dovi_8-video.mp4 - - + + diff --git a/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/sparks_dovi_8-video.mp4 b/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/sparks_dovi_8-video.mp4 index 9d45d17ada79d42f3398bb340835a397e8879a8d..3d195949a2d85221e3cdc0aeba89549206a7e2e2 100644 GIT binary patch delta 59 zcmccdRO!xBB?$%w2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVMPfSXxC`TSeGf MMcB8Ba2(kL05O~qY5)KL delta 55 zcmccfRO!Z3B@qS&29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-(!du(V3Bwo0(IO0aL0 I;5f1g0PPGAL;wH) diff --git a/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/stream_0.m3u8 b/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/stream_0.m3u8 index 6e64c73711..bd6fd0465e 100644 --- a/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/stream_0.m3u8 +++ b/packager/app/test/testdata/dolby-vision-profile-8-with-encryption/stream_0.m3u8 @@ -3,10 +3,10 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:3 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="sparks_dovi_8-video.mp4",BYTERANGE="1355@0" +#EXT-X-MAP:URI="sparks_dovi_8-video.mp4",BYTERANGE="1359@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:2.002, -#EXT-X-BYTERANGE:172013@1435 +#EXT-X-BYTERANGE:172013@1439 sparks_dovi_8-video.mp4 #EXTINF:2.002, #EXT-X-BYTERANGE:189474 diff --git a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.m3u8 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.m3u8 index ba062cde5f..a5933ef15e 100644 --- a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.m3u8 +++ b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.m3u8 @@ -3,10 +3,10 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-ec3-audio.mp4",BYTERANGE="945@0" +#EXT-X-MAP:URI="bear-640x360-ec3-audio.mp4",BYTERANGE="949@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.004, -#EXT-X-BYTERANGE:24460@1013 +#EXT-X-BYTERANGE:24460@1017 bear-640x360-ec3-audio.mp4 #EXTINF:1.010, #EXT-X-BYTERANGE:24747 diff --git a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.mp4 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.mp4 index 3443d7f1b3c20f791c77c8027d0c7a482bfb55dd..1a90fee88b8471106c48601adcd1aab335e47efb 100644 GIT binary patch delta 38 rcmcaUh2{1X76}Fh29>mu%7WYi6GI@IA+tE&0*G@PMYf7CI&%R4-- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-ec3-video.mp4",BYTERANGE="1127@0" +#EXT-X-MAP:URI="bear-640x360-ec3-video.mp4",BYTERANGE="1131@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:93805@1195 +#EXT-X-BYTERANGE:93805@1199 bear-640x360-ec3-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:122340 diff --git a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.mp4 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.mp4 index 9aa46242412cb8bb65b821c785d878a9850ef851..e8d6c342da90372860a834ed25e92754b64935ad 100644 GIT binary patch delta 47 zcmdl#S?KU&AqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWu&nL`08jf3 Av;Y7A delta 43 wcmX>+S!n-cArS@!29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgU|HP>03A{cegFUf diff --git a/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-audio.mp4 index d989336d241c15b3153f71b13698ab27bda95134..80dde0beea18b128f963414ded3c3aa06708e30c 100644 GIT binary patch delta 35 ocmaEGhv~^3CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riukMp0NB9`yZ`_I delta 31 kcmaEIhv~r`CJ_b(28Fbe%7V<|{9GWL0Z3bHl<-*x0J0bgb^rhX diff --git a/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-video-trick_play_factor_1.mp4 b/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-video-trick_play_factor_1.mp4 index a71bd09ad15ca01fb4ce92b53ca4d85541f2dc57..702b955b01fdb47b3be89a7de8c6d876dcab13da 100644 GIT binary patch delta 35 ocmcb$g!$eQW(fuc2930m%7WYi6GI@IA+tE&0*G@rinv_@0LiioWB>pF delta 31 kcmcb&g!$GIW)TJk29>mu%7V<|{9GWL0Z3bHlyJKQ0Homx9smFU diff --git a/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/bear-640x360-video.mp4 index c82b090d9eb1f7ea145388920f53aeafac31a77a..506a9d66ee46f0d4fe3bb65572e12c5df6e375ec 100644 GIT binary patch delta 47 zcmX@SPw4nQAqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWu;|YR0AF|w AtN;K2 delta 43 wcmX@UPw4PIArS@!29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgV9}os04rAvb^rhX diff --git a/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/output.mpd b/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/output.mpd index a69aa022e2..bab2e5ac5f 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/output.mpd +++ b/packager/app/test/testdata/encryption-and-ad-cues-and-dash-trick-play/output.mpd @@ -10,8 +10,8 @@ bear-640x360-audio.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-video.mp4 - - + + @@ -35,8 +35,8 @@ bear-640x360-video-trick_play_factor_1.mp4 - - + + @@ -50,8 +50,8 @@ bear-640x360-audio.mp4 - - + + @@ -62,8 +62,8 @@ bear-640x360-video.mp4 - - + + @@ -75,8 +75,8 @@ bear-640x360-video-trick_play_factor_1.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio.m3u8 b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio.m3u8 index 4bf434fd7a..cc27914413 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio.m3u8 @@ -3,10 +3,10 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-audio1.mp4",BYTERANGE="1003@0" +#EXT-X-MAP:URI="bear-640x360-audio1.mp4",BYTERANGE="1007@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@1059 +#EXT-X-BYTERANGE:17028@1063 bear-640x360-audio1.mp4 #EXTINF:0.975, #EXT-X-BYTERANGE:16269 @@ -14,6 +14,6 @@ bear-640x360-audio1.mp4 #EXT-X-PLACEMENT-OPPORTUNITY #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:0.743, -#EXT-X-BYTERANGE:10272@1047 +#EXT-X-BYTERANGE:10272@1051 bear-640x360-audio2.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio1.mp4 b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio1.mp4 index 2b97d2fba67fbb1a3d66b27b39d616a1379b6c4c..0af2d953433b0cd0ff3eac2a33524fa24e4b49f6 100644 GIT binary patch delta 35 ncmdne!?dG^NrHiaK_#uEvLLs>#1P14$Slsc0OH(@A_{E)xNQn> delta 31 jcmdnd!?dM`NrZucK_RWAvLLfKKNrYm0MZs4B^25Km81zO 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 0a7b85b861ae28695a6b1cc21a7b3d3c25b545a8..66ef12945d64dee830625650c5a6c1b9b2ae7d10 100644 GIT binary patch delta 33 lcmdlUu{%P7fq_9Kt)#Lbx4^^@$Y#ha&bI*K+>Ij2Ism8r39|qI delta 29 hcmdlTu{}bBfq_9Gt)#Lbvp7E&$Yuc278@m$bpVFQ2yFlW diff --git a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video-iframe.m3u8 index 46a7737114..85cd30bce6 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video-iframe.m3u8 @@ -4,17 +4,17 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY -#EXT-X-MAP:URI="bear-640x360-video1.mp4",BYTERANGE="1127@0" +#EXT-X-MAP:URI="bear-640x360-video1.mp4",BYTERANGE="1131@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@1183 +#EXT-X-BYTERANGE:15581@1187 bear-640x360-video1.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18754@100496 +#EXT-X-BYTERANGE:18754@100500 bear-640x360-video1.mp4 #EXT-X-PLACEMENT-OPPORTUNITY #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:0.734, -#EXT-X-BYTERANGE:20068@1171 +#EXT-X-BYTERANGE:20068@1175 bear-640x360-video2.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video.m3u8 b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video.m3u8 index 69086961a8..eccf901cbe 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video.m3u8 @@ -3,10 +3,10 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video1.mp4",BYTERANGE="1127@0" +#EXT-X-MAP:URI="bear-640x360-video1.mp4",BYTERANGE="1131@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@1183 +#EXT-X-BYTERANGE:99313@1187 bear-640x360-video1.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:122340 @@ -14,6 +14,6 @@ bear-640x360-video1.mp4 #EXT-X-PLACEMENT-OPPORTUNITY #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:0.734, -#EXT-X-BYTERANGE:80067@1171 +#EXT-X-BYTERANGE:80067@1175 bear-640x360-video2.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video1.mp4 b/packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video1.mp4 index 8886a1a02cf54642fd3c5178096b9d691417d374..74dc52d9d83cf60b378e45058b82359eb668f142 100644 GIT binary patch delta 44 xcmexzhWE!AUI_*U2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb_*iZCan0RT(04SN6p delta 40 tcmexyhWE=EUJ(Wc29>mu%7V<|{9GWL0Z3akO0-Hawn{Kmu%7V<|{9GWL0Z3akN^F&2bg~5i)>R70 diff --git a/packager/app/test/testdata/encryption-and-ad-cues-split-content/output.mpd b/packager/app/test/testdata/encryption-and-ad-cues-split-content/output.mpd index 002796df53..da61e47ec0 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues-split-content/output.mpd +++ b/packager/app/test/testdata/encryption-and-ad-cues-split-content/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video1.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio1.mp4 - - + + @@ -36,8 +36,8 @@ bear-640x360-video2.mp4 - - + + @@ -49,8 +49,8 @@ bear-640x360-audio2.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.m3u8 b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.m3u8 index 074f9ef39a..06f545169f 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.m3u8 @@ -3,10 +3,10 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="1003@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="1007@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@1071 +#EXT-X-BYTERANGE:17028@1075 bear-640x360-audio.mp4 #EXTINF:0.975, #EXT-X-BYTERANGE:16269 diff --git a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.mp4 index d989336d241c15b3153f71b13698ab27bda95134..80dde0beea18b128f963414ded3c3aa06708e30c 100644 GIT binary patch delta 35 ocmaEGhv~^3CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riukMp0NB9`yZ`_I delta 31 kcmaEIhv~r`CJ_b(28Fbe%7V<|{9GWL0Z3bHl<-*x0J0bgb^rhX diff --git a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video-iframe.m3u8 index 365f9a2166..f6f3053452 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video-iframe.m3u8 @@ -4,16 +4,16 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1127@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1131@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@1195 +#EXT-X-BYTERANGE:15581@1199 bear-640x360-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18754@100508 +#EXT-X-BYTERANGE:18754@100512 bear-640x360-video.mp4 #EXT-X-PLACEMENT-OPPORTUNITY #EXTINF:0.734, -#EXT-X-BYTERANGE:20068@222848 +#EXT-X-BYTERANGE:20068@222852 bear-640x360-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.m3u8 b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.m3u8 index ee532489b3..5e01d87116 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.m3u8 @@ -3,10 +3,10 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1127@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1131@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@1195 +#EXT-X-BYTERANGE:99313@1199 bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:122340 diff --git a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.mp4 index c82b090d9eb1f7ea145388920f53aeafac31a77a..506a9d66ee46f0d4fe3bb65572e12c5df6e375ec 100644 GIT binary patch delta 47 zcmX@SPw4nQAqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWu;|YR0AF|w AtN;K2 delta 43 wcmX@UPw4PIArS@!29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgV9}os04rAvb^rhX diff --git a/packager/app/test/testdata/encryption-and-ad-cues/output.mpd b/packager/app/test/testdata/encryption-and-ad-cues/output.mpd index 228bcba980..757464e1c5 100644 --- a/packager/app/test/testdata/encryption-and-ad-cues/output.mpd +++ b/packager/app/test/testdata/encryption-and-ad-cues/output.mpd @@ -10,8 +10,8 @@ bear-640x360-audio.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-video.mp4 - - + + @@ -37,8 +37,8 @@ bear-640x360-audio.mp4 - - + + @@ -49,8 +49,8 @@ bear-640x360-video.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-audio.mp4 index 91b967fb27e5d9e5ee5a972e67a9320186bfe51f..5fd86d115a2d386c5d86c7d9af15e8359f9e27c3 100644 GIT binary patch delta 35 ocmZ2~pK0@bCJ6=x29>mu%7WYi6GI@IA+tE&0*G@rip*XQ0L@SfumAu6 delta 31 kcmdmdpK1MlCJ_b(28Fbe%7V<|{9GWL0Z3bHl$gC90H_xVY5)KL 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 2841b7e2a7dafac9ff5788bda56c5769d4fb0a31..66c33fca7f05ae3aae9646c24e8f97ff5800846d 100644 GIT binary patch delta 47 zcmca`Q0U4*AqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWumu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgVA-<(05O~mBme*a 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 7128d250eb373f0b00e24787f724b1d5adf87dd1..a86c776cf5fecb8e5f63e59d2104906e8b1fdfb2 100644 GIT binary patch delta 35 ocmca|mFdP+CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riX2!40Mxn+1^@s6 delta 31 kcmca{mFdb=CJ_b(28Fbe%7V<|{9GWL0Z3bHlsK>o0IsPDzyJUM 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 9bc668f8f67f4b86d9a97d1c0da8016d31dedff1..04ed1816fe8b874d83fe6973d42405a0d569603c 100644 GIT binary patch delta 47 zcmeC(Dl~DckOTt*gGO3OWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSSn`$07 bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-audio.mp4 index 22d9741b3ca28312c707eec4c016ce251ba2da13..c9e6e3a824b6b5b10246a9b7933a4e0c6f238c61 100644 GIT binary patch delta 35 ocmZ2;hiStdCJ6=x29>mu%7WYi6GI@IA+tE&0*G@rib$*j0Lr}!AOHXW delta 31 kcmdmRhiT0nCJ_b(28Fbe%7V<|{9GWL0Z3bHl#o~l0Hw4E+5i9m 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 81691dafeed4cc9fd07a2fe2c22567d00cb6f7cd..638172c5bae05688e64680a8d3ee86725730ba92 100644 GIT binary patch delta 47 zcmeC*Cp3AVkOTt*gGO3OWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSbom~08Wz* A4*&oF delta 43 wcmbQdPpE&NkO%_76}02~qw*#H0l diff --git a/packager/app/test/testdata/encryption-and-no-pssh-in-stream/output.mpd b/packager/app/test/testdata/encryption-and-no-pssh-in-stream/output.mpd index 8984bb81c5..33c32168a8 100644 --- a/packager/app/test/testdata/encryption-and-no-pssh-in-stream/output.mpd +++ b/packager/app/test/testdata/encryption-and-no-pssh-in-stream/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-non-dash-if-iop/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-non-dash-if-iop/bear-640x360-audio.mp4 index 81afce8c79e42d06cc52e1fac291b7d4de1fd525..6a196f333d4927841218aca7c7255f45145a8bb6 100644 GIT binary patch delta 35 ocmaEGhv~^3CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riukMp0NB9`yZ`_I delta 31 kcmaEIhv~r`CJ_b(28Fbe%7V<|{9GWL0Z3bHl<-*x0J0bgb^rhX 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 c82b090d9eb1f7ea145388920f53aeafac31a77a..506a9d66ee46f0d4fe3bb65572e12c5df6e375ec 100644 GIT binary patch delta 47 zcmX@SPw4nQAqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWu;|YR0AF|w AtN;K2 delta 43 wcmX@UPw4PIArS@!29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgV9}os04rAvb^rhX diff --git a/packager/app/test/testdata/encryption-and-non-dash-if-iop/output.mpd b/packager/app/test/testdata/encryption-and-non-dash-if-iop/output.mpd index 9e57374ebc..2418f1e46d 100644 --- a/packager/app/test/testdata/encryption-and-non-dash-if-iop/output.mpd +++ b/packager/app/test/testdata/encryption-and-non-dash-if-iop/output.mpd @@ -9,8 +9,8 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/bear-640x360-video.mp4 index c82b090d9eb1f7ea145388920f53aeafac31a77a..506a9d66ee46f0d4fe3bb65572e12c5df6e375ec 100644 GIT binary patch delta 47 zcmX@SPw4nQAqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWu;|YR0AF|w AtN;K2 delta 43 wcmX@UPw4PIArS@!29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgV9}os04rAvb^rhX diff --git a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/bear-640x360-video.mp4.media_info b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/bear-640x360-video.mp4.media_info index 3dd2d56428..b851ffc019 100644 --- a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/bear-640x360-video.mp4.media_info +++ b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/bear-640x360-video.mp4.media_info @@ -11,11 +11,11 @@ video_info { } init_range { begin: 0 - end: 1126 + end: 1130 } index_range { - begin: 1127 - end: 1194 + begin: 1131 + end: 1198 } media_file_name: "bear-640x360-video.mp4" media_duration_seconds: 2.73606658 diff --git a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/output.mpd b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/output.mpd index 080d441abd..a02fccd37a 100644 --- a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/output.mpd +++ b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4 index 81afce8c79e42d06cc52e1fac291b7d4de1fd525..6a196f333d4927841218aca7c7255f45145a8bb6 100644 GIT binary patch delta 35 ocmaEGhv~^3CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riukMp0NB9`yZ`_I delta 31 kcmaEIhv~r`CJ_b(28Fbe%7V<|{9GWL0Z3bHl<-*x0J0bgb^rhX diff --git a/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4.media_info b/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4.media_info index 3034f429f3..0e86bf54c6 100644 --- a/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4.media_info +++ b/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4.media_info @@ -8,11 +8,11 @@ audio_info { } init_range { begin: 0 - end: 1002 + end: 1006 } index_range { - begin: 1003 - end: 1070 + begin: 1007 + end: 1074 } media_file_name: "bear-640x360-audio.mp4" media_duration_seconds: 2.76317453 diff --git a/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-video.mp4 index c82b090d9eb1f7ea145388920f53aeafac31a77a..506a9d66ee46f0d4fe3bb65572e12c5df6e375ec 100644 GIT binary patch delta 47 zcmX@SPw4nQAqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWu;|YR0AF|w AtN;K2 delta 43 wcmX@UPw4PIArS@!29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgV9}os04rAvb^rhX diff --git a/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-video.mp4.media_info b/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-video.mp4.media_info index 3dd2d56428..b851ffc019 100644 --- a/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-video.mp4.media_info +++ b/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-video.mp4.media_info @@ -11,11 +11,11 @@ video_info { } init_range { begin: 0 - end: 1126 + end: 1130 } index_range { - begin: 1127 - end: 1194 + begin: 1131 + end: 1198 } media_file_name: "bear-640x360-video.mp4" media_duration_seconds: 2.73606658 diff --git a/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-audio.mp4 index 81afce8c79e42d06cc52e1fac291b7d4de1fd525..6a196f333d4927841218aca7c7255f45145a8bb6 100644 GIT binary patch delta 35 ocmaEGhv~^3CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riukMp0NB9`yZ`_I delta 31 kcmaEIhv~r`CJ_b(28Fbe%7V<|{9GWL0Z3bHl<-*x0J0bgb^rhX 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 a71bd09ad15ca01fb4ce92b53ca4d85541f2dc57..702b955b01fdb47b3be89a7de8c6d876dcab13da 100644 GIT binary patch delta 35 ocmcb$g!$eQW(fuc2930m%7WYi6GI@IA+tE&0*G@rinv_@0LiioWB>pF delta 31 kcmcb&g!$GIW)TJk29>mu%7V<|{9GWL0Z3bHlyJKQ0Homx9smFU 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 c82b090d9eb1f7ea145388920f53aeafac31a77a..506a9d66ee46f0d4fe3bb65572e12c5df6e375ec 100644 GIT binary patch delta 47 zcmX@SPw4nQAqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWu;|YR0AF|w AtN;K2 delta 43 wcmX@UPw4PIArS@!29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgV9}os04rAvb^rhX 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 7128d250eb373f0b00e24787f724b1d5adf87dd1..a86c776cf5fecb8e5f63e59d2104906e8b1fdfb2 100644 GIT binary patch delta 35 ocmca|mFdP+CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riX2!40Mxn+1^@s6 delta 31 kcmca{mFdb=CJ_b(28Fbe%7V<|{9GWL0Z3bHlsK>o0IsPDzyJUM 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 9bc668f8f67f4b86d9a97d1c0da8016d31dedff1..04ed1816fe8b874d83fe6973d42405a0d569603c 100644 GIT binary patch delta 47 zcmeC(Dl~DckOTt*gGO3OWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSSn`$07mu%7V<|{9GWL0Z3bHl-O_q0H5{>Q~&?~ diff --git a/packager/app/test/testdata/encryption-and-trick-play/output.mpd b/packager/app/test/testdata/encryption-and-trick-play/output.mpd index 9bfc9d648e..70e30abd3f 100644 --- a/packager/app/test/testdata/encryption-and-trick-play/output.mpd +++ b/packager/app/test/testdata/encryption-and-trick-play/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-video-trick_play_factor_1.mp4 - - + + @@ -35,8 +35,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-audio.mp4 index 81afce8c79e42d06cc52e1fac291b7d4de1fd525..6a196f333d4927841218aca7c7255f45145a8bb6 100644 GIT binary patch delta 35 ocmaEGhv~^3CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riukMp0NB9`yZ`_I delta 31 kcmaEIhv~r`CJ_b(28Fbe%7V<|{9GWL0Z3bHl<-*x0J0bgb^rhX 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 a71bd09ad15ca01fb4ce92b53ca4d85541f2dc57..702b955b01fdb47b3be89a7de8c6d876dcab13da 100644 GIT binary patch delta 35 ocmcb$g!$eQW(fuc2930m%7WYi6GI@IA+tE&0*G@rinv_@0LiioWB>pF delta 31 kcmcb&g!$GIW)TJk29>mu%7V<|{9GWL0Z3bHlyJKQ0Homx9smFU 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 524042168fb725f7d1ae6bbaee2e21d7fd1757c6..490e0acc6d69638d265fe813567558a51f5a5b70 100644 GIT binary patch delta 35 ocmdlngK5tUCJ6=x2930m%7WYi6GI@IA+tE&0*G@rim3De0KE4Ko&W#< delta 31 kcmdlpgK5VMCJ_b(29>mu%7V<|{9GWL0Z3bHlu+pb0GXZ%SO5S3 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 c82b090d9eb1f7ea145388920f53aeafac31a77a..506a9d66ee46f0d4fe3bb65572e12c5df6e375ec 100644 GIT binary patch delta 47 zcmX@SPw4nQAqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWu;|YR0AF|w AtN;K2 delta 43 wcmX@UPw4PIArS@!29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgV9}os04rAvb^rhX diff --git a/packager/app/test/testdata/encryption-and-two-trick-plays/output.mpd b/packager/app/test/testdata/encryption-and-two-trick-plays/output.mpd index 537a83b450..3f6098f3a0 100644 --- a/packager/app/test/testdata/encryption-and-two-trick-plays/output.mpd +++ b/packager/app/test/testdata/encryption-and-two-trick-plays/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,14 +22,14 @@ bear-640x360-video-trick_play_factor_1.mp4 - - + + bear-640x360-video-trick_play_factor_2.mp4 - - + + @@ -41,8 +41,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-cbc-1/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-cbc-1/bear-640x360-audio.mp4 index 8bac0b7402f719fc8c1d43651054e01ae1089f0f..d8305188bd117bc81e3d33cca1c3209c872a4cb1 100644 GIT binary patch delta 35 ocmaEGhv~^3CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riukMp0NB9`yZ`_I delta 31 kcmaEIhv~r`CJ_b(28Fbe%7V<|{9GWL0Z3bHl<-*x0J0bgb^rhX 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 97167ea5c4b50f58f322c08b37f07f8d51981a1d..ad9b58594f97f0c4f2ed82c50611923c83b7cdef 100644 GIT binary patch delta 47 zcmX@SPw4nQAqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWu;|YR0AF|w AtN;K2 delta 43 wcmX@UPw4PIArS@!29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgV9}os04rAvb^rhX 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 7128d250eb373f0b00e24787f724b1d5adf87dd1..a86c776cf5fecb8e5f63e59d2104906e8b1fdfb2 100644 GIT binary patch delta 35 ocmca|mFdP+CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riX2!40Mxn+1^@s6 delta 31 kcmca{mFdb=CJ_b(28Fbe%7V<|{9GWL0Z3bHlsK>o0IsPDzyJUM 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 9bc668f8f67f4b86d9a97d1c0da8016d31dedff1..04ed1816fe8b874d83fe6973d42405a0d569603c 100644 GIT binary patch delta 47 zcmeC(Dl~DckOTt*gGO3OWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSSn`$07 bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-cbcs-with-full-protection/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-cbcs-with-full-protection/bear-640x360-audio.mp4 index 8be897b31395e21ac61de6e461b9edcc669efc11..2b54a78601ee3b5fb9f1537b5eace0bff6a74912 100644 GIT binary patch delta 35 ocmX?qo$2y*CJ6=x29>mu%7WYi6GI@IA+tE&0*G@ritJtu0Mq0P`~Uy| delta 31 kcmcb7o$35_CJ_b(28Fbe%7V<|{9GWL0Z3bHl-Ru*0Ill^wg3PC diff --git a/packager/app/test/testdata/encryption-cbcs-with-full-protection/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-cbcs-with-full-protection/bear-640x360-video.mp4 index b69276fb2700eaee089a3de97b6a70cb312fd2ff..bbaf346e16a285fd14af0240f73c7ab76f51d7fb 100644 GIT binary patch delta 47 zcmZ3pTWG^>AqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWu*{eX09OzV A-v9sr delta 43 wcmdn6TWHO0ArS@!29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgV3{!&03*K)sQ>@~ diff --git a/packager/app/test/testdata/encryption-cbcs-with-full-protection/decrypted-bear-640x360-audio-0.mp4 b/packager/app/test/testdata/encryption-cbcs-with-full-protection/decrypted-bear-640x360-audio-0.mp4 index 7128d250eb373f0b00e24787f724b1d5adf87dd1..a86c776cf5fecb8e5f63e59d2104906e8b1fdfb2 100644 GIT binary patch delta 35 ocmca|mFdP+CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riX2!40Mxn+1^@s6 delta 31 kcmca{mFdb=CJ_b(28Fbe%7V<|{9GWL0Z3bHlsK>o0IsPDzyJUM diff --git a/packager/app/test/testdata/encryption-cbcs-with-full-protection/decrypted-bear-640x360-video-0.mp4 b/packager/app/test/testdata/encryption-cbcs-with-full-protection/decrypted-bear-640x360-video-0.mp4 index 9bc668f8f67f4b86d9a97d1c0da8016d31dedff1..04ed1816fe8b874d83fe6973d42405a0d569603c 100644 GIT binary patch delta 47 zcmeC(Dl~DckOTt*gGO3OWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSSn`$07 bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-cbcs/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-cbcs/bear-640x360-audio.mp4 index 8be897b31395e21ac61de6e461b9edcc669efc11..2b54a78601ee3b5fb9f1537b5eace0bff6a74912 100644 GIT binary patch delta 35 ocmX?qo$2y*CJ6=x29>mu%7WYi6GI@IA+tE&0*G@ritJtu0Mq0P`~Uy| delta 31 kcmcb7o$35_CJ_b(28Fbe%7V<|{9GWL0Z3bHl-Ru*0Ill^wg3PC 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 8c31d6d26677af85de429c1b6d704fc287a0fecf..235d502cd9bcda9e2db7ac81f34a07e8d0e70fd1 100644 GIT binary patch delta 47 zcmZ3pTWG^>AqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWu*{eX09OzV A-v9sr delta 43 wcmdn6TWHO0ArS@!29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgV3{!&03*K)sQ>@~ 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 7128d250eb373f0b00e24787f724b1d5adf87dd1..a86c776cf5fecb8e5f63e59d2104906e8b1fdfb2 100644 GIT binary patch delta 35 ocmca|mFdP+CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riX2!40Mxn+1^@s6 delta 31 kcmca{mFdb=CJ_b(28Fbe%7V<|{9GWL0Z3bHlsK>o0IsPDzyJUM 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 9bc668f8f67f4b86d9a97d1c0da8016d31dedff1..04ed1816fe8b874d83fe6973d42405a0d569603c 100644 GIT binary patch delta 47 zcmeC(Dl~DckOTt*gGO3OWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSSn`$07 bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-cens/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-cens/bear-640x360-audio.mp4 index 9cc8dba201a915c2ea407b483b58d5f64531e924..d2ffeb930085c30fc7df0cba65d9b574c4d579d8 100644 GIT binary patch delta 35 ocmaEGhv~^3CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riukMp0NB9`yZ`_I delta 31 kcmaEIhv~r`CJ_b(28Fbe%7V<|{9GWL0Z3bHl<-*x0J0bgb^rhX 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 6dbe4bf996fcd5de6b1a8b52c0c9c5a2db7028e8..50ed6b390cdb0efd192d55d243d366667f1a1364 100644 GIT binary patch delta 47 zcmX@SPw4nQAqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWu;|YR0AF|w AtN;K2 delta 43 wcmX@UPw4PIArS@!29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgV9}os04rAvb^rhX 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 7128d250eb373f0b00e24787f724b1d5adf87dd1..a86c776cf5fecb8e5f63e59d2104906e8b1fdfb2 100644 GIT binary patch delta 35 ocmca|mFdP+CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riX2!40Mxn+1^@s6 delta 31 kcmca{mFdb=CJ_b(28Fbe%7V<|{9GWL0Z3bHlsK>o0IsPDzyJUM 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 9bc668f8f67f4b86d9a97d1c0da8016d31dedff1..04ed1816fe8b874d83fe6973d42405a0d569603c 100644 GIT binary patch delta 47 zcmeC(Dl~DckOTt*gGO3OWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSSn`$07 bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-audio.mp4 index b18f8880d632d6f28715b885603b4d35bfe95cc4..455d58aadd75f60a829a61d7ee5c7eae1fb603bf 100644 GIT binary patch delta 35 ocmexxhv~~5CJ6=x29>mu%7WYi6GI@IA+tE&0*G@rio~n~0NoJ_>;M1& delta 31 kcmexzhv~x|CJ_b(28Fbe%7V<|{9GWL0Z3bHl!#de0JZ1}rT_o{ 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 91a84082d7c665fe50c502ce95a1851a18f26d8b..94910f98d52c5c6d32a66d0845235f756628969c 100644 GIT binary patch delta 47 zcmcb-Pw4tSAqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWu-MNB0A)xG A+yDRo delta 43 wcmcbmu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgV6mSM05GQvrT_o{ diff --git a/packager/app/test/testdata/encryption-multi-keys-with-stream-label/output.mpd b/packager/app/test/testdata/encryption-multi-keys-with-stream-label/output.mpd index 47756c1e88..b8a44039bb 100644 --- a/packager/app/test/testdata/encryption-multi-keys-with-stream-label/output.mpd +++ b/packager/app/test/testdata/encryption-multi-keys-with-stream-label/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-multi-keys/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-multi-keys/bear-640x360-audio.mp4 index 9a75a53c53e0b4ab42e836957483a55bff16d307..6fa418a5f845705153d218cae7ddba9e930b84fb 100644 GIT binary patch delta 35 ocmexxhv~~5CJ6=x29>mu%7WYi6GI@IA+tE&0*G@rio~n~0NoJ_>;M1& delta 31 kcmexzhv~x|CJ_b(28Fbe%7V<|{9GWL0Z3bHl!#de0JZ1}rT_o{ 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 bc6db29fd50d5886ed356ceeca46972e4237ef18..c0fde80c34781b0332b81d01017b465db983120f 100644 GIT binary patch delta 47 zcmcb-Pw4tSAqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWu-MNB0A)xG A+yDRo delta 43 wcmcbmu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgV6mSM05GQvrT_o{ diff --git a/packager/app/test/testdata/encryption-multi-keys/output.mpd b/packager/app/test/testdata/encryption-multi-keys/output.mpd index f1ef2fa2ae..b4d6699274 100644 --- a/packager/app/test/testdata/encryption-multi-keys/output.mpd +++ b/packager/app/test/testdata/encryption-multi-keys/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-of-only-video-stream/bear-640x360-audio-skip_encryption.mp4 b/packager/app/test/testdata/encryption-of-only-video-stream/bear-640x360-audio-skip_encryption.mp4 index 7128d250eb373f0b00e24787f724b1d5adf87dd1..a86c776cf5fecb8e5f63e59d2104906e8b1fdfb2 100644 GIT binary patch delta 35 ocmca|mFdP+CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riX2!40Mxn+1^@s6 delta 31 kcmca{mFdb=CJ_b(28Fbe%7V<|{9GWL0Z3bHlsK>o0IsPDzyJUM 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 c82b090d9eb1f7ea145388920f53aeafac31a77a..506a9d66ee46f0d4fe3bb65572e12c5df6e375ec 100644 GIT binary patch delta 47 zcmX@SPw4nQAqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWu;|YR0AF|w AtN;K2 delta 43 wcmX@UPw4PIArS@!29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgV9}os04rAvb^rhX 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 9bc668f8f67f4b86d9a97d1c0da8016d31dedff1..04ed1816fe8b874d83fe6973d42405a0d569603c 100644 GIT binary patch delta 47 zcmeC(Dl~DckOTt*gGO3OWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSSn`$07 bear-640x360-video.mp4 - - + + @@ -18,8 +18,8 @@ bear-640x360-audio-skip_encryption.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-using-explicit-pssh/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-using-explicit-pssh/bear-640x360-audio.mp4 index 40ad67469b057c94d043339836d1c1ea3af07620..b0e44b946e76749d1d475bdb4bf914c5bb5d1511 100644 GIT binary patch delta 35 ocmX?ehv~u{CJ6=x29>mu%7WYi6GI@IA+tE&0*G@ridd`z0MlIyfB*mh delta 31 kcmca`hw026CJ_b(28Fbe%7V<|{9GWL0Z3bHl(1L_0IgICIsgCw diff --git a/packager/app/test/testdata/encryption-using-explicit-pssh/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-using-explicit-pssh/bear-640x360-video.mp4 index 47ae5cb2e9c3345b9b1f2d19e974c5e27bb12156..f2f948fee05c78f745fff911bd76fee03425115e 100644 GIT binary patch delta 47 zcmZ3#PiXT#AqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWut?7b09Z5) AZ~y=R delta 43 wcmdnIPiXxmu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgV3D2=03@>vIsgCw diff --git a/packager/app/test/testdata/encryption-using-explicit-pssh/output.mpd b/packager/app/test/testdata/encryption-using-explicit-pssh/output.mpd index 036da83e1c..690ddb9221 100644 --- a/packager/app/test/testdata/encryption-using-explicit-pssh/output.mpd +++ b/packager/app/test/testdata/encryption-using-explicit-pssh/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-audio.mp4 index 81afce8c79e42d06cc52e1fac291b7d4de1fd525..6a196f333d4927841218aca7c7255f45145a8bb6 100644 GIT binary patch delta 35 ocmaEGhv~^3CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riukMp0NB9`yZ`_I delta 31 kcmaEIhv~r`CJ_b(28Fbe%7V<|{9GWL0Z3bHl<-*x0J0bgb^rhX 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 c82b090d9eb1f7ea145388920f53aeafac31a77a..506a9d66ee46f0d4fe3bb65572e12c5df6e375ec 100644 GIT binary patch delta 47 zcmX@SPw4nQAqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWu;|YR0AF|w AtN;K2 delta 43 wcmX@UPw4PIArS@!29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgV9}os04rAvb^rhX 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 7128d250eb373f0b00e24787f724b1d5adf87dd1..a86c776cf5fecb8e5f63e59d2104906e8b1fdfb2 100644 GIT binary patch delta 35 ocmca|mFdP+CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riX2!40Mxn+1^@s6 delta 31 kcmca{mFdb=CJ_b(28Fbe%7V<|{9GWL0Z3bHlsK>o0IsPDzyJUM 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 9bc668f8f67f4b86d9a97d1c0da8016d31dedff1..04ed1816fe8b874d83fe6973d42405a0d569603c 100644 GIT binary patch delta 47 zcmeC(Dl~DckOTt*gGO3OWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSSn`$07 bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-with-multi-drms/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-with-multi-drms/bear-640x360-audio.mp4 index d9e4d1b766f154e8586c6308cc70cdd424d8bf40..061b8eac78c641b5246e4748e4eba9cd27ac03e7 100644 GIT binary patch delta 35 ncmeBr$kg|cNrHiaK_#uEvLLs>#1P14$Slsc0OH(@B4rx@!`cf* delta 31 kcmeBs$kg?aNrZucK_RWAvLLfKKNrYm0MZs4CCWAc0H3)E00000 diff --git a/packager/app/test/testdata/encryption-with-multi-drms/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-with-multi-drms/bear-640x360-video.mp4 index 7b643856d73420727c8160696c1b28f714c156c6..709850a7d01fbd0377adc7eba3bb213fa93424a0 100644 GIT binary patch delta 47 zcmaERNa*7sAqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWutY8d0B|4< AGynhq delta 43 wcmex(Na*b$ArS@!29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgV2NA^06LEh{r~^~ diff --git a/packager/app/test/testdata/encryption-with-multi-drms/output.mpd b/packager/app/test/testdata/encryption-with-multi-drms/output.mpd index 042a364134..e95d01930a 100644 --- a/packager/app/test/testdata/encryption-with-multi-drms/output.mpd +++ b/packager/app/test/testdata/encryption-with-multi-drms/output.mpd @@ -18,8 +18,8 @@ bear-640x360-video.mp4 - - + + @@ -40,8 +40,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/encryption-with-multi-drms/stream_0.m3u8 b/packager/app/test/testdata/encryption-with-multi-drms/stream_0.m3u8 index af241c654d..e1d9506695 100644 --- a/packager/app/test/testdata/encryption-with-multi-drms/stream_0.m3u8 +++ b/packager/app/test/testdata/encryption-with-multi-drms/stream_0.m3u8 @@ -3,11 +3,11 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="1557@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="1561@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,AAAAOHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABgSEDEyMzQ1Njc4OTAxMjM0NTZI49yVmwY=",KEYID=0x31323334353637383930313233343536,KEYFORMATVERSIONS="1",KEYFORMAT="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="skd://www.license.com/getkey?KeyId=31323334-3536-3738-3930-313233343536",KEYFORMATVERSIONS="1",KEYFORMAT="com.apple.streamingkeydelivery" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@1625 +#EXT-X-BYTERANGE:17028@1629 bear-640x360-audio.mp4 #EXTINF:0.998, #EXT-X-BYTERANGE:16682 diff --git a/packager/app/test/testdata/encryption-with-multi-drms/stream_1.m3u8 b/packager/app/test/testdata/encryption-with-multi-drms/stream_1.m3u8 index 7a42c87ef0..f6bf6c83c1 100644 --- a/packager/app/test/testdata/encryption-with-multi-drms/stream_1.m3u8 +++ b/packager/app/test/testdata/encryption-with-multi-drms/stream_1.m3u8 @@ -3,11 +3,11 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1681@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1685@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,AAAAOHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABgSEDEyMzQ1Njc4OTAxMjM0NTZI49yVmwY=",KEYID=0x31323334353637383930313233343536,KEYFORMATVERSIONS="1",KEYFORMAT="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="skd://www.license.com/getkey?KeyId=31323334-3536-3738-3930-313233343536",KEYFORMATVERSIONS="1",KEYFORMAT="com.apple.streamingkeydelivery" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@1749 +#EXT-X-BYTERANGE:99313@1753 bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:122340 diff --git a/packager/app/test/testdata/encryption/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption/bear-640x360-audio.mp4 index 81afce8c79e42d06cc52e1fac291b7d4de1fd525..6a196f333d4927841218aca7c7255f45145a8bb6 100644 GIT binary patch delta 35 ocmaEGhv~^3CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riukMp0NB9`yZ`_I delta 31 kcmaEIhv~r`CJ_b(28Fbe%7V<|{9GWL0Z3bHl<-*x0J0bgb^rhX diff --git a/packager/app/test/testdata/encryption/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption/bear-640x360-video.mp4 index c82b090d9eb1f7ea145388920f53aeafac31a77a..506a9d66ee46f0d4fe3bb65572e12c5df6e375ec 100644 GIT binary patch delta 47 zcmX@SPw4nQAqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWu;|YR0AF|w AtN;K2 delta 43 wcmX@UPw4PIArS@!29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgV9}os04rAvb^rhX 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 7128d250eb373f0b00e24787f724b1d5adf87dd1..a86c776cf5fecb8e5f63e59d2104906e8b1fdfb2 100644 GIT binary patch delta 35 ocmca|mFdP+CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riX2!40Mxn+1^@s6 delta 31 kcmca{mFdb=CJ_b(28Fbe%7V<|{9GWL0Z3bHlsK>o0IsPDzyJUM 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 9bc668f8f67f4b86d9a97d1c0da8016d31dedff1..04ed1816fe8b874d83fe6973d42405a0d569603c 100644 GIT binary patch delta 47 zcmeC(Dl~DckOTt*gGO3OWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSSn`$07 bear-640x360-video.mp4 - - + + @@ -22,8 +22,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/first-stream/bear-640x360-0.mp4 b/packager/app/test/testdata/first-stream/bear-640x360-0.mp4 index 9bc668f8f67f4b86d9a97d1c0da8016d31dedff1..04ed1816fe8b874d83fe6973d42405a0d569603c 100644 GIT binary patch delta 47 zcmeC(Dl~DckOTt*gGO3OWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSSn`$07 bear-640x360-0.mp4 - - + + diff --git a/packager/app/test/testdata/flac-with-encryption/bear-flac-audio.mp4 b/packager/app/test/testdata/flac-with-encryption/bear-flac-audio.mp4 index 0a51c057d8b9169aa269c477b4b3109ac3fbd1f0..4b092ae0bdcc54daa87958482129a3644cd6a9ee 100644 GIT binary patch delta 44 xcmX@VkoWRJUI_*U29>mu%7WYi6GI@IA+tE&0*G@PMOsA|TSb_*iZJgE001$O4IBUf delta 40 tcmcb-koWvTUJ(Wc28Fbe%7V<|{9GWL0Z3akO0-Hawn{K#1P14$Slsc0OH(6kya7LRuQJHBFyjo02jgxumAu6 delta 40 tcmZpl$J;!QSA>CqK_RWAvLLfKKNrYm0MZtX60H)9trARIC79p)0RZY~3w8hi diff --git a/packager/app/test/testdata/flac-with-encryption/output.mpd b/packager/app/test/testdata/flac-with-encryption/output.mpd index 6ef77687de..ae290944cf 100644 --- a/packager/app/test/testdata/flac-with-encryption/output.mpd +++ b/packager/app/test/testdata/flac-with-encryption/output.mpd @@ -10,8 +10,8 @@ bear-flac-audio.mp4 - - + + diff --git a/packager/app/test/testdata/flac-with-encryption/stream_0.m3u8 b/packager/app/test/testdata/flac-with-encryption/stream_0.m3u8 index 591b5ae26d..1479d23b4e 100644 --- a/packager/app/test/testdata/flac-with-encryption/stream_0.m3u8 +++ b/packager/app/test/testdata/flac-with-encryption/stream_0.m3u8 @@ -3,10 +3,10 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-flac-audio.mp4",BYTERANGE="983@0" +#EXT-X-MAP:URI="bear-flac-audio.mp4",BYTERANGE="987@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.045, -#EXT-X-BYTERANGE:85277@1051 +#EXT-X-BYTERANGE:85277@1055 bear-flac-audio.mp4 #EXTINF:1.045, #EXT-X-BYTERANGE:87892 diff --git a/packager/app/test/testdata/hdr10-with-encryption/bear-640x360-hevc-hdr10-video.mp4 b/packager/app/test/testdata/hdr10-with-encryption/bear-640x360-hevc-hdr10-video.mp4 index 63e0042f295ca5ff00057cdef882c4b3c0064f34..2cda9b6d6f111c0fd51f04986c0c221dd6d683ea 100644 GIT binary patch delta 38 rcmdnh%f7FdU4nsuK_jiCvLLs>#1P14$Slsc0OH(6k*y+(%Z>p6-DwN# delta 34 ncmdnj%f73ZU4(&wK_#uEvLLfKKNrYm0MZtX5?du0mmLEDwr&cl diff --git a/packager/app/test/testdata/hdr10-with-encryption/output.mpd b/packager/app/test/testdata/hdr10-with-encryption/output.mpd index 4a76f34309..0c6cc1a3cb 100644 --- a/packager/app/test/testdata/hdr10-with-encryption/output.mpd +++ b/packager/app/test/testdata/hdr10-with-encryption/output.mpd @@ -9,8 +9,8 @@ bear-640x360-hevc-hdr10-video.mp4 - - + + diff --git a/packager/app/test/testdata/hdr10-with-encryption/stream_0.m3u8 b/packager/app/test/testdata/hdr10-with-encryption/stream_0.m3u8 index 63762cbc6b..328432ec8c 100644 --- a/packager/app/test/testdata/hdr10-with-encryption/stream_0.m3u8 +++ b/packager/app/test/testdata/hdr10-with-encryption/stream_0.m3u8 @@ -3,8 +3,8 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:3 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-hevc-hdr10-video.mp4",BYTERANGE="5227@0" +#EXT-X-MAP:URI="bear-640x360-hevc-hdr10-video.mp4",BYTERANGE="5231@0" #EXTINF:2.803, -#EXT-X-BYTERANGE:111139@5271 +#EXT-X-BYTERANGE:111139@5275 bear-640x360-hevc-hdr10-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/hevc-with-encryption/bear-640x360-hevc-video.mp4 b/packager/app/test/testdata/hevc-with-encryption/bear-640x360-hevc-video.mp4 index a8c72073bec6aa2927417270480585ea19d888d9..eb98dd0f7f8ba72a47b143920b4520b6a09f86b2 100644 GIT binary patch delta 38 rcmZ2_m38G+RtW|M29>mu%7WYi6GI@IA+tE&0*G@PMYf7CPRs%T>EsL9 delta 34 ncmZ2^m38S=RuKjU28Fbe%7V<|{9GWL0Z3akN^F&2oR|dw!Ep+g 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 298f9532bba40d3a0b213a034be2db277bf78a43..77a649e6ad6385d4b8812794794c20caebe17008 100644 GIT binary patch delta 38 rcmdmen05bQRtW|M29>mu%7WYi6GI@IA+tE&0*G@PMYf7CE>8pi>rV^r delta 34 ncmdmgn05DIRuKjU28Fbe%7V<|{9GWL0Z3akN^F&2T%HI3!n_Ks diff --git a/packager/app/test/testdata/hevc-with-encryption/output.mpd b/packager/app/test/testdata/hevc-with-encryption/output.mpd index db5775be46..0fad79e843 100644 --- a/packager/app/test/testdata/hevc-with-encryption/output.mpd +++ b/packager/app/test/testdata/hevc-with-encryption/output.mpd @@ -9,8 +9,8 @@ bear-640x360-hevc-video.mp4 - - + + diff --git a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-1.m4s b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-audio-1.m4s index 55ee417db133ab4b70534ac50952bb7adbba691f..6e56dd8555c756cee3aab506c0bf6c812e47d5ec 100644 GIT binary patch delta 35 ncmcc6%6O%fQG$ViL8Z8)vLLs>#1P14$Slsc0OH(@B72+wzvl}5 delta 31 kcmcc8%6OrbQG|hkL7}*$vLLfKKNrYm0MZs4CH6Q00Gvt*w*UYD 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 3e151a7d97fa5cedceb060fff9220b36ec774b28..74163d0b7b3818823ade6378d7e5e61c8b5185b9 100644 GIT binary patch delta 33 lcmcaobE8Irfq_A#xTLZmx4^^@$Y#ha&bI*K+>Ig*b^y6~3UL4c delta 29 hcmcanbEQUvfq_AxxTLZmvp7E&$Yuc278@lT>;RSs2`c~q 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 e86f365d7fdd39644fb08a04a34d1caddddc984a..03b9029c21fe66283b9a37d427d8488238daab66 100644 GIT binary patch delta 33 lcmdn)x7$yGfq_A#xTLZmx4^^@$Y#ha&bI*K+>Ij2>Hwz138w%6 delta 29 hcmdn(x7|;Kfq_AxxTLZmvp7E&$Yuc278@m$)d7X82w?yK 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 825a8072d239ef72afac81d49c7488de32ed5746..2b143225fa32563f54511044d9a96fe2b1658ba9 100644 GIT binary patch delta 33 lcmbQqHkVC;fq_9Kt)#Lbx4^^@$Y#ha&bI*K+>Iiv%m9o$2#f## delta 29 hcmbQsHj_<+fq_9Gt)#Lbvp7E&$Yuc278@m4nE`Hx2Sxw@ 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 4dbca6653fa09207d3845c9b6c91272135d3bdbb..2c90c4688356179183c0ca7e434f855991e3bd5a 100644 GIT binary patch delta 38 qcmX@u!FIHRO@e`eL8G{&vLLs>#1P14$Slsc0OH(6k*y+(x-9_R>kB{t delta 34 mcmX@w!FI5NO@x7gL8Z8)vLLfKKNrYm0MZtX5?du0bz1};o=LF delta 34 ncmZ3ygMI!Eb`b^!29@HH%7V<|{9GWL0Z3akN^F&20mQkDB3nfmv&;ec-wX2q delta 34 ncmZpA&+_jbiwFY)gGzBpWkF_felC#B0HiG%CALa1W|;#3&L0Y~ diff --git a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-iframe.m3u8 index 756a032739..e3961bbcaf 100644 --- a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-iframe.m3u8 @@ -6,13 +6,13 @@ #EXT-X-I-FRAMES-ONLY #EXT-X-MAP:URI="bear-640x360-video-init.mp4" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@80 +#EXT-X-BYTERANGE:15581@84 bear-640x360-video-1.m4s #EXTINF:1.001, -#EXT-X-BYTERANGE:18221@80 +#EXT-X-BYTERANGE:18221@84 bear-640x360-video-2.m4s #EXT-X-PLACEMENT-OPPORTUNITY #EXTINF:0.734, -#EXT-X-BYTERANGE:19663@80 +#EXT-X-BYTERANGE:19663@84 bear-640x360-video-3.m4s #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-init.mp4 b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-640x360-video-init.mp4 index aa3f67b37c7f01b7c6bd30269fb2a92d1af790af..c9553addb55927b30281de77c54df8f769f1f8fb 100644 GIT binary patch delta 33 lcmcc3cArgxfq_9It)#Lbx4^^@$Y#ha&bI*K+>Ijc%mAIF3043A delta 29 hcmcc5cAHIvfq_9Kt)#Lbvp7E&$Yuc278@npnE`#z2oL}O diff --git a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/output.m3u8 b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/output.m3u8 index d0ecedb6ff..2f8252e4f9 100644 --- a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/output.m3u8 +++ b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/output.m3u8 @@ -7,7 +7,7 @@ #EXT-X-MEDIA:TYPE=SUBTITLES,URI="bear-english-text.m3u8",GROUP-ID="default-text-group",NAME="stream_0",AUTOSELECT=YES -#EXT-X-STREAM-INF:BANDWIDTH=1108051,AVERAGE-BANDWIDTH=1005999,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",SUBTITLES="default-text-group" +#EXT-X-STREAM-INF:BANDWIDTH=1108115,AVERAGE-BANDWIDTH=1006069,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",SUBTITLES="default-text-group" bear-640x360-video.m3u8 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=214292,AVERAGE-BANDWIDTH=156327,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-video-iframe.m3u8" diff --git a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-1.m4s b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-1.m4s index 55ee417db133ab4b70534ac50952bb7adbba691f..6e56dd8555c756cee3aab506c0bf6c812e47d5ec 100644 GIT binary patch delta 35 ncmcc6%6O%fQG$ViL8Z8)vLLs>#1P14$Slsc0OH(@B72+wzvl}5 delta 31 kcmcc8%6OrbQG|hkL7}*$vLLfKKNrYm0MZs4CH6Q00Gvt*w*UYD 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 1ddbee3bdddead3bf9553e039e102efdb21657c1..5bf76aa0d1a4c7974b9318d2953c0a5362c5ded7 100644 GIT binary patch delta 33 lcmaD^|F&L&fq_A#xTLZmx4^^@$Y#ha&bI*K+>Ihv?E%1^3pW4& delta 29 icmaD`|FT|$fq_AxxTLZmvp7E&$Yuc278@n5+5-TbZ3*!J 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 a7100e5c241d78c4d5f7a5830c8f6dc6ed92b838..d6bcbb5de8cac9e9db7d2d5f5b828ac3cf72d62a 100644 GIT binary patch delta 33 lcmZ4Fz06yJfq_A#xTLZmx4^^@$Y#ha&bI*K+>IiAssN#$3E%(# delta 29 hcmZ4Hy~taHfq_AxxTLZmvp7E&$Yuc278@n{Q~`lS2$}!@ 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 825a8072d239ef72afac81d49c7488de32ed5746..2b143225fa32563f54511044d9a96fe2b1658ba9 100644 GIT binary patch delta 33 lcmbQqHkVC;fq_9Kt)#Lbx4^^@$Y#ha&bI*K+>Iiv%m9o$2#f## delta 29 hcmbQsHj_<+fq_9Gt)#Lbvp7E&$Yuc278@m4nE`Hx2Sxw@ diff --git a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/output.m3u8 b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/output.m3u8 index 4afd3b2540..ff61b452ca 100644 --- a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/output.m3u8 +++ b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/output.m3u8 @@ -5,5 +5,5 @@ #EXT-X-MEDIA:TYPE=AUDIO,URI="audio/audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2" -#EXT-X-STREAM-INF:BANDWIDTH=1108051,AVERAGE-BANDWIDTH=1005999,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group" +#EXT-X-STREAM-INF:BANDWIDTH=1108115,AVERAGE-BANDWIDTH=1006069,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group" video/video.m3u8 diff --git a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video-1.m4s b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/video/video-1.m4s index 4dbca6653fa09207d3845c9b6c91272135d3bdbb..2c90c4688356179183c0ca7e434f855991e3bd5a 100644 GIT binary patch delta 38 qcmX@u!FIHRO@e`eL8G{&vLLs>#1P14$Slsc0OH(6k*y+(x-9_R>kB{t delta 34 mcmX@w!FI5NO@x7gL8Z8)vLLfKKNrYm0MZtX5?du0bz1};o=LF delta 34 ncmZ3ygMI!Eb`b^!29@HH%7V<|{9GWL0Z3akN^F&20mQkDB3nfmv&;ec-wX2q delta 34 ncmZpA&+_jbiwFY)gGzBpWkF_felC#B0HiG%CALa1W|;#3&L0Y~ 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 aa3f67b37c7f01b7c6bd30269fb2a92d1af790af..c9553addb55927b30281de77c54df8f769f1f8fb 100644 GIT binary patch delta 33 lcmcc3cArgxfq_9It)#Lbx4^^@$Y#ha&bI*K+>Ijc%mAIF3043A delta 29 hcmcc5cAHIvfq_9Kt)#Lbvp7E&$Yuc278@npnE`#z2oL}O diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-1.m4s b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-1.m4s index 55ee417db133ab4b70534ac50952bb7adbba691f..6e56dd8555c756cee3aab506c0bf6c812e47d5ec 100644 GIT binary patch delta 35 ncmcc6%6O%fQG$ViL8Z8)vLLs>#1P14$Slsc0OH(@B72+wzvl}5 delta 31 kcmcc8%6OrbQG|hkL7}*$vLLfKKNrYm0MZs4CH6Q00Gvt*w*UYD diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-2.m4s b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-2.m4s index 1ddbee3bdddead3bf9553e039e102efdb21657c1..5bf76aa0d1a4c7974b9318d2953c0a5362c5ded7 100644 GIT binary patch delta 33 lcmaD^|F&L&fq_A#xTLZmx4^^@$Y#ha&bI*K+>Ihv?E%1^3pW4& delta 29 icmaD`|FT|$fq_AxxTLZmvp7E&$Yuc278@n5+5-TbZ3*!J diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-3.m4s b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-3.m4s index a7100e5c241d78c4d5f7a5830c8f6dc6ed92b838..d6bcbb5de8cac9e9db7d2d5f5b828ac3cf72d62a 100644 GIT binary patch delta 33 lcmZ4Fz06yJfq_A#xTLZmx4^^@$Y#ha&bI*K+>IiAssN#$3E%(# delta 29 hcmZ4Hy~taHfq_AxxTLZmvp7E&$Yuc278@n{Q~`lS2$}!@ diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-audio-init.mp4 index 825a8072d239ef72afac81d49c7488de32ed5746..2b143225fa32563f54511044d9a96fe2b1658ba9 100644 GIT binary patch delta 33 lcmbQqHkVC;fq_9Kt)#Lbx4^^@$Y#ha&bI*K+>Iiv%m9o$2#f## delta 29 hcmbQsHj_<+fq_9Gt)#Lbvp7E&$Yuc278@m4nE`Hx2Sxw@ diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-1.m4s b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-1.m4s index 4dbca6653fa09207d3845c9b6c91272135d3bdbb..2c90c4688356179183c0ca7e434f855991e3bd5a 100644 GIT binary patch delta 38 qcmX@u!FIHRO@e`eL8G{&vLLs>#1P14$Slsc0OH(6k*y+(x-9_R>kB{t delta 34 mcmX@w!FI5NO@x7gL8Z8)vLLfKKNrYm0MZtX5?du0bz1};o=LF delta 34 ncmZ3ygMI!Eb`b^!29@HH%7V<|{9GWL0Z3akN^F&20mQkDB3nfmv&;ec-wX2q delta 34 ncmZpA&+_jbiwFY)gGzBpWkF_felC#B0HiG%CALa1W|;#3&L0Y~ diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-init.mp4 b/packager/app/test/testdata/hls-only-dash-only-captions/bear-640x360-video-init.mp4 index aa3f67b37c7f01b7c6bd30269fb2a92d1af790af..c9553addb55927b30281de77c54df8f769f1f8fb 100644 GIT binary patch delta 33 lcmcc3cArgxfq_9It)#Lbx4^^@$Y#ha&bI*K+>Ijc%mAIF3043A delta 29 hcmcc5cAHIvfq_9Kt)#Lbvp7E&$Yuc278@npnE`#z2oL}O diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-1.m4s b/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-1.m4s index 577826f3fa2f1e33884dbb39ced2392c4c69a734..7f6fea5f0301b5140ec26bede2b97e8ca57b12d4 100644 GIT binary patch delta 32 kcmaFQ_?c0Hfq_A#xTLZmx4^^@$Y#ha&bI*K+=(K$0hsv-?f?J) delta 28 hcmey&_?}UOfq_AxxTLZmvp7E&$Yuc27850I0|0r>2&e!6 diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-2.m4s b/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-2.m4s index 806b3320daab87cea63225e297b376b4a0096f46..a59e2a79add424b7aa7307d6577b63fbc9931d2b 100644 GIT binary patch delta 32 kcmaFM_>ob9fq_A#xTLZmx4^^@$Y#ha&bI*K+=(JL0hoIU=l}o! delta 28 hcmey!_?A(Gfq_AxxTLZmvp7E&$Yuc27850I0swhn2%-Q0 diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-3.m4s b/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-3.m4s index 22368c5f3059c45cb457a5b0a801bccbbcd55a38..08140209f9e829b7e4888d39439138e7b6f8d64f 100644 GIT binary patch delta 32 kcmaFM_>ob9fq_A#xTLZmx4^^@$Y#ha&bI*K+=(JL0hoIU=l}o! delta 28 hcmey!_?A(Gfq_AxxTLZmvp7E&$Yuc27850I0swhn2%-Q0 diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-4.m4s b/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-4.m4s index a4abbbe1de51824187f47a0e4638b8bc49ab3e38..666cbc3c1ed710944b034430a5cbd1993f25725f 100644 GIT binary patch delta 32 kcmaFM_>ob9fq_A#xTLZmx4^^@$Y#ha&bI*K+=(JL0hoIU=l}o! delta 28 hcmey!_?A(Gfq_AxxTLZmvp7E&$Yuc27850I0swhn2%-Q0 diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-5.m4s b/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-5.m4s index 904dea7dbe30572b437b8b02fbf898d35a6b2fc8..5c8f82c5da402b4ecbd1634ce793eae6566bb949 100644 GIT binary patch delta 32 kcmey%*vKToz`&qVTvAz(TVP@cWHV$I=UV`A?nIH70F8(VnE(I) delta 28 gcmZo<`pYQ7z`&qTTvAz(S)88>WHSJ1i-{610dDIEQvd(} diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-init.mp4 b/packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-init.mp4 index 0ec4fa9c168400edf0f9c87f5f7289267516aa1d..8d60268521f6ec0efd5531645467682400a388b9 100644 GIT binary patch delta 33 lcmcb@dV^Jhfq_9Kt)#Lbx4^^@$Y#ha&bI*K+>Ig!m;jtJ3Az9P delta 29 icmcb?dWBVlfq_9Gt)#Lbvp7E&$Yuc278@lFFaZF3t_XAh diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/output.m3u8 b/packager/app/test/testdata/hls-only-dash-only-captions/output.m3u8 index 718bd865b5..075fa4f659 100644 --- a/packager/app/test/testdata/hls-only-dash-only-captions/output.m3u8 +++ b/packager/app/test/testdata/hls-only-dash-only-captions/output.m3u8 @@ -7,5 +7,5 @@ #EXT-X-MEDIA:TYPE=SUBTITLES,URI="stream_1.m3u8",GROUP-ID="default-text-group",NAME="stream_1",AUTOSELECT=YES -#EXT-X-STREAM-INF:BANDWIDTH=1108051,AVERAGE-BANDWIDTH=1005999,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",SUBTITLES="default-text-group" +#EXT-X-STREAM-INF:BANDWIDTH=1108115,AVERAGE-BANDWIDTH=1006069,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",SUBTITLES="default-text-group" stream_3.m3u8 diff --git a/packager/app/test/testdata/hls-only-dash-only-captions/output.mpd b/packager/app/test/testdata/hls-only-dash-only-captions/output.mpd index bf21bef5d6..6bb2ccbbd3 100644 --- a/packager/app/test/testdata/hls-only-dash-only-captions/output.mpd +++ b/packager/app/test/testdata/hls-only-dash-only-captions/output.mpd @@ -3,7 +3,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -23,7 +23,7 @@ - + diff --git a/packager/app/test/testdata/hls-only-dash-only/bear-640x360-audio.mp4 b/packager/app/test/testdata/hls-only-dash-only/bear-640x360-audio.mp4 index 7128d250eb373f0b00e24787f724b1d5adf87dd1..a86c776cf5fecb8e5f63e59d2104906e8b1fdfb2 100644 GIT binary patch delta 35 ocmca|mFdP+CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riX2!40Mxn+1^@s6 delta 31 kcmca{mFdb=CJ_b(28Fbe%7V<|{9GWL0Z3bHlsK>o0IsPDzyJUM diff --git a/packager/app/test/testdata/hls-only-dash-only/bear-640x360-video.mp4 b/packager/app/test/testdata/hls-only-dash-only/bear-640x360-video.mp4 index 9bc668f8f67f4b86d9a97d1c0da8016d31dedff1..04ed1816fe8b874d83fe6973d42405a0d569603c 100644 GIT binary patch delta 47 zcmeC(Dl~DckOTt*gGO3OWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSSn`$07 bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/hls-only-dash-only/stream_1.m3u8 b/packager/app/test/testdata/hls-only-dash-only/stream_1.m3u8 index baf17ef66b..4e8bdb5f7f 100644 --- a/packager/app/test/testdata/hls-only-dash-only/stream_1.m3u8 +++ b/packager/app/test/testdata/hls-only-dash-only/stream_1.m3u8 @@ -3,9 +3,9 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="863@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@927 +#EXT-X-BYTERANGE:99313@931 bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:121807 diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.m3u8 index da4fa92b55..1714a25c7a 100644 --- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.m3u8 +++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.m3u8 @@ -3,10 +3,10 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="1003@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="1007@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@1071 +#EXT-X-BYTERANGE:17028@1075 bear-640x360-audio.mp4 #EXTINF:0.998, #EXT-X-BYTERANGE:16682 diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.mp4 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.mp4 index 81afce8c79e42d06cc52e1fac291b7d4de1fd525..6a196f333d4927841218aca7c7255f45145a8bb6 100644 GIT binary patch delta 35 ocmaEGhv~^3CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riukMp0NB9`yZ`_I delta 31 kcmaEIhv~r`CJ_b(28Fbe%7V<|{9GWL0Z3bHl<-*x0J0bgb^rhX diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video-iframe.m3u8 index 38e6359066..c0c92aecc6 100644 --- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video-iframe.m3u8 @@ -4,15 +4,15 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXT-X-I-FRAMES-ONLY -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1127@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1131@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@1195 +#EXT-X-BYTERANGE:15581@1199 bear-640x360-video.mp4 #EXTINF:1.001, -#EXT-X-BYTERANGE:18754@100508 +#EXT-X-BYTERANGE:18754@100512 bear-640x360-video.mp4 #EXTINF:0.734, -#EXT-X-BYTERANGE:20068@222848 +#EXT-X-BYTERANGE:20068@222852 bear-640x360-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.m3u8 index 1c32fdfbfb..0d032347c1 100644 --- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.m3u8 +++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.m3u8 @@ -3,10 +3,10 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1127@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1131@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@1195 +#EXT-X-BYTERANGE:99313@1199 bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:122340 diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.mp4 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.mp4 index c82b090d9eb1f7ea145388920f53aeafac31a77a..506a9d66ee46f0d4fe3bb65572e12c5df6e375ec 100644 GIT binary patch delta 47 zcmX@SPw4nQAqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWu;|YR0AF|w AtN;K2 delta 43 wcmX@UPw4PIArS@!29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgV9}os04rAvb^rhX 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 badadb49a123b7adc69a7173ae0fcc165f7134fb..d24e94440c32a29acc2164f8766e84b92f340cec 100644 GIT binary patch delta 35 ncmcc6%6O%fQG$ViL8Z8)vLLs>#1P14$Slsc0OH(@B72+wzvl}5 delta 31 kcmcc8%6OrbQG|hkL7}*$vLLfKKNrYm0MZs4CH6Q00Gvt*w*UYD 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 4f898961fbfb700b6cdb949468bdc1506ab7a32e..0293ce904548f3e10d34257d9b9a72e77e77c056 100644 GIT binary patch delta 35 ncmey?#Q3X;QG$ViL8Z8)vLLs>#1P14$Slsc0OH(@B1w(_$YBcT delta 31 jcmey>#Q3d=QG|hkL7}*$vLLfKKNrYm0MZs4C6XKgqpS&{ 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 08f022c924f01c6810b6af5c52e3b96d77e28eb3..3b18cda1d285f2f9fb1a255e4efe584f1390a772 100644 GIT binary patch delta 33 lcmX@_d)Zflfq_A#xTLZmx4^^@$Y#ha&bI*K+>Ii;)c~!v3TyxX delta 29 icmccYd)`-sfq_AxxTLZmvp7E&$Yuc278@mYs{sIuIjFnE|4n3IqTE delta 29 icmaFQ{+eBcfq_9Gt)#Lbvp7E&$Yuc278@n5GXnsEQ3$>O 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 5e673cb82983e2bb209524ba20df462918670b0d..131628625f83d50a0efc176a50a0380f4b42d021 100644 GIT binary patch delta 47 zcmeyrLZEr2fCK{rgGO;lWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSh7U`SY!<| delta 43 wcmZo(De!-VfCvKvgGzBpWkF_felC#B0HiG%C0ZpITP2uUC78ELuw;t>03&V-{Qv*} 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 c2d8240e94e93ce3d878d133ff3150858f3b3cb0..7ce8ccba26f61a6f4c66aa37afa6935938c9fbe8 100644 GIT binary patch delta 50 zcmeC^73t{}kzin8&?qjcEXXY|F$A(1GK=#qfH=2Nq*a8mRfMTkgt=9OWvd8l2^#=n CmJKfe delta 46 ycmeC_73t^|5n*6pP$@2{EXXX*&jqp>fV4%UM5_d2s{~W41aqqd%T@{25;g!W{|o&9 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 df7c5a353d1be89c1e581d6bae16c048f8edfedd..cc0d7602550120c93663c4b800f9716fad079dc9 100644 GIT binary patch delta 44 xcmdnGhj-^5UI_*U294s9%7WYi6GI@IA+tE&0*G@PMOsA|TSb_*iZCn20RS?;45I)5 delta 40 tcmdnFhj;59UJ(Wc29@HH%7V<|{9GWL0Z3akO0-Hawn{KIiEEC8Uj33&hj delta 29 hcmaFK@svY^fq_9Kt)#Lbvp7E&$Yuc278@l3Spa~52r~cx diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-1.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-1.m4s index f336d41dd24a431f7dff2792953df863c365ff8b..ea72612f12dd3776db3599952511f950f10a8651 100644 GIT binary patch delta 35 ncmccJ#CX4nQG$ViL8Z8)vLLs>#1P14$Slsc0OH(@BJPd=!5Rve delta 31 jcmccL#CW@jQG|hkL7}*$vLLfKKNrYm0MZs4CEOhWojnOr diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-2.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-2.m4s index e285304cbf782685b82e324369d47200c93b6459..ff7a97f469393712d63dca7cf3f51afe3a43a0aa 100644 GIT binary patch delta 35 ncmccC#CWTTQG$ViL8Z8)vLLs>#1P14$Slsc0OH(@B2JC~zrhNK delta 31 jcmccB#CWZVQG|hkL7}*$vLLfKKNrYm0MZs4C7c`qoD2y< diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-3.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-3.m4s index 65868cc9198288ff136ff519ab0ea8185015c0cf..4a33c09402369102b99eb35f5378c5cd5d18d37f 100644 GIT binary patch delta 33 lcmaD6_$E+-fq_A#xTLZmx4^^@$Y#ha&bI*K+>IhvGyt_B3c&yX delta 29 icmaD8_##k*fq_AxxTLZmvp7E&$Yuc278@n5XaE3`XbF1& diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-320x180-audio-init.mp4 index c5319cf20f272aa6e243231b245a425a02453574..76353f8f95bf8ef146cbdf4d2f82660e8bfc219b 100644 GIT binary patch delta 33 lcmX@kewtl^fq_9Kt)#Lbx4^^@$Y#ha&bI*K+>IienE{zr377x? delta 29 icmX@jew0mQi*MKX5-0NC^k<^TWy delta 31 kcmZqt&h+;ilL!L?gGzBpWkF_felC#B0HiH8N@VT^0I<#qpa1{> 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 2e50a20245d35b380edbb49404c90f4e11833adc..bc2f2c88ae80023fd1ccd9d1b3eb224335ae94f2 100644 GIT binary patch delta 35 ncmZ3`$+V=CNrHiaL8G{&vLLs>#1P14$Slsc0OH(@B0VhtwBQQ8 delta 31 jcmZ3|$+V!8NrZucL8Z8)vLLfKKNrYm0MZs4C3;!_l8Xs< 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 599e13cd9dbc63003e79fb2d5fe2a084537e8586..f708ee93571d3fe4bca016d9ce2c9b0663b951da 100644 GIT binary patch delta 33 lcmaFL@sdM=fq_9It)#Lbx4^^@$Y#ha&bI*K+>IiEEC8Uj33&hj delta 29 hcmaFK@svY^fq_9Kt)#Lbvp7E&$Yuc278@l3Spa~52r~cx 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 badadb49a123b7adc69a7173ae0fcc165f7134fb..d24e94440c32a29acc2164f8766e84b92f340cec 100644 GIT binary patch delta 35 ncmcc6%6O%fQG$ViL8Z8)vLLs>#1P14$Slsc0OH(@B72+wzvl}5 delta 31 kcmcc8%6OrbQG|hkL7}*$vLLfKKNrYm0MZs4CH6Q00Gvt*w*UYD 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 4f898961fbfb700b6cdb949468bdc1506ab7a32e..0293ce904548f3e10d34257d9b9a72e77e77c056 100644 GIT binary patch delta 35 ncmey?#Q3X;QG$ViL8Z8)vLLs>#1P14$Slsc0OH(@B1w(_$YBcT delta 31 jcmey>#Q3d=QG|hkL7}*$vLLfKKNrYm0MZs4C6XKgqpS&{ 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 08f022c924f01c6810b6af5c52e3b96d77e28eb3..3b18cda1d285f2f9fb1a255e4efe584f1390a772 100644 GIT binary patch delta 33 lcmX@_d)Zflfq_A#xTLZmx4^^@$Y#ha&bI*K+>Ii;)c~!v3TyxX delta 29 icmccYd)`-sfq_AxxTLZmvp7E&$Yuc278@mYs{sIuIjFnE|4n3IqTE delta 29 icmaFQ{+eBcfq_9Gt)#Lbvp7E&$Yuc278@n5GXnsEQ3$>O 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 b43a5cf3cd5b482468bf8e6a7c7612b4ef8a1193..9172dcef1ba0d10df28afbb593946ba23b6db1c0 100644 GIT binary patch delta 38 qcmX@u!FIHRO@e`eL8G{&vLLs>#1P14$Slsc0OH(6k*y+(x-9_R>kB{t delta 34 mcmX@w!FI5NO@x7gL8Z8)vLLfKKNrYm0MZtX5?du0bz1Ii^EC8W734Z_p delta 29 hcmaFO@ti}1fq_9Kt)#Lbvp7E&$Yuc278@mkSpb0a2sr=% diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/output.mpd b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/output.mpd index a233a9be50..bdf40745c9 100644 --- a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/output.mpd +++ b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/output.mpd @@ -7,7 +7,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + @@ -15,15 +15,7 @@ - - - - - - - - - + @@ -31,23 +23,21 @@ + + + + + + + + AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - - - - - - - - - - - + @@ -57,7 +47,7 @@ - + @@ -67,6 +57,16 @@ + + + + + + + + + + diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-1.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-1.m4s index badadb49a123b7adc69a7173ae0fcc165f7134fb..d24e94440c32a29acc2164f8766e84b92f340cec 100644 GIT binary patch delta 35 ncmcc6%6O%fQG$ViL8Z8)vLLs>#1P14$Slsc0OH(@B72+wzvl}5 delta 31 kcmcc8%6OrbQG|hkL7}*$vLLfKKNrYm0MZs4CH6Q00Gvt*w*UYD 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 4f898961fbfb700b6cdb949468bdc1506ab7a32e..0293ce904548f3e10d34257d9b9a72e77e77c056 100644 GIT binary patch delta 35 ncmey?#Q3X;QG$ViL8Z8)vLLs>#1P14$Slsc0OH(@B1w(_$YBcT delta 31 jcmey>#Q3d=QG|hkL7}*$vLLfKKNrYm0MZs4C6XKgqpS&{ 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 08f022c924f01c6810b6af5c52e3b96d77e28eb3..3b18cda1d285f2f9fb1a255e4efe584f1390a772 100644 GIT binary patch delta 33 lcmX@_d)Zflfq_A#xTLZmx4^^@$Y#ha&bI*K+>Ii;)c~!v3TyxX delta 29 icmccYd)`-sfq_AxxTLZmvp7E&$Yuc278@mYs{sIuIjFnE|4n3IqTE delta 29 icmaFQ{+eBcfq_9Gt)#Lbvp7E&$Yuc278@n5GXnsEQ3$>O 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 b43a5cf3cd5b482468bf8e6a7c7612b4ef8a1193..9172dcef1ba0d10df28afbb593946ba23b6db1c0 100644 GIT binary patch delta 38 qcmX@u!FIHRO@e`eL8G{&vLLs>#1P14$Slsc0OH(6k*y+(x-9_R>kB{t delta 34 mcmX@w!FI5NO@x7gL8Z8)vLLfKKNrYm0MZtX5?du0bz1Ii^EC8W734Z_p delta 29 hcmaFO@ti}1fq_9Kt)#Lbvp7E&$Yuc278@mkSpb0a2sr=% diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output.mpd b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output.mpd index 24b5e67416..2dbe4ccd2b 100644 --- a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output.mpd +++ b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output.mpd @@ -3,7 +3,7 @@ - + AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== @@ -17,7 +17,7 @@ - + diff --git a/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-1.m4s b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-1.m4s index badadb49a123b7adc69a7173ae0fcc165f7134fb..d24e94440c32a29acc2164f8766e84b92f340cec 100644 GIT binary patch delta 35 ncmcc6%6O%fQG$ViL8Z8)vLLs>#1P14$Slsc0OH(@B72+wzvl}5 delta 31 kcmcc8%6OrbQG|hkL7}*$vLLfKKNrYm0MZs4CH6Q00Gvt*w*UYD 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 4f898961fbfb700b6cdb949468bdc1506ab7a32e..0293ce904548f3e10d34257d9b9a72e77e77c056 100644 GIT binary patch delta 35 ncmey?#Q3X;QG$ViL8Z8)vLLs>#1P14$Slsc0OH(@B1w(_$YBcT delta 31 jcmey>#Q3d=QG|hkL7}*$vLLfKKNrYm0MZs4C6XKgqpS&{ 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 08f022c924f01c6810b6af5c52e3b96d77e28eb3..3b18cda1d285f2f9fb1a255e4efe584f1390a772 100644 GIT binary patch delta 33 lcmX@_d)Zflfq_A#xTLZmx4^^@$Y#ha&bI*K+>Ii;)c~!v3TyxX delta 29 icmccYd)`-sfq_AxxTLZmvp7E&$Yuc278@mYs{sIuIjFnE|4n3IqTE delta 29 icmaFQ{+eBcfq_9Gt)#Lbvp7E&$Yuc278@n5GXnsEQ3$>O 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 b43a5cf3cd5b482468bf8e6a7c7612b4ef8a1193..9172dcef1ba0d10df28afbb593946ba23b6db1c0 100644 GIT binary patch delta 38 qcmX@u!FIHRO@e`eL8G{&vLLs>#1P14$Slsc0OH(6k*y+(x-9_R>kB{t delta 34 mcmX@w!FI5NO@x7gL8Z8)vLLfKKNrYm0MZtX5?du0bz1Ii^EC8W734Z_p delta 29 hcmaFO@ti}1fq_9Kt)#Lbvp7E&$Yuc278@mkSpb0a2sr=% diff --git a/packager/app/test/testdata/live-profile-and-encryption/output.mpd b/packager/app/test/testdata/live-profile-and-encryption/output.mpd index cd7abd5883..2c92b7dd6a 100644 --- a/packager/app/test/testdata/live-profile-and-encryption/output.mpd +++ b/packager/app/test/testdata/live-profile-and-encryption/output.mpd @@ -7,7 +7,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + @@ -21,7 +21,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-1.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-1.m4s index badadb49a123b7adc69a7173ae0fcc165f7134fb..d24e94440c32a29acc2164f8766e84b92f340cec 100644 GIT binary patch delta 35 ncmcc6%6O%fQG$ViL8Z8)vLLs>#1P14$Slsc0OH(@B72+wzvl}5 delta 31 kcmcc8%6OrbQG|hkL7}*$vLLfKKNrYm0MZs4CH6Q00Gvt*w*UYD 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 7225f42cfdec971dc6c811f508a086762fbb735f..f462b514357b5a31b5a6cfb2988508ed5ebc0587 100644 GIT binary patch delta 35 ncmdnj%y_7oQG$ViL8Z8)vLLs>#1P14$Slsc0OH(@BC8w$x{3Ij4>HwaE2}b|` delta 29 hcmbR3H{DN!fq_AxxTLZmvp7E&$Yuc278@m))d7BM2mt^9 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 2b138e6923a4c26be18707ef5392c2139574e51e..68d3e3c97898f7a3a37bffbebce66b3185d708c5 100644 GIT binary patch delta 33 lcmdnazMEZwfq_9Kt)#Lbx4^^@$Y#ha&bI*K+>IiOnE{nH31|QS delta 29 icmdnZzMWl!fq_9Gt)#Lbvp7E&$Yuc278@lNGXns2i3lP9 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 b43a5cf3cd5b482468bf8e6a7c7612b4ef8a1193..9172dcef1ba0d10df28afbb593946ba23b6db1c0 100644 GIT binary patch delta 38 qcmX@u!FIHRO@e`eL8G{&vLLs>#1P14$Slsc0OH(6k*y+(x-9_R>kB{t delta 34 mcmX@w!FI5NO@x7gL8Z8)vLLfKKNrYm0MZtX5?du0bz10mQkDB3nfmGwuNZ?BNVH delta 34 ncmZqJ%l>B%y9fgVgGzBpWkF_felC#B0HiG%CALa1X50e+!l?@M 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 6edb281273d10b53800b25fef4b4ec9672f0d3de..5c7c77253b0593bd2248b2e91e1577e1775389e4 100644 GIT binary patch delta 38 rcmccpiRJz$76}Fh294s9%7WYi6GI@IA+tE&0*G@PMYf7Cx?2JO0x1j= delta 34 ncmccriRJbu77+#p29@HH%7V<|{9GWL0Z3akN^F&2bhiWm*3$~n 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 b6d8683a49ba055cbb5bb75d8eaa4bf4395f28e9..5476e932c76da7ec890cf03cd29395944954c0c5 100644 GIT binary patch delta 33 lcmdnYv7JMLfq_9It)#Lbx4^^@$Y#ha&bI*K+>IjgEC7?y2;%?% delta 29 hcmdnav6(}Jfq_9Kt)#Lbvp7E&$Yuc278@nxSpan`2b}-_ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output.mpd b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output.mpd index 834b2af16d..13dfe0bf32 100644 --- a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output.mpd +++ b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output.mpd @@ -5,7 +5,7 @@ - + @@ -17,7 +17,7 @@ - + diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-1.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-1.m4s index f88b004a5e3b4e4219503d855cb433c745e1d97b..9bf4381128042fa573185d84d278ad3b34a8d51c 100644 GIT binary patch delta 35 ncmZo^W9(>Slwe?BP$@2{EXXY|F$A(1GK=#qfH-%f$Ok6?tgH%~ delta 31 jcmeBZV{B<-6k%XsP$({`EXXX*&jqp>fV9O%i4RTyi)RT{ 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 bb9fca908fdd0d5720e7d480a39f549358ac5710..81e95aa15285a25e0486fae42546be9e0bff5222 100644 GIT binary patch delta 35 ncmey=%=oRDQG$ViL8Z8)vLLs>#1P14$Slsc0OH(@BKI5t$c_tM delta 31 kcmey?%=oF9QG|hkL7}*$vLLfKKNrYm0MZs4CGI%_0Hg5=7ytkO 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 2aac646b7a30d97b87057722f18556d4f69f4961..f83ad44a8685dd92c7311d067fdb6ddc36c41f1c 100644 GIT binary patch delta 33 lcmX@@civBefq_A#xTLZmx4^^@$Y#ha&bI*K+>IjU>Hw?k3F80& delta 29 hcmX@_ciK;cfq_AxxTLZmvp7E&$Yuc278@nZ)d7k#2%P`` 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 2b138e6923a4c26be18707ef5392c2139574e51e..68d3e3c97898f7a3a37bffbebce66b3185d708c5 100644 GIT binary patch delta 33 lcmdnazMEZwfq_9Kt)#Lbx4^^@$Y#ha&bI*K+>IiOnE{nH31|QS delta 29 icmdnZzMWl!fq_9Gt)#Lbvp7E&$Yuc278@lNGXns2i3lP9 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 5c18184d267aa8d4a268dccb571c94f3205945df..d111baa752f6d5d0528265f83406da43ecb3a522 100644 GIT binary patch delta 38 qcmey`!S=I*O@e`eL8G{&vLLs>#1P14$Slsc0OH(6k*y+(i7f!_CkxyF delta 34 mcmey_!S=O-O@x7gL8Z8)vLLfKKNrYm0MZtX5?du06I%epPzss= 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 6033d3393eafadd000ec758a295d2128b1cd9aa8..140a9007cdc43e14af169a0818153ddf1ce5704e 100644 GIT binary patch delta 38 rcmdn6mwn4#b_oUs294s9%7WYi6GI@IA+tE&0*G@PMYf7C&bbEw=|T)s delta 34 ncmdn8mwm%tb`b^!29@HH%7V<|{9GWL0Z3akN^F&2oO2HVz~c)M 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 c6594c8d954e624c5556eee95bf9b1d591790e62..848de8e384c2e4c1e10eab3a58994607364fc8ac 100644 GIT binary patch delta 38 qcmeDG%rf~iiv$A$gGO;lWkGI%i6M~9kXf8>0mQkDB3nfmt1SWT9SgAl delta 34 ncmbRInWg_TiwFY)gGzBpWkF_felC#B0HiG%CALa1R$Br9#4ZYN 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 b6d8683a49ba055cbb5bb75d8eaa4bf4395f28e9..5476e932c76da7ec890cf03cd29395944954c0c5 100644 GIT binary patch delta 33 lcmdnYv7JMLfq_9It)#Lbx4^^@$Y#ha&bI*K+>IjgEC7?y2;%?% delta 29 hcmdnav6(}Jfq_9Kt)#Lbvp7E&$Yuc278@nxSpan`2b}-_ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output.mpd b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output.mpd index a3e7a483f7..240a4247f3 100644 --- a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output.mpd +++ b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output.mpd @@ -3,7 +3,7 @@ - + @@ -15,7 +15,7 @@ - + diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-1.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-1.m4s index f88b004a5e3b4e4219503d855cb433c745e1d97b..9bf4381128042fa573185d84d278ad3b34a8d51c 100644 GIT binary patch delta 35 ncmZo^W9(>Slwe?BP$@2{EXXY|F$A(1GK=#qfH-%f$Ok6?tgH%~ delta 31 jcmeBZV{B<-6k%XsP$({`EXXX*&jqp>fV9O%i4RTyi)RT{ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-2.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-2.m4s index 8ce5fdb11b143464521f049500358e219a20b5ce..7a8459bce1057e103a47683a64ec6bd43d90312e 100644 GIT binary patch delta 35 ncmey@z}VEtD8azMpi*2?S&&;`VhCh2WESUJ0CDa{kt_!Qx+MyH delta 31 jcmZo_Wc=5_D8j(Npio>=S&&(rp9^F&0BMVj5?KxamA?r# diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-3.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-3.m4s index 49c6767ad72d177470fc3b686f2adda45549dd3d..040dbae8c39f5836b21daae65da2de0b769f3cb9 100644 GIT binary patch delta 33 lcmdn)v)f04fq_A#xTLZmx4^^@$Y#ha&bI*K+>Ij2Y5=B338DZ1 delta 29 hcmdn(v)xC8fq_AxxTLZmvp7E&$Yuc278@m$)c}P)2wVUF diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-audio-init.mp4 index 056b2ef8322ec5e430f74f253304bd42ef5aaddd..9989085206aabc95068bccda37f1d6080e836892 100644 GIT binary patch delta 33 lcmX@WeuQ0ufq_9Kt)#Lbx4^^@$Y#ha&bI*K+>Ih@m;slF34;It delta 29 icmX@Yet=zsfq_9Gt)#Lbvp7E&$Yuc278@njFarR1lL$Qk diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-1.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-1.m4s index 5c18184d267aa8d4a268dccb571c94f3205945df..d111baa752f6d5d0528265f83406da43ecb3a522 100644 GIT binary patch delta 38 qcmey`!S=I*O@e`eL8G{&vLLs>#1P14$Slsc0OH(6k*y+(i7f!_CkxyF delta 34 mcmey_!S=O-O@x7gL8Z8)vLLfKKNrYm0MZtX5?du06I%epPzss= diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-2.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-2.m4s index 2a2982dac4b659517777be2e425655d717e8c371..a3f8b6ebc959a24f908ac3744032e6af78fc902f 100644 GIT binary patch delta 38 rcmX@PoBix=b_oUs294s9%7WYi6GI@IA+tE&0*G@PMYf7CZoLZt@CFQ- delta 34 ncmX@RoBiZ&b`b^!29@HH%7V<|{9GWL0Z3akN^F&2+$-t76}Fh294s9%7WYi6GI@IA+tE&0*G@PMYf7CUa$ll77+#p29@HH%7V<|{9GWL0Z3akN^F&2ykY?W+WHH1 diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/bear-640x360-video-init.mp4 index 4df1c9fb4274981cac53b41b42328e7e0e8963c7..0009d9133554c62af14d89517bca880594048294 100644 GIT binary patch delta 33 lcmdnPaezaDfq_9It)#Lbx4^^@$Y#ha&bI*K+>Ig{EC7}x2>t*7 delta 29 hcmX@Wv4=y1fq_9Kt)#Lbvp7E&$Yuc278@lrSO9l62e<$L diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/output.mpd b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/output.mpd index 80c25d20db..d66effc16e 100644 --- a/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/output.mpd +++ b/packager/app/test/testdata/live-profile-and-key-rotation-cbcs/output.mpd @@ -5,7 +5,7 @@ - + @@ -17,7 +17,7 @@ - + diff --git a/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-1.m4s b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-1.m4s index f88b004a5e3b4e4219503d855cb433c745e1d97b..9bf4381128042fa573185d84d278ad3b34a8d51c 100644 GIT binary patch delta 35 ncmZo^W9(>Slwe?BP$@2{EXXY|F$A(1GK=#qfH-%f$Ok6?tgH%~ delta 31 jcmeBZV{B<-6k%XsP$({`EXXX*&jqp>fV9O%i4RTyi)RT{ 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 bb9fca908fdd0d5720e7d480a39f549358ac5710..81e95aa15285a25e0486fae42546be9e0bff5222 100644 GIT binary patch delta 35 ncmey=%=oRDQG$ViL8Z8)vLLs>#1P14$Slsc0OH(@BKI5t$c_tM delta 31 kcmey?%=oF9QG|hkL7}*$vLLfKKNrYm0MZs4CGI%_0Hg5=7ytkO 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 2aac646b7a30d97b87057722f18556d4f69f4961..f83ad44a8685dd92c7311d067fdb6ddc36c41f1c 100644 GIT binary patch delta 33 lcmX@@civBefq_A#xTLZmx4^^@$Y#ha&bI*K+>IjU>Hw?k3F80& delta 29 hcmX@_ciK;cfq_AxxTLZmvp7E&$Yuc278@nZ)d7k#2%P`` 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 2b138e6923a4c26be18707ef5392c2139574e51e..68d3e3c97898f7a3a37bffbebce66b3185d708c5 100644 GIT binary patch delta 33 lcmdnazMEZwfq_9Kt)#Lbx4^^@$Y#ha&bI*K+>IiOnE{nH31|QS delta 29 icmdnZzMWl!fq_9Gt)#Lbvp7E&$Yuc278@lNGXns2i3lP9 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 5c18184d267aa8d4a268dccb571c94f3205945df..d111baa752f6d5d0528265f83406da43ecb3a522 100644 GIT binary patch delta 38 qcmey`!S=I*O@e`eL8G{&vLLs>#1P14$Slsc0OH(6k*y+(i7f!_CkxyF delta 34 mcmey_!S=O-O@x7gL8Z8)vLLfKKNrYm0MZtX5?du06I%epPzss= 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 6033d3393eafadd000ec758a295d2128b1cd9aa8..140a9007cdc43e14af169a0818153ddf1ce5704e 100644 GIT binary patch delta 38 rcmdn6mwn4#b_oUs294s9%7WYi6GI@IA+tE&0*G@PMYf7C&bbEw=|T)s delta 34 ncmdn8mwm%tb`b^!29@HH%7V<|{9GWL0Z3akN^F&2oO2HVz~c)M 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 c6594c8d954e624c5556eee95bf9b1d591790e62..848de8e384c2e4c1e10eab3a58994607364fc8ac 100644 GIT binary patch delta 38 qcmeDG%rf~iiv$A$gGO;lWkGI%i6M~9kXf8>0mQkDB3nfmt1SWT9SgAl delta 34 ncmbRInWg_TiwFY)gGzBpWkF_felC#B0HiG%CALa1R$Br9#4ZYN 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 b6d8683a49ba055cbb5bb75d8eaa4bf4395f28e9..5476e932c76da7ec890cf03cd29395944954c0c5 100644 GIT binary patch delta 33 lcmdnYv7JMLfq_9It)#Lbx4^^@$Y#ha&bI*K+>IjgEC7?y2;%?% delta 29 hcmdnav6(}Jfq_9Kt)#Lbvp7E&$Yuc278@nxSpan`2b}-_ diff --git a/packager/app/test/testdata/live-profile-and-key-rotation/output.mpd b/packager/app/test/testdata/live-profile-and-key-rotation/output.mpd index 0dfd5c1afe..c8cf36ad11 100644 --- a/packager/app/test/testdata/live-profile-and-key-rotation/output.mpd +++ b/packager/app/test/testdata/live-profile-and-key-rotation/output.mpd @@ -5,7 +5,7 @@ - + @@ -17,7 +17,7 @@ - + diff --git a/packager/app/test/testdata/live-profile/bear-640x360-audio-1.m4s b/packager/app/test/testdata/live-profile/bear-640x360-audio-1.m4s index 55ee417db133ab4b70534ac50952bb7adbba691f..6e56dd8555c756cee3aab506c0bf6c812e47d5ec 100644 GIT binary patch delta 35 ncmcc6%6O%fQG$ViL8Z8)vLLs>#1P14$Slsc0OH(@B72+wzvl}5 delta 31 kcmcc8%6OrbQG|hkL7}*$vLLfKKNrYm0MZs4CH6Q00Gvt*w*UYD 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 1ddbee3bdddead3bf9553e039e102efdb21657c1..5bf76aa0d1a4c7974b9318d2953c0a5362c5ded7 100644 GIT binary patch delta 33 lcmaD^|F&L&fq_A#xTLZmx4^^@$Y#ha&bI*K+>Ihv?E%1^3pW4& delta 29 icmaD`|FT|$fq_AxxTLZmvp7E&$Yuc278@n5+5-TbZ3*!J 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 a7100e5c241d78c4d5f7a5830c8f6dc6ed92b838..d6bcbb5de8cac9e9db7d2d5f5b828ac3cf72d62a 100644 GIT binary patch delta 33 lcmZ4Fz06yJfq_A#xTLZmx4^^@$Y#ha&bI*K+>IiAssN#$3E%(# delta 29 hcmZ4Hy~taHfq_AxxTLZmvp7E&$Yuc278@n{Q~`lS2$}!@ 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 825a8072d239ef72afac81d49c7488de32ed5746..2b143225fa32563f54511044d9a96fe2b1658ba9 100644 GIT binary patch delta 33 lcmbQqHkVC;fq_9Kt)#Lbx4^^@$Y#ha&bI*K+>Iiv%m9o$2#f## delta 29 hcmbQsHj_<+fq_9Gt)#Lbvp7E&$Yuc278@m4nE`Hx2Sxw@ 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 4dbca6653fa09207d3845c9b6c91272135d3bdbb..2c90c4688356179183c0ca7e434f855991e3bd5a 100644 GIT binary patch delta 38 qcmX@u!FIHRO@e`eL8G{&vLLs>#1P14$Slsc0OH(6k*y+(x-9_R>kB{t delta 34 mcmX@w!FI5NO@x7gL8Z8)vLLfKKNrYm0MZtX5?du0bz1};o=LF delta 34 ncmZ3ygMI!Eb`b^!29@HH%7V<|{9GWL0Z3akN^F&20mQkDB3nfmv&;ec-wX2q delta 34 ncmZpA&+_jbiwFY)gGzBpWkF_felC#B0HiG%CALa1W|;#3&L0Y~ 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 aa3f67b37c7f01b7c6bd30269fb2a92d1af790af..c9553addb55927b30281de77c54df8f769f1f8fb 100644 GIT binary patch delta 33 lcmcc3cArgxfq_9It)#Lbx4^^@$Y#ha&bI*K+>Ijc%mAIF3043A delta 29 hcmcc5cAHIvfq_9Kt)#Lbvp7E&$Yuc278@npnE`#z2oL}O diff --git a/packager/app/test/testdata/live-profile/output.mpd b/packager/app/test/testdata/live-profile/output.mpd index c68a2c59d7..a972a41fa3 100644 --- a/packager/app/test/testdata/live-profile/output.mpd +++ b/packager/app/test/testdata/live-profile/output.mpd @@ -3,7 +3,7 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-0.m4s b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-0.m4s index 55ee417db133ab4b70534ac50952bb7adbba691f..6e56dd8555c756cee3aab506c0bf6c812e47d5ec 100644 GIT binary patch delta 35 ncmcc6%6O%fQG$ViL8Z8)vLLs>#1P14$Slsc0OH(@B72+wzvl}5 delta 31 kcmcc8%6OrbQG|hkL7}*$vLLfKKNrYm0MZs4CH6Q00Gvt*w*UYD diff --git a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-45056.m4s b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-45056.m4s index 1ddbee3bdddead3bf9553e039e102efdb21657c1..5bf76aa0d1a4c7974b9318d2953c0a5362c5ded7 100644 GIT binary patch delta 33 lcmaD^|F&L&fq_A#xTLZmx4^^@$Y#ha&bI*K+>Ihv?E%1^3pW4& delta 29 icmaD`|FT|$fq_AxxTLZmvp7E&$Yuc278@n5+5-TbZ3*!J diff --git a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-89088.m4s b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-89088.m4s index a7100e5c241d78c4d5f7a5830c8f6dc6ed92b838..d6bcbb5de8cac9e9db7d2d5f5b828ac3cf72d62a 100644 GIT binary patch delta 33 lcmZ4Fz06yJfq_A#xTLZmx4^^@$Y#ha&bI*K+>IiAssN#$3E%(# delta 29 hcmZ4Hy~taHfq_AxxTLZmvp7E&$Yuc278@n{Q~`lS2$}!@ diff --git a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-audio-init.mp4 index 825a8072d239ef72afac81d49c7488de32ed5746..2b143225fa32563f54511044d9a96fe2b1658ba9 100644 GIT binary patch delta 33 lcmbQqHkVC;fq_9Kt)#Lbx4^^@$Y#ha&bI*K+>Iiv%m9o$2#f## delta 29 hcmbQsHj_<+fq_9Gt)#Lbvp7E&$Yuc278@m4nE`Hx2Sxw@ diff --git a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-0.m4s b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-0.m4s index 4dbca6653fa09207d3845c9b6c91272135d3bdbb..2c90c4688356179183c0ca7e434f855991e3bd5a 100644 GIT binary patch delta 38 qcmX@u!FIHRO@e`eL8G{&vLLs>#1P14$Slsc0OH(6k*y+(x-9_R>kB{t delta 34 mcmX@w!FI5NO@x7gL8Z8)vLLfKKNrYm0MZtX5?du0bz1};o=LF delta 34 ncmZ3ygMI!Eb`b^!29@HH%7V<|{9GWL0Z3akN^F&20mQkDB3nfmv&;ec-wX2q delta 34 ncmZpA&+_jbiwFY)gGzBpWkF_felC#B0HiG%CALa1W|;#3&L0Y~ diff --git a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-init.mp4 b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/bear-640x360-video-init.mp4 index aa3f67b37c7f01b7c6bd30269fb2a92d1af790af..c9553addb55927b30281de77c54df8f769f1f8fb 100644 GIT binary patch delta 33 lcmcc3cArgxfq_9It)#Lbx4^^@$Y#ha&bI*K+>Ijc%mAIF3043A delta 29 hcmcc5cAHIvfq_9Kt)#Lbvp7E&$Yuc278@npnE`#z2oL}O diff --git a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/output.mpd b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/output.mpd index 67cd9e16af..4090157956 100644 --- a/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/output.mpd +++ b/packager/app/test/testdata/live-static-profile-with-time-in-segment-name/output.mpd @@ -3,7 +3,7 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/packager/app/test/testdata/live-static-profile/bear-640x360-audio-1.m4s b/packager/app/test/testdata/live-static-profile/bear-640x360-audio-1.m4s index 55ee417db133ab4b70534ac50952bb7adbba691f..6e56dd8555c756cee3aab506c0bf6c812e47d5ec 100644 GIT binary patch delta 35 ncmcc6%6O%fQG$ViL8Z8)vLLs>#1P14$Slsc0OH(@B72+wzvl}5 delta 31 kcmcc8%6OrbQG|hkL7}*$vLLfKKNrYm0MZs4CH6Q00Gvt*w*UYD 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 1ddbee3bdddead3bf9553e039e102efdb21657c1..5bf76aa0d1a4c7974b9318d2953c0a5362c5ded7 100644 GIT binary patch delta 33 lcmaD^|F&L&fq_A#xTLZmx4^^@$Y#ha&bI*K+>Ihv?E%1^3pW4& delta 29 icmaD`|FT|$fq_AxxTLZmvp7E&$Yuc278@n5+5-TbZ3*!J 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 a7100e5c241d78c4d5f7a5830c8f6dc6ed92b838..d6bcbb5de8cac9e9db7d2d5f5b828ac3cf72d62a 100644 GIT binary patch delta 33 lcmZ4Fz06yJfq_A#xTLZmx4^^@$Y#ha&bI*K+>IiAssN#$3E%(# delta 29 hcmZ4Hy~taHfq_AxxTLZmvp7E&$Yuc278@n{Q~`lS2$}!@ 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 825a8072d239ef72afac81d49c7488de32ed5746..2b143225fa32563f54511044d9a96fe2b1658ba9 100644 GIT binary patch delta 33 lcmbQqHkVC;fq_9Kt)#Lbx4^^@$Y#ha&bI*K+>Iiv%m9o$2#f## delta 29 hcmbQsHj_<+fq_9Gt)#Lbvp7E&$Yuc278@m4nE`Hx2Sxw@ 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 4dbca6653fa09207d3845c9b6c91272135d3bdbb..2c90c4688356179183c0ca7e434f855991e3bd5a 100644 GIT binary patch delta 38 qcmX@u!FIHRO@e`eL8G{&vLLs>#1P14$Slsc0OH(6k*y+(x-9_R>kB{t delta 34 mcmX@w!FI5NO@x7gL8Z8)vLLfKKNrYm0MZtX5?du0bz1};o=LF delta 34 ncmZ3ygMI!Eb`b^!29@HH%7V<|{9GWL0Z3akN^F&20mQkDB3nfmv&;ec-wX2q delta 34 ncmZpA&+_jbiwFY)gGzBpWkF_felC#B0HiG%CALa1W|;#3&L0Y~ 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 aa3f67b37c7f01b7c6bd30269fb2a92d1af790af..c9553addb55927b30281de77c54df8f769f1f8fb 100644 GIT binary patch delta 33 lcmcc3cArgxfq_9It)#Lbx4^^@$Y#ha&bI*K+>Ijc%mAIF3043A delta 29 hcmcc5cAHIvfq_9Kt)#Lbvp7E&$Yuc278@npnE`#z2oL}O diff --git a/packager/app/test/testdata/live-static-profile/output.mpd b/packager/app/test/testdata/live-static-profile/output.mpd index 5bb9dacec3..606f454b33 100644 --- a/packager/app/test/testdata/live-static-profile/output.mpd +++ b/packager/app/test/testdata/live-static-profile/output.mpd @@ -3,7 +3,7 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/packager/app/test/testdata/mp4-trailing-moov/bear-640x360-trailing-moov-audio.mp4 b/packager/app/test/testdata/mp4-trailing-moov/bear-640x360-trailing-moov-audio.mp4 index 7128d250eb373f0b00e24787f724b1d5adf87dd1..a86c776cf5fecb8e5f63e59d2104906e8b1fdfb2 100644 GIT binary patch delta 35 ocmca|mFdP+CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riX2!40Mxn+1^@s6 delta 31 kcmca{mFdb=CJ_b(28Fbe%7V<|{9GWL0Z3bHlsK>o0IsPDzyJUM diff --git a/packager/app/test/testdata/mp4-trailing-moov/bear-640x360-trailing-moov-video.mp4 b/packager/app/test/testdata/mp4-trailing-moov/bear-640x360-trailing-moov-video.mp4 index 9bc668f8f67f4b86d9a97d1c0da8016d31dedff1..04ed1816fe8b874d83fe6973d42405a0d569603c 100644 GIT binary patch delta 47 zcmeC(Dl~DckOTt*gGO3OWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSSn`$07 bear-640x360-trailing-moov-video.mp4 - - + + @@ -14,8 +14,8 @@ bear-640x360-trailing-moov-audio.mp4 - - + + diff --git a/packager/app/test/testdata/mp4-trailing-moov/stream_0.m3u8 b/packager/app/test/testdata/mp4-trailing-moov/stream_0.m3u8 index 66c3b375a1..b09c6ea13a 100644 --- a/packager/app/test/testdata/mp4-trailing-moov/stream_0.m3u8 +++ b/packager/app/test/testdata/mp4-trailing-moov/stream_0.m3u8 @@ -3,9 +3,9 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-trailing-moov-audio.mp4",BYTERANGE="793@0" +#EXT-X-MAP:URI="bear-640x360-trailing-moov-audio.mp4",BYTERANGE="797@0" #EXTINF:1.022, -#EXT-X-BYTERANGE:17028@861 +#EXT-X-BYTERANGE:17028@865 bear-640x360-trailing-moov-audio.mp4 #EXTINF:0.998, #EXT-X-BYTERANGE:16285 diff --git a/packager/app/test/testdata/mp4-trailing-moov/stream_1.m3u8 b/packager/app/test/testdata/mp4-trailing-moov/stream_1.m3u8 index 08568d3384..d86af4e3c4 100644 --- a/packager/app/test/testdata/mp4-trailing-moov/stream_1.m3u8 +++ b/packager/app/test/testdata/mp4-trailing-moov/stream_1.m3u8 @@ -3,9 +3,9 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-trailing-moov-video.mp4",BYTERANGE="859@0" +#EXT-X-MAP:URI="bear-640x360-trailing-moov-video.mp4",BYTERANGE="863@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:99313@927 +#EXT-X-BYTERANGE:99313@931 bear-640x360-trailing-moov-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:121807 diff --git a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-audio.mp4 b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-audio.mp4 index db1cc3a4aee57baaca48c20c7022d825a78f68ab..c5c37481375594d669d19e4a48bce0371b60d049 100644 GIT binary patch delta 35 ocmZ2}mvQx7MhON629>mu%7WYi6GI@IA+tE&0*G@ricHP}0Lmr{Q2+n{ delta 31 kcmZ2|mvQ-BMiB-E28Fbe%7V<|{9GWL0Z3bHl$e|c0Hs9=3jhEB 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 eca0bdb0f27b963f687201b85b6a10f66e3fe451..ea0447f779c53b9c555954ae25cbb3dd4372824f 100644 GIT binary patch delta 38 rcmcb#k>%P(76}Fh2930m%7WYi6GI@IA+tE&0*G@PMYf7C?vnrj?C=Z7 delta 34 ncmcb%k>%1x77+#p29>mu%7V<|{9GWL0Z3akN^F&2+$RA5#4QSj diff --git a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/decrypted-bear-320x240-vp9-opus-audio-0.mp4 b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/decrypted-bear-320x240-vp9-opus-audio-0.mp4 index 4332c1ac88197c6f45afb6e78b832d1d7ec558d5..92eb02604962ba037c086d4f7ffe401b097f5360 100644 GIT binary patch delta 35 ocmdmWm2uxyMhON629>mu%7WYi6GI@IA+tE&0*G@riY&_l0L?iIb^rhX delta 31 kcmdmYm2uZqMiB-E28Fbe%7V<|{9GWL0Z3bHlvtJp0H^>8FaQ7m diff --git a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/decrypted-bear-320x240-vp9-opus-video-0.mp4 b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/decrypted-bear-320x240-vp9-opus-video-0.mp4 index 987cf6ed2db856221656ad1148f5366e9aad199d..ce95f11641d43c95b77569c82964d43f90810f93 100644 GIT binary patch delta 38 rcmZ3rf@R$b76}Fh2930m%7WYi6GI@IA+tE&0*G@PMYf7CiirRK-L(q3 delta 34 ncmZ3tf@ReT77+#p29>mu%7V<|{9GWL0Z3akN^F&26cYgewt5M8 diff --git a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/output.mpd b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/output.mpd index 283e00ab9e..53e657b9b4 100644 --- a/packager/app/test/testdata/opus-vp9-mp4-with-encryption/output.mpd +++ b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/output.mpd @@ -10,8 +10,8 @@ bear-320x240-vp9-opus-audio.mp4 - - + + @@ -22,8 +22,8 @@ bear-320x240-vp9-opus-video.mp4 - - + + diff --git a/packager/app/test/testdata/video-audio-ttml/bear-640x360-audio.mp4 b/packager/app/test/testdata/video-audio-ttml/bear-640x360-audio.mp4 index 7128d250eb373f0b00e24787f724b1d5adf87dd1..a86c776cf5fecb8e5f63e59d2104906e8b1fdfb2 100644 GIT binary patch delta 35 ocmca|mFdP+CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riX2!40Mxn+1^@s6 delta 31 kcmca{mFdb=CJ_b(28Fbe%7V<|{9GWL0Z3bHlsK>o0IsPDzyJUM diff --git a/packager/app/test/testdata/video-audio-ttml/bear-640x360-video.mp4 b/packager/app/test/testdata/video-audio-ttml/bear-640x360-video.mp4 index 9bc668f8f67f4b86d9a97d1c0da8016d31dedff1..04ed1816fe8b874d83fe6973d42405a0d569603c 100644 GIT binary patch delta 47 zcmeC(Dl~DckOTt*gGO3OWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSSn`$07 bear-640x360-video.mp4 - - + + @@ -19,8 +19,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/video-audio-webvtt/bear-640x360-audio.mp4 b/packager/app/test/testdata/video-audio-webvtt/bear-640x360-audio.mp4 index 7128d250eb373f0b00e24787f724b1d5adf87dd1..a86c776cf5fecb8e5f63e59d2104906e8b1fdfb2 100644 GIT binary patch delta 35 ocmca|mFdP+CJ6=x29>mu%7WYi6GI@IA+tE&0*G@riX2!40Mxn+1^@s6 delta 31 kcmca{mFdb=CJ_b(28Fbe%7V<|{9GWL0Z3bHlsK>o0IsPDzyJUM diff --git a/packager/app/test/testdata/video-audio-webvtt/bear-640x360-video.mp4 b/packager/app/test/testdata/video-audio-webvtt/bear-640x360-video.mp4 index 9bc668f8f67f4b86d9a97d1c0da8016d31dedff1..04ed1816fe8b874d83fe6973d42405a0d569603c 100644 GIT binary patch delta 47 zcmeC(Dl~DckOTt*gGO3OWkGI%i6M~9kXf8>0mQkDBCR5fts+dVBFtMwSSn`$07 bear-640x360-video.mp4 - - + + @@ -19,8 +19,8 @@ bear-640x360-audio.mp4 - - + + diff --git a/packager/app/test/testdata/video-no-edit-list/bear-640x360-no_edit_list-video.mp4 b/packager/app/test/testdata/video-no-edit-list/bear-640x360-no_edit_list-video.mp4 index 37528cb505b97924307fa65cddd25a772c0b25c3..93a5b5ff882ef8cf46dbd6c409125e1496a654d3 100644 GIT binary patch delta 47 zcmZ3nLTJqjAqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWu!u|n08RJ} ABme*a delta 43 wcmZ3pLTJSbArS@!29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgU=f)D02^Nm?f?J) diff --git a/packager/app/test/testdata/video-no-edit-list/output.mpd b/packager/app/test/testdata/video-no-edit-list/output.mpd index d2b6ba4b5f..16cc109f7c 100644 --- a/packager/app/test/testdata/video-no-edit-list/output.mpd +++ b/packager/app/test/testdata/video-no-edit-list/output.mpd @@ -5,8 +5,8 @@ bear-640x360-no_edit_list-video.mp4 - - + + diff --git a/packager/app/test/testdata/video-non-square-pixel/bear-640x360-non_square_pixel-with_pasp-video.mp4 b/packager/app/test/testdata/video-non-square-pixel/bear-640x360-non_square_pixel-with_pasp-video.mp4 index e6b93fdeb92f7a316d69737eb3f9c89802bd4620..f739c96719302276aacfded4d4f3df779875325c 100644 GIT binary patch delta 38 rcmZ4ao^|beRtW|M2930m%7WYi6GI@IA+tE&0*G@PMYf7CPAvxj^1}=& delta 34 ncmZ4co^|DWRuKjU29>mu%7V<|{9GWL0Z3akN^F&2oLUY5$xsUD diff --git a/packager/app/test/testdata/video-non-square-pixel/output.mpd b/packager/app/test/testdata/video-non-square-pixel/output.mpd index b9629931ce..2d050479f8 100644 --- a/packager/app/test/testdata/video-non-square-pixel/output.mpd +++ b/packager/app/test/testdata/video-non-square-pixel/output.mpd @@ -5,8 +5,8 @@ bear-640x360-non_square_pixel-with_pasp-video.mp4 - - + + diff --git a/packager/app/test/testdata/video-non-square-pixel/stream_0.m3u8 b/packager/app/test/testdata/video-non-square-pixel/stream_0.m3u8 index dd7f673065..322b0b6f0b 100644 --- a/packager/app/test/testdata/video-non-square-pixel/stream_0.m3u8 +++ b/packager/app/test/testdata/video-non-square-pixel/stream_0.m3u8 @@ -3,8 +3,8 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="bear-640x360-non_square_pixel-with_pasp-video.mp4",BYTERANGE="879@0" +#EXT-X-MAP:URI="bear-640x360-non_square_pixel-with_pasp-video.mp4",BYTERANGE="883@0" #EXTINF:1.001, -#EXT-X-BYTERANGE:95246@923 +#EXT-X-BYTERANGE:95246@927 bear-640x360-non_square_pixel-with_pasp-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/vp8-mp4-with-encryption/bear-640x360-video.mp4 b/packager/app/test/testdata/vp8-mp4-with-encryption/bear-640x360-video.mp4 index dbfd1689cc46e9df99a436fbd19797bcb65b38b4..6ee51d74369e56b5f697a3d1cc41b35380f9ebc2 100644 GIT binary patch delta 38 qcmbQz&pxA{U4nsuK_jiCvLLs>#1P14$Slsc0OH(6k*y+(4aWh})(d|C delta 34 ncmbQy&pxG}U4(&wK_#uEvLLfKKNrYm0MZtX5?du08;%12tosT* diff --git a/packager/app/test/testdata/vp8-mp4-with-encryption/decrypted-bear-640x360-video-0.mp4 b/packager/app/test/testdata/vp8-mp4-with-encryption/decrypted-bear-640x360-video-0.mp4 index e5033f940a62e01c637fef591d8e5dd76e35c1f0..60830645488c2a0a109b91dafc4deeab1f2fc4b0 100644 GIT binary patch delta 38 qcmbQ!$-bbIU4nsuK_jiCvLLs>#1P14$Slsc0OH(6k*y+(9Y+AufeVNL delta 34 ncmZ3`$v&r(U4(&wK_#uEvLLfKKNrYm0MZtX5?du0JB|PVt(FQ# diff --git a/packager/app/test/testdata/vp8-mp4-with-encryption/output.mpd b/packager/app/test/testdata/vp8-mp4-with-encryption/output.mpd index 1fe1015889..18c65a5d1a 100644 --- a/packager/app/test/testdata/vp8-mp4-with-encryption/output.mpd +++ b/packager/app/test/testdata/vp8-mp4-with-encryption/output.mpd @@ -9,8 +9,8 @@ bear-640x360-video.mp4 - - + + diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-1.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-audio-1.m4s index 55ee417db133ab4b70534ac50952bb7adbba691f..6e56dd8555c756cee3aab506c0bf6c812e47d5ec 100644 GIT binary patch delta 35 ncmcc6%6O%fQG$ViL8Z8)vLLs>#1P14$Slsc0OH(@B72+wzvl}5 delta 31 kcmcc8%6OrbQG|hkL7}*$vLLfKKNrYm0MZs4CH6Q00Gvt*w*UYD 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 3e151a7d97fa5cedceb060fff9220b36ec774b28..74163d0b7b3818823ade6378d7e5e61c8b5185b9 100644 GIT binary patch delta 33 lcmcaobE8Irfq_A#xTLZmx4^^@$Y#ha&bI*K+>Ig*b^y6~3UL4c delta 29 hcmcanbEQUvfq_AxxTLZmvp7E&$Yuc278@lT>;RSs2`c~q 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 e86f365d7fdd39644fb08a04a34d1caddddc984a..03b9029c21fe66283b9a37d427d8488238daab66 100644 GIT binary patch delta 33 lcmdn)x7$yGfq_A#xTLZmx4^^@$Y#ha&bI*K+>Ij2>Hwz138w%6 delta 29 hcmdn(x7|;Kfq_AxxTLZmvp7E&$Yuc278@m$)d7X82w?yK 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 825a8072d239ef72afac81d49c7488de32ed5746..2b143225fa32563f54511044d9a96fe2b1658ba9 100644 GIT binary patch delta 33 lcmbQqHkVC;fq_9Kt)#Lbx4^^@$Y#ha&bI*K+>Iiv%m9o$2#f## delta 29 hcmbQsHj_<+fq_9Gt)#Lbvp7E&$Yuc278@m4nE`Hx2Sxw@ 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 4dbca6653fa09207d3845c9b6c91272135d3bdbb..2c90c4688356179183c0ca7e434f855991e3bd5a 100644 GIT binary patch delta 38 qcmX@u!FIHRO@e`eL8G{&vLLs>#1P14$Slsc0OH(6k*y+(x-9_R>kB{t delta 34 mcmX@w!FI5NO@x7gL8Z8)vLLfKKNrYm0MZtX5?du0bz1};o=LF delta 34 ncmZ3ygMI!Eb`b^!29@HH%7V<|{9GWL0Z3akN^F&20mQkDB3nfmv&;ec-wX2q delta 34 ncmZpA&+_jbiwFY)gGzBpWkF_felC#B0HiG%CALa1W|;#3&L0Y~ diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-iframe.m3u8 index 756a032739..e3961bbcaf 100644 --- a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-iframe.m3u8 +++ b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-iframe.m3u8 @@ -6,13 +6,13 @@ #EXT-X-I-FRAMES-ONLY #EXT-X-MAP:URI="bear-640x360-video-init.mp4" #EXTINF:1.001, -#EXT-X-BYTERANGE:15581@80 +#EXT-X-BYTERANGE:15581@84 bear-640x360-video-1.m4s #EXTINF:1.001, -#EXT-X-BYTERANGE:18221@80 +#EXT-X-BYTERANGE:18221@84 bear-640x360-video-2.m4s #EXT-X-PLACEMENT-OPPORTUNITY #EXTINF:0.734, -#EXT-X-BYTERANGE:19663@80 +#EXT-X-BYTERANGE:19663@84 bear-640x360-video-3.m4s #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-init.mp4 b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-640x360-video-init.mp4 index aa3f67b37c7f01b7c6bd30269fb2a92d1af790af..c9553addb55927b30281de77c54df8f769f1f8fb 100644 GIT binary patch delta 33 lcmcc3cArgxfq_9It)#Lbx4^^@$Y#ha&bI*K+>Ijc%mAIF3043A delta 29 hcmcc5cAHIvfq_9Kt)#Lbvp7E&$Yuc278@npnE`#z2oL}O diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-1.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-1.m4s index 577826f3fa2f1e33884dbb39ced2392c4c69a734..7f6fea5f0301b5140ec26bede2b97e8ca57b12d4 100644 GIT binary patch delta 32 kcmaFQ_?c0Hfq_A#xTLZmx4^^@$Y#ha&bI*K+=(K$0hsv-?f?J) delta 28 hcmey&_?}UOfq_AxxTLZmvp7E&$Yuc27850I0|0r>2&e!6 diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-2.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-2.m4s index 806b3320daab87cea63225e297b376b4a0096f46..a59e2a79add424b7aa7307d6577b63fbc9931d2b 100644 GIT binary patch delta 32 kcmaFM_>ob9fq_A#xTLZmx4^^@$Y#ha&bI*K+=(JL0hoIU=l}o! delta 28 hcmey!_?A(Gfq_AxxTLZmvp7E&$Yuc27850I0swhn2%-Q0 diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-3.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-3.m4s index c07be534473e7e044f03985f061ee07ee034c658..0f434e3d9b09da4bb1177e98b0de86788112f40d 100644 GIT binary patch delta 32 kcmaFM_>ob9fq_A#xTLZmx4^^@$Y#ha&bI*K+=(JL0hoIU=l}o! delta 28 hcmey!_?A(Gfq_AxxTLZmvp7E&$Yuc27850I0swhn2%-Q0 diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-4.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-4.m4s index 23386a8e95c2b15c57d335af1f88837d9acf14f1..a03dd2653e999fe8ba0cff8143ae45d503b4f1f4 100644 GIT binary patch delta 32 kcmaFM_>ob9fq_A#xTLZmx4^^@$Y#ha&bI*K+=(JL0hoIU=l}o! delta 28 hcmey!_?A(Gfq_AxxTLZmvp7E&$Yuc27850I0swhn2%-Q0 diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-5.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-5.m4s index 10f932a22bc5f790165568077a3db28bc6b26c7a..14d335f2d9e2db71a6307f14fe2c5b6969971257 100644 GIT binary patch delta 32 kcmaFM_>ob9fq_A#xTLZmx4^^@$Y#ha&bI*K+=(JL0hoIU=l}o! delta 28 hcmey!_?A(Gfq_AxxTLZmvp7E&$Yuc27850I0swhn2%-Q0 diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-6.m4s b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-6.m4s index eea8e784d09a096557c2de51cbfa01c702bae3a4..c39fd9adff5d1857b45378440ad95abea16d12c4 100644 GIT binary patch delta 32 kcmey%*vKToz`&qVTvAz(TVP@cWHV$I=UV`A?nIH70F8(VnE(I) delta 28 gcmZo<`pYQ7z`&qTTvAz(S)88>WHSJ1i-{610dDIEQvd(} diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-init.mp4 b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-init.mp4 index 6e32428639822fce538daef67549b5bbb753d7c3..56d2ac6ca34f99c504e42dc0fbe1d2fadf7cfba5 100644 GIT binary patch delta 33 lcmcb@dV^Jhfq_9Kt)#Lbx4^^@$Y#ha&bI*K+>Ig!m;jtJ3Az9P delta 29 icmcb?dWBVlfq_9Gt)#Lbvp7E&$Yuc278@lFFaZF3t_XAh diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.m3u8 b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.m3u8 index d0ecedb6ff..2f8252e4f9 100644 --- a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.m3u8 +++ b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.m3u8 @@ -7,7 +7,7 @@ #EXT-X-MEDIA:TYPE=SUBTITLES,URI="bear-english-text.m3u8",GROUP-ID="default-text-group",NAME="stream_0",AUTOSELECT=YES -#EXT-X-STREAM-INF:BANDWIDTH=1108051,AVERAGE-BANDWIDTH=1005999,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",SUBTITLES="default-text-group" +#EXT-X-STREAM-INF:BANDWIDTH=1108115,AVERAGE-BANDWIDTH=1006069,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",SUBTITLES="default-text-group" bear-640x360-video.m3u8 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=214292,AVERAGE-BANDWIDTH=156327,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-video-iframe.m3u8" diff --git a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.mpd b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.mpd index e51298416e..6e663cde8b 100644 --- a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.mpd +++ b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.mpd @@ -2,18 +2,9 @@ - - - - - - - - - - + - + @@ -22,8 +13,17 @@ + + + + + + + + + - + @@ -35,18 +35,9 @@ - - - - - - - - - - + - + @@ -54,8 +45,17 @@ + + + + + + + + + - + diff --git a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-0.mp4 b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-0.mp4 index d104284403e8646a92032e57d120393492eb48f1..d22aa64cbe16970a03ea6fed381a8ffcd3cd8e02 100644 GIT binary patch delta 38 rcmaF5iT&j!b_oUs29>mu%7WYi6GI@IA+tE&0*G@PMYf7C2Hpe!^5_gk delta 34 ncmaF4iT&v&b`b^!28Fbe%7V<|{9GWL0Z3akN^F&247>>d$$bk1 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 0127cfffbb8315f7c849decacd8b55c938600119..50a7ff5d181e87ecbc878399ffade1d276c18729 100644 GIT binary patch delta 35 ocmbPwpK0cOCJ6=x29>mu%7WYi6GI@IA+tE&0*G@riZreV0LD%WVgLXD delta 31 kcmbPvpK0oSCJ_b(28Fbe%7V<|{9GWL0Z3bHlxSQJ0HNgy8~^|S 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 a182d049f74ae7e0523c4b334f1cd2488e24412f..5ef69733c1e5af84e997ed6c88f18c86e6c9abd5 100644 GIT binary patch delta 47 zcmbQaQfTfmu%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWu(VDA07*&> AbpQYW delta 43 wcmbQcQfTH%ArS@!28Fbe%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgU}>EK02eU~KL7v# 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 ec42c301b6eccdbf60d434d82a2c021e099ac85a..b80f762b32a30059487d918afe9d0eb6a71dfc0c 100644 GIT binary patch delta 35 ocmaF+oay6pCJ6=x29>mu%7WYi6GI@IA+tE&0*G@rirm}`0N@e~egFUf delta 31 kcmezPoayazCJ_b(28Fbe%7V<|{9GWL0Z3bHl(@MW0Jy0OH~;_u diff --git a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output.mpd b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output.mpd index d80c0fdbba..71b96ec2a8 100644 --- a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output.mpd +++ b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output.mpd @@ -5,14 +5,14 @@ bear-multi-configs-0.mp4 - - + + bear-multi-configs-2.mp4 - - + + @@ -20,15 +20,15 @@ bear-multi-configs-1.mp4 - - + + bear-multi-configs-3.mp4 - - + + diff --git a/packager/app/test/testdata/wvm-input/bear-multi-configs-0.mp4 b/packager/app/test/testdata/wvm-input/bear-multi-configs-0.mp4 index 9e835548708b8bf6f85a4d58672a86ae7651f266..75c89080ac4f8f020fd02c7368798e43f40a3785 100644 GIT binary patch delta 38 rcmeyqk^T2Zb_oUs2930m%7WYi6GI@IA+tE&0*G@PMYf7CKE43}`Bn`5 delta 34 ncmeypk^TEdb`b^!29>mu%7V<|{9GWL0Z3akN^F&2e0&1{&r=J# 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 0127cfffbb8315f7c849decacd8b55c938600119..50a7ff5d181e87ecbc878399ffade1d276c18729 100644 GIT binary patch delta 35 ocmbPwpK0cOCJ6=x29>mu%7WYi6GI@IA+tE&0*G@riZreV0LD%WVgLXD delta 31 kcmbPvpK0oSCJ_b(28Fbe%7V<|{9GWL0Z3bHlxSQJ0HNgy8~^|S 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 b8817819677ddb2973811b4f3cd34eeaffdd559d..2cae9528a9360595d0ba3a18b5e6f7d42e674130 100644 GIT binary patch delta 47 zcmZ3nLTJqjAqfTs2930m%7WYi6GI@IA+tE&0*G@PMOsA|TSb^!MVPmWu!u|n08RJ} ABme*a delta 43 wcmZ3pLTJSbArS@!29>mu%7V<|{9GWL0Z3akO0-Hawn{LyN-%GgU=f)D02^Nm?f?J) 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 ec42c301b6eccdbf60d434d82a2c021e099ac85a..b80f762b32a30059487d918afe9d0eb6a71dfc0c 100644 GIT binary patch delta 35 ocmaF+oay6pCJ6=x29>mu%7WYi6GI@IA+tE&0*G@rirm}`0N@e~egFUf delta 31 kcmezPoayazCJ_b(28Fbe%7V<|{9GWL0Z3bHl(@MW0Jy0OH~;_u diff --git a/packager/app/test/testdata/wvm-input/output.mpd b/packager/app/test/testdata/wvm-input/output.mpd index cd5677f847..3c2b7cc015 100644 --- a/packager/app/test/testdata/wvm-input/output.mpd +++ b/packager/app/test/testdata/wvm-input/output.mpd @@ -5,14 +5,14 @@ bear-multi-configs-0.mp4 - - + + bear-multi-configs-2.mp4 - - + + @@ -20,15 +20,15 @@ bear-multi-configs-1.mp4 - - + + bear-multi-configs-3.mp4 - - + + diff --git a/packager/media/formats/mp4/mp4_muxer.cc b/packager/media/formats/mp4/mp4_muxer.cc index 356d7a9e9b..6af6b38aab 100644 --- a/packager/media/formats/mp4/mp4_muxer.cc +++ b/packager/media/formats/mp4/mp4_muxer.cc @@ -206,8 +206,9 @@ Status MP4Muxer::DelayInitializeMuxer() { std::unique_ptr ftyp(new FileType); std::unique_ptr moov(new Movie); - ftyp->major_brand = FOURCC_isom; + ftyp->major_brand = FOURCC_mp41; ftyp->compatible_brands.push_back(FOURCC_iso8); + ftyp->compatible_brands.push_back(FOURCC_isom); ftyp->compatible_brands.push_back(FOURCC_mp41); ftyp->compatible_brands.push_back(FOURCC_dash);