From a8ea7fd085e296c8a38edbcbc3d08c7f3e111ff7 Mon Sep 17 00:00:00 2001
From: koln67 <67125539+koln67@users.noreply.github.com>
Date: Wed, 15 Jul 2020 21:14:15 +0000
Subject: [PATCH] Always set ES_ID to 0 when writing ES Descriptor in mp4
 (#798)

Required by ISO/IEC 14496-14:2018 and ISO/IEC 23000-19:2018.

Issue #755.
---
 ...bear-640x360-aac_he-silent_right-audio.mp4 | Bin 24567 -> 24567 bytes
 .../bear-640x360-audio.mp4                    | Bin 43732 -> 43732 bytes
 .../bear-640x360-audio.mp4                    | Bin 44640 -> 44640 bytes
 .../bear-640x360-audio.mp4                    | Bin 43732 -> 43732 bytes
 .../output.mpd                                |  14 +++----
 .../bear-640x360-audio.mp4                    | Bin 43732 -> 43732 bytes
 .../bear-640x360-audio.mp4                    | Bin 43732 -> 43732 bytes
 .../bear-640x360-audio.mp4                    | Bin 43732 -> 43732 bytes
 .../bear-640x360-audio.mp4                    | Bin 43732 -> 43732 bytes
 .../audio-video/bear-640x360-audio.mp4        | Bin 43732 -> 43732 bytes
 .../bear-640x360-audio-init.mp4               | Bin 754 -> 754 bytes
 .../bandwidth-override/bear-640x360-audio.mp4 | Bin 43732 -> 43732 bytes
 .../bear-640x360-audio.mp4                    | Bin 44640 -> 44640 bytes
 .../bear-640x360-audio1.mp4                   | Bin 34356 -> 34356 bytes
 .../bear-640x360-audio2.mp4                   | Bin 11319 -> 11319 bytes
 .../bear-640x360-audio.mp4                    | Bin 44640 -> 44640 bytes
 .../bear-640x360-audio.mp4                    | Bin 44975 -> 44975 bytes
 .../decrypted-bear-640x360-audio-0.mp4        | Bin 43732 -> 43732 bytes
 .../bear-640x360-audio.mp4                    | Bin 44588 -> 44588 bytes
 .../bear-640x360-audio.mp4                    | Bin 44640 -> 44640 bytes
 .../bear-640x360-audio.mp4                    | Bin 44640 -> 44640 bytes
 .../bear-640x360-audio.mp4                    | Bin 44640 -> 44640 bytes
 .../decrypted-bear-640x360-audio-0.mp4        | Bin 43732 -> 43732 bytes
 .../bear-640x360-audio.mp4                    | Bin 44640 -> 44640 bytes
 .../encryption-cbc-1/bear-640x360-audio.mp4   | Bin 44640 -> 44640 bytes
 .../decrypted-bear-640x360-audio-0.mp4        | Bin 43732 -> 43732 bytes
 .../bear-640x360-audio.mp4                    | Bin 43983 -> 43983 bytes
 .../decrypted-bear-640x360-audio-0.mp4        | Bin 43732 -> 43732 bytes
 .../encryption-cbcs/bear-640x360-audio.mp4    | Bin 43983 -> 43983 bytes
 .../decrypted-bear-640x360-audio-0.mp4        | Bin 43732 -> 43732 bytes
 .../encryption-cens/bear-640x360-audio.mp4    | Bin 44640 -> 44640 bytes
 .../decrypted-bear-640x360-audio-0.mp4        | Bin 43732 -> 43732 bytes
 .../bear-640x360-audio.mp4                    | Bin 44656 -> 44656 bytes
 .../bear-640x360-audio.mp4                    | Bin 44656 -> 44656 bytes
 .../bear-640x360-audio-skip_encryption.mp4    | Bin 43732 -> 43732 bytes
 .../bear-640x360-audio.mp4                    | Bin 44620 -> 44620 bytes
 .../bear-640x360-audio.mp4                    | Bin 44640 -> 44640 bytes
 .../decrypted-bear-640x360-audio-0.mp4        | Bin 43732 -> 43732 bytes
 .../bear-640x360-audio.mp4                    | Bin 45194 -> 45194 bytes
 .../encryption/bear-640x360-audio.mp4         | Bin 44640 -> 44640 bytes
 .../decrypted-bear-640x360-audio-0.mp4        | Bin 43732 -> 43732 bytes
 .../bear-640x360-audio-init.mp4               | Bin 793 -> 793 bytes
 .../audio/audio-init.mp4                      | Bin 793 -> 793 bytes
 .../bear-640x360-audio-init.mp4               | Bin 793 -> 793 bytes
 .../hls-only-dash-only/bear-640x360-audio.mp4 | Bin 43732 -> 43732 bytes
 .../bear-640x360-audio.mp4                    | Bin 44640 -> 44640 bytes
 .../bear-1280x720-audio-init.mp4              | Bin 1003 -> 1003 bytes
 .../bear-320x180-audio-init.mp4               | Bin 967 -> 967 bytes
 .../bear-640x360-audio-init.mp4               | Bin 1003 -> 1003 bytes
 .../output.mpd                                |  24 +++++------
 .../bear-640x360-audio-init.mp4               | Bin 1003 -> 1003 bytes
 .../bear-640x360-audio-init.mp4               | Bin 1003 -> 1003 bytes
 .../bear-640x360-audio-init.mp4               | Bin 951 -> 951 bytes
 .../bear-640x360-audio-init.mp4               | Bin 951 -> 951 bytes
 .../bear-640x360-audio-init.mp4               | Bin 960 -> 960 bytes
 .../bear-640x360-audio-init.mp4               | Bin 951 -> 951 bytes
 .../live-profile/bear-640x360-audio-init.mp4  | Bin 793 -> 793 bytes
 .../bear-640x360-audio-init.mp4               | Bin 793 -> 793 bytes
 .../bear-640x360-audio-init.mp4               | Bin 793 -> 793 bytes
 .../bear-640x360-trailing-moov-audio.mp4      | Bin 43732 -> 43732 bytes
 .../video-audio-ttml/bear-640x360-audio.mp4   | Bin 43732 -> 43732 bytes
 .../video-audio-webvtt/bear-640x360-audio.mp4 | Bin 43732 -> 43732 bytes
 .../bear-640x360-audio-init.mp4               | Bin 793 -> 793 bytes
 .../vtt-text-to-mp4-with-ad-cues/output.mpd   |  38 +++++++++---------
 .../bear-multi-configs-1.mp4                  | Bin 44949 -> 44949 bytes
 .../bear-multi-configs-3.mp4                  | Bin 46061 -> 46061 bytes
 .../wvm-input/bear-multi-configs-1.mp4        | Bin 44949 -> 44949 bytes
 .../wvm-input/bear-multi-configs-3.mp4        | Bin 46061 -> 46061 bytes
 packager/media/codecs/es_descriptor.cc        |   5 ++-
 packager/media/codecs/es_descriptor.h         |   1 -
 .../media/codecs/es_descriptor_unittest.cc    |  17 +++++++-
 .../formats/mp4/box_definitions_unittest.cc   |   5 ---
 packager/media/formats/mp4/mp4_muxer.cc       |  17 +++-----
 packager/media/formats/mp4/mp4_muxer.h        |  12 ++----
 74 files changed, 66 insertions(+), 67 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 4bfebf3a61ffc5ca1a7941b024e2e624f75b3fd2..67829e30ffbe3353ba97126567fcad3f73d7776e 100644
GIT binary patch
delta 16
YcmeyqpYi*C#tnW<j0~IonO4LC06=U8c>n+a

delta 16
YcmeyqpYi*C#tnW<jEtN8nO4LC06=mEdH?_b

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 87f89a93c0c2fbc9536735c7762add595e83085f..7128d250eb373f0b00e24787f724b1d5adf87dd1 100644
GIT binary patch
delta 16
Ycmca|mFdb=rVV~fj0~IonOau>06yggi2wiq

delta 16
Ycmca|mFdb=rVV~fjEtN8nOau>06yymiU0rr

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 b82b25f6181c3fedb83ec039fce7fde21d69d5fe..81afce8c79e42d06cc52e1fac291b7d4de1fd525 100644
GIT binary patch
delta 26
ecmaEGhv~r`rVV~fj0}_gndX8?+09(cVXFa&O$fpO

delta 26
ecmaEGhv~r`rVV~fjEs~0ndX8?+09(cVXFa&X9&aq

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 87f89a93c0c2fbc9536735c7762add595e83085f..7128d250eb373f0b00e24787f724b1d5adf87dd1 100644
GIT binary patch
delta 16
Ycmca|mFdb=rVV~fj0~IonOau>06yggi2wiq

delta 16
Ycmca|mFdb=rVV~fjEtN8nOau>06yymiU0rr

diff --git a/packager/app/test/testdata/audio-video-with-codec-switching/output.mpd b/packager/app/test/testdata/audio-video-with-codec-switching/output.mpd
index 5a7630776d..2aadb124ea 100644
--- a/packager/app/test/testdata/audio-video-with-codec-switching/output.mpd
+++ b/packager/app/test/testdata/audio-video-with-codec-switching/output.mpd
@@ -15,18 +15,18 @@
     <AdaptationSet id="1" contentType="video" maxWidth="1280" maxHeight="720" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
       <SupplementalProperty schemeIdUri="urn:mpeg:dash:adaptation-set-switching:2016" value="0"/>
       <Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/>
-      <Representation id="1" bandwidth="2627285" codecs="avc1.64001f" mimeType="video/mp4" sar="1:1" width="1280" height="720">
-        <BaseURL>bear-1280x720-video.mp4</BaseURL>
-        <SegmentBase indexRange="858-925" timescale="30000">
-          <Initialization range="0-857"/>
-        </SegmentBase>
-      </Representation>
-      <Representation id="2" bandwidth="973483" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" width="640" height="360">
+      <Representation id="1" bandwidth="973483" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" width="640" height="360">
         <BaseURL>bear-640x360-video.mp4</BaseURL>
         <SegmentBase indexRange="859-926" timescale="30000">
           <Initialization range="0-858"/>
         </SegmentBase>
       </Representation>
+      <Representation id="2" bandwidth="2627285" codecs="avc1.64001f" mimeType="video/mp4" sar="1:1" width="1280" height="720">
+        <BaseURL>bear-1280x720-video.mp4</BaseURL>
+        <SegmentBase indexRange="858-925" timescale="30000">
+          <Initialization range="0-857"/>
+        </SegmentBase>
+      </Representation>
     </AdaptationSet>
     <AdaptationSet id="2" contentType="audio" subsegmentAlignment="true">
       <Representation id="3" bandwidth="133334" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
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 42857986c7b15a926bd64094b21105fc80f716cb..50899857d2ff39021d05e80f23d8f85b5de6c1dc 100644
GIT binary patch
delta 16
Ycmca|mFdb=rVV~fj0~IonOau>06yggi2wiq

delta 16
Ycmca|mFdb=rVV~fjEtN8nOau>06yymiU0rr

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 42857986c7b15a926bd64094b21105fc80f716cb..50899857d2ff39021d05e80f23d8f85b5de6c1dc 100644
GIT binary patch
delta 16
Ycmca|mFdb=rVV~fj0~IonOau>06yggi2wiq

delta 16
Ycmca|mFdb=rVV~fjEtN8nOau>06yymiU0rr

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 87f89a93c0c2fbc9536735c7762add595e83085f..7128d250eb373f0b00e24787f724b1d5adf87dd1 100644
GIT binary patch
delta 16
Ycmca|mFdb=rVV~fj0~IonOau>06yggi2wiq

delta 16
Ycmca|mFdb=rVV~fjEtN8nOau>06yymiU0rr

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 87f89a93c0c2fbc9536735c7762add595e83085f..7128d250eb373f0b00e24787f724b1d5adf87dd1 100644
GIT binary patch
delta 16
Ycmca|mFdb=rVV~fj0~IonOau>06yggi2wiq

delta 16
Ycmca|mFdb=rVV~fjEtN8nOau>06yymiU0rr

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 87f89a93c0c2fbc9536735c7762add595e83085f..7128d250eb373f0b00e24787f724b1d5adf87dd1 100644
GIT binary patch
delta 16
Ycmca|mFdb=rVV~fj0~IonOau>06yggi2wiq

delta 16
Ycmca|mFdb=rVV~fjEtN8nOau>06yymiU0rr

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 f6ff48bc011610a467f1fbf1092e83ab3393eace..cd5b19acde42a392e59f02f75d82093f1eb39f11 100644
GIT binary patch
delta 13
Ucmeyw`iXUe9}^?PWPhf`03*KycK`qY

delta 13
Ucmeyw`iXUe9}^?vWPhf`03*Z%cmMzZ

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 87f89a93c0c2fbc9536735c7762add595e83085f..7128d250eb373f0b00e24787f724b1d5adf87dd1 100644
GIT binary patch
delta 16
Ycmca|mFdb=rVV~fj0~IonOau>06yggi2wiq

delta 16
Ycmca|mFdb=rVV~fjEtN8nOau>06yymiU0rr

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 1941c3bec358ee5dbc71c8812cf7db0743e735eb..d989336d241c15b3153f71b13698ab27bda95134 100644
GIT binary patch
delta 26
ecmaEGhv~r`rVV~fj0}_gndX8?+09(cVXFa&O$fpO

delta 26
ecmaEGhv~r`rVV~fjEs~0ndX8?+09(cVXFa&X9&aq

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 c9ad4cd161f057d8064a0dae563e21bd64dbcfeb..2b97d2fba67fbb1a3d66b27b39d616a1379b6c4c 100644
GIT binary patch
delta 26
ecmdne!?dM`X@egVBg15Wrnz8Jb~6{VRx<!`u?Kbl

delta 26
ecmdne!?dM`X@egVBjaR$rnz8Jb~6{VRx<!`%LjM>

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 c9c14f2f18d8b4f3a080ea682a1b53c0a0956a70..0a7b85b861ae28695a6b1cc21a7b3d3c25b545a8 100644
GIT binary patch
delta 24
ccmdlUu{~mg9}^?PWPhf)U{ZE77qhM=0A$++xc~qF

delta 24
ccmdlUu{~mg9}^?vWPhf)U{ZE77qhM=0A%$By8r+H

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 1941c3bec358ee5dbc71c8812cf7db0743e735eb..d989336d241c15b3153f71b13698ab27bda95134 100644
GIT binary patch
delta 26
ecmaEGhv~r`rVV~fj0}_gndX8?+09(cVXFa&O$fpO

delta 26
ecmaEGhv~r`rVV~fjEs~0ndX8?+09(cVXFa&X9&aq

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 9cf72047ef0d7003eca73aa8c028c763c6dc8192..91b967fb27e5d9e5ee5a972e67a9320186bfe51f 100644
GIT binary patch
delta 16
YcmZ2~pK1MlrVV~fj0~IonG)6l06TpKGXMYp

delta 16
YcmZ2~pK1MlrVV~fjEtN8nG)6l06T*QGynhq

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 87f89a93c0c2fbc9536735c7762add595e83085f..7128d250eb373f0b00e24787f724b1d5adf87dd1 100644
GIT binary patch
delta 16
Ycmca|mFdb=rVV~fj0~IonOau>06yggi2wiq

delta 16
Ycmca|mFdb=rVV~fjEtN8nOau>06yymiU0rr

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 22fcb0a3ac3870d488d08ccd3275f6b06fc8247f..22d9741b3ca28312c707eec4c016ce251ba2da13 100644
GIT binary patch
delta 26
ecmZ2;hiT0nrVV~fj0}_gndX8?+09(cN~-~W@dzdW

delta 26
ecmZ2;hiT0nrVV~fjEs~0ndX8?+09(cN~-~X3kWCx

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 b82b25f6181c3fedb83ec039fce7fde21d69d5fe..81afce8c79e42d06cc52e1fac291b7d4de1fd525 100644
GIT binary patch
delta 26
ecmaEGhv~r`rVV~fj0}_gndX8?+09(cVXFa&O$fpO

delta 26
ecmaEGhv~r`rVV~fjEs~0ndX8?+09(cVXFa&X9&aq

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 b82b25f6181c3fedb83ec039fce7fde21d69d5fe..81afce8c79e42d06cc52e1fac291b7d4de1fd525 100644
GIT binary patch
delta 26
ecmaEGhv~r`rVV~fj0}_gndX8?+09(cVXFa&O$fpO

delta 26
ecmaEGhv~r`rVV~fjEs~0ndX8?+09(cVXFa&X9&aq

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 b82b25f6181c3fedb83ec039fce7fde21d69d5fe..81afce8c79e42d06cc52e1fac291b7d4de1fd525 100644
GIT binary patch
delta 26
ecmaEGhv~r`rVV~fj0}_gndX8?+09(cVXFa&O$fpO

delta 26
ecmaEGhv~r`rVV~fjEs~0ndX8?+09(cVXFa&X9&aq

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 87f89a93c0c2fbc9536735c7762add595e83085f..7128d250eb373f0b00e24787f724b1d5adf87dd1 100644
GIT binary patch
delta 16
Ycmca|mFdb=rVV~fj0~IonOau>06yggi2wiq

delta 16
Ycmca|mFdb=rVV~fjEtN8nOau>06yymiU0rr

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 b82b25f6181c3fedb83ec039fce7fde21d69d5fe..81afce8c79e42d06cc52e1fac291b7d4de1fd525 100644
GIT binary patch
delta 26
ecmaEGhv~r`rVV~fj0}_gndX8?+09(cVXFa&O$fpO

delta 26
ecmaEGhv~r`rVV~fjEs~0ndX8?+09(cVXFa&X9&aq

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 cedd5fbc52dc8dbd7cfc1ec5dc4775585106a9d6..8bac0b7402f719fc8c1d43651054e01ae1089f0f 100644
GIT binary patch
delta 26
ecmaEGhv~r`rVV~fj0}_gndX8?+09(cVXFa&O$fpO

delta 26
ecmaEGhv~r`rVV~fjEs~0ndX8?+09(cVXFa&X9&aq

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 87f89a93c0c2fbc9536735c7762add595e83085f..7128d250eb373f0b00e24787f724b1d5adf87dd1 100644
GIT binary patch
delta 16
Ycmca|mFdb=rVV~fj0~IonOau>06yggi2wiq

delta 16
Ycmca|mFdb=rVV~fjEtN8nOau>06yymiU0rr

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 05fe6fa48c5f369ffaee9ca20a06aa4f37101189..8be897b31395e21ac61de6e461b9edcc669efc11 100644
GIT binary patch
delta 26
fcmX?qo$35_rVV~fj0}_gnU;Y`+0DYtdsYAdhI$DL

delta 26
fcmX?qo$35_rVV~fjEs~0nU;Y`+0DYtdsYAdhLi~n

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 87f89a93c0c2fbc9536735c7762add595e83085f..7128d250eb373f0b00e24787f724b1d5adf87dd1 100644
GIT binary patch
delta 16
Ycmca|mFdb=rVV~fj0~IonOau>06yggi2wiq

delta 16
Ycmca|mFdb=rVV~fjEtN8nOau>06yymiU0rr

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 05fe6fa48c5f369ffaee9ca20a06aa4f37101189..8be897b31395e21ac61de6e461b9edcc669efc11 100644
GIT binary patch
delta 26
fcmX?qo$35_rVV~fj0}_gnU;Y`+0DYtdsYAdhI$DL

delta 26
fcmX?qo$35_rVV~fjEs~0nU;Y`+0DYtdsYAdhLi~n

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 87f89a93c0c2fbc9536735c7762add595e83085f..7128d250eb373f0b00e24787f724b1d5adf87dd1 100644
GIT binary patch
delta 16
Ycmca|mFdb=rVV~fj0~IonOau>06yggi2wiq

delta 16
Ycmca|mFdb=rVV~fjEtN8nOau>06yymiU0rr

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 5f0e489582537e488eec859bc2f0c420f7ae0c18..9cc8dba201a915c2ea407b483b58d5f64531e924 100644
GIT binary patch
delta 26
ecmaEGhv~r`rVV~fj0}_gndX8?+09(cVXFa&O$fpO

delta 26
ecmaEGhv~r`rVV~fjEs~0ndX8?+09(cVXFa&X9&aq

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 87f89a93c0c2fbc9536735c7762add595e83085f..7128d250eb373f0b00e24787f724b1d5adf87dd1 100644
GIT binary patch
delta 16
Ycmca|mFdb=rVV~fj0~IonOau>06yggi2wiq

delta 16
Ycmca|mFdb=rVV~fjEtN8nOau>06yymiU0rr

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 09c04bf62e0d8f37327a474cfc47bffee0fdd5c8..b18f8880d632d6f28715b885603b4d35bfe95cc4 100644
GIT binary patch
delta 26
ecmexxhv~x|rVV~fj0}_gndX8?+09(cX{!N@eF*XZ

delta 26
ecmexxhv~x|rVV~fjEs~0ndX8?+09(cX{!N@mk9I#

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 a5e112bcc5c1004db2de6311a0ed657e4ae26fd4..9a75a53c53e0b4ab42e836957483a55bff16d307 100644
GIT binary patch
delta 26
ecmexxhv~x|rVV~fj0}_gndX8?+09(cX{!N@eF*XZ

delta 26
ecmexxhv~x|rVV~fjEs~0ndX8?+09(cX{!N@mk9I#

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 87f89a93c0c2fbc9536735c7762add595e83085f..7128d250eb373f0b00e24787f724b1d5adf87dd1 100644
GIT binary patch
delta 16
Ycmca|mFdb=rVV~fj0~IonOau>06yggi2wiq

delta 16
Ycmca|mFdb=rVV~fjEtN8nOau>06yymiU0rr

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 60adc5cf99782678ecb865d9a9a83a04c1b9bfdc..40ad67469b057c94d043339836d1c1ea3af07620 100644
GIT binary patch
delta 26
ecmX?ehw026rVV~fj0}_gndX8?+09(cPOAZhQ3!?r

delta 26
ecmX?ehw026rVV~fjEs~0ndX8?+09(cPOAZhYY2z{

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 b82b25f6181c3fedb83ec039fce7fde21d69d5fe..81afce8c79e42d06cc52e1fac291b7d4de1fd525 100644
GIT binary patch
delta 26
ecmaEGhv~r`rVV~fj0}_gndX8?+09(cVXFa&O$fpO

delta 26
ecmaEGhv~r`rVV~fjEs~0ndX8?+09(cVXFa&X9&aq

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 87f89a93c0c2fbc9536735c7762add595e83085f..7128d250eb373f0b00e24787f724b1d5adf87dd1 100644
GIT binary patch
delta 16
Ycmca|mFdb=rVV~fj0~IonOau>06yggi2wiq

delta 16
Ycmca|mFdb=rVV~fjEtN8nOau>06yymiU0rr

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 68521c6fb41625f6cebc6009460fa6b9f5e97c26..d9e4d1b766f154e8586c6308cc70cdd424d8bf40 100644
GIT binary patch
delta 26
ecmeBr$kg?aX@egVBg15Wrnz8Jb~6`q!&(4(7zj)N

delta 26
ecmeBr$kg?aX@egVBjaR$rnz8Jb~6`q!&(4(G6+rp

diff --git a/packager/app/test/testdata/encryption/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption/bear-640x360-audio.mp4
index b82b25f6181c3fedb83ec039fce7fde21d69d5fe..81afce8c79e42d06cc52e1fac291b7d4de1fd525 100644
GIT binary patch
delta 26
ecmaEGhv~r`rVV~fj0}_gndX8?+09(cVXFa&O$fpO

delta 26
ecmaEGhv~r`rVV~fjEs~0ndX8?+09(cVXFa&X9&aq

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 87f89a93c0c2fbc9536735c7762add595e83085f..7128d250eb373f0b00e24787f724b1d5adf87dd1 100644
GIT binary patch
delta 16
Ycmca|mFdb=rVV~fj0~IonOau>06yggi2wiq

delta 16
Ycmca|mFdb=rVV~fjEtN8nOau>06yymiU0rr

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 1ba3d9abb9919926489f6cc1ecd098715b69cc65..825a8072d239ef72afac81d49c7488de32ed5746 100644
GIT binary patch
delta 13
UcmbQqHj{0G9}^?PWPhep02`zO?f?J)

delta 13
UcmbQqHj{0G9}^?vWPhep02`?T?*IS*

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 1ba3d9abb9919926489f6cc1ecd098715b69cc65..825a8072d239ef72afac81d49c7488de32ed5746 100644
GIT binary patch
delta 13
UcmbQqHj{0G9}^?PWPhep02`zO?f?J)

delta 13
UcmbQqHj{0G9}^?vWPhep02`?T?*IS*

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 1ba3d9abb9919926489f6cc1ecd098715b69cc65..825a8072d239ef72afac81d49c7488de32ed5746 100644
GIT binary patch
delta 13
UcmbQqHj{0G9}^?PWPhep02`zO?f?J)

delta 13
UcmbQqHj{0G9}^?vWPhep02`?T?*IS*

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 87f89a93c0c2fbc9536735c7762add595e83085f..7128d250eb373f0b00e24787f724b1d5adf87dd1 100644
GIT binary patch
delta 16
Ycmca|mFdb=rVV~fj0~IonOau>06yggi2wiq

delta 16
Ycmca|mFdb=rVV~fjEtN8nOau>06yymiU0rr

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 b82b25f6181c3fedb83ec039fce7fde21d69d5fe..81afce8c79e42d06cc52e1fac291b7d4de1fd525 100644
GIT binary patch
delta 26
ecmaEGhv~r`rVV~fj0}_gndX8?+09(cVXFa&O$fpO

delta 26
ecmaEGhv~r`rVV~fjEs~0ndX8?+09(cVXFa&X9&aq

diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-1280x720-audio-init.mp4
index bb4986496e6f02e75c8bd3a84add5f5804755a69..5b46a8a3bac7dbdb577c030fce76fc5a7b4db7a0 100644
GIT binary patch
delta 23
bcmaFO{+fM*9}^?PWPhf)U{ZE67xO~^S^Ng-

delta 23
bcmaFO{+fM*9}^?vWPhf)U{ZE67xO~^S`-HC

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 374d5fa05d2b4d3a1ffcf9c93a7f042307d35bc5..c5319cf20f272aa6e243231b245a425a02453574 100644
GIT binary patch
delta 23
bcmX@kew=-S9}^?PWPhf)U{ZE67xP{KQ>X@h

delta 23
bcmX@kew=-S9}^?vWPhf)U{ZE67xP{KQ@{p*

diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption-and-mult-files/bear-640x360-audio-init.mp4
index bb4986496e6f02e75c8bd3a84add5f5804755a69..5b46a8a3bac7dbdb577c030fce76fc5a7b4db7a0 100644
GIT binary patch
delta 23
bcmaFO{+fM*9}^?PWPhf)U{ZE67xO~^S^Ng-

delta 23
bcmaFO{+fM*9}^?vWPhf)U{ZE67xO~^S`-HC

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 5a82778bb8..565aaabd30 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,15 +7,7 @@
       <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
         <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
       </ContentProtection>
-      <Representation id="0" bandwidth="2632184" codecs="avc1.64001f" mimeType="video/mp4" sar="1:1" width="1280" height="720">
-        <SegmentTemplate timescale="30000" initialization="bear-1280x720-video-init.mp4" media="bear-1280x720-video-$Number$.m4s" startNumber="1">
-          <SegmentTimeline>
-            <S t="0" d="30030" r="1"/>
-            <S t="60060" d="22022"/>
-          </SegmentTimeline>
-        </SegmentTemplate>
-      </Representation>
-      <Representation id="1" bandwidth="978382" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" width="640" height="360">
+      <Representation id="0" bandwidth="978382" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" width="640" height="360">
         <SegmentTemplate timescale="30000" initialization="bear-640x360-video-init.mp4" media="bear-640x360-video-$Number$.m4s" startNumber="1">
           <SegmentTimeline>
             <S t="0" d="30030" r="1"/>
@@ -23,7 +15,7 @@
           </SegmentTimeline>
         </SegmentTemplate>
       </Representation>
-      <Representation id="2" bandwidth="383593" codecs="avc1.64000d" mimeType="video/mp4" sar="1:1" width="320" height="180">
+      <Representation id="1" bandwidth="383593" codecs="avc1.64000d" mimeType="video/mp4" sar="1:1" width="320" height="180">
         <SegmentTemplate timescale="30000" initialization="bear-320x180-video-init.mp4" media="bear-320x180-video-$Number$.m4s" startNumber="1">
           <SegmentTimeline>
             <S t="0" d="30030" r="1"/>
@@ -31,6 +23,14 @@
           </SegmentTimeline>
         </SegmentTemplate>
       </Representation>
+      <Representation id="2" bandwidth="2632184" codecs="avc1.64001f" mimeType="video/mp4" sar="1:1" width="1280" height="720">
+        <SegmentTemplate timescale="30000" initialization="bear-1280x720-video-init.mp4" media="bear-1280x720-video-$Number$.m4s" startNumber="1">
+          <SegmentTimeline>
+            <S t="0" d="30030" r="1"/>
+            <S t="60060" d="22022"/>
+          </SegmentTimeline>
+        </SegmentTemplate>
+      </Representation>
     </AdaptationSet>
     <AdaptationSet id="1" contentType="audio" segmentAlignment="true">
       <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
@@ -39,7 +39,7 @@
       </ContentProtection>
       <Representation id="3" bandwidth="134272" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
         <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
-        <SegmentTemplate timescale="44100" initialization="bear-1280x720-audio-init.mp4" media="bear-1280x720-audio-$Number$.m4s" startNumber="1">
+        <SegmentTemplate timescale="44100" initialization="bear-640x360-audio-init.mp4" media="bear-640x360-audio-$Number$.m4s" startNumber="1">
           <SegmentTimeline>
             <S t="0" d="45056"/>
             <S t="45056" d="44032"/>
@@ -49,7 +49,7 @@
       </Representation>
       <Representation id="4" bandwidth="134272" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
         <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
-        <SegmentTemplate timescale="44100" initialization="bear-640x360-audio-init.mp4" media="bear-640x360-audio-$Number$.m4s" startNumber="1">
+        <SegmentTemplate timescale="44100" initialization="bear-1280x720-audio-init.mp4" media="bear-1280x720-audio-$Number$.m4s" startNumber="1">
           <SegmentTimeline>
             <S t="0" d="45056"/>
             <S t="45056" d="44032"/>
diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-init.mp4
index bb4986496e6f02e75c8bd3a84add5f5804755a69..5b46a8a3bac7dbdb577c030fce76fc5a7b4db7a0 100644
GIT binary patch
delta 23
bcmaFO{+fM*9}^?PWPhf)U{ZE67xO~^S^Ng-

delta 23
bcmaFO{+fM*9}^?vWPhf)U{ZE67xO~^S`-HC

diff --git a/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-init.mp4
index bb4986496e6f02e75c8bd3a84add5f5804755a69..5b46a8a3bac7dbdb577c030fce76fc5a7b4db7a0 100644
GIT binary patch
delta 23
bcmaFO{+fM*9}^?PWPhf)U{ZE67xO~^S^Ng-

delta 23
bcmaFO{+fM*9}^?vWPhf)U{ZE67xO~^S`-HC

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 06cbf09f13e2409aaae183dffca1f194edb0cde5..2b138e6923a4c26be18707ef5392c2139574e51e 100644
GIT binary patch
delta 23
bcmdnazMXx89}^?PWPhf)U{ZE67xP*GP}l}e

delta 23
bcmdnazMXx89}^?vWPhf)U{ZE67xP*GQ1Av&

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 06cbf09f13e2409aaae183dffca1f194edb0cde5..2b138e6923a4c26be18707ef5392c2139574e51e 100644
GIT binary patch
delta 23
bcmdnazMXx89}^?PWPhf)U{ZE67xP*GP}l}e

delta 23
bcmdnazMXx89}^?vWPhf)U{ZE67xP*GQ1Av&

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 136514d671be62652a6bf3faf32d98356558daa4..056b2ef8322ec5e430f74f253304bd42ef5aaddd 100644
GIT binary patch
delta 23
bcmX@Wet><09}^?PWPhe*U{ZFnF!NdfQsM@3

delta 23
bcmX@Wet><09}^?vWPhe*U{ZFnF!NdfQu+pT

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 06cbf09f13e2409aaae183dffca1f194edb0cde5..2b138e6923a4c26be18707ef5392c2139574e51e 100644
GIT binary patch
delta 23
bcmdnazMXx89}^?PWPhf)U{ZE67xP*GP}l}e

delta 23
bcmdnazMXx89}^?vWPhf)U{ZE67xP*GQ1Av&

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 1ba3d9abb9919926489f6cc1ecd098715b69cc65..825a8072d239ef72afac81d49c7488de32ed5746 100644
GIT binary patch
delta 13
UcmbQqHj{0G9}^?PWPhep02`zO?f?J)

delta 13
UcmbQqHj{0G9}^?vWPhep02`?T?*IS*

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 1ba3d9abb9919926489f6cc1ecd098715b69cc65..825a8072d239ef72afac81d49c7488de32ed5746 100644
GIT binary patch
delta 13
UcmbQqHj{0G9}^?PWPhep02`zO?f?J)

delta 13
UcmbQqHj{0G9}^?vWPhep02`?T?*IS*

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 1ba3d9abb9919926489f6cc1ecd098715b69cc65..825a8072d239ef72afac81d49c7488de32ed5746 100644
GIT binary patch
delta 13
UcmbQqHj{0G9}^?PWPhep02`zO?f?J)

