Merge pull request #2145 from v-novaltd:dsparano-exo328

PiperOrigin-RevId: 730853667

RELEASENOTES.md

@@ -13,6 +13,8 @@
 *   Transformer:
 *   Track Selection:
 *   Extractors:
+    *   Fix issue where TS streams can get stuck on some devices
+        ([#2069](https://github.com/androidx/media/issues/2069)).
 *   DataSource:
 *   Audio:
 *   Video:

libraries/container/src/main/java/androidx/media3/container/NalUnitUtil.java

@@ -106,6 +106,9 @@ public final class NalUnitUtil {
    */
   @Deprecated public static final int NAL_UNIT_TYPE_PREFIX = H264_NAL_UNIT_TYPE_PREFIX;
 
+  /** H.264 unspecified NAL unit. */
+  public static final int H264_NAL_UNIT_TYPE_UNSPECIFIED = 24;
+
   /** H.265 coded slice segment of a random access skipped leading picture (RASL_R). */
   public static final int H265_NAL_UNIT_TYPE_RASL_R = 9;
 
@@ -133,6 +136,9 @@ public final class NalUnitUtil {
   /** H.265 suffixed supplemental enhancement information (SUFFIX_SEI_NUT). */
   public static final int H265_NAL_UNIT_TYPE_SUFFIX_SEI = 40;
 
+  /** H.265 unspecified NAL unit. */
+  public static final int H265_NAL_UNIT_TYPE_UNSPECIFIED = 48;
+
   /** Holds data parsed from a H.264 sequence parameter set NAL unit. */
   public static final class SpsData {
 

libraries/extractor/src/main/java/androidx/media3/extractor/ts/H264Reader.java

@@ -151,6 +151,14 @@ public final class H264Reader implements ElementaryStreamReader {
       // We've seen the start of a NAL unit of the following type.
       int nalUnitType = NalUnitUtil.getNalUnitType(dataArray, nalUnitOffset);
 
+      // Case of a 4 byte start code prefix 0x00000001, recoil NAL unit offset by one byte
+      // to avoid previous byte being assigned to the previous access unit.
+      int prefixSize = 3;
+      if (nalUnitOffset > 0 && dataArray[nalUnitOffset - 1] == 0x00) {
+        nalUnitOffset--;
+        prefixSize = 4;
+      }
+
       // This is the number of bytes from the current offset to the start of the next NAL unit.
       // It may be negative if the NAL unit started in the previously consumed data.
       int lengthToNalUnit = nalUnitOffset - offset;
@@ -170,7 +178,7 @@ public final class H264Reader implements ElementaryStreamReader {
       // Indicate the start of the next NAL unit.
       startNalUnit(absolutePosition, nalUnitType, pesTimeUs);
       // Continue scanning the data.
-      offset = nalUnitOffset + 3;
+      offset = nalUnitOffset + prefixSize;
     }
   }
 
@@ -179,7 +187,10 @@ public final class H264Reader implements ElementaryStreamReader {
     assertTracksCreated();
     if (isEndOfInput) {
       seiReader.flush();
-      sampleReader.end(totalBytesWritten);
+      // Simulate end of current NAL unit and start an AUD one to trigger output of current sample
+      endNalUnit(totalBytesWritten, 0, 0, pesTimeUs);
+      startNalUnit(totalBytesWritten, NalUnitUtil.H264_NAL_UNIT_TYPE_AUD, pesTimeUs);
+      endNalUnit(totalBytesWritten, 0, 0, pesTimeUs);
     }
   }
 
@@ -508,17 +519,11 @@ public final class H264Reader implements ElementaryStreamReader {
         readingSample = true;
       }
       setSampleIsKeyframe();
+      // Reset NAL unit type to avoid stale state
+      nalUnitType = NalUnitUtil.H264_NAL_UNIT_TYPE_UNSPECIFIED;
       return sampleIsKeyframe;
     }
 
-    public void end(long position) {
-      setSampleIsKeyframe();
-      // Output a final sample with the NAL units currently held
-      nalUnitStartPosition = position;
-      outputSample(/* offset= */ 0);
-      readingSample = false;
-    }
-
     private void setSampleIsKeyframe() {
       boolean treatIFrameAsKeyframe =
           allowNonIdrKeyframes ? sliceHeader.isISlice() : randomAccessIndicator;
@@ -528,7 +533,7 @@ public final class H264Reader implements ElementaryStreamReader {
     }
 
     private void outputSample(int offset) {
-      if (sampleTimeUs == C.TIME_UNSET) {
+      if (sampleTimeUs == C.TIME_UNSET || nalUnitStartPosition == samplePosition) {
         return;
       }
       @C.BufferFlags int flags = sampleIsKeyframe ? C.BUFFER_FLAG_KEY_FRAME : 0;

libraries/extractor/src/main/java/androidx/media3/extractor/ts/H265Reader.java

@@ -139,6 +139,14 @@ public final class H265Reader implements ElementaryStreamReader {
         // We've seen the start of a NAL unit of the following type.
         int nalUnitType = NalUnitUtil.getH265NalUnitType(dataArray, nalUnitOffset);
 
+        // Case of a 4 byte start code prefix 0x00000001, recoil NAL unit offset by one byte
+        // to avoid previous byte being assigned to the previous access unit.
+        int prefixSize = 3;
+        if (nalUnitOffset > 0 && dataArray[nalUnitOffset - 1] == 0x00) {
+          nalUnitOffset--;
+          prefixSize = 4;
+        }
+
         // This is the number of bytes from the current offset to the start of the next NAL unit.
         // It may be negative if the NAL unit started in the previously consumed data.
         int lengthToNalUnit = nalUnitOffset - offset;
@@ -159,7 +167,7 @@ public final class H265Reader implements ElementaryStreamReader {
         // Indicate the start of the next NAL unit.
         startNalUnit(absolutePosition, bytesWrittenPastPosition, nalUnitType, pesTimeUs);
         // Continue scanning the data.
-        offset = nalUnitOffset + 3;
+        offset = nalUnitOffset + prefixSize;
       }
     }
   }
@@ -169,7 +177,10 @@ public final class H265Reader implements ElementaryStreamReader {
     assertTracksCreated();
     if (isEndOfInput) {
       seiReader.flush();
-      sampleReader.end(totalBytesWritten);
+      // Simulate end of current NAL unit and start an unspecified one to trigger output of current
+      // sample
+      endNalUnit(totalBytesWritten, 0, 0, pesTimeUs);
+      startNalUnit(totalBytesWritten, 0, NalUnitUtil.H265_NAL_UNIT_TYPE_UNSPECIFIED, pesTimeUs);
     }
   }
 
@@ -384,19 +395,8 @@ public final class H265Reader implements ElementaryStreamReader {
       }
     }
 
-    public void end(long position) {
-      sampleIsKeyframe = nalUnitHasKeyframeData;
-      // Output a sample with the NAL units since the current nalUnitPosition
-      outputSample(/* offset= */ (int) (position - nalUnitPosition));
-      // Output a final sample with the remaining NAL units up to the passed position
-      samplePosition = nalUnitPosition;
-      nalUnitPosition = position;
-      outputSample(/* offset= */ 0);
-      readingSample = false;
-    }
-
     private void outputSample(int offset) {
-      if (sampleTimeUs == C.TIME_UNSET) {
+      if (sampleTimeUs == C.TIME_UNSET || nalUnitPosition == samplePosition) {
         return;
       }
       @C.BufferFlags int flags = sampleIsKeyframe ? C.BUFFER_FLAG_KEY_FRAME : 0;

libraries/extractor/src/main/java/androidx/media3/extractor/ts/PesReader.java

@@ -171,9 +171,14 @@ public final class PesReader implements TsPayloadReader {
     // pes does not have a length field and body is being read, another exclusion
     // is due to H262 streams possibly having, in HLS mode, a pes across more than one segment
     // which would trigger committing an unfinished sample in the middle of the access unit
+
+    // Only call parseHeader if isModeHls is true and can parse header as some HLS streams may
+    // contain packages.
+    boolean headerParsed = !isModeHls || parseHeader();
     return state == STATE_READING_BODY
         && payloadSize == C.LENGTH_UNSET
-        && !(isModeHls && reader instanceof H262Reader);
+        && !(isModeHls && reader instanceof H262Reader)
+        && headerParsed;
   }
 
   private void setState(int state) {

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.0.dump

@@ -21,126 +21,126 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 29, hash A220FDE0
+      data = length 28, hash 78D7C620
       data = length 9, hash D971CD89
   sample 0:
     time = 66666
     flags = 1
-    data = length 856, hash E3FC14FA
+    data = length 856, hash C9A451E8
   sample 1:
     time = 100000
     flags = 0
-    data = length 3330, hash ACE433CC
+    data = length 3330, hash 6FC4E656
   sample 2:
     time = 166666
     flags = 0
-    data = length 6849, hash 2762E298
+    data = length 6849, hash AD411A86
   sample 3:
     time = 133333
     flags = 0
-    data = length 794, hash 16489833
+    data = length 794, hash 6289130F
   sample 4:
     time = 233333
     flags = 0
-    data = length 1874, hash 24DF8A2D
+    data = length 1874, hash 8A60ABD5
   sample 5:
     time = 200000
     flags = 0
-    data = length 1209, hash B137200F
+    data = length 1209, hash 9947502F
   sample 6:
     time = 366666
     flags = 0
-    data = length 476, hash 1D70B27E
+    data = length 476, hash 31B872E4
   sample 7:
     time = 300000
     flags = 0
-    data = length 325, hash D3FB2CC2
+    data = length 325, hash E39A441C
   sample 8:
     time = 266666
     flags = 0
-    data = length 89, hash F66C5D60
+    data = length 89, hash 14CB8CBE
   sample 9:
     time = 333333
     flags = 0
-    data = length 177, hash 7E6DB5B7
+    data = length 177, hash 2E796387
   sample 10:
     time = 400000
     flags = 1
-    data = length 11054, hash 1FC7442D
+    data = length 11054, hash F88DAD5
   sample 11:
     time = 533333
     flags = 0
-    data = length 302, hash 5432E85C
+    data = length 302, hash 8AF4C6
   sample 12:
     time = 466666
     flags = 0
-    data = length 302, hash 95A21C90
+    data = length 302, hash 8F0A6A12
   sample 13:
     time = 433333
     flags = 0
-    data = length 96, hash 8C98DBB8
+    data = length 96, hash 32B6396A
   sample 14:
     time = 500000
     flags = 0
-    data = length 198, hash 114E22D9
+    data = length 198, hash 9D64D0A9
   sample 15:
     time = 666666
     flags = 0
-    data = length 303, hash C2C45716
+    data = length 303, hash 470A29C8
   sample 16:
     time = 600000
     flags = 0
-    data = length 168, hash 1B048DCA
+    data = length 168, hash D1EBAB18
   sample 17:
     time = 566666
     flags = 0
-    data = length 98, hash 3AA3B8B4
+    data = length 98, hash 69F34C6E
   sample 18:
     time = 633333
     flags = 0
-    data = length 108, hash 4F67E6F8
+    data = length 108, hash ECDDA32A
   sample 19:
     time = 700000
     flags = 0
-    data = length 110, hash 625A9B91
+    data = length 110, hash D77B6F1
   sample 20:
     time = 733333
     flags = 1
-    data = length 11235, hash 8EDDEB9
+    data = length 11235, hash BBB44EC5
   sample 21:
     time = 866666
     flags = 0
-    data = length 358, hash 797276E4
+    data = length 358, hash 1A21273E
   sample 22:
     time = 800000
     flags = 0
-    data = length 336, hash B92DBED9
+    data = length 336, hash F0603229
   sample 23:
     time = 766666
     flags = 0
-    data = length 105, hash 223F3D12
+    data = length 105, hash EF20F2CC
   sample 24:
     time = 833333
     flags = 0
-    data = length 106, hash DF8D1552
+    data = length 106, hash C9702210
   sample 25:
     time = 1000000
     flags = 0
-    data = length 235, hash 6127527D
+    data = length 235, hash EBD51481
   sample 26:
     time = 933333
     flags = 0
-    data = length 109, hash E8E69F9F
+    data = length 109, hash 77764B9F
   sample 27:
     time = 900000
     flags = 0
-    data = length 84, hash 54E55CB4
+    data = length 84, hash 74F4BEE
   sample 28:
     time = 966666
     flags = 0
-    data = length 93, hash B6B6263C
+    data = length 93, hash 9522F962
   sample 29:
     time = 1033333
     flags = 0
-    data = length 234, hash A48D3D90
+    data = length 235, hash BECC682E
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.1.dump

@@ -21,90 +21,90 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 29, hash A220FDE0
+      data = length 28, hash 78D7C620
       data = length 9, hash D971CD89
   sample 0:
     time = 333333
     flags = 0
-    data = length 177, hash 7E6DB5B7
+    data = length 177, hash 2E796387
   sample 1:
     time = 400000
     flags = 1
-    data = length 11054, hash 1FC7442D
+    data = length 11054, hash F88DAD5
   sample 2:
     time = 533333
     flags = 0
-    data = length 302, hash 5432E85C
+    data = length 302, hash 8AF4C6
   sample 3:
     time = 466666
     flags = 0
-    data = length 302, hash 95A21C90
+    data = length 302, hash 8F0A6A12
   sample 4:
     time = 433333
     flags = 0
-    data = length 96, hash 8C98DBB8
+    data = length 96, hash 32B6396A
   sample 5:
     time = 500000
     flags = 0
-    data = length 198, hash 114E22D9
+    data = length 198, hash 9D64D0A9
   sample 6:
     time = 666666
     flags = 0
-    data = length 303, hash C2C45716
+    data = length 303, hash 470A29C8
   sample 7:
     time = 600000
     flags = 0
-    data = length 168, hash 1B048DCA
+    data = length 168, hash D1EBAB18
   sample 8:
     time = 566666
     flags = 0
-    data = length 98, hash 3AA3B8B4
+    data = length 98, hash 69F34C6E
   sample 9:
     time = 633333
     flags = 0
-    data = length 108, hash 4F67E6F8
+    data = length 108, hash ECDDA32A
   sample 10:
     time = 700000
     flags = 0
-    data = length 110, hash 625A9B91
+    data = length 110, hash D77B6F1
   sample 11:
     time = 733333
     flags = 1
-    data = length 11235, hash 8EDDEB9
+    data = length 11235, hash BBB44EC5
   sample 12:
     time = 866666
     flags = 0
-    data = length 358, hash 797276E4
+    data = length 358, hash 1A21273E
   sample 13:
     time = 800000
     flags = 0
-    data = length 336, hash B92DBED9
+    data = length 336, hash F0603229
   sample 14:
     time = 766666
     flags = 0
-    data = length 105, hash 223F3D12
+    data = length 105, hash EF20F2CC
   sample 15:
     time = 833333
     flags = 0
-    data = length 106, hash DF8D1552
+    data = length 106, hash C9702210
   sample 16:
     time = 1000000
     flags = 0
-    data = length 235, hash 6127527D
+    data = length 235, hash EBD51481
   sample 17:
     time = 933333
     flags = 0
-    data = length 109, hash E8E69F9F
+    data = length 109, hash 77764B9F
   sample 18:
     time = 900000
     flags = 0
-    data = length 84, hash 54E55CB4
+    data = length 84, hash 74F4BEE
   sample 19:
     time = 966666
     flags = 0
-    data = length 93, hash B6B6263C
+    data = length 93, hash 9522F962
   sample 20:
     time = 1033333
     flags = 0
-    data = length 234, hash A48D3D90
+    data = length 235, hash BECC682E
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.2.dump

@@ -21,54 +21,54 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 29, hash A220FDE0
+      data = length 28, hash 78D7C620
       data = length 9, hash D971CD89
   sample 0:
     time = 633333
     flags = 0
-    data = length 108, hash 4F67E6F8
+    data = length 108, hash ECDDA32A
   sample 1:
     time = 700000
     flags = 0
-    data = length 110, hash 625A9B91
+    data = length 110, hash D77B6F1
   sample 2:
     time = 733333
     flags = 1
-    data = length 11235, hash 8EDDEB9
+    data = length 11235, hash BBB44EC5
   sample 3:
     time = 866666
     flags = 0
-    data = length 358, hash 797276E4
+    data = length 358, hash 1A21273E
   sample 4:
     time = 800000
     flags = 0
-    data = length 336, hash B92DBED9
+    data = length 336, hash F0603229
   sample 5:
     time = 766666
     flags = 0
-    data = length 105, hash 223F3D12
+    data = length 105, hash EF20F2CC
   sample 6:
     time = 833333
     flags = 0
-    data = length 106, hash DF8D1552
+    data = length 106, hash C9702210
   sample 7:
     time = 1000000
     flags = 0
-    data = length 235, hash 6127527D
+    data = length 235, hash EBD51481
   sample 8:
     time = 933333
     flags = 0
-    data = length 109, hash E8E69F9F
+    data = length 109, hash 77764B9F
   sample 9:
     time = 900000
     flags = 0
-    data = length 84, hash 54E55CB4
+    data = length 84, hash 74F4BEE
   sample 10:
     time = 966666
     flags = 0
-    data = length 93, hash B6B6263C
+    data = length 93, hash 9522F962
   sample 11:
     time = 1033333
     flags = 0
-    data = length 234, hash A48D3D90
+    data = length 235, hash BECC682E
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.3.dump

@@ -21,18 +21,18 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 29, hash A220FDE0
+      data = length 28, hash 78D7C620
       data = length 9, hash D971CD89
   sample 0:
     time = 900000
     flags = 0
-    data = length 84, hash 54E55CB4
+    data = length 84, hash 74F4BEE
   sample 1:
     time = 966666
     flags = 0
-    data = length 93, hash B6B6263C
+    data = length 93, hash 9522F962
   sample 2:
     time = 1033333
     flags = 0
-    data = length 234, hash A48D3D90
+    data = length 235, hash BECC682E
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.unknown_length.dump

@@ -18,126 +18,126 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 29, hash A220FDE0
+      data = length 28, hash 78D7C620
       data = length 9, hash D971CD89
   sample 0:
     time = 66666
     flags = 1
-    data = length 856, hash E3FC14FA
+    data = length 856, hash C9A451E8
   sample 1:
     time = 100000
     flags = 0
-    data = length 3330, hash ACE433CC
+    data = length 3330, hash 6FC4E656
   sample 2:
     time = 166666
     flags = 0
-    data = length 6849, hash 2762E298
+    data = length 6849, hash AD411A86
   sample 3:
     time = 133333
     flags = 0
-    data = length 794, hash 16489833
+    data = length 794, hash 6289130F
   sample 4:
     time = 233333
     flags = 0
-    data = length 1874, hash 24DF8A2D
+    data = length 1874, hash 8A60ABD5
   sample 5:
     time = 200000
     flags = 0
-    data = length 1209, hash B137200F
+    data = length 1209, hash 9947502F
   sample 6:
     time = 366666
     flags = 0
-    data = length 476, hash 1D70B27E
+    data = length 476, hash 31B872E4
   sample 7:
     time = 300000
     flags = 0
-    data = length 325, hash D3FB2CC2
+    data = length 325, hash E39A441C
   sample 8:
     time = 266666
     flags = 0
-    data = length 89, hash F66C5D60
+    data = length 89, hash 14CB8CBE
   sample 9:
     time = 333333
     flags = 0
-    data = length 177, hash 7E6DB5B7
+    data = length 177, hash 2E796387
   sample 10:
     time = 400000
     flags = 1
-    data = length 11054, hash 1FC7442D
+    data = length 11054, hash F88DAD5
   sample 11:
     time = 533333
     flags = 0
-    data = length 302, hash 5432E85C
+    data = length 302, hash 8AF4C6
   sample 12:
     time = 466666
     flags = 0
-    data = length 302, hash 95A21C90
+    data = length 302, hash 8F0A6A12
   sample 13:
     time = 433333
     flags = 0
-    data = length 96, hash 8C98DBB8
+    data = length 96, hash 32B6396A
   sample 14:
     time = 500000
     flags = 0
-    data = length 198, hash 114E22D9
+    data = length 198, hash 9D64D0A9
   sample 15:
     time = 666666
     flags = 0
-    data = length 303, hash C2C45716
+    data = length 303, hash 470A29C8
   sample 16:
     time = 600000
     flags = 0
-    data = length 168, hash 1B048DCA
+    data = length 168, hash D1EBAB18
   sample 17:
     time = 566666
     flags = 0
-    data = length 98, hash 3AA3B8B4
+    data = length 98, hash 69F34C6E
   sample 18:
     time = 633333
     flags = 0
-    data = length 108, hash 4F67E6F8
+    data = length 108, hash ECDDA32A
   sample 19:
     time = 700000
     flags = 0
-    data = length 110, hash 625A9B91
+    data = length 110, hash D77B6F1
   sample 20:
     time = 733333
     flags = 1
-    data = length 11235, hash 8EDDEB9
+    data = length 11235, hash BBB44EC5
   sample 21:
     time = 866666
     flags = 0
-    data = length 358, hash 797276E4
+    data = length 358, hash 1A21273E
   sample 22:
     time = 800000
     flags = 0
-    data = length 336, hash B92DBED9
+    data = length 336, hash F0603229
   sample 23:
     time = 766666
     flags = 0
-    data = length 105, hash 223F3D12
+    data = length 105, hash EF20F2CC
   sample 24:
     time = 833333
     flags = 0
-    data = length 106, hash DF8D1552
+    data = length 106, hash C9702210
   sample 25:
     time = 1000000
     flags = 0
-    data = length 235, hash 6127527D
+    data = length 235, hash EBD51481
   sample 26:
     time = 933333
     flags = 0
-    data = length 109, hash E8E69F9F
+    data = length 109, hash 77764B9F
   sample 27:
     time = 900000
     flags = 0
-    data = length 84, hash 54E55CB4
+    data = length 84, hash 74F4BEE
   sample 28:
     time = 966666
     flags = 0
-    data = length 93, hash B6B6263C
+    data = length 93, hash 9522F962
   sample 29:
     time = 1033333
     flags = 0
-    data = length 234, hash A48D3D90
+    data = length 235, hash BECC682E
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.0.dump

@@ -21,20 +21,20 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 29, hash 4C2CAE9C
+      data = length 28, hash 2750DE4
       data = length 9, hash D971CD89
   sample 0:
     time = 66733
     flags = 1
-    data = length 12394, hash A39F5311
+    data = length 12394, hash DAC3B071
   sample 1:
     time = 100100
     flags = 0
-    data = length 813, hash 99F7B4FA
+    data = length 813, hash 1F184EE4
   sample 2:
     time = 133466
     flags = 0
-    data = length 442, hash A7367ECF
+    data = length 443, hash 4C6CDD6D
 track 257:
   total output bytes = 18432
   sample count = 9

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.unknown_length.dump

@@ -18,20 +18,20 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 29, hash 4C2CAE9C
+      data = length 28, hash 2750DE4
       data = length 9, hash D971CD89
   sample 0:
     time = 66733
     flags = 1
-    data = length 12394, hash A39F5311
+    data = length 12394, hash DAC3B071
   sample 1:
     time = 100100
     flags = 0
-    data = length 813, hash 99F7B4FA
+    data = length 813, hash 1F184EE4
   sample 2:
     time = 133466
     flags = 0
-    data = length 442, hash A7367ECF
+    data = length 443, hash 4C6CDD6D
 track 257:
   total output bytes = 18432
   sample count = 9

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.0.dump

@@ -21,126 +21,126 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 25, hash 8F89F820
+      data = length 24, hash 994683E0
       data = length 8, hash 9BAAE288
   sample 0:
     time = 0
     flags = 1
-    data = length 774, hash 72202772
+    data = length 774, hash 33CCC4F0
   sample 1:
     time = 33333
     flags = 1
-    data = length 3340, hash DBB55E8B
+    data = length 3340, hash 92B54537
   sample 2:
     time = 66666
     flags = 1
-    data = length 5499, hash 6B17E43
+    data = length 5499, hash 85137BFB
   sample 3:
     time = 100000
     flags = 1
-    data = length 6409, hash 8F315700
+    data = length 6409, hash C0530B1E
   sample 4:
     time = 133333
     flags = 1
-    data = length 7254, hash FF49E98C
+    data = length 7254, hash 588B8396
   sample 5:
     time = 166666
     flags = 1
-    data = length 7638, hash 8FCCA884
+    data = length 7638, hash BF94A59E
   sample 6:
     time = 200000
     flags = 1
-    data = length 7555, hash 3FAA49AD
+    data = length 7555, hash C40F1D51
   sample 7:
     time = 233333
     flags = 1
-    data = length 7549, hash 5FC03E0C
+    data = length 7549, hash 5521EF92
   sample 8:
     time = 266666
     flags = 1
-    data = length 7506, hash D649BB10
+    data = length 7506, hash D175D292
   sample 9:
     time = 300000
     flags = 1
-    data = length 7496, hash F58C0476
+    data = length 7496, hash 339886EC
   sample 10:
     time = 333333
     flags = 1
-    data = length 7344, hash 3B8E291C
+    data = length 7344, hash 896E1B86
   sample 11:
     time = 366666
     flags = 1
-    data = length 7343, hash A8389647
+    data = length 7343, hash 6B07A077
   sample 12:
     time = 400000
     flags = 1
-    data = length 7316, hash FD7A4579
+    data = length 7316, hash F0D6A689
   sample 13:
     time = 433333
     flags = 1
-    data = length 7302, hash D701AB2
+    data = length 7302, hash B0E709B0
   sample 14:
     time = 466666
     flags = 1
-    data = length 7324, hash 1B8B56B4
+    data = length 7324, hash AAB8BFEE
   sample 15:
     time = 500000
     flags = 1
-    data = length 7273, hash 6E72090F
+    data = length 7273, hash 739D332F
   sample 16:
     time = 533333
     flags = 1
-    data = length 7298, hash 4CAD6DE6
+    data = length 7298, hash E61720FC
   sample 17:
     time = 566666
     flags = 1
-    data = length 7287, hash 310B4416
+    data = length 7287, hash 607DEEC8
   sample 18:
     time = 600000
     flags = 1
-    data = length 7268, hash DEDEAAE6
+    data = length 7268, hash 30E4EB7C
   sample 19:
     time = 633333
     flags = 1
-    data = length 7243, hash B5CFF1BB
+    data = length 7243, hash C8D6D83
   sample 20:
     time = 666666
     flags = 1
-    data = length 7335, hash B9E7BA4C
+    data = length 7335, hash 57DE5D2
   sample 21:
     time = 700000
     flags = 1
-    data = length 7326, hash 69DDD01
+    data = length 7326, hash 374AFB81
   sample 22:
     time = 733333
     flags = 1
-    data = length 7379, hash 8EA6EDC8
+    data = length 7379, hash E2C2DDD6
   sample 23:
     time = 766666
     flags = 1
-    data = length 7341, hash 751383
+    data = length 7341, hash DAB6DB3B
   sample 24:
     time = 800000
     flags = 1
-    data = length 7323, hash E6D08DC8
+    data = length 7323, hash EDC1AFD6
   sample 25:
     time = 833333
     flags = 1
-    data = length 7302, hash DADFB1AC
+    data = length 7302, hash C80BAB76
   sample 26:
     time = 866666
     flags = 1
-    data = length 7327, hash 401FE473
+    data = length 7327, hash 85ED8CB
   sample 27:
     time = 900000
     flags = 1
-    data = length 7340, hash DAAC756E
+    data = length 7340, hash 8D715DF4
   sample 28:
     time = 933333
     flags = 1
-    data = length 7334, hash 614FA397
+    data = length 7334, hash CF2D482B
   sample 29:
     time = 966666
     flags = 1
-    data = length 7287, hash A67CBA0A
+    data = length 7288, hash 24B1602C
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.1.dump

@@ -21,90 +21,90 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 25, hash 8F89F820
+      data = length 24, hash 994683E0
       data = length 8, hash 9BAAE288
   sample 0:
     time = 300000
     flags = 1
-    data = length 7496, hash F58C0476
+    data = length 7496, hash 339886EC
   sample 1:
     time = 333333
     flags = 1
-    data = length 7344, hash 3B8E291C
+    data = length 7344, hash 896E1B86
   sample 2:
     time = 366666
     flags = 1
-    data = length 7343, hash A8389647
+    data = length 7343, hash 6B07A077
   sample 3:
     time = 400000
     flags = 1
-    data = length 7316, hash FD7A4579
+    data = length 7316, hash F0D6A689
   sample 4:
     time = 433333
     flags = 1
-    data = length 7302, hash D701AB2
+    data = length 7302, hash B0E709B0
   sample 5:
     time = 466666
     flags = 1
-    data = length 7324, hash 1B8B56B4
+    data = length 7324, hash AAB8BFEE
   sample 6:
     time = 500000
     flags = 1
-    data = length 7273, hash 6E72090F
+    data = length 7273, hash 739D332F
   sample 7:
     time = 533333
     flags = 1
-    data = length 7298, hash 4CAD6DE6
+    data = length 7298, hash E61720FC
   sample 8:
     time = 566666
     flags = 1
-    data = length 7287, hash 310B4416
+    data = length 7287, hash 607DEEC8
   sample 9:
     time = 600000
     flags = 1
-    data = length 7268, hash DEDEAAE6
+    data = length 7268, hash 30E4EB7C
   sample 10:
     time = 633333
     flags = 1
-    data = length 7243, hash B5CFF1BB
+    data = length 7243, hash C8D6D83
   sample 11:
     time = 666666
     flags = 1
-    data = length 7335, hash B9E7BA4C
+    data = length 7335, hash 57DE5D2
   sample 12:
     time = 700000
     flags = 1
-    data = length 7326, hash 69DDD01
+    data = length 7326, hash 374AFB81
   sample 13:
     time = 733333
     flags = 1
-    data = length 7379, hash 8EA6EDC8
+    data = length 7379, hash E2C2DDD6
   sample 14:
     time = 766666
     flags = 1
-    data = length 7341, hash 751383
+    data = length 7341, hash DAB6DB3B
   sample 15:
     time = 800000
     flags = 1
-    data = length 7323, hash E6D08DC8
+    data = length 7323, hash EDC1AFD6
   sample 16:
     time = 833333
     flags = 1
-    data = length 7302, hash DADFB1AC
+    data = length 7302, hash C80BAB76
   sample 17:
     time = 866666
     flags = 1
-    data = length 7327, hash 401FE473
+    data = length 7327, hash 85ED8CB
   sample 18:
     time = 900000
     flags = 1
-    data = length 7340, hash DAAC756E
+    data = length 7340, hash 8D715DF4
   sample 19:
     time = 933333
     flags = 1
-    data = length 7334, hash 614FA397
+    data = length 7334, hash CF2D482B
   sample 20:
     time = 966666
     flags = 1
-    data = length 7287, hash A67CBA0A
+    data = length 7288, hash 24B1602C
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.2.dump

@@ -21,54 +21,54 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 25, hash 8F89F820
+      data = length 24, hash 994683E0
       data = length 8, hash 9BAAE288
   sample 0:
     time = 600000
     flags = 1
-    data = length 7268, hash DEDEAAE6
+    data = length 7268, hash 30E4EB7C
   sample 1:
     time = 633333
     flags = 1
-    data = length 7243, hash B5CFF1BB
+    data = length 7243, hash C8D6D83
   sample 2:
     time = 666666
     flags = 1
-    data = length 7335, hash B9E7BA4C
+    data = length 7335, hash 57DE5D2
   sample 3:
     time = 700000
     flags = 1
-    data = length 7326, hash 69DDD01
+    data = length 7326, hash 374AFB81
   sample 4:
     time = 733333
     flags = 1
-    data = length 7379, hash 8EA6EDC8
+    data = length 7379, hash E2C2DDD6
   sample 5:
     time = 766666
     flags = 1
-    data = length 7341, hash 751383
+    data = length 7341, hash DAB6DB3B
   sample 6:
     time = 800000
     flags = 1
-    data = length 7323, hash E6D08DC8
+    data = length 7323, hash EDC1AFD6
   sample 7:
     time = 833333
     flags = 1
-    data = length 7302, hash DADFB1AC
+    data = length 7302, hash C80BAB76
   sample 8:
     time = 866666
     flags = 1
-    data = length 7327, hash 401FE473
+    data = length 7327, hash 85ED8CB
   sample 9:
     time = 900000
     flags = 1
-    data = length 7340, hash DAAC756E
+    data = length 7340, hash 8D715DF4
   sample 10:
     time = 933333
     flags = 1
-    data = length 7334, hash 614FA397
+    data = length 7334, hash CF2D482B
   sample 11:
     time = 966666
     flags = 1
-    data = length 7287, hash A67CBA0A
+    data = length 7288, hash 24B1602C
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.3.dump

@@ -21,10 +21,10 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 25, hash 8F89F820
+      data = length 24, hash 994683E0
       data = length 8, hash 9BAAE288
   sample 0:
     time = 966666
     flags = 1
-    data = length 7287, hash A67CBA0A
+    data = length 7288, hash 24B1602C
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.unknown_length.dump

@@ -18,126 +18,126 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 25, hash 8F89F820
+      data = length 24, hash 994683E0
       data = length 8, hash 9BAAE288
   sample 0:
     time = 0
     flags = 1
-    data = length 774, hash 72202772
+    data = length 774, hash 33CCC4F0
   sample 1:
     time = 33333
     flags = 1
-    data = length 3340, hash DBB55E8B
+    data = length 3340, hash 92B54537
   sample 2:
     time = 66666
     flags = 1
-    data = length 5499, hash 6B17E43
+    data = length 5499, hash 85137BFB
   sample 3:
     time = 100000
     flags = 1
-    data = length 6409, hash 8F315700
+    data = length 6409, hash C0530B1E
   sample 4:
     time = 133333
     flags = 1
-    data = length 7254, hash FF49E98C
+    data = length 7254, hash 588B8396
   sample 5:
     time = 166666
     flags = 1
-    data = length 7638, hash 8FCCA884
+    data = length 7638, hash BF94A59E
   sample 6:
     time = 200000
     flags = 1
-    data = length 7555, hash 3FAA49AD
+    data = length 7555, hash C40F1D51
   sample 7:
     time = 233333
     flags = 1
-    data = length 7549, hash 5FC03E0C
+    data = length 7549, hash 5521EF92
   sample 8:
     time = 266666
     flags = 1
-    data = length 7506, hash D649BB10
+    data = length 7506, hash D175D292
   sample 9:
     time = 300000
     flags = 1
-    data = length 7496, hash F58C0476
+    data = length 7496, hash 339886EC
   sample 10:
     time = 333333
     flags = 1
-    data = length 7344, hash 3B8E291C
+    data = length 7344, hash 896E1B86
   sample 11:
     time = 366666
     flags = 1
-    data = length 7343, hash A8389647
+    data = length 7343, hash 6B07A077
   sample 12:
     time = 400000
     flags = 1
-    data = length 7316, hash FD7A4579
+    data = length 7316, hash F0D6A689
   sample 13:
     time = 433333
     flags = 1
-    data = length 7302, hash D701AB2
+    data = length 7302, hash B0E709B0
   sample 14:
     time = 466666
     flags = 1
-    data = length 7324, hash 1B8B56B4
+    data = length 7324, hash AAB8BFEE
   sample 15:
     time = 500000
     flags = 1
-    data = length 7273, hash 6E72090F
+    data = length 7273, hash 739D332F
   sample 16:
     time = 533333
     flags = 1
-    data = length 7298, hash 4CAD6DE6
+    data = length 7298, hash E61720FC
   sample 17:
     time = 566666
     flags = 1
-    data = length 7287, hash 310B4416
+    data = length 7287, hash 607DEEC8
   sample 18:
     time = 600000
     flags = 1
-    data = length 7268, hash DEDEAAE6
+    data = length 7268, hash 30E4EB7C
   sample 19:
     time = 633333
     flags = 1
-    data = length 7243, hash B5CFF1BB
+    data = length 7243, hash C8D6D83
   sample 20:
     time = 666666
     flags = 1
-    data = length 7335, hash B9E7BA4C
+    data = length 7335, hash 57DE5D2
   sample 21:
     time = 700000
     flags = 1
-    data = length 7326, hash 69DDD01
+    data = length 7326, hash 374AFB81
   sample 22:
     time = 733333
     flags = 1
-    data = length 7379, hash 8EA6EDC8
+    data = length 7379, hash E2C2DDD6
   sample 23:
     time = 766666
     flags = 1
-    data = length 7341, hash 751383
+    data = length 7341, hash DAB6DB3B
   sample 24:
     time = 800000
     flags = 1
-    data = length 7323, hash E6D08DC8
+    data = length 7323, hash EDC1AFD6
   sample 25:
     time = 833333
     flags = 1
-    data = length 7302, hash DADFB1AC
+    data = length 7302, hash C80BAB76
   sample 26:
     time = 866666
     flags = 1
-    data = length 7327, hash 401FE473
+    data = length 7327, hash 85ED8CB
   sample 27:
     time = 900000
     flags = 1
-    data = length 7340, hash DAAC756E
+    data = length 7340, hash 8D715DF4
   sample 28:
     time = 933333
     flags = 1
-    data = length 7334, hash 614FA397
+    data = length 7334, hash CF2D482B
   sample 29:
     time = 966666
     flags = 1
-    data = length 7287, hash A67CBA0A
+    data = length 7288, hash 24B1602C
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.0.dump

@@ -21,20 +21,20 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 29, hash 4C2CAE9C
+      data = length 28, hash 2750DE4
       data = length 9, hash D971CD89
   sample 0:
     time = 66733
     flags = 1
-    data = length 12394, hash A39F5311
+    data = length 12394, hash DAC3B071
   sample 1:
     time = 100100
     flags = 0
-    data = length 813, hash 99F7B4FA
+    data = length 813, hash 1F184EE4
   sample 2:
     time = 133466
     flags = 0
-    data = length 442, hash A7367ECF
+    data = length 443, hash 4C6CDD6D
 track 257:
   total output bytes = 5015
   sample count = 4

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.1.dump

@@ -21,20 +21,20 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 29, hash 4C2CAE9C
+      data = length 28, hash 2750DE4
       data = length 9, hash D971CD89
   sample 0:
     time = 66733
     flags = 1
-    data = length 12394, hash A39F5311
+    data = length 12394, hash DAC3B071
   sample 1:
     time = 100100
     flags = 0
-    data = length 813, hash 99F7B4FA
+    data = length 813, hash 1F184EE4
   sample 2:
     time = 133466
     flags = 0
-    data = length 442, hash A7367ECF
+    data = length 443, hash 4C6CDD6D
 track 257:
   total output bytes = 5015
   sample count = 4

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.2.dump

@@ -21,20 +21,20 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 29, hash 4C2CAE9C
+      data = length 28, hash 2750DE4
       data = length 9, hash D971CD89
   sample 0:
     time = 66733
     flags = 1
-    data = length 12394, hash A39F5311
+    data = length 12394, hash DAC3B071
   sample 1:
     time = 100100
     flags = 0
-    data = length 813, hash 99F7B4FA
+    data = length 813, hash 1F184EE4
   sample 2:
     time = 133466
     flags = 0
-    data = length 442, hash A7367ECF
+    data = length 443, hash 4C6CDD6D
 track 257:
   total output bytes = 5015
   sample count = 4

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.3.dump

@@ -21,7 +21,7 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 29, hash 4C2CAE9C
+      data = length 28, hash 2750DE4
       data = length 9, hash D971CD89
 track 257:
   total output bytes = 0

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.unknown_length.dump

@@ -18,20 +18,20 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 29, hash 4C2CAE9C
+      data = length 28, hash 2750DE4
       data = length 9, hash D971CD89
   sample 0:
     time = 66733
     flags = 1
-    data = length 12394, hash A39F5311
+    data = length 12394, hash DAC3B071
   sample 1:
     time = 100100
     flags = 0
-    data = length 813, hash 99F7B4FA
+    data = length 813, hash 1F184EE4
   sample 2:
     time = 133466
     flags = 0
-    data = length 442, hash A7367ECF
+    data = length 443, hash 4C6CDD6D
 track 257:
   total output bytes = 5015
   sample count = 4

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.0.dump

@@ -8,7 +8,7 @@ seekMap:
 numberOfTracks = 1
 track 256:
   total output bytes = 12451
-  sample count = 5
+  sample count = 6
   format 0:
     id = 1/256
     containerMimeType = video/mp2t
@@ -21,26 +21,30 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 29, hash 4C2CAE9C
+      data = length 28, hash 2750DE4
       data = length 9, hash D971CD89
   sample 0:
     time = 66733
     flags = 0
-    data = length 734, hash AF0D9485
+    data = length 735, hash E551BC23
   sample 1:
     time = 66733
     flags = 1
-    data = length 10938, hash 68420875
+    data = length 10937, hash D1D094EB
   sample 2:
     time = 133466
     flags = 0
-    data = length 6, hash 34E6CF79
+    data = length 6, hash 34E64009
   sample 3:
     time = 133466
     flags = 0
-    data = length 518, hash 546C177
+    data = length 518, hash 2AB0964B
   sample 4:
     time = 100100
     flags = 0
-    data = length 254, hash 36EBDA1
+    data = length 6, hash 34E64009
+  sample 5:
+    time = 100100
+    flags = 0
+    data = length 249, hash 689D3447
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.1.dump

@@ -8,7 +8,7 @@ seekMap:
 numberOfTracks = 1
 track 256:
   total output bytes = 12451
-  sample count = 5
+  sample count = 6
   format 0:
     id = 1/256
     containerMimeType = video/mp2t
@@ -21,26 +21,30 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 29, hash 4C2CAE9C
+      data = length 28, hash 2750DE4
       data = length 9, hash D971CD89
   sample 0:
     time = 66733
     flags = 0
-    data = length 734, hash AF0D9485
+    data = length 735, hash E551BC23
   sample 1:
     time = 66733
     flags = 1
-    data = length 10938, hash 68420875
+    data = length 10937, hash D1D094EB
   sample 2:
     time = 133466
     flags = 0
-    data = length 6, hash 34E6CF79
+    data = length 6, hash 34E64009
   sample 3:
     time = 133466
     flags = 0
-    data = length 518, hash 546C177
+    data = length 518, hash 2AB0964B
   sample 4:
     time = 100100
     flags = 0
-    data = length 254, hash 36EBDA1
+    data = length 6, hash 34E64009
+  sample 5:
+    time = 100100
+    flags = 0
+    data = length 249, hash 689D3447
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.2.dump

@@ -8,7 +8,7 @@ seekMap:
 numberOfTracks = 1
 track 256:
   total output bytes = 12451
-  sample count = 5
+  sample count = 6
   format 0:
     id = 1/256
     containerMimeType = video/mp2t
@@ -21,26 +21,30 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 29, hash 4C2CAE9C
+      data = length 28, hash 2750DE4
       data = length 9, hash D971CD89
   sample 0:
     time = 66733
     flags = 0
-    data = length 734, hash AF0D9485
+    data = length 735, hash E551BC23
   sample 1:
     time = 66733
     flags = 1
-    data = length 10938, hash 68420875
+    data = length 10937, hash D1D094EB
   sample 2:
     time = 133466
     flags = 0
-    data = length 6, hash 34E6CF79
+    data = length 6, hash 34E64009
   sample 3:
     time = 133466
     flags = 0
-    data = length 518, hash 546C177
+    data = length 518, hash 2AB0964B
   sample 4:
     time = 100100
     flags = 0
-    data = length 254, hash 36EBDA1
+    data = length 6, hash 34E64009
+  sample 5:
+    time = 100100
+    flags = 0
+    data = length 249, hash 689D3447
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.3.dump

@@ -8,7 +8,7 @@ seekMap:
 numberOfTracks = 1
 track 256:
   total output bytes = 255
-  sample count = 1
+  sample count = 2
   format 0:
     id = 1/256
     containerMimeType = video/mp2t
@@ -21,10 +21,14 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 29, hash 4C2CAE9C
+      data = length 28, hash 2750DE4
       data = length 9, hash D971CD89
   sample 0:
     time = 100100
     flags = 0
-    data = length 254, hash 36EBDA1
+    data = length 6, hash 34E64009
+  sample 1:
+    time = 100100
+    flags = 0
+    data = length 249, hash 689D3447
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.unknown_length.dump

@@ -5,7 +5,7 @@ seekMap:
 numberOfTracks = 1
 track 256:
   total output bytes = 12451
-  sample count = 5
+  sample count = 6
   format 0:
     id = 1/256
     containerMimeType = video/mp2t
@@ -18,26 +18,30 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 29, hash 4C2CAE9C
+      data = length 28, hash 2750DE4
       data = length 9, hash D971CD89
   sample 0:
     time = 66733
     flags = 0
-    data = length 734, hash AF0D9485
+    data = length 735, hash E551BC23
   sample 1:
     time = 66733
     flags = 1
-    data = length 10938, hash 68420875
+    data = length 10937, hash D1D094EB
   sample 2:
     time = 133466
     flags = 0
-    data = length 6, hash 34E6CF79
+    data = length 6, hash 34E64009
   sample 3:
     time = 133466
     flags = 0
-    data = length 518, hash 546C177
+    data = length 518, hash 2AB0964B
   sample 4:
     time = 100100
     flags = 0
-    data = length 254, hash 36EBDA1
+    data = length 6, hash 34E64009
+  sample 5:
+    time = 100100
+    flags = 0
+    data = length 249, hash 689D3447
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.0.dump

@@ -8,7 +8,7 @@ seekMap:
 numberOfTracks = 1
 track 256:
   total output bytes = 19364
-  sample count = 31
+  sample count = 30
   format 0:
     id = 1/256
     containerMimeType = video/mp2t
@@ -23,129 +23,125 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 83, hash 7F428
+      data = length 81, hash 2D0E82DA
   sample 0:
     time = 66666
     flags = 1
-    data = length 2517, hash 85352308
+    data = length 2517, hash D07D9116
   sample 1:
     time = 100000
     flags = 0
-    data = length 1226, hash 11D564DA
+    data = length 1226, hash BBFDA988
   sample 2:
     time = 266666
     flags = 0
-    data = length 7817, hash 50D15703
+    data = length 7817, hash B742DEBB
   sample 3:
     time = 200000
     flags = 0
-    data = length 2313, hash ECA5AEE6
+    data = length 2313, hash 849D1E78
   sample 4:
     time = 133333
     flags = 0
-    data = length 1065, hash 8720A939
+    data = length 1065, hash E8BED5C5
   sample 5:
     time = 166666
     flags = 0
-    data = length 105, hash 3A3A582D
+    data = length 105, hash B6188851
   sample 6:
     time = 233333
     flags = 0
-    data = length 68, hash FC241239
+    data = length 68, hash 6547D5C9
   sample 7:
     time = 433333
     flags = 0
-    data = length 303, hash 41B28452
+    data = length 303, hash CF43650C
   sample 8:
     time = 366666
     flags = 0
-    data = length 144, hash 60BBCD4C
+    data = length 144, hash 73A33956
   sample 9:
     time = 300000
     flags = 0
-    data = length 225, hash E0FAD7E9
+    data = length 225, hash C61E3F15
   sample 10:
     time = 333333
     flags = 0
-    data = length 184, hash A3A6E036
+    data = length 184, hash 3EDAD72C
   sample 11:
     time = 400000
     flags = 0
-    data = length 89, hash 43B0E322
+    data = length 89, hash 69DE46BC
   sample 12:
     time = 533333
     flags = 0
-    data = length 297, hash 6D9FEEDA
+    data = length 297, hash 49DF1804
   sample 13:
     time = 500000
     flags = 0
-    data = length 275, hash 27430DB
+    data = length 275, hash 34C7C63
   sample 14:
     time = 466666
     flags = 0
-    data = length 185, hash 97389E88
+    data = length 185, hash 504E9E96
   sample 15:
     time = 566666
     flags = 0
-    data = length 278, hash 5819FEBB
+    data = length 278, hash C7315C87
   sample 16:
     time = 733333
     flags = 0
-    data = length 264, hash 8545F36A
+    data = length 264, hash 56B3F978
   sample 17:
     time = 666666
     flags = 0
-    data = length 213, hash 52C7574A
+    data = length 213, hash DE708C94
   sample 18:
     time = 600000
     flags = 0
-    data = length 137, hash D4F0BCD7
+    data = length 137, hash 6E6DEE67
   sample 19:
     time = 633333
     flags = 0
-    data = length 121, hash BE52EEB8
+    data = length 121, hash D117866
   sample 20:
     time = 700000
     flags = 0
-    data = length 102, hash 6AA3C84F
+    data = length 102, hash 65B2BC73
   sample 21:
     time = 900000
     flags = 0
-    data = length 240, hash 8E3CA414
+    data = length 240, hash 2A9D518E
   sample 22:
     time = 833333
     flags = 0
-    data = length 210, hash 5D050FE8
+    data = length 210, hash 5953A2BA
   sample 23:
     time = 766666
     flags = 0
-    data = length 102, hash ED3BD5C9
+    data = length 102, hash DD8617B9
   sample 24:
     time = 800000
     flags = 0
-    data = length 110, hash CF65ED37
+    data = length 110, hash 4288988B
   sample 25:
     time = 866666
     flags = 0
-    data = length 118, hash BA0156BF
+    data = length 118, hash 3BDC1C03
   sample 26:
     time = 1033333
     flags = 0
-    data = length 260, hash ED6ABC1D
+    data = length 260, hash 86D42F65
   sample 27:
     time = 966666
     flags = 0
-    data = length 141, hash 9787F33A
+    data = length 141, hash AAFAA0A4
   sample 28:
     time = 933333
     flags = 0
-    data = length 87, hash EEC4D98C
+    data = length 87, hash FB87CA92
   sample 29:
     time = 1000000
     flags = 0
-    data = length 7, hash 680F23CB
+    data = length 168, hash 8220F9BC
-  sample 30:
-    time = 1000000
-    flags = 0
-    data = length 160, hash 11EC03D0
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.1.dump

@@ -8,7 +8,7 @@ seekMap:
 numberOfTracks = 1
 track 256:
   total output bytes = 3806
-  sample count = 22
+  sample count = 21
   format 0:
     id = 1/256
     containerMimeType = video/mp2t
@@ -23,93 +23,89 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 83, hash 7F428
+      data = length 81, hash 2D0E82DA
   sample 0:
     time = 300000
     flags = 0
-    data = length 225, hash E0FAD7E9
+    data = length 225, hash C61E3F15
   sample 1:
     time = 333333
     flags = 0
-    data = length 184, hash A3A6E036
+    data = length 184, hash 3EDAD72C
   sample 2:
     time = 400000
     flags = 0
-    data = length 89, hash 43B0E322
+    data = length 89, hash 69DE46BC
   sample 3:
     time = 533333
     flags = 0
-    data = length 297, hash 6D9FEEDA
+    data = length 297, hash 49DF1804
   sample 4:
     time = 500000
     flags = 0
-    data = length 275, hash 27430DB
+    data = length 275, hash 34C7C63
   sample 5:
     time = 466666
     flags = 0
-    data = length 185, hash 97389E88
+    data = length 185, hash 504E9E96
   sample 6:
     time = 566666
     flags = 0
-    data = length 278, hash 5819FEBB
+    data = length 278, hash C7315C87
   sample 7:
     time = 733333
     flags = 0
-    data = length 264, hash 8545F36A
+    data = length 264, hash 56B3F978
   sample 8:
     time = 666666
     flags = 0
-    data = length 213, hash 52C7574A
+    data = length 213, hash DE708C94
   sample 9:
     time = 600000
     flags = 0
-    data = length 137, hash D4F0BCD7
+    data = length 137, hash 6E6DEE67
   sample 10:
     time = 633333
     flags = 0
-    data = length 121, hash BE52EEB8
+    data = length 121, hash D117866
   sample 11:
     time = 700000
     flags = 0
-    data = length 102, hash 6AA3C84F
+    data = length 102, hash 65B2BC73
   sample 12:
     time = 900000
     flags = 0
-    data = length 240, hash 8E3CA414
+    data = length 240, hash 2A9D518E
   sample 13:
     time = 833333
     flags = 0
-    data = length 210, hash 5D050FE8
+    data = length 210, hash 5953A2BA
   sample 14:
     time = 766666
     flags = 0
-    data = length 102, hash ED3BD5C9
+    data = length 102, hash DD8617B9
   sample 15:
     time = 800000
     flags = 0
-    data = length 110, hash CF65ED37
+    data = length 110, hash 4288988B
   sample 16:
     time = 866666
     flags = 0
-    data = length 118, hash BA0156BF
+    data = length 118, hash 3BDC1C03
   sample 17:
     time = 1033333
     flags = 0
-    data = length 260, hash ED6ABC1D
+    data = length 260, hash 86D42F65
   sample 18:
     time = 966666
     flags = 0
-    data = length 141, hash 9787F33A
+    data = length 141, hash AAFAA0A4
   sample 19:
     time = 933333
     flags = 0
-    data = length 87, hash EEC4D98C
+    data = length 87, hash FB87CA92
   sample 20:
     time = 1000000
     flags = 0
-    data = length 7, hash 680F23CB
+    data = length 168, hash 8220F9BC
-  sample 21:
-    time = 1000000
-    flags = 0
-    data = length 160, hash 11EC03D0
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.2.dump

@@ -8,7 +8,7 @@ seekMap:
 numberOfTracks = 1
 track 256:
   total output bytes = 1796
-  sample count = 13
+  sample count = 12
   format 0:
     id = 1/256
     containerMimeType = video/mp2t
@@ -23,57 +23,53 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 83, hash 7F428
+      data = length 81, hash 2D0E82DA
   sample 0:
     time = 600000
     flags = 0
-    data = length 137, hash D4F0BCD7
+    data = length 137, hash 6E6DEE67
   sample 1:
     time = 633333
     flags = 0
-    data = length 121, hash BE52EEB8
+    data = length 121, hash D117866
   sample 2:
     time = 700000
     flags = 0
-    data = length 102, hash 6AA3C84F
+    data = length 102, hash 65B2BC73
   sample 3:
     time = 900000
     flags = 0
-    data = length 240, hash 8E3CA414
+    data = length 240, hash 2A9D518E
   sample 4:
     time = 833333
     flags = 0
-    data = length 210, hash 5D050FE8
+    data = length 210, hash 5953A2BA
   sample 5:
     time = 766666
     flags = 0
-    data = length 102, hash ED3BD5C9
+    data = length 102, hash DD8617B9
   sample 6:
     time = 800000
     flags = 0
-    data = length 110, hash CF65ED37
+    data = length 110, hash 4288988B
   sample 7:
     time = 866666
     flags = 0
-    data = length 118, hash BA0156BF
+    data = length 118, hash 3BDC1C03
   sample 8:
     time = 1033333
     flags = 0
-    data = length 260, hash ED6ABC1D
+    data = length 260, hash 86D42F65
   sample 9:
     time = 966666
     flags = 0
-    data = length 141, hash 9787F33A
+    data = length 141, hash AAFAA0A4
   sample 10:
     time = 933333
     flags = 0
-    data = length 87, hash EEC4D98C
+    data = length 87, hash FB87CA92
   sample 11:
     time = 1000000
     flags = 0
-    data = length 7, hash 680F23CB
+    data = length 168, hash 8220F9BC
-  sample 12:
-    time = 1000000
-    flags = 0
-    data = length 160, hash 11EC03D0
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.3.dump

@@ -8,7 +8,7 @@ seekMap:
 numberOfTracks = 1
 track 256:
   total output bytes = 396
-  sample count = 4
+  sample count = 3
   format 0:
     id = 1/256
     containerMimeType = video/mp2t
@@ -23,21 +23,17 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 83, hash 7F428
+      data = length 81, hash 2D0E82DA
   sample 0:
     time = 966666
     flags = 0
-    data = length 141, hash 9787F33A
+    data = length 141, hash AAFAA0A4
   sample 1:
     time = 933333
     flags = 0
-    data = length 87, hash EEC4D98C
+    data = length 87, hash FB87CA92
   sample 2:
     time = 1000000
     flags = 0
-    data = length 7, hash 680F23CB
+    data = length 168, hash 8220F9BC
-  sample 3:
-    time = 1000000
-    flags = 0
-    data = length 160, hash 11EC03D0
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.unknown_length.dump

@@ -5,7 +5,7 @@ seekMap:
 numberOfTracks = 1
 track 256:
   total output bytes = 19364
-  sample count = 31
+  sample count = 30
   format 0:
     id = 1/256
     containerMimeType = video/mp2t
@@ -20,129 +20,125 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 83, hash 7F428
+      data = length 81, hash 2D0E82DA
   sample 0:
     time = 66666
     flags = 1
-    data = length 2517, hash 85352308
+    data = length 2517, hash D07D9116
   sample 1:
     time = 100000
     flags = 0
-    data = length 1226, hash 11D564DA
+    data = length 1226, hash BBFDA988
   sample 2:
     time = 266666
     flags = 0
-    data = length 7817, hash 50D15703
+    data = length 7817, hash B742DEBB
   sample 3:
     time = 200000
     flags = 0
-    data = length 2313, hash ECA5AEE6
+    data = length 2313, hash 849D1E78
   sample 4:
     time = 133333
     flags = 0
-    data = length 1065, hash 8720A939
+    data = length 1065, hash E8BED5C5
   sample 5:
     time = 166666
     flags = 0
-    data = length 105, hash 3A3A582D
+    data = length 105, hash B6188851
   sample 6:
     time = 233333
     flags = 0
-    data = length 68, hash FC241239
+    data = length 68, hash 6547D5C9
   sample 7:
     time = 433333
     flags = 0
-    data = length 303, hash 41B28452
+    data = length 303, hash CF43650C
   sample 8:
     time = 366666
     flags = 0
-    data = length 144, hash 60BBCD4C
+    data = length 144, hash 73A33956
   sample 9:
     time = 300000
     flags = 0
-    data = length 225, hash E0FAD7E9
+    data = length 225, hash C61E3F15
   sample 10:
     time = 333333
     flags = 0
-    data = length 184, hash A3A6E036
+    data = length 184, hash 3EDAD72C
   sample 11:
     time = 400000
     flags = 0
-    data = length 89, hash 43B0E322
+    data = length 89, hash 69DE46BC
   sample 12:
     time = 533333
     flags = 0
-    data = length 297, hash 6D9FEEDA
+    data = length 297, hash 49DF1804
   sample 13:
     time = 500000
     flags = 0
-    data = length 275, hash 27430DB
+    data = length 275, hash 34C7C63
   sample 14:
     time = 466666
     flags = 0
-    data = length 185, hash 97389E88
+    data = length 185, hash 504E9E96
   sample 15:
     time = 566666
     flags = 0
-    data = length 278, hash 5819FEBB
+    data = length 278, hash C7315C87
   sample 16:
     time = 733333
     flags = 0
-    data = length 264, hash 8545F36A
+    data = length 264, hash 56B3F978
   sample 17:
     time = 666666
     flags = 0
-    data = length 213, hash 52C7574A
+    data = length 213, hash DE708C94
   sample 18:
     time = 600000
     flags = 0
-    data = length 137, hash D4F0BCD7
+    data = length 137, hash 6E6DEE67
   sample 19:
     time = 633333
     flags = 0
-    data = length 121, hash BE52EEB8
+    data = length 121, hash D117866
   sample 20:
     time = 700000
     flags = 0
-    data = length 102, hash 6AA3C84F
+    data = length 102, hash 65B2BC73
   sample 21:
     time = 900000
     flags = 0
-    data = length 240, hash 8E3CA414
+    data = length 240, hash 2A9D518E
   sample 22:
     time = 833333
     flags = 0
-    data = length 210, hash 5D050FE8
+    data = length 210, hash 5953A2BA
   sample 23:
     time = 766666
     flags = 0
-    data = length 102, hash ED3BD5C9
+    data = length 102, hash DD8617B9
   sample 24:
     time = 800000
     flags = 0
-    data = length 110, hash CF65ED37
+    data = length 110, hash 4288988B
   sample 25:
     time = 866666
     flags = 0
-    data = length 118, hash BA0156BF
+    data = length 118, hash 3BDC1C03
   sample 26:
     time = 1033333
     flags = 0
-    data = length 260, hash ED6ABC1D
+    data = length 260, hash 86D42F65
   sample 27:
     time = 966666
     flags = 0
-    data = length 141, hash 9787F33A
+    data = length 141, hash AAFAA0A4
   sample 28:
     time = 933333
     flags = 0
-    data = length 87, hash EEC4D98C
+    data = length 87, hash FB87CA92
   sample 29:
     time = 1000000
     flags = 0
-    data = length 7, hash 680F23CB
+    data = length 168, hash 8220F9BC
-  sample 30:
-    time = 1000000
-    flags = 0
-    data = length 160, hash 11EC03D0
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.0.dump

@@ -8,7 +8,7 @@ seekMap:
 numberOfTracks = 1
 track 256:
   total output bytes = 10004
-  sample count = 17
+  sample count = 16
   format 0:
     id = 1/256
     containerMimeType = video/mp2t
@@ -23,73 +23,69 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 146, hash 61554FEF
+      data = length 144, hash 549DF6F3
   sample 0:
     time = 266666
     flags = 1
-    data = length 7464, hash EBF8518B
+    data = length 7464, hash C054CB37
   sample 1:
     time = 1200000
     flags = 0
-    data = length 1042, hash F69C93E1
+    data = length 1042, hash B9B86BA1
   sample 2:
     time = 733333
     flags = 0
-    data = length 465, hash 2B469969
+    data = length 465, hash 95D48995
   sample 3:
     time = 466666
     flags = 0
-    data = length 177, hash 79777966
+    data = length 177, hash 7060EDF8
   sample 4:
     time = 333333
     flags = 0
-    data = length 65, hash 63DA4886
+    data = length 65, hash 9B879ED8
   sample 5:
     time = 400000
     flags = 0
-    data = length 33, hash EFE759C6
+    data = length 33, hash DFCB5D98
   sample 6:
     time = 600000
     flags = 0
-    data = length 88, hash 98333D02
+    data = length 88, hash 287CC8E0
   sample 7:
     time = 533333
     flags = 0
-    data = length 49, hash F9A023E1
+    data = length 49, hash F1EB681D
   sample 8:
     time = 666666
     flags = 0
-    data = length 58, hash 74F1E9D9
+    data = length 58, hash 2475ACA9
   sample 9:
     time = 933333
     flags = 0
-    data = length 114, hash FA033C4D
+    data = length 114, hash 7980EDB5
   sample 10:
     time = 800000
     flags = 0
-    data = length 87, hash 1A1C57E4
+    data = length 87, hash B29B213A
   sample 11:
     time = 866666
     flags = 0
-    data = length 65, hash 59F937BE
+    data = length 65, hash 8AB1E8A0
   sample 12:
     time = 1066666
     flags = 0
-    data = length 94, hash 5D02AC81
+    data = length 94, hash F02B4C01
   sample 13:
     time = 1000000
     flags = 0
-    data = length 57, hash 2750D207
+    data = length 57, hash BB325F37
   sample 14:
     time = 1133333
     flags = 0
-    data = length 46, hash CE770A40
+    data = length 46, hash 99614662
   sample 15:
     time = 1266666
     flags = 0
-    data = length 7, hash 680F23CB
+    data = length 100, hash 6E090F99
-  sample 16:
-    time = 1266666
-    flags = 0
-    data = length 92, hash 531EE3AD
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.1.dump

@@ -8,7 +8,7 @@ seekMap:
 numberOfTracks = 1
 track 256:
   total output bytes = 856
-  sample count = 13
+  sample count = 12
   format 0:
     id = 1/256
     containerMimeType = video/mp2t
@@ -23,57 +23,53 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 146, hash 61554FEF
+      data = length 144, hash 549DF6F3
   sample 0:
     time = 333333
     flags = 0
-    data = length 65, hash 63DA4886
+    data = length 65, hash 9B879ED8
   sample 1:
     time = 400000
     flags = 0
-    data = length 33, hash EFE759C6
+    data = length 33, hash DFCB5D98
   sample 2:
     time = 600000
     flags = 0
-    data = length 88, hash 98333D02
+    data = length 88, hash 287CC8E0
   sample 3:
     time = 533333
     flags = 0
-    data = length 49, hash F9A023E1
+    data = length 49, hash F1EB681D
   sample 4:
     time = 666666
     flags = 0
-    data = length 58, hash 74F1E9D9
+    data = length 58, hash 2475ACA9
   sample 5:
     time = 933333
     flags = 0
-    data = length 114, hash FA033C4D
+    data = length 114, hash 7980EDB5
   sample 6:
     time = 800000
     flags = 0
-    data = length 87, hash 1A1C57E4
+    data = length 87, hash B29B213A
   sample 7:
     time = 866666
     flags = 0
-    data = length 65, hash 59F937BE
+    data = length 65, hash 8AB1E8A0
   sample 8:
     time = 1066666
     flags = 0
-    data = length 94, hash 5D02AC81
+    data = length 94, hash F02B4C01
   sample 9:
     time = 1000000
     flags = 0
-    data = length 57, hash 2750D207
+    data = length 57, hash BB325F37
   sample 10:
     time = 1133333
     flags = 0
-    data = length 46, hash CE770A40
+    data = length 46, hash 99614662
   sample 11:
     time = 1266666
     flags = 0
-    data = length 7, hash 680F23CB
+    data = length 100, hash 6E090F99
-  sample 12:
-    time = 1266666
-    flags = 0
-    data = length 92, hash 531EE3AD
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.2.dump

@@ -8,7 +8,7 @@ seekMap:
 numberOfTracks = 1
 track 256:
   total output bytes = 563
-  sample count = 8
+  sample count = 7
   format 0:
     id = 1/256
     containerMimeType = video/mp2t
@@ -23,37 +23,33 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 146, hash 61554FEF
+      data = length 144, hash 549DF6F3
   sample 0:
     time = 933333
     flags = 0
-    data = length 114, hash FA033C4D
+    data = length 114, hash 7980EDB5
   sample 1:
     time = 800000
     flags = 0
-    data = length 87, hash 1A1C57E4
+    data = length 87, hash B29B213A
   sample 2:
     time = 866666
     flags = 0
-    data = length 65, hash 59F937BE
+    data = length 65, hash 8AB1E8A0
   sample 3:
     time = 1066666
     flags = 0
-    data = length 94, hash 5D02AC81
+    data = length 94, hash F02B4C01
   sample 4:
     time = 1000000
     flags = 0
-    data = length 57, hash 2750D207
+    data = length 57, hash BB325F37
   sample 5:
     time = 1133333
     flags = 0
-    data = length 46, hash CE770A40
+    data = length 46, hash 99614662
   sample 6:
     time = 1266666
     flags = 0
-    data = length 7, hash 680F23CB
+    data = length 100, hash 6E090F99
-  sample 7:
-    time = 1266666
-    flags = 0
-    data = length 92, hash 531EE3AD
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.3.dump

@@ -8,7 +8,7 @@ seekMap:
 numberOfTracks = 1
 track 256:
   total output bytes = 146
-  sample count = 3
+  sample count = 2
   format 0:
     id = 1/256
     containerMimeType = video/mp2t
@@ -23,17 +23,13 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 146, hash 61554FEF
+      data = length 144, hash 549DF6F3
   sample 0:
     time = 1133333
     flags = 0
-    data = length 46, hash CE770A40
+    data = length 46, hash 99614662
   sample 1:
     time = 1266666
     flags = 0
-    data = length 7, hash 680F23CB
+    data = length 100, hash 6E090F99
-  sample 2:
-    time = 1266666
-    flags = 0
-    data = length 92, hash 531EE3AD
 tracksEnded = true

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.unknown_length.dump

@@ -5,7 +5,7 @@ seekMap:
 numberOfTracks = 1
 track 256:
   total output bytes = 10004
-  sample count = 17
+  sample count = 16
   format 0:
     id = 1/256
     containerMimeType = video/mp2t
@@ -20,73 +20,69 @@ track 256:
       lumaBitdepth = 8
       chromaBitdepth = 8
     initializationData:
-      data = length 146, hash 61554FEF
+      data = length 144, hash 549DF6F3
   sample 0:
     time = 266666
     flags = 1
-    data = length 7464, hash EBF8518B
+    data = length 7464, hash C054CB37
   sample 1:
     time = 1200000
     flags = 0
-    data = length 1042, hash F69C93E1
+    data = length 1042, hash B9B86BA1
   sample 2:
     time = 733333
     flags = 0
-    data = length 465, hash 2B469969
+    data = length 465, hash 95D48995
   sample 3:
     time = 466666
     flags = 0
-    data = length 177, hash 79777966
+    data = length 177, hash 7060EDF8
   sample 4:
     time = 333333
     flags = 0
-    data = length 65, hash 63DA4886
+    data = length 65, hash 9B879ED8
   sample 5:
     time = 400000
     flags = 0
-    data = length 33, hash EFE759C6
+    data = length 33, hash DFCB5D98
   sample 6:
     time = 600000
     flags = 0
-    data = length 88, hash 98333D02
+    data = length 88, hash 287CC8E0
   sample 7:
     time = 533333
     flags = 0
-    data = length 49, hash F9A023E1
+    data = length 49, hash F1EB681D
   sample 8:
     time = 666666
     flags = 0
-    data = length 58, hash 74F1E9D9
+    data = length 58, hash 2475ACA9
   sample 9:
     time = 933333
     flags = 0
-    data = length 114, hash FA033C4D
+    data = length 114, hash 7980EDB5
   sample 10:
     time = 800000
     flags = 0
-    data = length 87, hash 1A1C57E4
+    data = length 87, hash B29B213A
   sample 11:
     time = 866666
     flags = 0
-    data = length 65, hash 59F937BE
+    data = length 65, hash 8AB1E8A0
   sample 12:
     time = 1066666
     flags = 0
-    data = length 94, hash 5D02AC81
+    data = length 94, hash F02B4C01
   sample 13:
     time = 1000000
     flags = 0
-    data = length 57, hash 2750D207
+    data = length 57, hash BB325F37
   sample 14:
     time = 1133333
     flags = 0
-    data = length 46, hash CE770A40
+    data = length 46, hash 99614662
   sample 15:
     time = 1266666
     flags = 0
-    data = length 7, hash 680F23CB
+    data = length 100, hash 6E090F99
-  sample 16:
-    time = 1266666
-    flags = 0
-    data = length 92, hash 531EE3AD
 tracksEnded = true

libraries/test_data/src/test/assets/playbackdumps/hls/cea608.dump

@@ -807,187 +807,184 @@ MediaCodecAdapter (exotest.audio.aac):
       rendered = false
 MediaCodecAdapter (exotest.video.avc):
   inputBuffers:
-    count = 59
+    count = 58
     input buffer #0:
       timeUs = 1000000000000
-      contents = length 427, hash 45C53469
+      contents = length 427, hash 24517515
     input buffer #1:
       timeUs = 1000000125000
-      contents = length 24, hash D53B54B2
+      contents = length 24, hash 44BD0B30
     input buffer #2:
       timeUs = 1000000166666
-      contents = length 63, hash 9215E8D5
+      contents = length 63, hash F2A0A829
     input buffer #3:
       timeUs = 1000000208322
-      contents = length 97, hash 71712826
+      contents = length 97, hash 50CE5338
     input buffer #4:
       timeUs = 1000000250000
-      contents = length 306, hash 85E2342E
+      contents = length 306, hash D0B8C5B4
     input buffer #5:
       timeUs = 1000000291666
-      contents = length 622, hash 23F9C643
+      contents = length 622, hash FC1EEDFF
     input buffer #6:
       timeUs = 1000000333322
-      contents = length 1249, hash CCAE2DB3
+      contents = length 1249, hash 6A25080B
     input buffer #7:
       timeUs = 1000000375000
-      contents = length 538, hash 851D792A
+      contents = length 538, hash 59A0F738
     input buffer #8:
       timeUs = 1000000416666
-      contents = length 1210, hash CC844A65
+      contents = length 1210, hash 9AB1EA9D
     input buffer #9:
       timeUs = 1000000458322
-      contents = length 2388, hash B1DBEC08
+      contents = length 2388, hash 13F5421A
     input buffer #10:
       timeUs = 1000000500000
-      contents = length 2473, hash F2F3DDB6
+      contents = length 2473, hash CAE5FDA8
     input buffer #11:
       timeUs = 1000000541666
-      contents = length 3060, hash 3C68404C
+      contents = length 3060, hash CF71AD56
     input buffer #12:
       timeUs = 1000000583322
-      contents = length 3658, hash D8443A23
+      contents = length 3658, hash 3B4271F
     input buffer #13:
       timeUs = 1000000625000
-      contents = length 4653, hash 89DB8715
+      contents = length 4653, hash 99580D69
     input buffer #14:
       timeUs = 1000000666666
-      contents = length 4509, hash CFA267E2
+      contents = length 4509, hash 42913AFC
     input buffer #15:
       timeUs = 1000000708322
-      contents = length 4205, hash 813D55A5
+      contents = length 4205, hash 4811BCD9
     input buffer #16:
       timeUs = 1000000750000
-      contents = length 5337, hash BB063537
+      contents = length 5337, hash 8740FE07
     input buffer #17:
       timeUs = 1000000791666
-      contents = length 4687, hash 5969B9FF
+      contents = length 4687, hash E9F68DBF
     input buffer #18:
       timeUs = 1000000833322
-      contents = length 4570, hash EEAA0B10
+      contents = length 4570, hash 3721A092
     input buffer #19:
       timeUs = 1000000875000
-      contents = length 4464, hash 3DA70E97
+      contents = length 4464, hash A721EAAB
     input buffer #20:
       timeUs = 1000000916666
-      contents = length 4391, hash 4A8031DF
+      contents = length 4391, hash 3383CFDF
     input buffer #21:
       timeUs = 1000000958322
-      contents = length 4730, hash B1B116C
+      contents = length 4730, hash DF1D36B6
     input buffer #22:
       timeUs = 1000001000000
-      contents = length 4915, hash 57354B0C
+      contents = length 4915, hash 76916012
     input buffer #23:
       timeUs = 1000001041666
-      contents = length 4901, hash 2E173C66
+      contents = length 4901, hash 2C0C27F8
     input buffer #24:
       timeUs = 1000001083322
-      contents = length 5051, hash F10E97A6
+      contents = length 5051, hash C8A7BA38
     input buffer #25:
       timeUs = 1000001125000
-      contents = length 5371, hash 6094AB61
+      contents = length 5371, hash CEAF131D
     input buffer #26:
       timeUs = 1000001166666
-      contents = length 5723, hash FA424A20
+      contents = length 5723, hash E2DD787E
     input buffer #27:
       timeUs = 1000001208322
-      contents = length 5611, hash 47290DD2
+      contents = length 5611, hash CEE95A8C
     input buffer #28:
       timeUs = 1000001250000
-      contents = length 4574, hash ECD5AA80
+      contents = length 4574, hash 9BC8B222
     input buffer #29:
       timeUs = 1000001291666
-      contents = length 5403, hash 7D64ECED
+      contents = length 5403, hash 18387811
     input buffer #30:
       timeUs = 1000001333322
-      contents = length 6053, hash 984E63D7
+      contents = length 6053, hash EDAEE67
     input buffer #31:
       timeUs = 1000001375000
-      contents = length 6044, hash EBD71327
+      contents = length 6044, hash 2323691B
     input buffer #32:
       timeUs = 1000001416666
-      contents = length 6978, hash DDE85902
+      contents = length 6978, hash 6D2AB260
     input buffer #33:
       timeUs = 1000001458322
-      contents = length 6137, hash 1E87A66B
+      contents = length 6137, hash DBE35E53
     input buffer #34:
       timeUs = 1000001500000
-      contents = length 6754, hash 2156888D
+      contents = length 6754, hash 31741D75
     input buffer #35:
       timeUs = 1000001541666
-      contents = length 7015, hash 58A76EB0
+      contents = length 7015, hash BD8FC4EE
     input buffer #36:
       timeUs = 1000001583322
-      contents = length 5095, hash 650D7FF7
+      contents = length 5095, hash 96D50EC7
     input buffer #37:
       timeUs = 1000001625000
-      contents = length 5813, hash 12A3FBDA
+      contents = length 5813, hash A1968E04
     input buffer #38:
       timeUs = 1000001666666
-      contents = length 5612, hash FEACB6B1
+      contents = length 5612, hash D7921851
     input buffer #39:
       timeUs = 1000001708322
-      contents = length 5995, hash AAD1473A
+      contents = length 5995, hash 9C8B424
     input buffer #40:
       timeUs = 1000001750000
-      contents = length 4708, hash B097923
+      contents = length 4708, hash 89CB619F
     input buffer #41:
       timeUs = 1000001791666
-      contents = length 5083, hash F64DA231
+      contents = length 5083, hash F395BA4D
     input buffer #42:
       timeUs = 1000001833322
-      contents = length 5190, hash C0FDFE63
+      contents = length 5190, hash B24D7BDF
     input buffer #43:
       timeUs = 1000001875000
-      contents = length 5178, hash 39C034B1
+      contents = length 5178, hash 6661A6D1
     input buffer #44:
       timeUs = 1000001916666
-      contents = length 5231, hash 60512119
+      contents = length 5231, hash 4A536365
     input buffer #45:
       timeUs = 1000001958322
-      contents = length 5703, hash 913D29DE
+      contents = length 5703, hash 292BA400
     input buffer #46:
       timeUs = 1000002000000
-      contents = length 5630, hash 2974C63E
+      contents = length 5630, hash A68C1EA4
     input buffer #47:
       timeUs = 1000002041666
-      contents = length 5171, hash B723CD8D
+      contents = length 5171, hash 71A84971
     input buffer #48:
       timeUs = 1000002083322
-      contents = length 5663, hash EA25A0B
+      contents = length 5663, hash 7D21B033
     input buffer #49:
       timeUs = 1000002125000
-      contents = length 5739, hash 1B4072AD
+      contents = length 5739, hash 36C8E51
     input buffer #50:
       timeUs = 1000002166666
-      contents = length 6371, hash A180072B
+      contents = length 6371, hash CBCD9013
     input buffer #51:
       timeUs = 1000002208322
-      contents = length 4900, hash 6ACE10D7
+      contents = length 4900, hash B23CD36B
     input buffer #52:
       timeUs = 1000002250000
-      contents = length 1042, hash 287E52BD
+      contents = length 1042, hash 3F756145
     input buffer #53:
       timeUs = 1000002291666
-      contents = length 961, hash 8E3587F9
+      contents = length 961, hash D7E0505
     input buffer #54:
       timeUs = 1000002333322
-      contents = length 1154, hash F99FD09B
+      contents = length 1154, hash 6BE913A7
     input buffer #55:
       timeUs = 1000002375000
-      contents = length 1074, hash B5561132
+      contents = length 1074, hash D4EA7830
     input buffer #56:
       timeUs = 1000002416666
-      contents = length 1035, hash 324B27D0
+      contents = length 1035, hash D75690CE
     input buffer #57:
-      timeUs = 1000002458322
-      contents = length 787, hash 1111D81C
-    input buffer #58:
       timeUs = 0
       flags = 4
       contents = length 0, hash 1
   outputBuffers:
-    count = 58
+    count = 57
     output buffer #0:
       timeUs = 1000000000000
       size = 427
@@ -1216,10 +1213,6 @@ MediaCodecAdapter (exotest.video.avc):
       timeUs = 1000002416666
       size = 1035
       rendered = true
-    output buffer #57:
-      timeUs = 1000002458322
-      size = 787
-      rendered = true
 AudioSink:
   buffer count = 114
   config:

libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_dts_audio.ts.dump

@@ -3,13 +3,13 @@ MediaCodecAdapter (exotest.video.avc):
     count = 4
     input buffer #0:
       timeUs = 1000000066733
-      contents = length 12394, hash A39F5311
+      contents = length 12394, hash DAC3B071
     input buffer #1:
       timeUs = 1000000100100
-      contents = length 813, hash 99F7B4FA
+      contents = length 813, hash 1F184EE4
     input buffer #2:
       timeUs = 1000000133466
-      contents = length 442, hash A7367ECF
+      contents = length 443, hash 4C6CDD6D
     input buffer #3:
       timeUs = 0
       flags = 4
@@ -26,5 +26,5 @@ MediaCodecAdapter (exotest.video.avc):
       rendered = true
     output buffer #2:
       timeUs = 1000000133466
-      size = 442
+      size = 443
       rendered = true

libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_mpeg_audio.ts.dump

@@ -40,13 +40,13 @@ MediaCodecAdapter (exotest.video.avc):
     count = 4
     input buffer #0:
       timeUs = 1000000066733
-      contents = length 12394, hash A39F5311
+      contents = length 12394, hash DAC3B071
     input buffer #1:
       timeUs = 1000000100100
-      contents = length 813, hash 99F7B4FA
+      contents = length 813, hash 1F184EE4
     input buffer #2:
       timeUs = 1000000133466
-      contents = length 442, hash A7367ECF
+      contents = length 443, hash 4C6CDD6D
     input buffer #3:
       timeUs = 0
       flags = 4
@@ -63,7 +63,7 @@ MediaCodecAdapter (exotest.video.avc):
       rendered = true
     output buffer #2:
       timeUs = 1000000133466
-      size = 442
+      size = 443
       rendered = true
 AudioSink:
   buffer count = 4

libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_no_access_unit_delimiters.ts.dump

@@ -3,13 +3,13 @@ MediaCodecAdapter (exotest.video.avc):
     count = 4
     input buffer #0:
       timeUs = 1000000066733
-      contents = length 11672, hash 476AEFF9
+      contents = length 11672, hash 3F220B09
     input buffer #1:
       timeUs = 1000000133466
-      contents = length 524, hash 184416EF
+      contents = length 524, hash A76B053
     input buffer #2:
       timeUs = 1000000100100
-      contents = length 254, hash 36EBDA1
+      contents = length 255, hash 66DC6D3F
     input buffer #3:
       timeUs = 0
       flags = 4
@@ -26,5 +26,5 @@ MediaCodecAdapter (exotest.video.avc):
       rendered = true
     output buffer #2:
       timeUs = 1000000100100
-      size = 254
+      size = 255
       rendered = true

libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265.ts.dump

@@ -1,105 +1,102 @@
 MediaCodecAdapter (exotest.video.hevc):
   inputBuffers:
-    count = 32
+    count = 31
     input buffer #0:
       timeUs = 1000000066666
-      contents = length 2517, hash 85352308
+      contents = length 2517, hash D07D9116
     input buffer #1:
       timeUs = 1000000100000
-      contents = length 1226, hash 11D564DA
+      contents = length 1226, hash BBFDA988
     input buffer #2:
       timeUs = 1000000266666
-      contents = length 7817, hash 50D15703
+      contents = length 7817, hash B742DEBB
     input buffer #3:
       timeUs = 1000000200000
-      contents = length 2313, hash ECA5AEE6
+      contents = length 2313, hash 849D1E78
     input buffer #4:
       timeUs = 1000000133333
-      contents = length 1065, hash 8720A939
+      contents = length 1065, hash E8BED5C5
     input buffer #5:
       timeUs = 1000000166666
-      contents = length 105, hash 3A3A582D
+      contents = length 105, hash B6188851
     input buffer #6:
       timeUs = 1000000233333
-      contents = length 68, hash FC241239
+      contents = length 68, hash 6547D5C9
     input buffer #7:
       timeUs = 1000000433333
-      contents = length 303, hash 41B28452
+      contents = length 303, hash CF43650C
     input buffer #8:
       timeUs = 1000000366666
-      contents = length 144, hash 60BBCD4C
+      contents = length 144, hash 73A33956
     input buffer #9:
       timeUs = 1000000300000
-      contents = length 225, hash E0FAD7E9
+      contents = length 225, hash C61E3F15
     input buffer #10:
       timeUs = 1000000333333
-      contents = length 184, hash A3A6E036
+      contents = length 184, hash 3EDAD72C
     input buffer #11:
       timeUs = 1000000400000
-      contents = length 89, hash 43B0E322
+      contents = length 89, hash 69DE46BC
     input buffer #12:
       timeUs = 1000000533333
-      contents = length 297, hash 6D9FEEDA
+      contents = length 297, hash 49DF1804
     input buffer #13:
       timeUs = 1000000500000
-      contents = length 275, hash 27430DB
+      contents = length 275, hash 34C7C63
     input buffer #14:
       timeUs = 1000000466666
-      contents = length 185, hash 97389E88
+      contents = length 185, hash 504E9E96
     input buffer #15:
       timeUs = 1000000566666
-      contents = length 278, hash 5819FEBB
+      contents = length 278, hash C7315C87
     input buffer #16:
       timeUs = 1000000733333
-      contents = length 264, hash 8545F36A
+      contents = length 264, hash 56B3F978
     input buffer #17:
       timeUs = 1000000666666
-      contents = length 213, hash 52C7574A
+      contents = length 213, hash DE708C94
     input buffer #18:
       timeUs = 1000000600000
-      contents = length 137, hash D4F0BCD7
+      contents = length 137, hash 6E6DEE67
     input buffer #19:
       timeUs = 1000000633333
-      contents = length 121, hash BE52EEB8
+      contents = length 121, hash D117866
     input buffer #20:
       timeUs = 1000000700000
-      contents = length 102, hash 6AA3C84F
+      contents = length 102, hash 65B2BC73
     input buffer #21:
       timeUs = 1000000900000
-      contents = length 240, hash 8E3CA414
+      contents = length 240, hash 2A9D518E
     input buffer #22:
       timeUs = 1000000833333
-      contents = length 210, hash 5D050FE8
+      contents = length 210, hash 5953A2BA
     input buffer #23:
       timeUs = 1000000766666
-      contents = length 102, hash ED3BD5C9
+      contents = length 102, hash DD8617B9
     input buffer #24:
       timeUs = 1000000800000
-      contents = length 110, hash CF65ED37
+      contents = length 110, hash 4288988B
     input buffer #25:
       timeUs = 1000000866666
-      contents = length 118, hash BA0156BF
+      contents = length 118, hash 3BDC1C03
     input buffer #26:
       timeUs = 1000001033333
-      contents = length 260, hash ED6ABC1D
+      contents = length 260, hash 86D42F65
     input buffer #27:
       timeUs = 1000000966666
-      contents = length 141, hash 9787F33A
+      contents = length 141, hash AAFAA0A4
     input buffer #28:
       timeUs = 1000000933333
-      contents = length 87, hash EEC4D98C
+      contents = length 87, hash FB87CA92
     input buffer #29:
       timeUs = 1000001000000
-      contents = length 7, hash 680F23CB
+      contents = length 168, hash 8220F9BC
     input buffer #30:
-      timeUs = 1000001000000
-      contents = length 160, hash 11EC03D0
-    input buffer #31:
       timeUs = 0
       flags = 4
       contents = length 0, hash 1
   outputBuffers:
-    count = 31
+    count = 30
     output buffer #0:
       timeUs = 1000000066666
       size = 2517
@@ -218,9 +215,5 @@ MediaCodecAdapter (exotest.video.hevc):
       rendered = true
     output buffer #29:
       timeUs = 1000001000000
-      size = 7
+      size = 168
-      rendered = true
-    output buffer #30:
-      timeUs = 1000001000000
-      size = 160
       rendered = true

libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265_rps_pred.ts.dump

@@ -1,63 +1,60 @@
 MediaCodecAdapter (exotest.video.hevc):
   inputBuffers:
-    count = 18
+    count = 17
     input buffer #0:
       timeUs = 1000000266666
-      contents = length 7464, hash EBF8518B
+      contents = length 7464, hash C054CB37
     input buffer #1:
       timeUs = 1000001200000
-      contents = length 1042, hash F69C93E1
+      contents = length 1042, hash B9B86BA1
     input buffer #2:
       timeUs = 1000000733333
-      contents = length 465, hash 2B469969
+      contents = length 465, hash 95D48995
     input buffer #3:
       timeUs = 1000000466666
-      contents = length 177, hash 79777966
+      contents = length 177, hash 7060EDF8
     input buffer #4:
       timeUs = 1000000333333
-      contents = length 65, hash 63DA4886
+      contents = length 65, hash 9B879ED8
     input buffer #5:
       timeUs = 1000000400000
-      contents = length 33, hash EFE759C6
+      contents = length 33, hash DFCB5D98
     input buffer #6:
       timeUs = 1000000600000
-      contents = length 88, hash 98333D02
+      contents = length 88, hash 287CC8E0
     input buffer #7:
       timeUs = 1000000533333
-      contents = length 49, hash F9A023E1
+      contents = length 49, hash F1EB681D
     input buffer #8:
       timeUs = 1000000666666
-      contents = length 58, hash 74F1E9D9
+      contents = length 58, hash 2475ACA9
     input buffer #9:
       timeUs = 1000000933333
-      contents = length 114, hash FA033C4D
+      contents = length 114, hash 7980EDB5
     input buffer #10:
       timeUs = 1000000800000
-      contents = length 87, hash 1A1C57E4
+      contents = length 87, hash B29B213A
     input buffer #11:
       timeUs = 1000000866666
-      contents = length 65, hash 59F937BE
+      contents = length 65, hash 8AB1E8A0
     input buffer #12:
       timeUs = 1000001066666
-      contents = length 94, hash 5D02AC81
+      contents = length 94, hash F02B4C01
     input buffer #13:
       timeUs = 1000001000000
-      contents = length 57, hash 2750D207
+      contents = length 57, hash BB325F37
     input buffer #14:
       timeUs = 1000001133333
-      contents = length 46, hash CE770A40
+      contents = length 46, hash 99614662
     input buffer #15:
       timeUs = 1000001266666
-      contents = length 7, hash 680F23CB
+      contents = length 100, hash 6E090F99
     input buffer #16:
-      timeUs = 1000001266666
-      contents = length 92, hash 531EE3AD
-    input buffer #17:
       timeUs = 0
       flags = 4
       contents = length 0, hash 1
   outputBuffers:
-    count = 17
+    count = 16
     output buffer #0:
       timeUs = 1000000266666
       size = 7464
@@ -120,9 +117,5 @@ MediaCodecAdapter (exotest.video.hevc):
       rendered = true
     output buffer #15:
       timeUs = 1000001266666
-      size = 7
+      size = 100
-      rendered = true
-    output buffer #16:
-      timeUs = 1000001266666
-      size = 92
       rendered = true

libraries/test_data/src/test/assets/transformerdumps/ts/sample_h264.ts/transmuxed_with_inappmuxer.dump

@@ -2,12 +2,12 @@ seekMap:
   isSeekable = true
   duration = 1000000
   getPosition(0) = [[timeUs=0, position=400052]]
-  getPosition(1) = [[timeUs=0, position=400052], [timeUs=333333, position=416043]]
+  getPosition(1) = [[timeUs=0, position=400052], [timeUs=333333, position=416033]]
-  getPosition(500000) = [[timeUs=333333, position=416043], [timeUs=666666, position=428793]]
+  getPosition(500000) = [[timeUs=333333, position=416033], [timeUs=666666, position=428773]]
-  getPosition(1000000) = [[timeUs=666666, position=428793]]
+  getPosition(1000000) = [[timeUs=666666, position=428773]]
 numberOfTracks = 1
 track 0:
-  total output bytes = 41647
+  total output bytes = 41618
   sample count = 30
   track duration = 1000000
   format 0:
@@ -15,7 +15,7 @@ track 0:
     containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
-    maxInputSize = 11267
+    maxInputSize = 11266
     maxNumReorderSamples = 2
     width = 854
     height = 480
@@ -28,124 +28,124 @@ track 0:
       chromaBitdepth = 8
     metadata = entries=[Mp4Timestamp: creation time=3000000000, modification time=4000000000, timescale=10000]
     initializationData:
-      data = length 30, hash B65D1A82
+      data = length 29, hash 50348D3E
       data = length 10, hash 7A0D0F2B
   sample 0:
     time = 0
     flags = 1
-    data = length 859, hash 202E188E
+    data = length 858, hash F0859DB2
   sample 1:
     time = 33333
     flags = 0
-    data = length 3331, hash 88D7E46A
+    data = length 3330, hash 6FC4E656
   sample 2:
     time = 100000
     flags = 0
-    data = length 6850, hash FAE2363A
+    data = length 6849, hash AD411A86
   sample 3:
     time = 66666
     flags = 0
-    data = length 795, hash EE994ED1
+    data = length 794, hash 6289130F
   sample 4:
     time = 166666
     flags = 0
-    data = length 1875, hash C1B4CECB
+    data = length 1874, hash 8A60ABD5
   sample 5:
     time = 133333
     flags = 0
-    data = length 1210, hash 8FA2B5B1
+    data = length 1209, hash 9947502F
   sample 6:
     time = 300000
     flags = 0
-    data = length 477, hash 555E99C
+    data = length 476, hash 31B872E4
   sample 7:
     time = 233333
     flags = 0
-    data = length 326, hash 8FAE3F64
+    data = length 325, hash E39A441C
   sample 8:
     time = 200000
     flags = 0
-    data = length 90, hash 84A60B02
+    data = length 89, hash 14CB8CBE
   sample 9:
     time = 266666
     flags = 0
-    data = length 178, hash A0B30D59
+    data = length 177, hash 2E796387
   sample 10:
     time = 333333
     flags = 1
-    data = length 11056, hash 52E2FD8B
+    data = length 11055, hash 9751A515
   sample 11:
     time = 466666
     flags = 0
-    data = length 303, hash 10D3A3FA
+    data = length 302, hash 8AF4C6
   sample 12:
     time = 400000
     flags = 0
-    data = length 303, hash 5242D82E
+    data = length 302, hash 8F0A6A12
   sample 13:
     time = 366666
     flags = 0
-    data = length 97, hash 2410F3D6
+    data = length 96, hash 32B6396A
   sample 14:
     time = 433333
     flags = 0
-    data = length 199, hash F354477
+    data = length 198, hash 9D64D0A9
   sample 15:
     time = 600000
     flags = 0
-    data = length 304, hash 9A3B0F38
+    data = length 303, hash 470A29C8
   sample 16:
     time = 533333
     flags = 0
-    data = length 169, hash 6B89B7E8
+    data = length 168, hash D1EBAB18
   sample 17:
     time = 500000
     flags = 0
-    data = length 99, hash D4764152
+    data = length 98, hash 69F34C6E
   sample 18:
     time = 566666
     flags = 0
-    data = length 109, hash AED6C216
+    data = length 108, hash ECDDA32A
   sample 19:
     time = 633333
     flags = 0
-    data = length 111, hash A17F272F
+    data = length 110, hash D77B6F1
   sample 20:
     time = 666666
     flags = 1
-    data = length 11237, hash 2914241B
+    data = length 11236, hash 1A196C85
   sample 21:
     time = 800000
     flags = 0
-    data = length 359, hash 2A03C082
+    data = length 358, hash 1A21273E
   sample 22:
     time = 733333
     flags = 0
-    data = length 337, hash 1BA612F7
+    data = length 336, hash F0603229
   sample 23:
     time = 700000
     flags = 0
-    data = length 106, hash F4FD66B4
+    data = length 105, hash EF20F2CC
   sample 24:
     time = 766666
     flags = 0
-    data = length 107, hash 64941FF0
+    data = length 106, hash C9702210
   sample 25:
     time = 933333
     flags = 0
-    data = length 236, hash 8ECD7B9F
+    data = length 235, hash EBD51481
   sample 26:
     time = 866666
     flags = 0
-    data = length 110, hash 77532841
+    data = length 109, hash 77764B9F
   sample 27:
     time = 833333
     flags = 0
-    data = length 85, hash E29A31D2
+    data = length 84, hash 74F4BEE
   sample 28:
     time = 900000
     flags = 0
-    data = length 94, hash F3C32DE
+    data = length 93, hash 9522F962
   sample 29:
     time = 966666
     flags = 536870912