diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.1.dump
index 86b6448eee..a223a6654c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.1.dump
@@ -1,20 +1,23 @@
 seekMap:
   isSeekable = true
-  duration = 0
+  duration = 100100
   getPosition(0) = [[timeUs=0, position=0]]
   getPosition(1) = [[timeUs=1, position=0]]
-  getPosition(0) = [[timeUs=0, position=0]]
-  getPosition(0) = [[timeUs=0, position=0]]
-numberOfTracks = 3
+  getPosition(50050) = [[timeUs=50050, position=17225]]
+  getPosition(100100) = [[timeUs=100100, position=34639]]
+numberOfTracks = 2
 track 256:
   total output bytes = 13650
-  sample count = 2
+  sample count = 3
   format 0:
     id = 1/256
     sampleMimeType = video/avc
     codecs = avc1.64001E
     width = 640
     height = 426
+    colorInfo:
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     initializationData:
       data = length 29, hash 4C2CAE9C
       data = length 9, hash D971CD89
@@ -26,6 +29,10 @@ track 256:
     time = 100100
     flags = 0
     data = length 813, hash 99F7B4FA
+  sample 2:
+    time = 133467
+    flags = 0
+    data = length 442, hash A7367ECF
 track 257:
   total output bytes = 18432
   sample count = 9
@@ -45,23 +52,23 @@ track 257:
     flags = 1
     data = length 2048, hash 88866F81
   sample 2:
-    time = 89955
+    time = 89956
     flags = 1
     data = length 2048, hash 88866F81
   sample 3:
-    time = 101566
+    time = 101567
     flags = 1
     data = length 2048, hash 88866F81
   sample 4:
-    time = 113177
+    time = 113178
     flags = 1
     data = length 2048, hash 88866F81
   sample 5:
-    time = 124777
+    time = 124778
     flags = 1
     data = length 2048, hash 88866F81
   sample 6:
-    time = 136388
+    time = 136389
     flags = 1
     data = length 2048, hash 88866F81
   sample 7:
@@ -72,10 +79,4 @@ track 257:
     time = 159611
     flags = 1
     data = length 2048, hash 88866F81
-track 8448:
-  total output bytes = 0
-  sample count = 0
-  format 0:
-    id = 1/8448
-    sampleMimeType = application/cea-608
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.2.dump
index 86b6448eee..29b01a5d05 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.2.dump
@@ -1,34 +1,29 @@
 seekMap:
   isSeekable = true
-  duration = 0
+  duration = 100100
   getPosition(0) = [[timeUs=0, position=0]]
   getPosition(1) = [[timeUs=1, position=0]]
-  getPosition(0) = [[timeUs=0, position=0]]
-  getPosition(0) = [[timeUs=0, position=0]]
-numberOfTracks = 3
+  getPosition(50050) = [[timeUs=50050, position=17225]]
+  getPosition(100100) = [[timeUs=100100, position=34639]]
+numberOfTracks = 2
 track 256:
-  total output bytes = 13650
-  sample count = 2
+  total output bytes = 0
+  sample count = 0
   format 0:
     id = 1/256
     sampleMimeType = video/avc
     codecs = avc1.64001E
     width = 640
     height = 426
+    colorInfo:
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     initializationData:
       data = length 29, hash 4C2CAE9C
       data = length 9, hash D971CD89
-  sample 0:
-    time = 66733
-    flags = 1
-    data = length 12394, hash A39F5311
-  sample 1:
-    time = 100100
-    flags = 0
-    data = length 813, hash 99F7B4FA
 track 257:
-  total output bytes = 18432
-  sample count = 9
+  total output bytes = 10240
+  sample count = 5
   format 0:
     averageBitrate = 1411500
     id = 1/257
@@ -37,45 +32,23 @@ track 257:
     sampleRate = 44100
     language = und
   sample 0:
-    time = 66733
+    time = 113178
     flags = 1
     data = length 2048, hash 88866F81
   sample 1:
-    time = 78344
+    time = 124778
     flags = 1
     data = length 2048, hash 88866F81
   sample 2:
-    time = 89955
+    time = 136389
     flags = 1
     data = length 2048, hash 88866F81
   sample 3:
-    time = 101566
-    flags = 1
-    data = length 2048, hash 88866F81
-  sample 4:
-    time = 113177
-    flags = 1
-    data = length 2048, hash 88866F81
-  sample 5:
-    time = 124777
-    flags = 1
-    data = length 2048, hash 88866F81
-  sample 6:
-    time = 136388
-    flags = 1
-    data = length 2048, hash 88866F81
-  sample 7:
     time = 148000
     flags = 1
     data = length 2048, hash 88866F81
-  sample 8:
+  sample 4:
     time = 159611
     flags = 1
     data = length 2048, hash 88866F81
-track 8448:
-  total output bytes = 0
-  sample count = 0
-  format 0:
-    id = 1/8448
-    sampleMimeType = application/cea-608
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.3.dump
index 86b6448eee..6e8b04d429 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.3.dump
@@ -1,34 +1,29 @@
 seekMap:
   isSeekable = true
-  duration = 0
+  duration = 100100
   getPosition(0) = [[timeUs=0, position=0]]
   getPosition(1) = [[timeUs=1, position=0]]
-  getPosition(0) = [[timeUs=0, position=0]]
-  getPosition(0) = [[timeUs=0, position=0]]
-numberOfTracks = 3
+  getPosition(50050) = [[timeUs=50050, position=17225]]
+  getPosition(100100) = [[timeUs=100100, position=34639]]
+numberOfTracks = 2
 track 256:
-  total output bytes = 13650
-  sample count = 2
+  total output bytes = 0
+  sample count = 0
   format 0:
     id = 1/256
     sampleMimeType = video/avc
     codecs = avc1.64001E
     width = 640
     height = 426
+    colorInfo:
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     initializationData:
       data = length 29, hash 4C2CAE9C
       data = length 9, hash D971CD89
-  sample 0:
-    time = 66733
-    flags = 1
-    data = length 12394, hash A39F5311
-  sample 1:
-    time = 100100
-    flags = 0
-    data = length 813, hash 99F7B4FA
 track 257:
-  total output bytes = 18432
-  sample count = 9
+  total output bytes = 0
+  sample count = 0
   format 0:
     averageBitrate = 1411500
     id = 1/257
@@ -36,46 +31,4 @@ track 257:
     channelCount = 1
     sampleRate = 44100
     language = und
-  sample 0:
-    time = 66733
-    flags = 1
-    data = length 2048, hash 88866F81
-  sample 1:
-    time = 78344
-    flags = 1
-    data = length 2048, hash 88866F81
-  sample 2:
-    time = 89955
-    flags = 1
-    data = length 2048, hash 88866F81
-  sample 3:
-    time = 101566
-    flags = 1
-    data = length 2048, hash 88866F81
-  sample 4:
-    time = 113177
-    flags = 1
-    data = length 2048, hash 88866F81
-  sample 5:
-    time = 124777
-    flags = 1
-    data = length 2048, hash 88866F81
-  sample 6:
-    time = 136388
-    flags = 1
-    data = length 2048, hash 88866F81
-  sample 7:
-    time = 148000
-    flags = 1
-    data = length 2048, hash 88866F81
-  sample 8:
-    time = 159611
-    flags = 1
-    data = length 2048, hash 88866F81
-track 8448:
-  total output bytes = 0
-  sample count = 0
-  format 0:
-    id = 1/8448
-    sampleMimeType = application/cea-608
 tracksEnded = true