delta 13
UcmbQqHj{0G9}^?vWPhep02`?T?*IS*

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 87f89a93c0c2fbc9536735c7762add595e83085f..7128d250eb373f0b00e24787f724b1d5adf87dd1 100644
GIT binary patch
delta 16
Ycmca|mFdb=rVV~fj0~IonOau>06yggi2wiq

delta 16
Ycmca|mFdb=rVV~fjEtN8nOau>06yymiU0rr

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 87f89a93c0c2fbc9536735c7762add595e83085f..7128d250eb373f0b00e24787f724b1d5adf87dd1 100644
GIT binary patch
delta 16
Ycmca|mFdb=rVV~fj0~IonOau>06yggi2wiq

delta 16
Ycmca|mFdb=rVV~fjEtN8nOau>06yymiU0rr

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 87f89a93c0c2fbc9536735c7762add595e83085f..7128d250eb373f0b00e24787f724b1d5adf87dd1 100644
GIT binary patch
delta 16
Ycmca|mFdb=rVV~fj0~IonOau>06yggi2wiq

delta 16
Ycmca|mFdb=rVV~fjEtN8nOau>06yymiU0rr

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 1ba3d9abb9919926489f6cc1ecd098715b69cc65..825a8072d239ef72afac81d49c7488de32ed5746 100644
GIT binary patch
delta 13
UcmbQqHj{0G9}^?PWPhep02`zO?f?J)

delta 13
UcmbQqHj{0G9}^?vWPhep02`?T?*IS*

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 fa415453e9..e51298416e 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,22 +2,22 @@
 <!--Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>-->
 <MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" profiles="urn:mpeg:dash:profile:isoff-live:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT2.7360668182373047S">
   <Period id="0" duration="PT2.002S">
-    <AdaptationSet id="0" contentType="text" segmentAlignment="true">
-      <Role schemeIdUri="urn:mpeg:dash:role:2011" value="subtitle"/>
-      <Representation id="0" bandwidth="1912" codecs="wvtt" mimeType="application/mp4">
-        <SegmentTemplate timescale="1000" initialization="bear-english-text-init.mp4" media="bear-english-text-$Number$.m4s" startNumber="1">
+    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" segmentAlignment="true" par="16:9">
+      <Representation id="0" bandwidth="974122" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+        <SegmentTemplate timescale="30000" initialization="bear-640x360-video-init.mp4" media="bear-640x360-video-$Number$.m4s" startNumber="1">
           <SegmentTimeline>
-            <S t="0" d="1000" r="1"/>
-            <S t="2000" d="1"/>
+            <S t="0" d="30030" r="1"/>
           </SegmentTimeline>
         </SegmentTemplate>
       </Representation>
     </AdaptationSet>
-    <AdaptationSet id="1" contentType="video" width="640" height="360" frameRate="30000/1001" segmentAlignment="true" par="16:9">
-      <Representation id="1" bandwidth="974122" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
-        <SegmentTemplate timescale="30000" initialization="bear-640x360-video-init.mp4" media="bear-640x360-video-$Number$.m4s" startNumber="1">
+    <AdaptationSet id="1" contentType="text" segmentAlignment="true">
+      <Role schemeIdUri="urn:mpeg:dash:role:2011" value="subtitle"/>
+      <Representation id="1" bandwidth="1912" codecs="wvtt" mimeType="application/mp4">
+        <SegmentTemplate timescale="1000" initialization="bear-english-text-init.mp4" media="bear-english-text-$Number$.m4s" startNumber="1">
           <SegmentTimeline>
-            <S t="0" d="30030" r="1"/>
+            <S t="0" d="1000" r="1"/>
+            <S t="2000" d="1"/>
           </SegmentTimeline>
         </SegmentTemplate>
       </Representation>
@@ -35,21 +35,21 @@
     </AdaptationSet>
   </Period>
   <Period id="1" duration="PT.7340666666666671S">
-    <AdaptationSet id="0" contentType="text" segmentAlignment="true">
-      <Role schemeIdUri="urn:mpeg:dash:role:2011" value="subtitle"/>
-      <Representation id="0" bandwidth="2024" codecs="wvtt" mimeType="application/mp4">
-        <SegmentTemplate timescale="1000" presentationTimeOffset="2001" initialization="bear-english-text-init.mp4" media="bear-english-text-$Number$.m4s" startNumber="4">
+    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" segmentAlignment="true" par="16:9">
+      <Representation id="0" bandwidth="869044" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+        <SegmentTemplate timescale="30000" presentationTimeOffset="60059" initialization="bear-640x360-video-init.mp4" media="bear-640x360-video-$Number$.m4s" startNumber="3">
           <SegmentTimeline>
-            <S t="2001" d="1000" r="2"/>
+            <S t="60060" d="22022"/>
           </SegmentTimeline>
         </SegmentTemplate>
       </Representation>
     </AdaptationSet>
-    <AdaptationSet id="1" contentType="video" width="640" height="360" frameRate="30000/1001" segmentAlignment="true" par="16:9">
-      <Representation id="1" bandwidth="869044" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
-        <SegmentTemplate timescale="30000" presentationTimeOffset="60059" initialization="bear-640x360-video-init.mp4" media="bear-640x360-video-$Number$.m4s" startNumber="3">
+    <AdaptationSet id="1" contentType="text" segmentAlignment="true">
+      <Role schemeIdUri="urn:mpeg:dash:role:2011" value="subtitle"/>
+      <Representation id="1" bandwidth="2024" codecs="wvtt" mimeType="application/mp4">
+        <SegmentTemplate timescale="1000" presentationTimeOffset="2001" initialization="bear-english-text-init.mp4" media="bear-english-text-$Number$.m4s" startNumber="4">
           <SegmentTimeline>
-            <S t="60060" d="22022"/>
+            <S t="2001" d="1000" r="2"/>
           </SegmentTimeline>
         </SegmentTemplate>
       </Representation>
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 372bb7827ee9b069f7324140b7494608069d2b0e..0127cfffbb8315f7c849decacd8b55c938600119 100644
GIT binary patch
delta 16
YcmbPwpK0oSrVV~fj0~IoncUU_0613#<p2Nx

delta 16
YcmbPwpK0oSrVV~fjEtN8ncUU_061L*<^TWy

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 c5ec848107f61607830cc2bf43d89555f7e48288..ec42c301b6eccdbf60d434d82a2c021e099ac85a 100644
GIT binary patch
delta 16
YcmaF+oayazrVV~fj0~IondWT-07Kgc0RR91

delta 16
YcmaF+oayazrVV~fjEtN8ndWT-07Kyi0ssI2

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 372bb7827ee9b069f7324140b7494608069d2b0e..0127cfffbb8315f7c849decacd8b55c938600119 100644
GIT binary patch
delta 16
YcmbPwpK0oSrVV~fj0~IoncUU_0613#<p2Nx

delta 16
YcmbPwpK0oSrVV~fjEtN8ncUU_061L*<^TWy

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 c5ec848107f61607830cc2bf43d89555f7e48288..ec42c301b6eccdbf60d434d82a2c021e099ac85a 100644
GIT binary patch
delta 16
YcmaF+oayazrVV~fj0~IondWT-07Kgc0RR91

delta 16
YcmaF+oayazrVV~fjEtN8ndWT-07Kyi0ssI2

diff --git a/packager/media/codecs/es_descriptor.cc b/packager/media/codecs/es_descriptor.cc
index 639ce4b5c2..bc17c7a3f9 100644
--- a/packager/media/codecs/es_descriptor.cc
+++ b/packager/media/codecs/es_descriptor.cc
@@ -219,7 +219,10 @@ bool ESDescriptor::ReadData(BitReader* reader) {
 void ESDescriptor::WriteInternal(BufferWriter* writer) {
   WriteHeader(writer);
 
-  writer->AppendInt(esid_);
+  // According to ISO/IEC 14496-14:2018 Section 4.1.2, 
+  // ES_ID is set to 0 when stored
+  const uint16_t kEsid = 0;
+  writer->AppendInt(kEsid);
   const uint8_t kNoEsFlags = 0;
   writer->AppendInt(kNoEsFlags);
 
diff --git a/packager/media/codecs/es_descriptor.h b/packager/media/codecs/es_descriptor.h
index e4caaf2b72..674a6620c0 100644
--- a/packager/media/codecs/es_descriptor.h
+++ b/packager/media/codecs/es_descriptor.h
@@ -175,7 +175,6 @@ class ESDescriptor : public BaseDescriptor {
   ESDescriptor() : BaseDescriptor(DescriptorTag::kES) {}
 
   uint16_t esid() const { return esid_; }
-  void set_esid(uint16_t esid) { esid_ = esid; }
 
   const DecoderConfigDescriptor& decoder_config_descriptor() const {
     return decoder_config_descriptor_;
diff --git a/packager/media/codecs/es_descriptor_unittest.cc b/packager/media/codecs/es_descriptor_unittest.cc
index 2bd32c5a8d..2458d121e1 100644
--- a/packager/media/codecs/es_descriptor_unittest.cc
+++ b/packager/media/codecs/es_descriptor_unittest.cc
@@ -21,7 +21,7 @@ TEST(ESDescriptorTest, SingleByteLengthTest) {
       // ESDescriptor tag with one byte size.
       0x03, 0x19,
         // ESDescriptor fields.
-        0x00, 0x01, 0x00,
+        0x00, 0x00, 0x00,
         // DecoderConfigDescriptor tag with one byte size.
         0x04, 0x11,
           // Object Type.
@@ -56,6 +56,19 @@ TEST(ESDescriptorTest, SingleByteLengthTest) {
   EXPECT_THAT(
       std::vector<uint8_t>(writer.Buffer(), writer.Buffer() + writer.Size()),
       ElementsAreArray(kBuffer));
+  
+  EXPECT_EQ(0u, es_desc.esid());
+  const size_t kEsIdOffset = 3;
+  const uint8_t kEsId = 5;
+  data[kEsIdOffset] = kEsId;
+  ASSERT_TRUE(es_desc.Parse(data));
+  EXPECT_EQ(kEsId, es_desc.esid());
+
+  writer.Clear();
+  es_desc.Write(&writer);
+  EXPECT_THAT(
+      std::vector<uint8_t>(writer.Buffer(), writer.Buffer() + writer.Size()),
+      ElementsAreArray(kBuffer));
 }
 
 TEST(ESDescriptorTest, NonAACTest) {
@@ -64,7 +77,7 @@ TEST(ESDescriptorTest, NonAACTest) {
       // ESDescriptor tag with one byte size.
       0x03, 0x19,
         // ESDescriptor fields.
-        0x00, 0x01, 0x00,
+        0x00, 0x00, 0x00,
         // DecoderConfigDescriptor tag with one byte size.
         0x04, 0x11,
           // Object Type.
diff --git a/packager/media/formats/mp4/box_definitions_unittest.cc b/packager/media/formats/mp4/box_definitions_unittest.cc
index 96b9413ffd..19526922ae 100644
--- a/packager/media/formats/mp4/box_definitions_unittest.cc
+++ b/packager/media/formats/mp4/box_definitions_unittest.cc
@@ -383,7 +383,6 @@ class BoxDefinitionsTestGeneral : public testing::Test {
 
   void Fill(ElementaryStreamDescriptor* esds) {
     const uint8_t kDecoderSpecificInfo[] = {18, 16};
-    esds->es_descriptor.set_esid(1);
     esds->es_descriptor.mutable_decoder_config_descriptor()->set_object_type(
         ObjectType::kISO_14496_3);
     std::vector<uint8_t> decoder_specific_info(
@@ -394,10 +393,6 @@ class BoxDefinitionsTestGeneral : public testing::Test {
         ->set_data(decoder_specific_info);
   }
 
-  void Modify(ElementaryStreamDescriptor* esds) {
-    esds->es_descriptor.set_esid(2);
-  }
-
   void Fill(DTSSpecific* ddts) {
     const uint8_t kDdtsExtraData[] = {0xe4, 0x7c, 0, 4, 0, 0x0f, 0};
     ddts->max_bitrate = 768000;
diff --git a/packager/media/formats/mp4/mp4_muxer.cc b/packager/media/formats/mp4/mp4_muxer.cc
index 73dff8f4f9..356d7a9e9b 100644
--- a/packager/media/formats/mp4/mp4_muxer.cc
+++ b/packager/media/formats/mp4/mp4_muxer.cc
@@ -250,15 +250,15 @@ Status MP4Muxer::DelayInitializeMuxer() {
     switch (stream->stream_type()) {
       case kStreamVideo:
         generate_trak_result = GenerateVideoTrak(
-            static_cast<const VideoStreamInfo*>(stream), &trak, i + 1);
+            static_cast<const VideoStreamInfo*>(stream), &trak);
         break;
       case kStreamAudio:
         generate_trak_result = GenerateAudioTrak(
-            static_cast<const AudioStreamInfo*>(stream), &trak, i + 1);
+            static_cast<const AudioStreamInfo*>(stream), &trak);
         break;
       case kStreamText:
         generate_trak_result = GenerateTextTrak(
-            static_cast<const TextStreamInfo*>(stream), &trak, i + 1);
+            static_cast<const TextStreamInfo*>(stream), &trak);
         break;
       default:
         NOTIMPLEMENTED() << "Not implemented for stream type: "
@@ -395,8 +395,7 @@ void MP4Muxer::InitializeTrak(const StreamInfo* info, Track* trak) {
 }
 
 bool MP4Muxer::GenerateVideoTrak(const VideoStreamInfo* video_info,
-                                 Track* trak,
-                                 uint32_t track_id) {
+                                 Track* trak) {
   InitializeTrak(video_info, trak);
 
   // width and height specify the track's visual presentation size as
@@ -449,8 +448,7 @@ bool MP4Muxer::GenerateVideoTrak(const VideoStreamInfo* video_info,
 }
 
 bool MP4Muxer::GenerateAudioTrak(const AudioStreamInfo* audio_info,
-                                 Track* trak,
-                                 uint32_t track_id) {
+                                 Track* trak) {
   InitializeTrak(audio_info, trak);
 
   trak->header.volume = 0x100;
@@ -460,7 +458,6 @@ bool MP4Muxer::GenerateAudioTrak(const AudioStreamInfo* audio_info,
       CodecToFourCC(audio_info->codec(), H26xStreamFormat::kUnSpecified);
   switch(audio_info->codec()){
     case kCodecAAC: {
-      audio.esds.es_descriptor.set_esid(track_id);
       DecoderConfigDescriptor* decoder_config =
           audio.esds.es_descriptor.mutable_decoder_config_descriptor();
       decoder_config->set_object_type(ObjectType::kISO_14496_3);  // MPEG4 AAC.
@@ -494,7 +491,6 @@ bool MP4Muxer::GenerateAudioTrak(const AudioStreamInfo* audio_info,
       audio.dfla.data = audio_info->codec_config();
       break;
     case kCodecMP3: {
-      audio.esds.es_descriptor.set_esid(track_id);
       DecoderConfigDescriptor* decoder_config =
           audio.esds.es_descriptor.mutable_decoder_config_descriptor();
       uint32_t samplerate = audio_info->sampling_frequency();
@@ -567,8 +563,7 @@ bool MP4Muxer::GenerateAudioTrak(const AudioStreamInfo* audio_info,
 }
 
 bool MP4Muxer::GenerateTextTrak(const TextStreamInfo* text_info,
-                                Track* trak,
-                                uint32_t track_id) {
+                                Track* trak) {
   InitializeTrak(text_info, trak);
 
   if (text_info->codec_string() == "wvtt") {
diff --git a/packager/media/formats/mp4/mp4_muxer.h b/packager/media/formats/mp4/mp4_muxer.h
index 58d1bb3dee..67e625b291 100644
--- a/packager/media/formats/mp4/mp4_muxer.h
+++ b/packager/media/formats/mp4/mp4_muxer.h
@@ -48,15 +48,9 @@ class MP4Muxer : public Muxer {
 
   // Generate Audio/Video Track box.
   void InitializeTrak(const StreamInfo* info, Track* trak);
-  bool GenerateAudioTrak(const AudioStreamInfo* audio_info,
-                         Track* trak,
-                         uint32_t track_id);
-  bool GenerateVideoTrak(const VideoStreamInfo* video_info,
-                         Track* trak,
-                         uint32_t track_id);
-  bool GenerateTextTrak(const TextStreamInfo* video_info,
-                        Track* trak,
-                        uint32_t track_id);
+  bool GenerateAudioTrak(const AudioStreamInfo* audio_info, Track* trak);
+  bool GenerateVideoTrak(const VideoStreamInfo* video_info, Track* trak);
+  bool GenerateTextTrak(const TextStreamInfo* video_info, Track* trak);
 
   // Gets |start| and |end| initialization range. Returns true if there is an
   // init range and sets start-end byte-range-spec specified in RFC2616.