From e926b0df1e9ac5f453b369305b610df99ab5dfe7 Mon Sep 17 00:00:00 2001
From: rohks <rohks@google.com>
Date: Mon, 21 Oct 2024 07:14:10 -0700
Subject: [PATCH] Populate track duration in `Mp4Extractor` and
 `FragmentedMp4Extractor`

PiperOrigin-RevId: 688125056
---
 .../media3/extractor/mp4/FragmentedMp4Extractor.java      | 6 +++---
 .../java/androidx/media3/extractor/mp4/Mp4Extractor.java  | 8 +++++---
 .../jpeg/pixel-motion-photo-2-hevc-tracks.jpg.0.dump      | 4 ++++
 .../jpeg/pixel-motion-photo-2-hevc-tracks.jpg.1.dump      | 4 ++++
 .../jpeg/pixel-motion-photo-2-hevc-tracks.jpg.2.dump      | 4 ++++
 .../jpeg/pixel-motion-photo-2-hevc-tracks.jpg.3.dump      | 4 ++++
 .../pixel-motion-photo-jfif-segment-shortened.jpg.0.dump  | 1 +
 .../pixel-motion-photo-jfif-segment-shortened.jpg.1.dump  | 1 +
 .../pixel-motion-photo-jfif-segment-shortened.jpg.2.dump  | 1 +
 .../pixel-motion-photo-jfif-segment-shortened.jpg.3.dump  | 1 +
 .../src/test/assets/extractordumps/mp4/bt601.mov.0.dump   | 2 ++
 .../src/test/assets/extractordumps/mp4/bt601.mov.1.dump   | 2 ++
 .../src/test/assets/extractordumps/mp4/bt601.mov.2.dump   | 2 ++
 .../src/test/assets/extractordumps/mp4/bt601.mov.3.dump   | 2 ++
 ...t601.mov.reading_within_gop_sample_dependencies.0.dump | 2 ++
 ...t601.mov.reading_within_gop_sample_dependencies.1.dump | 2 ++
 ...t601.mov.reading_within_gop_sample_dependencies.2.dump | 2 ++
 ...t601.mov.reading_within_gop_sample_dependencies.3.dump | 2 ++
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 2 ++
 .../extractordumps/mp4/bt601.mov.unknown_length.dump      | 2 ++
 .../mp4/pixel-motion-photo-2-hevc-tracks.mp4.0.dump       | 4 ++++
 .../mp4/pixel-motion-photo-2-hevc-tracks.mp4.1.dump       | 4 ++++
 .../mp4/pixel-motion-photo-2-hevc-tracks.mp4.2.dump       | 4 ++++
 .../mp4/pixel-motion-photo-2-hevc-tracks.mp4.3.dump       | 4 ++++
 ...acks.mp4.reading_within_gop_sample_dependencies.0.dump | 4 ++++
 ...acks.mp4.reading_within_gop_sample_dependencies.1.dump | 4 ++++
 ...acks.mp4.reading_within_gop_sample_dependencies.2.dump | 4 ++++
 ...acks.mp4.reading_within_gop_sample_dependencies.3.dump | 4 ++++
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 4 ++++
 ...xel-motion-photo-2-hevc-tracks.mp4.unknown_length.dump | 4 ++++
 .../src/test/assets/extractordumps/mp4/sample.mp4.0.dump  | 2 ++
 .../src/test/assets/extractordumps/mp4/sample.mp4.1.dump  | 2 ++
 .../src/test/assets/extractordumps/mp4/sample.mp4.2.dump  | 2 ++
 .../src/test/assets/extractordumps/mp4/sample.mp4.3.dump  | 2 ++
 ...mple.mp4.reading_within_gop_sample_dependencies.0.dump | 2 ++
 ...mple.mp4.reading_within_gop_sample_dependencies.1.dump | 2 ++
 ...mple.mp4.reading_within_gop_sample_dependencies.2.dump | 2 ++
 ...mple.mp4.reading_within_gop_sample_dependencies.3.dump | 2 ++
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 2 ++
 .../extractordumps/mp4/sample.mp4.unknown_length.dump     | 2 ++
 .../mp4/sample.mp4_with_flag_read_Editable_video_tracks   | 2 ++
 .../extractordumps/mp4/sample_18byte_nclx_colr.mp4.0.dump | 1 +
 .../extractordumps/mp4/sample_18byte_nclx_colr.mp4.1.dump | 1 +
 .../extractordumps/mp4/sample_18byte_nclx_colr.mp4.2.dump | 1 +
 .../extractordumps/mp4/sample_18byte_nclx_colr.mp4.3.dump | 1 +
 ...colr.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ...colr.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ...colr.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ...colr.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 .../mp4/sample_18byte_nclx_colr.mp4.unknown_length.dump   | 1 +
 .../test/assets/extractordumps/mp4/sample_ac3.mp4.0.dump  | 1 +
 .../test/assets/extractordumps/mp4/sample_ac3.mp4.1.dump  | 1 +
 .../test/assets/extractordumps/mp4/sample_ac3.mp4.2.dump  | 1 +
 .../test/assets/extractordumps/mp4/sample_ac3.mp4.3.dump  | 1 +
 ..._ac3.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ..._ac3.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ..._ac3.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ..._ac3.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 .../extractordumps/mp4/sample_ac3.mp4.unknown_length.dump | 1 +
 .../extractordumps/mp4/sample_ac3_fragmented.mp4.0.dump   | 1 +
 .../extractordumps/mp4/sample_ac3_fragmented.mp4.1.dump   | 1 +
 .../extractordumps/mp4/sample_ac3_fragmented.mp4.2.dump   | 1 +
 .../extractordumps/mp4/sample_ac3_fragmented.mp4.3.dump   | 1 +
 ...nted.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ...nted.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ...nted.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ...nted.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 .../mp4/sample_ac3_fragmented.mp4.unknown_length.dump     | 1 +
 .../test/assets/extractordumps/mp4/sample_ac4.mp4.0.dump  | 1 +
 .../test/assets/extractordumps/mp4/sample_ac4.mp4.1.dump  | 1 +
 .../test/assets/extractordumps/mp4/sample_ac4.mp4.2.dump  | 1 +
 .../test/assets/extractordumps/mp4/sample_ac4.mp4.3.dump  | 1 +
 ..._ac4.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ..._ac4.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ..._ac4.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ..._ac4.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 .../extractordumps/mp4/sample_ac4.mp4.unknown_length.dump | 1 +
 .../extractordumps/mp4/sample_ac4_fragmented.mp4.0.dump   | 1 +
 .../extractordumps/mp4/sample_ac4_fragmented.mp4.1.dump   | 1 +
 .../extractordumps/mp4/sample_ac4_fragmented.mp4.2.dump   | 1 +
 .../extractordumps/mp4/sample_ac4_fragmented.mp4.3.dump   | 1 +
 ...nted.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ...nted.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ...nted.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ...nted.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 .../mp4/sample_ac4_fragmented.mp4.unknown_length.dump     | 1 +
 .../extractordumps/mp4/sample_ac4_protected.mp4.0.dump    | 1 +
 .../extractordumps/mp4/sample_ac4_protected.mp4.1.dump    | 1 +
 .../extractordumps/mp4/sample_ac4_protected.mp4.2.dump    | 1 +
 .../extractordumps/mp4/sample_ac4_protected.mp4.3.dump    | 1 +
 ...cted.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ...cted.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ...cted.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ...cted.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 .../mp4/sample_ac4_protected.mp4.unknown_length.dump      | 1 +
 .../mp4/sample_android_slow_motion.mp4.0.dump             | 1 +
 .../mp4/sample_android_slow_motion.mp4.1.dump             | 1 +
 .../mp4/sample_android_slow_motion.mp4.2.dump             | 1 +
 .../mp4/sample_android_slow_motion.mp4.3.dump             | 1 +
 ...tion.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ...tion.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ...tion.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ...tion.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 .../sample_android_slow_motion.mp4.unknown_length.dump    | 1 +
 .../test/assets/extractordumps/mp4/sample_dthd.mp4.0.dump | 1 +
 .../test/assets/extractordumps/mp4/sample_dthd.mp4.1.dump | 1 +
 .../test/assets/extractordumps/mp4/sample_dthd.mp4.2.dump | 1 +
 .../test/assets/extractordumps/mp4/sample_dthd.mp4.3.dump | 1 +
 ...dthd.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ...dthd.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ...dthd.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ...dthd.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 .../mp4/sample_dthd.mp4.unknown_length.dump               | 1 +
 .../test/assets/extractordumps/mp4/sample_eac3.mp4.0.dump | 1 +
 .../test/assets/extractordumps/mp4/sample_eac3.mp4.1.dump | 1 +
 .../test/assets/extractordumps/mp4/sample_eac3.mp4.2.dump | 1 +
 .../test/assets/extractordumps/mp4/sample_eac3.mp4.3.dump | 1 +
 ...eac3.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ...eac3.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ...eac3.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ...eac3.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 .../mp4/sample_eac3.mp4.unknown_length.dump               | 1 +
 .../extractordumps/mp4/sample_eac3_fragmented.mp4.0.dump  | 1 +
 .../extractordumps/mp4/sample_eac3_fragmented.mp4.1.dump  | 1 +
 .../extractordumps/mp4/sample_eac3_fragmented.mp4.2.dump  | 1 +
 .../extractordumps/mp4/sample_eac3_fragmented.mp4.3.dump  | 1 +
 ...nted.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ...nted.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ...nted.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ...nted.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 .../mp4/sample_eac3_fragmented.mp4.unknown_length.dump    | 1 +
 .../assets/extractordumps/mp4/sample_eac3joc.mp4.0.dump   | 1 +
 .../assets/extractordumps/mp4/sample_eac3joc.mp4.1.dump   | 1 +
 .../assets/extractordumps/mp4/sample_eac3joc.mp4.2.dump   | 1 +
 .../assets/extractordumps/mp4/sample_eac3joc.mp4.3.dump   | 1 +
 ...3joc.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ...3joc.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ...3joc.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ...3joc.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 .../mp4/sample_eac3joc.mp4.unknown_length.dump            | 1 +
 .../mp4/sample_eac3joc_fragmented.mp4.0.dump              | 1 +
 .../mp4/sample_eac3joc_fragmented.mp4.1.dump              | 1 +
 .../mp4/sample_eac3joc_fragmented.mp4.2.dump              | 1 +
 .../mp4/sample_eac3joc_fragmented.mp4.3.dump              | 1 +
 ...nted.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ...nted.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ...nted.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ...nted.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 .../mp4/sample_eac3joc_fragmented.mp4.unknown_length.dump | 1 +
 .../assets/extractordumps/mp4/sample_edit_list.mp4.0.dump | 2 ++
 .../assets/extractordumps/mp4/sample_edit_list.mp4.1.dump | 2 ++
 .../assets/extractordumps/mp4/sample_edit_list.mp4.2.dump | 2 ++
 .../assets/extractordumps/mp4/sample_edit_list.mp4.3.dump | 2 ++
 ...list.mp4.reading_within_gop_sample_dependencies.0.dump | 2 ++
 ...list.mp4.reading_within_gop_sample_dependencies.1.dump | 2 ++
 ...list.mp4.reading_within_gop_sample_dependencies.2.dump | 2 ++
 ...list.mp4.reading_within_gop_sample_dependencies.3.dump | 2 ++
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 2 ++
 .../mp4/sample_edit_list.mp4.unknown_length.dump          | 2 ++
 .../extractordumps/mp4/sample_empty_track.mp4.0.dump      | 2 ++
 .../extractordumps/mp4/sample_empty_track.mp4.1.dump      | 2 ++
 .../extractordumps/mp4/sample_empty_track.mp4.2.dump      | 2 ++
 .../extractordumps/mp4/sample_empty_track.mp4.3.dump      | 2 ++
 ...rack.mp4.reading_within_gop_sample_dependencies.0.dump | 2 ++
 ...rack.mp4.reading_within_gop_sample_dependencies.1.dump | 2 ++
 ...rack.mp4.reading_within_gop_sample_dependencies.2.dump | 2 ++
 ...rack.mp4.reading_within_gop_sample_dependencies.3.dump | 2 ++
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 2 ++
 .../mp4/sample_empty_track.mp4.unknown_length.dump        | 2 ++
 .../extractordumps/mp4/sample_fragmented_iamf.mp4.0.dump  | 1 +
 .../extractordumps/mp4/sample_fragmented_iamf.mp4.1.dump  | 1 +
 .../extractordumps/mp4/sample_fragmented_iamf.mp4.2.dump  | 1 +
 .../extractordumps/mp4/sample_fragmented_iamf.mp4.3.dump  | 1 +
 ...iamf.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ...iamf.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ...iamf.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ...iamf.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 .../mp4/sample_fragmented_iamf.mp4.unknown_length.dump    | 1 +
 .../mp4/sample_fragmented_large_bitrates.mp4.0.dump       | 2 ++
 .../mp4/sample_fragmented_large_bitrates.mp4.1.dump       | 2 ++
 .../mp4/sample_fragmented_large_bitrates.mp4.2.dump       | 2 ++
 .../mp4/sample_fragmented_large_bitrates.mp4.3.dump       | 2 ++
 ...ates.mp4.reading_within_gop_sample_dependencies.0.dump | 2 ++
 ...ates.mp4.reading_within_gop_sample_dependencies.1.dump | 2 ++
 ...ates.mp4.reading_within_gop_sample_dependencies.2.dump | 2 ++
 ...ates.mp4.reading_within_gop_sample_dependencies.3.dump | 2 ++
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 2 ++
 ...mple_fragmented_large_bitrates.mp4.unknown_length.dump | 2 ++
 .../mp4/sample_fragmented_seekable.mp4.0.dump             | 2 ++
 .../mp4/sample_fragmented_seekable.mp4.1.dump             | 2 ++
 .../mp4/sample_fragmented_seekable.mp4.2.dump             | 2 ++
 .../mp4/sample_fragmented_seekable.mp4.3.dump             | 2 ++
 ...able.mp4.reading_within_gop_sample_dependencies.0.dump | 2 ++
 ...able.mp4.reading_within_gop_sample_dependencies.1.dump | 2 ++
 ...able.mp4.reading_within_gop_sample_dependencies.2.dump | 2 ++
 ...able.mp4.reading_within_gop_sample_dependencies.3.dump | 2 ++
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 2 ++
 .../sample_fragmented_seekable.mp4.unknown_length.dump    | 2 ++
 .../test/assets/extractordumps/mp4/sample_iamf.mp4.0.dump | 1 +
 .../test/assets/extractordumps/mp4/sample_iamf.mp4.1.dump | 1 +
 .../test/assets/extractordumps/mp4/sample_iamf.mp4.2.dump | 1 +
 .../test/assets/extractordumps/mp4/sample_iamf.mp4.3.dump | 1 +
 ...iamf.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ...iamf.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ...iamf.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ...iamf.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 .../mp4/sample_iamf.mp4.unknown_length.dump               | 1 +
 .../extractordumps/mp4/sample_mdat_too_long.mp4.0.dump    | 2 ++
 .../extractordumps/mp4/sample_mdat_too_long.mp4.1.dump    | 2 ++
 .../extractordumps/mp4/sample_mdat_too_long.mp4.2.dump    | 2 ++
 .../extractordumps/mp4/sample_mdat_too_long.mp4.3.dump    | 2 ++
 ...long.mp4.reading_within_gop_sample_dependencies.0.dump | 2 ++
 ...long.mp4.reading_within_gop_sample_dependencies.1.dump | 2 ++
 ...long.mp4.reading_within_gop_sample_dependencies.2.dump | 2 ++
 ...long.mp4.reading_within_gop_sample_dependencies.3.dump | 2 ++
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 2 ++
 .../mp4/sample_mdat_too_long.mp4.unknown_length.dump      | 2 ++
 .../extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.0.dump    | 1 +
 .../extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.1.dump    | 1 +
 .../extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.2.dump    | 1 +
 .../extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.3.dump    | 1 +
 ...icp1.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ...icp1.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ...icp1.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ...icp1.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 .../mp4/sample_mhm1_bl_cicp1.mp4.unknown_length.dump      | 1 +
 .../mp4/sample_mhm1_bl_configchange.mp4.0.dump            | 1 +
 .../mp4/sample_mhm1_bl_configchange.mp4.1.dump            | 1 +
 .../mp4/sample_mhm1_bl_configchange.mp4.2.dump            | 1 +
 .../mp4/sample_mhm1_bl_configchange.mp4.3.dump            | 1 +
 ...ange.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ...ange.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ...ange.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ...ange.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 .../sample_mhm1_bl_configchange.mp4.unknown_length.dump   | 1 +
 .../extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.0.dump  | 1 +
 .../extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.1.dump  | 1 +
 .../extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.2.dump  | 1 +
 .../extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.3.dump  | 1 +
 ...icp1.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ...icp1.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ...icp1.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ...icp1.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 .../mp4/sample_mhm1_lcbl_cicp1.mp4.unknown_length.dump    | 1 +
 .../mp4/sample_mhm1_lcbl_configchange.mp4.0.dump          | 1 +
 .../mp4/sample_mhm1_lcbl_configchange.mp4.1.dump          | 1 +
 .../mp4/sample_mhm1_lcbl_configchange.mp4.2.dump          | 1 +
 .../mp4/sample_mhm1_lcbl_configchange.mp4.3.dump          | 1 +
 ...ange.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ...ange.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ...ange.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ...ange.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 .../sample_mhm1_lcbl_configchange.mp4.unknown_length.dump | 1 +
 .../extractordumps/mp4/sample_mpegh_mha1.mp4.0.dump       | 1 +
 .../extractordumps/mp4/sample_mpegh_mha1.mp4.1.dump       | 1 +
 .../extractordumps/mp4/sample_mpegh_mha1.mp4.2.dump       | 1 +
 .../extractordumps/mp4/sample_mpegh_mha1.mp4.3.dump       | 1 +
 ...mha1.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ...mha1.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ...mha1.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ...mha1.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 .../mp4/sample_mpegh_mha1.mp4.unknown_length.dump         | 1 +
 .../extractordumps/mp4/sample_mpegh_mhm1.mp4.0.dump       | 1 +
 .../extractordumps/mp4/sample_mpegh_mhm1.mp4.1.dump       | 1 +
 .../extractordumps/mp4/sample_mpegh_mhm1.mp4.2.dump       | 1 +
 .../extractordumps/mp4/sample_mpegh_mhm1.mp4.3.dump       | 1 +
 ...mhm1.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ...mhm1.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ...mhm1.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ...mhm1.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 .../mp4/sample_mpegh_mhm1.mp4.unknown_length.dump         | 1 +
 .../test/assets/extractordumps/mp4/sample_opus.mp4.0.dump | 1 +
 .../test/assets/extractordumps/mp4/sample_opus.mp4.1.dump | 1 +
 .../test/assets/extractordumps/mp4/sample_opus.mp4.2.dump | 1 +
 .../test/assets/extractordumps/mp4/sample_opus.mp4.3.dump | 1 +
 ...opus.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ...opus.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ...opus.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ...opus.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 .../mp4/sample_opus.mp4.unknown_length.dump               | 1 +
 .../mp4/sample_partially_fragmented.mp4.0.dump            | 2 ++
 ...nted.mp4.reading_within_gop_sample_dependencies.0.dump | 2 ++
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 2 ++
 .../sample_partially_fragmented.mp4.unknown_length.dump   | 2 ++
 .../assets/extractordumps/mp4/sample_with_av1c.mp4.0.dump | 1 +
 .../assets/extractordumps/mp4/sample_with_av1c.mp4.1.dump | 1 +
 .../assets/extractordumps/mp4/sample_with_av1c.mp4.2.dump | 1 +
 .../assets/extractordumps/mp4/sample_with_av1c.mp4.3.dump | 1 +
 ...av1c.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ...av1c.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ...av1c.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ...av1c.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 .../mp4/sample_with_av1c.mp4.unknown_length.dump          | 1 +
 .../extractordumps/mp4/sample_with_color_info.mp4.0.dump  | 2 ++
 .../extractordumps/mp4/sample_with_color_info.mp4.1.dump  | 2 ++
 .../extractordumps/mp4/sample_with_color_info.mp4.2.dump  | 2 ++
 .../extractordumps/mp4/sample_with_color_info.mp4.3.dump  | 2 ++
 ...info.mp4.reading_within_gop_sample_dependencies.0.dump | 2 ++
 ...info.mp4.reading_within_gop_sample_dependencies.1.dump | 2 ++
 ...info.mp4.reading_within_gop_sample_dependencies.2.dump | 2 ++
 ...info.mp4.reading_within_gop_sample_dependencies.3.dump | 2 ++
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 2 ++
 .../mp4/sample_with_color_info.mp4.unknown_length.dump    | 2 ++
 .../mp4/sample_with_colr_mdcv_and_clli.mp4.0.dump         | 2 ++
 .../mp4/sample_with_colr_mdcv_and_clli.mp4.1.dump         | 2 ++
 .../mp4/sample_with_colr_mdcv_and_clli.mp4.2.dump         | 2 ++
 .../mp4/sample_with_colr_mdcv_and_clli.mp4.3.dump         | 2 ++
 ...clli.mp4.reading_within_gop_sample_dependencies.0.dump | 2 ++
 ...clli.mp4.reading_within_gop_sample_dependencies.1.dump | 2 ++
 ...clli.mp4.reading_within_gop_sample_dependencies.2.dump | 2 ++
 ...clli.mp4.reading_within_gop_sample_dependencies.3.dump | 2 ++
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 2 ++
 ...sample_with_colr_mdcv_and_clli.mp4.unknown_length.dump | 2 ++
 .../mp4/sample_with_fake_editable_video_tracks.mp4.0.dump | 1 +
 .../mp4/sample_with_fake_editable_video_tracks.mp4.1.dump | 1 +
 .../mp4/sample_with_fake_editable_video_tracks.mp4.2.dump | 1 +
 .../mp4/sample_with_fake_editable_video_tracks.mp4.3.dump | 1 +
 ...acks.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ...acks.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ...acks.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ...acks.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 ...ith_fake_editable_video_tracks.mp4.unknown_length.dump | 1 +
 ..._video_tracks.mp4_with_flag_read_Editable_video_tracks | 2 ++
 ...racks_interleaved_with_primary_video_tracks.mp4.0.dump | 1 +
 ...racks_interleaved_with_primary_video_tracks.mp4.1.dump | 1 +
 ...racks_interleaved_with_primary_video_tracks.mp4.2.dump | 1 +
 ...racks_interleaved_with_primary_video_tracks.mp4.3.dump | 1 +
 ...acks.mp4.reading_within_gop_sample_dependencies.0.dump | 1 +
 ...acks.mp4.reading_within_gop_sample_dependencies.1.dump | 1 +
 ...acks.mp4.reading_within_gop_sample_dependencies.2.dump | 1 +
 ...acks.mp4.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 ...aved_with_primary_video_tracks.mp4.unknown_length.dump | 1 +
 ..._video_tracks.mp4_with_flag_read_Editable_video_tracks | 2 ++
 .../extractordumps/mp4/sample_with_metadata.mp4.0.dump    | 2 ++
 .../extractordumps/mp4/sample_with_metadata.mp4.1.dump    | 2 ++
 .../extractordumps/mp4/sample_with_metadata.mp4.2.dump    | 2 ++
 .../extractordumps/mp4/sample_with_metadata.mp4.3.dump    | 2 ++
 ...data.mp4.reading_within_gop_sample_dependencies.0.dump | 2 ++
 ...data.mp4.reading_within_gop_sample_dependencies.1.dump | 2 ++
 ...data.mp4.reading_within_gop_sample_dependencies.2.dump | 2 ++
 ...data.mp4.reading_within_gop_sample_dependencies.3.dump | 2 ++
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 2 ++
 .../mp4/sample_with_metadata.mp4.unknown_length.dump      | 2 ++
 .../mp4/sample_with_numeric_genre.mp4.0.dump              | 2 ++
 .../mp4/sample_with_numeric_genre.mp4.1.dump              | 2 ++
 .../mp4/sample_with_numeric_genre.mp4.2.dump              | 2 ++
 .../mp4/sample_with_numeric_genre.mp4.3.dump              | 2 ++
 ...enre.mp4.reading_within_gop_sample_dependencies.0.dump | 2 ++
 ...enre.mp4.reading_within_gop_sample_dependencies.1.dump | 2 ++
 ...enre.mp4.reading_within_gop_sample_dependencies.2.dump | 2 ++
 ...enre.mp4.reading_within_gop_sample_dependencies.3.dump | 2 ++
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 2 ++
 .../mp4/sample_with_numeric_genre.mp4.unknown_length.dump | 2 ++
 ...ample_with_original_quicktime_specification.mov.0.dump | 2 ++
 ...ample_with_original_quicktime_specification.mov.1.dump | 2 ++
 ...ample_with_original_quicktime_specification.mov.2.dump | 2 ++
 ...ample_with_original_quicktime_specification.mov.3.dump | 2 ++
 ...tion.mov.reading_within_gop_sample_dependencies.0.dump | 2 ++
 ...tion.mov.reading_within_gop_sample_dependencies.1.dump | 2 ++
 ...tion.mov.reading_within_gop_sample_dependencies.2.dump | 2 ++
 ...tion.mov.reading_within_gop_sample_dependencies.3.dump | 2 ++
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 2 ++
 ...iginal_quicktime_specification.mov.unknown_length.dump | 2 ++
 .../mp4/water_180_mvhevc_5frames.mov.0.dump               | 1 +
 .../mp4/water_180_mvhevc_5frames.mov.1.dump               | 1 +
 .../mp4/water_180_mvhevc_5frames.mov.2.dump               | 1 +
 .../mp4/water_180_mvhevc_5frames.mov.3.dump               | 1 +
 ...ames.mov.reading_within_gop_sample_dependencies.0.dump | 1 +
 ...ames.mov.reading_within_gop_sample_dependencies.1.dump | 1 +
 ...ames.mov.reading_within_gop_sample_dependencies.2.dump | 1 +
 ...ames.mov.reading_within_gop_sample_dependencies.3.dump | 1 +
 ...ing_within_gop_sample_dependencies.unknown_length.dump | 1 +
 .../mp4/water_180_mvhevc_5frames.mov.unknown_length.dump  | 1 +
 .../muxerdumps/bbb_176x144_128kbps_15fps_h263.3gp.dump    | 1 +
 .../muxerdumps/bbb_176x144_192kbps_15fps_mpeg4.mp4.dump   | 1 +
 .../assets/muxerdumps/bbb_1ch_16kHz_q10_vorbis.ogg.dump   | 1 +
 .../muxerdumps/bbb_642x642_768kbps_30fps_vp9.webm.dump    | 1 +
 .../src/test/assets/muxerdumps/bbb_6ch_8kHz_opus.ogg.dump | 1 +
 ..._800x640_768kbps_30fps_avc_2b_firstpts_10_sec.mp4.dump | 1 +
 ...bb_800x640_768kbps_30fps_avc_non_reference_3b.mp4.dump | 1 +
 .../bbb_800x640_768kbps_30fps_avc_pyramid_3b.mp4.dump     | 1 +
 .../muxerdumps/bbb_mono_16kHz_23.05kbps_amrwb.3gp.dump    | 1 +
 .../muxerdumps/bbb_mono_8kHz_12.2kbps_amrnb.3gp.dump      | 1 +
 .../assets/muxerdumps/h265_with_metadata_track.mp4.dump   | 3 +++
 .../src/test/assets/muxerdumps/hdr10-720p.mp4.dump        | 2 ++
 .../assets/muxerdumps/mp4_with_0_orientation.mp4.dump     | 1 +
 .../assets/muxerdumps/mp4_with_180_orientation.mp4.dump   | 1 +
 .../assets/muxerdumps/mp4_with_270_orientation.mp4.dump   | 1 +
 .../assets/muxerdumps/mp4_with_90_orientation.mp4.dump    | 1 +
 .../src/test/assets/muxerdumps/mp4_with_b_frame.mp4.dump  | 1 +
 .../assets/muxerdumps/mp4_with_b_frame_large_pts.mp4.dump | 2 ++
 .../muxerdumps/mp4_with_different_tracks_offset.mp4.dump  | 2 ++
 .../muxerdumps/mp4_with_editable_video_tracks.mp4.dump    | 2 ++
 ...racks_when_editable_track_samples_interleaved.mp4.dump | 2 ++
 .../assets/muxerdumps/mp4_with_float_metadata.mp4.dump    | 1 +
 .../test/assets/muxerdumps/mp4_with_frame_rate.mp4.dump   | 1 +
 .../src/test/assets/muxerdumps/mp4_with_location.mp4.dump | 1 +
 .../muxerdumps/mp4_with_negative_tracks_offset.mp4.dump   | 1 +
 .../assets/muxerdumps/mp4_with_null_location.mp4.dump     | 1 +
 .../assets/muxerdumps/mp4_with_primary_tracks.mp4.dump    | 1 +
 ...racks_when_editable_track_samples_interleaved.mp4.dump | 1 +
 .../muxerdumps/mp4_with_same_tracks_offset.mp4.dump       | 2 ++
 .../assets/muxerdumps/mp4_with_string_metadata.mp4.dump   | 1 +
 .../test/assets/muxerdumps/partial_hdr10-720p.mp4.dump    | 2 ++
 .../src/test/assets/muxerdumps/sample_av1.mp4.dump        | 2 ++
 .../src/test/assets/muxerdumps/sample_no_bframes.mp4.dump | 2 ++
 .../transmuxed_with_inappmuxer.dump                       | 1 +
 .../transmuxed_with_inappmuxer.dump                       | 1 +
 .../transmuxed_with_inappmuxer.dump                       | 1 +
 .../bbb_6ch_8kHz_opus.ogg/transmuxed_with_inappmuxer.dump | 1 +
 .../transmuxed_with_inappmuxer.dump                       | 1 +
 .../transmuxed_with_inappmuxer.dump                       | 1 +
 .../transmuxed_with_inappmuxer.dump                       | 2 ++
 .../mp4/sample_av1.mp4/transmuxed_with_inappmuxer.dump    | 2 ++
 .../sample_no_bframes.mp4/transmuxed_with_inappmuxer.dump | 2 ++
 .../ts/sample_h264.ts/transmuxed_with_inappmuxer.dump     | 1 +
 440 files changed, 629 insertions(+), 6 deletions(-)

diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/FragmentedMp4Extractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/FragmentedMp4Extractor.java
index 18521ed7fd..8db7798348 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/FragmentedMp4Extractor.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/FragmentedMp4Extractor.java
@@ -690,11 +690,11 @@ public class FragmentedMp4Extractor implements Extractor {
       for (int i = 0; i < trackCount; i++) {
         TrackSampleTable sampleTable = sampleTables.get(i);
         Track track = sampleTable.track;
+        TrackOutput output = extractorOutput.track(i, track.type);
+        output.durationUs(track.durationUs);
         TrackBundle trackBundle =
             new TrackBundle(
-                extractorOutput.track(i, track.type),
-                sampleTable,
-                getDefaultSampleValues(defaultSampleValuesArray, track.id));
+                output, sampleTable, getDefaultSampleValues(defaultSampleValuesArray, track.id));
         trackBundles.put(track.id, trackBundle);
         durationUs = max(durationUs, track.durationUs);
       }
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/Mp4Extractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/Mp4Extractor.java
index f756d0866c..35b24cf080 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/Mp4Extractor.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/Mp4Extractor.java
@@ -714,12 +714,14 @@ public final class Mp4Extractor implements Extractor, SeekMap {
         continue;
       }
       Track track = trackSampleTable.track;
-      long trackDurationUs =
-          track.durationUs != C.TIME_UNSET ? track.durationUs : trackSampleTable.durationUs;
-      durationUs = max(durationUs, trackDurationUs);
       Mp4Track mp4Track =
           new Mp4Track(track, trackSampleTable, extractorOutput.track(trackIndex++, track.type));
 
+      long trackDurationUs =
+          track.durationUs != C.TIME_UNSET ? track.durationUs : trackSampleTable.durationUs;
+      mp4Track.trackOutput.durationUs(trackDurationUs);
+      durationUs = max(durationUs, trackDurationUs);
+
       int maxInputSize;
       if (MimeTypes.AUDIO_TRUEHD.equals(track.format.sampleMimeType)) {
         // TrueHD groups samples per chunks of TRUEHD_RECHUNK_SAMPLE_COUNT samples.
diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.0.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.0.dump
index 023f5186cf..d8987f2dc2 100644
--- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 5
 track 0:
   total output bytes = 3306897
   sample count = 58
+  track duration = 2100700
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -264,6 +265,7 @@ track 0:
 track 1:
   total output bytes = 151315
   sample count = 1
+  track duration = 466800
   format 0:
     id = 2
     sampleMimeType = video/hevc
@@ -291,6 +293,7 @@ track 1:
 track 2:
   total output bytes = 26100
   sample count = 58
+  track duration = 2100700
   format 0:
     id = 3
     sampleMimeType = application/microvideo-meta-stream
@@ -531,6 +534,7 @@ track 2:
 track 3:
   total output bytes = 59
   sample count = 1
+  track duration = 1133700
   format 0:
     id = 4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.1.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.1.dump
index aa9ddec3b5..b970650e98 100644
--- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 5
 track 0:
   total output bytes = 2605317
   sample count = 44
+  track duration = 2100700
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -208,6 +209,7 @@ track 0:
 track 1:
   total output bytes = 151315
   sample count = 1
+  track duration = 466800
   format 0:
     id = 2
     sampleMimeType = video/hevc
@@ -235,6 +237,7 @@ track 1:
 track 2:
   total output bytes = 17100
   sample count = 38
+  track duration = 2100700
   format 0:
     id = 3
     sampleMimeType = application/microvideo-meta-stream
@@ -395,6 +398,7 @@ track 2:
 track 3:
   total output bytes = 59
   sample count = 1
+  track duration = 1133700
   format 0:
     id = 4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.2.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.2.dump
index 618d457bc7..818f706cfd 100644
--- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 5
 track 0:
   total output bytes = 1572110
   sample count = 23
+  track duration = 2100700
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -124,6 +125,7 @@ track 0:
 track 1:
   total output bytes = 151315
   sample count = 1
+  track duration = 466800
   format 0:
     id = 2
     sampleMimeType = video/hevc
@@ -151,6 +153,7 @@ track 1:
 track 2:
   total output bytes = 7650
   sample count = 17
+  track duration = 2100700
   format 0:
     id = 3
     sampleMimeType = application/microvideo-meta-stream
@@ -227,6 +230,7 @@ track 2:
 track 3:
   total output bytes = 59
   sample count = 1
+  track duration = 1133700
   format 0:
     id = 4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.3.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.3.dump
index f0a2834d11..28ec0a9bff 100644
--- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 5
 track 0:
   total output bytes = 209513
   sample count = 2
+  track duration = 2100700
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -40,6 +41,7 @@ track 0:
 track 1:
   total output bytes = 151315
   sample count = 1
+  track duration = 466800
   format 0:
     id = 2
     sampleMimeType = video/hevc
@@ -67,6 +69,7 @@ track 1:
 track 2:
   total output bytes = 450
   sample count = 1
+  track duration = 2100700
   format 0:
     id = 3
     sampleMimeType = application/microvideo-meta-stream
@@ -79,6 +82,7 @@ track 2:
 track 3:
   total output bytes = 59
   sample count = 1
+  track duration = 1133700
   format 0:
     id = 4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.0.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.0.dump
index c60c55ad44..13b3a508de 100644
--- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 3865
   sample count = 1
+  track duration = 867000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.1.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.1.dump
index c60c55ad44..13b3a508de 100644
--- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 3865
   sample count = 1
+  track duration = 867000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.2.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.2.dump
index c60c55ad44..13b3a508de 100644
--- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 3865
   sample count = 1
+  track duration = 867000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.3.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.3.dump
index c60c55ad44..13b3a508de 100644
--- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 3865
   sample count = 1
+  track duration = 867000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.0.dump
index 9aa3970f7f..1d07f4a441 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 9294
   sample count = 43
+  track duration = 1019300
   format 0:
     peakBitrate = 200000
     id = 1
@@ -196,6 +197,7 @@ track 0:
 track 1:
   total output bytes = 130926
   sample count = 30
+  track duration = 1020100
   format 0:
     id = 2
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.1.dump
index 36e2be85ac..d0ae34eb7f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 7229
   sample count = 31
+  track duration = 1019300
   format 0:
     peakBitrate = 200000
     id = 1
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 130926
   sample count = 30
+  track duration = 1020100
   format 0:
     id = 2
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.2.dump
index eb4e7670f1..f027fb9348 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 3784
   sample count = 16
+  track duration = 1019300
   format 0:
     peakBitrate = 200000
     id = 1
@@ -88,6 +89,7 @@ track 0:
 track 1:
   total output bytes = 130926
   sample count = 30
+  track duration = 1020100
   format 0:
     id = 2
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.3.dump
index 5271a1d505..f3c46e915a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 235
   sample count = 1
+  track duration = 1019300
   format 0:
     peakBitrate = 200000
     id = 1
@@ -28,6 +29,7 @@ track 0:
 track 1:
   total output bytes = 130926
   sample count = 30
+  track duration = 1020100
   format 0:
     id = 2
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.0.dump
index 394a2824a8..727ec3af69 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 9294
   sample count = 43
+  track duration = 1019300
   format 0:
     peakBitrate = 200000
     id = 1
@@ -196,6 +197,7 @@ track 0:
 track 1:
   total output bytes = 130926
   sample count = 30
+  track duration = 1020100
   format 0:
     id = 2
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.1.dump
index ba39fc6c6d..d4720fb0f2 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 7229
   sample count = 31
+  track duration = 1019300
   format 0:
     peakBitrate = 200000
     id = 1
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 130926
   sample count = 30
+  track duration = 1020100
   format 0:
     id = 2
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.2.dump
index 57831da514..d6affc874c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 3784
   sample count = 16
+  track duration = 1019300
   format 0:
     peakBitrate = 200000
     id = 1
@@ -88,6 +89,7 @@ track 0:
 track 1:
   total output bytes = 130926
   sample count = 30
+  track duration = 1020100
   format 0:
     id = 2
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.3.dump
index 6bd06a08d6..2fb5eaeeaa 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 235
   sample count = 1
+  track duration = 1019300
   format 0:
     peakBitrate = 200000
     id = 1
@@ -28,6 +29,7 @@ track 0:
 track 1:
   total output bytes = 130926
   sample count = 30
+  track duration = 1020100
   format 0:
     id = 2
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.unknown_length.dump
index 394a2824a8..727ec3af69 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 9294
   sample count = 43
+  track duration = 1019300
   format 0:
     peakBitrate = 200000
     id = 1
@@ -196,6 +197,7 @@ track 0:
 track 1:
   total output bytes = 130926
   sample count = 30
+  track duration = 1020100
   format 0:
     id = 2
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.unknown_length.dump
index 9aa3970f7f..1d07f4a441 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 9294
   sample count = 43
+  track duration = 1019300
   format 0:
     peakBitrate = 200000
     id = 1
@@ -196,6 +197,7 @@ track 0:
 track 1:
   total output bytes = 130926
   sample count = 30
+  track duration = 1020100
   format 0:
     id = 2
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.0.dump
index 8f54e56d36..f7afbeca95 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 4
 track 0:
   total output bytes = 3306897
   sample count = 58
+  track duration = 2100700
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -263,6 +264,7 @@ track 0:
 track 1:
   total output bytes = 151315
   sample count = 1
+  track duration = 466800
   format 0:
     id = 2
     sampleMimeType = video/hevc
@@ -289,6 +291,7 @@ track 1:
 track 2:
   total output bytes = 26100
   sample count = 58
+  track duration = 2100700
   format 0:
     id = 3
     sampleMimeType = application/microvideo-meta-stream
@@ -529,6 +532,7 @@ track 2:
 track 3:
   total output bytes = 59
   sample count = 1
+  track duration = 1133700
   format 0:
     id = 4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.1.dump
index d4b50f1486..dd1ac53e4f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 4
 track 0:
   total output bytes = 2605317
   sample count = 44
+  track duration = 2100700
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -207,6 +208,7 @@ track 0:
 track 1:
   total output bytes = 151315
   sample count = 1
+  track duration = 466800
   format 0:
     id = 2
     sampleMimeType = video/hevc
@@ -233,6 +235,7 @@ track 1:
 track 2:
   total output bytes = 17100
   sample count = 38
+  track duration = 2100700
   format 0:
     id = 3
     sampleMimeType = application/microvideo-meta-stream
@@ -393,6 +396,7 @@ track 2:
 track 3:
   total output bytes = 59
   sample count = 1
+  track duration = 1133700
   format 0:
     id = 4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.2.dump
index 71f3b6eab8..6aa62c9e8c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 4
 track 0:
   total output bytes = 1572110
   sample count = 23
+  track duration = 2100700
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -123,6 +124,7 @@ track 0:
 track 1:
   total output bytes = 151315
   sample count = 1
+  track duration = 466800
   format 0:
     id = 2
     sampleMimeType = video/hevc
@@ -149,6 +151,7 @@ track 1:
 track 2:
   total output bytes = 7650
   sample count = 17
+  track duration = 2100700
   format 0:
     id = 3
     sampleMimeType = application/microvideo-meta-stream
@@ -225,6 +228,7 @@ track 2:
 track 3:
   total output bytes = 59
   sample count = 1
+  track duration = 1133700
   format 0:
     id = 4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.3.dump
index a246afee30..a785cb75d3 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 4
 track 0:
   total output bytes = 209513
   sample count = 2
+  track duration = 2100700
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -39,6 +40,7 @@ track 0:
 track 1:
   total output bytes = 151315
   sample count = 1
+  track duration = 466800
   format 0:
     id = 2
     sampleMimeType = video/hevc
@@ -65,6 +67,7 @@ track 1:
 track 2:
   total output bytes = 450
   sample count = 1
+  track duration = 2100700
   format 0:
     id = 3
     sampleMimeType = application/microvideo-meta-stream
@@ -77,6 +80,7 @@ track 2:
 track 3:
   total output bytes = 59
   sample count = 1
+  track duration = 1133700
   format 0:
     id = 4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.0.dump
index 8f54e56d36..f7afbeca95 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 4
 track 0:
   total output bytes = 3306897
   sample count = 58
+  track duration = 2100700
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -263,6 +264,7 @@ track 0:
 track 1:
   total output bytes = 151315
   sample count = 1
+  track duration = 466800
   format 0:
     id = 2
     sampleMimeType = video/hevc
@@ -289,6 +291,7 @@ track 1:
 track 2:
   total output bytes = 26100
   sample count = 58
+  track duration = 2100700
   format 0:
     id = 3
     sampleMimeType = application/microvideo-meta-stream
@@ -529,6 +532,7 @@ track 2:
 track 3:
   total output bytes = 59
   sample count = 1
+  track duration = 1133700
   format 0:
     id = 4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.1.dump
index d4b50f1486..dd1ac53e4f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 4
 track 0:
   total output bytes = 2605317
   sample count = 44
+  track duration = 2100700
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -207,6 +208,7 @@ track 0:
 track 1:
   total output bytes = 151315
   sample count = 1
+  track duration = 466800
   format 0:
     id = 2
     sampleMimeType = video/hevc
@@ -233,6 +235,7 @@ track 1:
 track 2:
   total output bytes = 17100
   sample count = 38
+  track duration = 2100700
   format 0:
     id = 3
     sampleMimeType = application/microvideo-meta-stream
@@ -393,6 +396,7 @@ track 2:
 track 3:
   total output bytes = 59
   sample count = 1
+  track duration = 1133700
   format 0:
     id = 4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.2.dump
index 71f3b6eab8..6aa62c9e8c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 4
 track 0:
   total output bytes = 1572110
   sample count = 23
+  track duration = 2100700
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -123,6 +124,7 @@ track 0:
 track 1:
   total output bytes = 151315
   sample count = 1
+  track duration = 466800
   format 0:
     id = 2
     sampleMimeType = video/hevc
@@ -149,6 +151,7 @@ track 1:
 track 2:
   total output bytes = 7650
   sample count = 17
+  track duration = 2100700
   format 0:
     id = 3
     sampleMimeType = application/microvideo-meta-stream
@@ -225,6 +228,7 @@ track 2:
 track 3:
   total output bytes = 59
   sample count = 1
+  track duration = 1133700
   format 0:
     id = 4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.3.dump
index a246afee30..a785cb75d3 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 4
 track 0:
   total output bytes = 209513
   sample count = 2
+  track duration = 2100700
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -39,6 +40,7 @@ track 0:
 track 1:
   total output bytes = 151315
   sample count = 1
+  track duration = 466800
   format 0:
     id = 2
     sampleMimeType = video/hevc
@@ -65,6 +67,7 @@ track 1:
 track 2:
   total output bytes = 450
   sample count = 1
+  track duration = 2100700
   format 0:
     id = 3
     sampleMimeType = application/microvideo-meta-stream
@@ -77,6 +80,7 @@ track 2:
 track 3:
   total output bytes = 59
   sample count = 1
+  track duration = 1133700
   format 0:
     id = 4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 8f54e56d36..f7afbeca95 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 4
 track 0:
   total output bytes = 3306897
   sample count = 58
+  track duration = 2100700
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -263,6 +264,7 @@ track 0:
 track 1:
   total output bytes = 151315
   sample count = 1
+  track duration = 466800
   format 0:
     id = 2
     sampleMimeType = video/hevc
@@ -289,6 +291,7 @@ track 1:
 track 2:
   total output bytes = 26100
   sample count = 58
+  track duration = 2100700
   format 0:
     id = 3
     sampleMimeType = application/microvideo-meta-stream
@@ -529,6 +532,7 @@ track 2:
 track 3:
   total output bytes = 59
   sample count = 1
+  track duration = 1133700
   format 0:
     id = 4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.unknown_length.dump
index 8f54e56d36..f7afbeca95 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 4
 track 0:
   total output bytes = 3306897
   sample count = 58
+  track duration = 2100700
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -263,6 +264,7 @@ track 0:
 track 1:
   total output bytes = 151315
   sample count = 1
+  track duration = 466800
   format 0:
     id = 2
     sampleMimeType = video/hevc
@@ -289,6 +291,7 @@ track 1:
 track 2:
   total output bytes = 26100
   sample count = 58
+  track duration = 2100700
   format 0:
     id = 3
     sampleMimeType = application/microvideo-meta-stream
@@ -529,6 +532,7 @@ track 2:
 track 3:
   total output bytes = 59
   sample count = 1
+  track duration = 1133700
   format 0:
     id = 4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.0.dump
index 76263e04e7..e01f7a8636 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 9529
   sample count = 45
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.1.dump
index c4e67b288d..4cf1fcc8fb 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 7464
   sample count = 33
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.2.dump
index a8f1343c19..88a235e7d9 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 4019
   sample count = 18
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.3.dump
index da0920178e..5315d45a8e 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 470
   sample count = 3
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.0.dump
index 10e4cdd4db..a085e135c7 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 9529
   sample count = 45
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.1.dump
index 6f5cbecb1b..0f109ce9a3 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 7464
   sample count = 33
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.2.dump
index d3ba26251c..57a4dddeec 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 4019
   sample count = 18
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.3.dump
index cdc33f0d45..54cfb1303b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 470
   sample count = 3
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 10e4cdd4db..a085e135c7 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 9529
   sample count = 45
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.unknown_length.dump
index 76263e04e7..e01f7a8636 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 9529
   sample count = 45
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4_with_flag_read_Editable_video_tracks b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4_with_flag_read_Editable_video_tracks
index 76263e04e7..e01f7a8636 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4_with_flag_read_Editable_video_tracks
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4_with_flag_read_Editable_video_tracks
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 9529
   sample count = 45
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.0.dump
index 2233a5eaff..879b698b0d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.1.dump
index 2233a5eaff..879b698b0d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.2.dump
index 2233a5eaff..879b698b0d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.3.dump
index 2233a5eaff..879b698b0d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.0.dump
index fa0c4c0549..c09c445e45 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.1.dump
index fa0c4c0549..c09c445e45 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.2.dump
index fa0c4c0549..c09c445e45 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.3.dump
index fa0c4c0549..c09c445e45 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index fa0c4c0549..c09c445e45 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.unknown_length.dump
index 2233a5eaff..879b698b0d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.0.dump
index f34f662d59..a0d0062631 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 13824
   sample count = 9
+  track duration = 288333
   format 0:
     averageBitrate = 384000
     peakBitrate = 384000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.1.dump
index 1e4d5da55a..b9d4465ca0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 9216
   sample count = 6
+  track duration = 288333
   format 0:
     averageBitrate = 384000
     peakBitrate = 384000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.2.dump
index 447f2d9232..ea8896834d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 4608
   sample count = 3
+  track duration = 288333
   format 0:
     averageBitrate = 384000
     peakBitrate = 384000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.3.dump
index 8bd9f28f42..e25b4083e2 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 1536
   sample count = 1
+  track duration = 288333
   format 0:
     averageBitrate = 384000
     peakBitrate = 384000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.0.dump
index f34f662d59..a0d0062631 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 13824
   sample count = 9
+  track duration = 288333
   format 0:
     averageBitrate = 384000
     peakBitrate = 384000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.1.dump
index 1e4d5da55a..b9d4465ca0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 9216
   sample count = 6
+  track duration = 288333
   format 0:
     averageBitrate = 384000
     peakBitrate = 384000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.2.dump
index 447f2d9232..ea8896834d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 4608
   sample count = 3
+  track duration = 288333
   format 0:
     averageBitrate = 384000
     peakBitrate = 384000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.3.dump
index 8bd9f28f42..e25b4083e2 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 1536
   sample count = 1
+  track duration = 288333
   format 0:
     averageBitrate = 384000
     peakBitrate = 384000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index f34f662d59..a0d0062631 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 13824
   sample count = 9
+  track duration = 288333
   format 0:
     averageBitrate = 384000
     peakBitrate = 384000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.unknown_length.dump
index f34f662d59..a0d0062631 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 13824
   sample count = 9
+  track duration = 288333
   format 0:
     averageBitrate = 384000
     peakBitrate = 384000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.0.dump
index 448e79e1fd..1d5af213b8 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 13824
   sample count = 9
+  track duration = 288000
   format 0:
     averageBitrate = 384000
     peakBitrate = 384000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.1.dump
index 4bcb712c34..c8e7669f9e 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 9216
   sample count = 6
+  track duration = 288000
   format 0:
     averageBitrate = 384000
     peakBitrate = 384000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.2.dump
index c03c03e6c0..159065624b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 4608
   sample count = 3
+  track duration = 288000
   format 0:
     averageBitrate = 384000
     peakBitrate = 384000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.3.dump
index 76738dd5b3..2020e71359 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 1536
   sample count = 1
+  track duration = 288000
   format 0:
     averageBitrate = 384000
     peakBitrate = 384000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
index 448e79e1fd..1d5af213b8 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 13824
   sample count = 9
+  track duration = 288000
   format 0:
     averageBitrate = 384000
     peakBitrate = 384000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.1.dump
index 4bcb712c34..c8e7669f9e 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 9216
   sample count = 6
+  track duration = 288000
   format 0:
     averageBitrate = 384000
     peakBitrate = 384000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.2.dump
index c03c03e6c0..159065624b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 4608
   sample count = 3
+  track duration = 288000
   format 0:
     averageBitrate = 384000
     peakBitrate = 384000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.3.dump
index 76738dd5b3..2020e71359 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 1536
   sample count = 1
+  track duration = 288000
   format 0:
     averageBitrate = 384000
     peakBitrate = 384000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 448e79e1fd..1d5af213b8 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 13824
   sample count = 9
+  track duration = 288000
   format 0:
     averageBitrate = 384000
     peakBitrate = 384000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.unknown_length.dump
index 448e79e1fd..1d5af213b8 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 13824
   sample count = 9
+  track duration = 288000
   format 0:
     averageBitrate = 384000
     peakBitrate = 384000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.0.dump
index d97448c547..2afbfc8d92 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 7613
   sample count = 19
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.1.dump
index d97448c547..2afbfc8d92 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 7613
   sample count = 19
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.2.dump
index d97448c547..2afbfc8d92 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 7613
   sample count = 19
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.3.dump
index d97448c547..2afbfc8d92 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 7613
   sample count = 19
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.0.dump
index d97448c547..2afbfc8d92 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 7613
   sample count = 19
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.1.dump
index d97448c547..2afbfc8d92 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 7613
   sample count = 19
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.2.dump
index d97448c547..2afbfc8d92 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 7613
   sample count = 19
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.3.dump
index d97448c547..2afbfc8d92 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 7613
   sample count = 19
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index d97448c547..2afbfc8d92 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 7613
   sample count = 19
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.unknown_length.dump
index d97448c547..2afbfc8d92 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 7613
   sample count = 19
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.0.dump
index b2c54a9039..7f5dc0e5f0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 7613
   sample count = 19
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.1.dump
index f8d4804fdb..bd1be5adfc 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 5411
   sample count = 13
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.2.dump
index 43751731c0..06b968186d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 3081
   sample count = 7
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.3.dump
index 120dd66851..bc945ba75b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 393
   sample count = 1
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
index b2c54a9039..7f5dc0e5f0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 7613
   sample count = 19
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.1.dump
index f8d4804fdb..bd1be5adfc 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 5411
   sample count = 13
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.2.dump
index 43751731c0..06b968186d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 3081
   sample count = 7
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.3.dump
index 120dd66851..bc945ba75b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 393
   sample count = 1
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index b2c54a9039..7f5dc0e5f0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 7613
   sample count = 19
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.unknown_length.dump
index b2c54a9039..7f5dc0e5f0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 7613
   sample count = 19
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.0.dump
index 425e0f67e9..59e8c5f3f8 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 7936
   sample count = 19
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.1.dump
index 64935a88ef..94d06251df 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 5632
   sample count = 13
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.2.dump
index 5fad73c5c5..818c5622eb 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 3200
   sample count = 7
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.3.dump
index 3a857ff758..64c4bd67d8 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 410
   sample count = 1
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.reading_within_gop_sample_dependencies.0.dump
index 425e0f67e9..59e8c5f3f8 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 7936
   sample count = 19
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.reading_within_gop_sample_dependencies.1.dump
index 64935a88ef..94d06251df 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 5632
   sample count = 13
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.reading_within_gop_sample_dependencies.2.dump
index 5fad73c5c5..818c5622eb 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 3200
   sample count = 7
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.reading_within_gop_sample_dependencies.3.dump
index 3a857ff758..64c4bd67d8 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 410
   sample count = 1
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 425e0f67e9..59e8c5f3f8 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 7936
   sample count = 19
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.unknown_length.dump
index 425e0f67e9..59e8c5f3f8 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 7936
   sample count = 19
+  track duration = 760000
   format 0:
     id = 1
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.0.dump
index 51e3b5028e..5f381367f3 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 42320
   sample count = 7
+  track duration = 526000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.1.dump
index 51e3b5028e..5f381367f3 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 42320
   sample count = 7
+  track duration = 526000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.2.dump
index 51e3b5028e..5f381367f3 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 42320
   sample count = 7
+  track duration = 526000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.3.dump
index 51e3b5028e..5f381367f3 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 42320
   sample count = 7
+  track duration = 526000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.0.dump
index 17a5896062..04c11de22a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 42320
   sample count = 7
+  track duration = 526000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.1.dump
index 17a5896062..04c11de22a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 42320
   sample count = 7
+  track duration = 526000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.2.dump
index 17a5896062..04c11de22a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 42320
   sample count = 7
+  track duration = 526000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.3.dump
index 17a5896062..04c11de22a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 42320
   sample count = 7
+  track duration = 526000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 17a5896062..04c11de22a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 42320
   sample count = 7
+  track duration = 526000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.unknown_length.dump
index 51e3b5028e..5f381367f3 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 42320
   sample count = 7
+  track duration = 526000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.0.dump
index b4d61e8eca..da418782a6 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 94656
   sample count = 32
+  track duration = 418333
   format 0:
     id = 1
     sampleMimeType = audio/true-hd
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.1.dump
index 48af021b49..edec4d8aae 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 71068
   sample count = 24
+  track duration = 418333
   format 0:
     id = 1
     sampleMimeType = audio/true-hd
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.2.dump
index 3dd9c397b2..909347a4d6 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 47092
   sample count = 16
+  track duration = 418333
   format 0:
     id = 1
     sampleMimeType = audio/true-hd
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.3.dump
index c97a41a818..4063e8c9d4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 22738
   sample count = 8
+  track duration = 418333
   format 0:
     id = 1
     sampleMimeType = audio/true-hd
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.0.dump
index b4d61e8eca..da418782a6 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 94656
   sample count = 32
+  track duration = 418333
   format 0:
     id = 1
     sampleMimeType = audio/true-hd
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.1.dump
index 48af021b49..edec4d8aae 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 71068
   sample count = 24
+  track duration = 418333
   format 0:
     id = 1
     sampleMimeType = audio/true-hd
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.2.dump
index 3dd9c397b2..909347a4d6 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 47092
   sample count = 16
+  track duration = 418333
   format 0:
     id = 1
     sampleMimeType = audio/true-hd
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.3.dump
index c97a41a818..4063e8c9d4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 22738
   sample count = 8
+  track duration = 418333
   format 0:
     id = 1
     sampleMimeType = audio/true-hd
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index b4d61e8eca..da418782a6 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 94656
   sample count = 32
+  track duration = 418333
   format 0:
     id = 1
     sampleMimeType = audio/true-hd
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.unknown_length.dump
index b4d61e8eca..da418782a6 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 94656
   sample count = 32
+  track duration = 418333
   format 0:
     id = 1
     sampleMimeType = audio/true-hd
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.0.dump
index 85724d3d90..91f9886dd0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 216000
   sample count = 54
+  track duration = 1728000
   format 0:
     peakBitrate = 1000000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.1.dump
index 4217a6a51b..c7f24a3081 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 144000
   sample count = 36
+  track duration = 1728000
   format 0:
     peakBitrate = 1000000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.2.dump
index 760cb3b450..ca25d7245e 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 72000
   sample count = 18
+  track duration = 1728000
   format 0:
     peakBitrate = 1000000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.3.dump
index 892e1a4288..2f4bf06307 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 4000
   sample count = 1
+  track duration = 1728000
   format 0:
     peakBitrate = 1000000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.reading_within_gop_sample_dependencies.0.dump
index 85724d3d90..91f9886dd0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 216000
   sample count = 54
+  track duration = 1728000
   format 0:
     peakBitrate = 1000000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.reading_within_gop_sample_dependencies.1.dump
index 4217a6a51b..c7f24a3081 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 144000
   sample count = 36
+  track duration = 1728000
   format 0:
     peakBitrate = 1000000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.reading_within_gop_sample_dependencies.2.dump
index 760cb3b450..ca25d7245e 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 72000
   sample count = 18
+  track duration = 1728000
   format 0:
     peakBitrate = 1000000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.reading_within_gop_sample_dependencies.3.dump
index 892e1a4288..2f4bf06307 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 4000
   sample count = 1
+  track duration = 1728000
   format 0:
     peakBitrate = 1000000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 85724d3d90..91f9886dd0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 216000
   sample count = 54
+  track duration = 1728000
   format 0:
     peakBitrate = 1000000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.unknown_length.dump
index 85724d3d90..91f9886dd0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 216000
   sample count = 54
+  track duration = 1728000
   format 0:
     peakBitrate = 1000000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.0.dump
index 734051bb2d..b00deaab7a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 216000
   sample count = 54
+  track duration = 1728000
   format 0:
     peakBitrate = 1000000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.1.dump
index e33b92c7bc..47d58bafaf 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 144000
   sample count = 36
+  track duration = 1728000
   format 0:
     peakBitrate = 1000000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.2.dump
index a079fe334e..fc48a87e9e 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 72000
   sample count = 18
+  track duration = 1728000
   format 0:
     peakBitrate = 1000000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.3.dump
index 854d952ad8..d42df24401 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 4000
   sample count = 1
+  track duration = 1728000
   format 0:
     peakBitrate = 1000000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
index 734051bb2d..b00deaab7a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 216000
   sample count = 54
+  track duration = 1728000
   format 0:
     peakBitrate = 1000000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.reading_within_gop_sample_dependencies.1.dump
index e33b92c7bc..47d58bafaf 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 144000
   sample count = 36
+  track duration = 1728000
   format 0:
     peakBitrate = 1000000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.reading_within_gop_sample_dependencies.2.dump
index a079fe334e..fc48a87e9e 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 72000
   sample count = 18
+  track duration = 1728000
   format 0:
     peakBitrate = 1000000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.reading_within_gop_sample_dependencies.3.dump
index 854d952ad8..d42df24401 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 4000
   sample count = 1
+  track duration = 1728000
   format 0:
     peakBitrate = 1000000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 734051bb2d..b00deaab7a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 216000
   sample count = 54
+  track duration = 1728000
   format 0:
     peakBitrate = 1000000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.unknown_length.dump
index 734051bb2d..b00deaab7a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 216000
   sample count = 54
+  track duration = 1728000
   format 0:
     peakBitrate = 1000000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.0.dump
index 607c378d9d..1220803347 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 163840
   sample count = 64
+  track duration = 2048000
   format 0:
     peakBitrate = 640000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.1.dump
index beaeaf98ca..95e15cb5f5 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 110080
   sample count = 43
+  track duration = 2048000
   format 0:
     peakBitrate = 640000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.2.dump
index 79b8942def..3194a7bb3e 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 56320
   sample count = 22
+  track duration = 2048000
   format 0:
     peakBitrate = 640000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.3.dump
index e4612fa0b2..c5ef6fa2c5 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2560
   sample count = 1
+  track duration = 2048000
   format 0:
     peakBitrate = 640000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.reading_within_gop_sample_dependencies.0.dump
index 607c378d9d..1220803347 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 163840
   sample count = 64
+  track duration = 2048000
   format 0:
     peakBitrate = 640000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.reading_within_gop_sample_dependencies.1.dump
index beaeaf98ca..95e15cb5f5 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 110080
   sample count = 43
+  track duration = 2048000
   format 0:
     peakBitrate = 640000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.reading_within_gop_sample_dependencies.2.dump
index 79b8942def..3194a7bb3e 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 56320
   sample count = 22
+  track duration = 2048000
   format 0:
     peakBitrate = 640000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.reading_within_gop_sample_dependencies.3.dump
index e4612fa0b2..c5ef6fa2c5 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2560
   sample count = 1
+  track duration = 2048000
   format 0:
     peakBitrate = 640000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 607c378d9d..1220803347 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 163840
   sample count = 64
+  track duration = 2048000
   format 0:
     peakBitrate = 640000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.unknown_length.dump
index 607c378d9d..1220803347 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 163840
   sample count = 64
+  track duration = 2048000
   format 0:
     peakBitrate = 640000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.0.dump
index 87930b0bfb..2a043e5039 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 163840
   sample count = 64
+  track duration = 2048000
   format 0:
     peakBitrate = 640000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.1.dump
index e1aa764cfb..baab49a246 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 110080
   sample count = 43
+  track duration = 2048000
   format 0:
     peakBitrate = 640000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.2.dump
index c9f083805f..25a1e087d7 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 56320
   sample count = 22
+  track duration = 2048000
   format 0:
     peakBitrate = 640000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.3.dump
index a3875f612d..d76b75e550 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2560
   sample count = 1
+  track duration = 2048000
   format 0:
     peakBitrate = 640000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
index 87930b0bfb..2a043e5039 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 163840
   sample count = 64
+  track duration = 2048000
   format 0:
     peakBitrate = 640000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.reading_within_gop_sample_dependencies.1.dump
index e1aa764cfb..baab49a246 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 110080
   sample count = 43
+  track duration = 2048000
   format 0:
     peakBitrate = 640000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.reading_within_gop_sample_dependencies.2.dump
index c9f083805f..25a1e087d7 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 56320
   sample count = 22
+  track duration = 2048000
   format 0:
     peakBitrate = 640000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.reading_within_gop_sample_dependencies.3.dump
index a3875f612d..d76b75e550 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2560
   sample count = 1
+  track duration = 2048000
   format 0:
     peakBitrate = 640000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 87930b0bfb..2a043e5039 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 163840
   sample count = 64
+  track duration = 2048000
   format 0:
     peakBitrate = 640000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.unknown_length.dump
index 87930b0bfb..2a043e5039 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 163840
   sample count = 64
+  track duration = 2048000
   format 0:
     peakBitrate = 640000
     id = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.0.dump
index 2107c177f7..41237f0403 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 3208515
   sample count = 85
+  track duration = 2548333
   format 0:
     id = 1
     sampleMimeType = video/dolby-vision
@@ -371,6 +372,7 @@ track 0:
 track 1:
   total output bytes = 45765
   sample count = 112
+  track duration = 2548333
   format 0:
     peakBitrate = 192000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.1.dump
index 6d7b424e90..54d5a8b955 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 2264561
   sample count = 62
+  track duration = 2548333
   format 0:
     id = 1
     sampleMimeType = video/dolby-vision
@@ -279,6 +280,7 @@ track 0:
 track 1:
   total output bytes = 30664
   sample count = 76
+  track duration = 2548333
   format 0:
     peakBitrate = 192000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.2.dump
index 9622c90846..130240b824 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 1115896
   sample count = 30
+  track duration = 2548333
   format 0:
     id = 1
     sampleMimeType = video/dolby-vision
@@ -151,6 +152,7 @@ track 0:
 track 1:
   total output bytes = 15570
   sample count = 39
+  track duration = 2548333
   format 0:
     peakBitrate = 192000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.3.dump
index b54c01e901..d76e2661e3 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 1115896
   sample count = 30
+  track duration = 2548333
   format 0:
     id = 1
     sampleMimeType = video/dolby-vision
@@ -151,6 +152,7 @@ track 0:
 track 1:
   total output bytes = 1239
   sample count = 3
+  track duration = 2548333
   format 0:
     peakBitrate = 192000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.0.dump
index 2107c177f7..41237f0403 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 3208515
   sample count = 85
+  track duration = 2548333
   format 0:
     id = 1
     sampleMimeType = video/dolby-vision
@@ -371,6 +372,7 @@ track 0:
 track 1:
   total output bytes = 45765
   sample count = 112
+  track duration = 2548333
   format 0:
     peakBitrate = 192000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.1.dump
index 6d7b424e90..54d5a8b955 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 2264561
   sample count = 62
+  track duration = 2548333
   format 0:
     id = 1
     sampleMimeType = video/dolby-vision
@@ -279,6 +280,7 @@ track 0:
 track 1:
   total output bytes = 30664
   sample count = 76
+  track duration = 2548333
   format 0:
     peakBitrate = 192000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.2.dump
index 9622c90846..130240b824 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 1115896
   sample count = 30
+  track duration = 2548333
   format 0:
     id = 1
     sampleMimeType = video/dolby-vision
@@ -151,6 +152,7 @@ track 0:
 track 1:
   total output bytes = 15570
   sample count = 39
+  track duration = 2548333
   format 0:
     peakBitrate = 192000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.3.dump
index b54c01e901..d76e2661e3 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 1115896
   sample count = 30
+  track duration = 2548333
   format 0:
     id = 1
     sampleMimeType = video/dolby-vision
@@ -151,6 +152,7 @@ track 0:
 track 1:
   total output bytes = 1239
   sample count = 3
+  track duration = 2548333
   format 0:
     peakBitrate = 192000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 2107c177f7..41237f0403 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 3208515
   sample count = 85
+  track duration = 2548333
   format 0:
     id = 1
     sampleMimeType = video/dolby-vision
@@ -371,6 +372,7 @@ track 0:
 track 1:
   total output bytes = 45765
   sample count = 112
+  track duration = 2548333
   format 0:
     peakBitrate = 192000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.unknown_length.dump
index 2107c177f7..41237f0403 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 3208515
   sample count = 85
+  track duration = 2548333
   format 0:
     id = 1
     sampleMimeType = video/dolby-vision
@@ -371,6 +372,7 @@ track 0:
 track 1:
   total output bytes = 45765
   sample count = 112
+  track duration = 2548333
   format 0:
     peakBitrate = 192000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.0.dump
index 70e5645b50..56fd09d9c4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 301392
   sample count = 30
+  track duration = 967600
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -151,6 +152,7 @@ track 0:
 track 1:
   total output bytes = 9529
   sample count = 45
+  track duration = 1065600
   format 0:
     id = 3
     sampleMimeType = audio/mp4a-latm
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.1.dump
index 219c9e0643..db53899a5a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 301392
   sample count = 30
+  track duration = 967600
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -151,6 +152,7 @@ track 0:
 track 1:
   total output bytes = 7235
   sample count = 32
+  track duration = 1065600
   format 0:
     id = 3
     sampleMimeType = audio/mp4a-latm
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.2.dump
index aac44592cd..226fa24c60 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 301392
   sample count = 30
+  track duration = 967600
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -151,6 +152,7 @@ track 0:
 track 1:
   total output bytes = 3776
   sample count = 17
+  track duration = 1065600
   format 0:
     id = 3
     sampleMimeType = audio/mp4a-latm
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.3.dump
index 96bd943b99..caaa1b8ded 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 301392
   sample count = 30
+  track duration = 967600
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -151,6 +152,7 @@ track 0:
 track 1:
   total output bytes = 235
   sample count = 2
+  track duration = 1065600
   format 0:
     id = 3
     sampleMimeType = audio/mp4a-latm
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.0.dump
index 70e5645b50..56fd09d9c4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 301392
   sample count = 30
+  track duration = 967600
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -151,6 +152,7 @@ track 0:
 track 1:
   total output bytes = 9529
   sample count = 45
+  track duration = 1065600
   format 0:
     id = 3
     sampleMimeType = audio/mp4a-latm
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.1.dump
index 219c9e0643..db53899a5a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 301392
   sample count = 30
+  track duration = 967600
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -151,6 +152,7 @@ track 0:
 track 1:
   total output bytes = 7235
   sample count = 32
+  track duration = 1065600
   format 0:
     id = 3
     sampleMimeType = audio/mp4a-latm
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.2.dump
index aac44592cd..226fa24c60 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 301392
   sample count = 30
+  track duration = 967600
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -151,6 +152,7 @@ track 0:
 track 1:
   total output bytes = 3776
   sample count = 17
+  track duration = 1065600
   format 0:
     id = 3
     sampleMimeType = audio/mp4a-latm
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.3.dump
index 96bd943b99..caaa1b8ded 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 301392
   sample count = 30
+  track duration = 967600
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -151,6 +152,7 @@ track 0:
 track 1:
   total output bytes = 235
   sample count = 2
+  track duration = 1065600
   format 0:
     id = 3
     sampleMimeType = audio/mp4a-latm
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 70e5645b50..56fd09d9c4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 301392
   sample count = 30
+  track duration = 967600
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -151,6 +152,7 @@ track 0:
 track 1:
   total output bytes = 9529
   sample count = 45
+  track duration = 1065600
   format 0:
     id = 3
     sampleMimeType = audio/mp4a-latm
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.unknown_length.dump
index 70e5645b50..56fd09d9c4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 301392
   sample count = 30
+  track duration = 967600
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -151,6 +152,7 @@ track 0:
 track 1:
   total output bytes = 9529
   sample count = 45
+  track duration = 1065600
   format 0:
     id = 3
     sampleMimeType = audio/mp4a-latm
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.0.dump
index e8b970e66f..bbfde290b6 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 33377
   sample count = 125
+  track duration = 499875
   format 0:
     id = 1
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.1.dump
index 8b2fc883e1..07585bd9e5 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 22430
   sample count = 84
+  track duration = 499875
   format 0:
     id = 1
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.2.dump
index c60469bf41..f1ff9578f0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 11216
   sample count = 42
+  track duration = 499875
   format 0:
     id = 1
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.3.dump
index b6604d6df8..339684d0d6 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 269
   sample count = 1
+  track duration = 499875
   format 0:
     id = 1
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.0.dump
index e8b970e66f..bbfde290b6 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 33377
   sample count = 125
+  track duration = 499875
   format 0:
     id = 1
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.1.dump
index 8b2fc883e1..07585bd9e5 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 22430
   sample count = 84
+  track duration = 499875
   format 0:
     id = 1
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.2.dump
index c60469bf41..f1ff9578f0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 11216
   sample count = 42
+  track duration = 499875
   format 0:
     id = 1
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.3.dump
index b6604d6df8..339684d0d6 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 269
   sample count = 1
+  track duration = 499875
   format 0:
     id = 1
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index e8b970e66f..bbfde290b6 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 33377
   sample count = 125
+  track duration = 499875
   format 0:
     id = 1
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.unknown_length.dump
index e8b970e66f..bbfde290b6 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_iamf.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 33377
   sample count = 125
+  track duration = 499875
   format 0:
     id = 1
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.0.dump
index 27cd7b6a39..40cc74544c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 85933
   sample count = 30
+  track duration = 1068000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -145,6 +146,7 @@ track 0:
 track 1:
   total output bytes = 18257
   sample count = 46
+  track duration = 1068000
   format 0:
     averageBitrate = 2147483647
     peakBitrate = 2147483647
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.1.dump
index 3836b50077..3f8c9e8160 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 85933
   sample count = 30
+  track duration = 1068000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -145,6 +146,7 @@ track 0:
 track 1:
   total output bytes = 13359
   sample count = 31
+  track duration = 1068000
   format 0:
     averageBitrate = 2147483647
     peakBitrate = 2147483647
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.2.dump
index 463f3aede7..457779b83c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 85933
   sample count = 30
+  track duration = 1068000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -145,6 +146,7 @@ track 0:
 track 1:
   total output bytes = 6804
   sample count = 16
+  track duration = 1068000
   format 0:
     averageBitrate = 2147483647
     peakBitrate = 2147483647
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.3.dump
index d74a24a05c..550948fd50 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 85933
   sample count = 30
+  track duration = 1068000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -145,6 +146,7 @@ track 0:
 track 1:
   total output bytes = 10
   sample count = 1
+  track duration = 1068000
   format 0:
     averageBitrate = 2147483647
     peakBitrate = 2147483647
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.reading_within_gop_sample_dependencies.0.dump
index d6e5768056..bfce9c63fc 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 85933
   sample count = 30
+  track duration = 1068000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -145,6 +146,7 @@ track 0:
 track 1:
   total output bytes = 18257
   sample count = 46
+  track duration = 1068000
   format 0:
     averageBitrate = 2147483647
     peakBitrate = 2147483647
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.reading_within_gop_sample_dependencies.1.dump
index de030671cf..d686df0e68 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 85933
   sample count = 30
+  track duration = 1068000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -145,6 +146,7 @@ track 0:
 track 1:
   total output bytes = 13359
   sample count = 31
+  track duration = 1068000
   format 0:
     averageBitrate = 2147483647
     peakBitrate = 2147483647
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.reading_within_gop_sample_dependencies.2.dump
index f55e9b9bf3..c28423b2d6 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 85933
   sample count = 30
+  track duration = 1068000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -145,6 +146,7 @@ track 0:
 track 1:
   total output bytes = 6804
   sample count = 16
+  track duration = 1068000
   format 0:
     averageBitrate = 2147483647
     peakBitrate = 2147483647
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.reading_within_gop_sample_dependencies.3.dump
index 7d9b45b2c7..4dec414eee 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 85933
   sample count = 30
+  track duration = 1068000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -145,6 +146,7 @@ track 0:
 track 1:
   total output bytes = 10
   sample count = 1
+  track duration = 1068000
   format 0:
     averageBitrate = 2147483647
     peakBitrate = 2147483647
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index d6e5768056..bfce9c63fc 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 85933
   sample count = 30
+  track duration = 1068000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -145,6 +146,7 @@ track 0:
 track 1:
   total output bytes = 18257
   sample count = 46
+  track duration = 1068000
   format 0:
     averageBitrate = 2147483647
     peakBitrate = 2147483647
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.unknown_length.dump
index 27cd7b6a39..40cc74544c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 85933
   sample count = 30
+  track duration = 1068000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -145,6 +146,7 @@ track 0:
 track 1:
   total output bytes = 18257
   sample count = 46
+  track duration = 1068000
   format 0:
     averageBitrate = 2147483647
     peakBitrate = 2147483647
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.0.dump
index df1ba0cf60..64003f99d0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 85933
   sample count = 30
+  track duration = 1068000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -145,6 +146,7 @@ track 0:
 track 1:
   total output bytes = 18257
   sample count = 46
+  track duration = 1068000
   format 0:
     averageBitrate = 136736
     peakBitrate = 145976
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.1.dump
index 2c7f71ab81..7026d02548 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 85933
   sample count = 30
+  track duration = 1068000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -145,6 +146,7 @@ track 0:
 track 1:
   total output bytes = 13359
   sample count = 31
+  track duration = 1068000
   format 0:
     averageBitrate = 136736
     peakBitrate = 145976
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.2.dump
index 4f5fc0d7d6..3e45baf2f9 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 85933
   sample count = 30
+  track duration = 1068000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -145,6 +146,7 @@ track 0:
 track 1:
   total output bytes = 6804
   sample count = 16
+  track duration = 1068000
   format 0:
     averageBitrate = 136736
     peakBitrate = 145976
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.3.dump
index b8fd83b978..9cd5fc9828 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 85933
   sample count = 30
+  track duration = 1068000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -145,6 +146,7 @@ track 0:
 track 1:
   total output bytes = 10
   sample count = 1
+  track duration = 1068000
   format 0:
     averageBitrate = 136736
     peakBitrate = 145976
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.reading_within_gop_sample_dependencies.0.dump
index 9fc225ebe9..893b7105db 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 85933
   sample count = 30
+  track duration = 1068000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -145,6 +146,7 @@ track 0:
 track 1:
   total output bytes = 18257
   sample count = 46
+  track duration = 1068000
   format 0:
     averageBitrate = 136736
     peakBitrate = 145976
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.reading_within_gop_sample_dependencies.1.dump
index 52cf1812db..f059c2d002 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 85933
   sample count = 30
+  track duration = 1068000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -145,6 +146,7 @@ track 0:
 track 1:
   total output bytes = 13359
   sample count = 31
+  track duration = 1068000
   format 0:
     averageBitrate = 136736
     peakBitrate = 145976
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.reading_within_gop_sample_dependencies.2.dump
index 614a0d98fa..9a348f485d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 85933
   sample count = 30
+  track duration = 1068000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -145,6 +146,7 @@ track 0:
 track 1:
   total output bytes = 6804
   sample count = 16
+  track duration = 1068000
   format 0:
     averageBitrate = 136736
     peakBitrate = 145976
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.reading_within_gop_sample_dependencies.3.dump
index f466b98325..2a07029760 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 85933
   sample count = 30
+  track duration = 1068000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -145,6 +146,7 @@ track 0:
 track 1:
   total output bytes = 10
   sample count = 1
+  track duration = 1068000
   format 0:
     averageBitrate = 136736
     peakBitrate = 145976
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 9fc225ebe9..893b7105db 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 85933
   sample count = 30
+  track duration = 1068000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -145,6 +146,7 @@ track 0:
 track 1:
   total output bytes = 18257
   sample count = 46
+  track duration = 1068000
   format 0:
     averageBitrate = 136736
     peakBitrate = 145976
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.unknown_length.dump
index df1ba0cf60..64003f99d0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 85933
   sample count = 30
+  track duration = 1068000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -145,6 +146,7 @@ track 0:
 track 1:
   total output bytes = 18257
   sample count = 46
+  track duration = 1068000
   format 0:
     averageBitrate = 136736
     peakBitrate = 145976
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.0.dump
index 674a90ce14..e4142e68f0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 33377
   sample count = 125
+  track duration = 499875
   format 0:
     id = 1
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.1.dump
index d456b40337..bda897b6ef 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 22430
   sample count = 84
+  track duration = 499875
   format 0:
     id = 1
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.2.dump
index 6bea9f7e3c..29dc9e3dda 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 11216
   sample count = 42
+  track duration = 499875
   format 0:
     id = 1
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.3.dump
index 1e59aca14a..515f525889 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 269
   sample count = 1
+  track duration = 499875
   format 0:
     id = 1
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.0.dump
index 674a90ce14..e4142e68f0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 33377
   sample count = 125
+  track duration = 499875
   format 0:
     id = 1
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.1.dump
index d456b40337..bda897b6ef 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 22430
   sample count = 84
+  track duration = 499875
   format 0:
     id = 1
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.2.dump
index 6bea9f7e3c..29dc9e3dda 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 11216
   sample count = 42
+  track duration = 499875
   format 0:
     id = 1
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.3.dump
index 1e59aca14a..515f525889 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 269
   sample count = 1
+  track duration = 499875
   format 0:
     id = 1
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 674a90ce14..e4142e68f0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 33377
   sample count = 125
+  track duration = 499875
   format 0:
     id = 1
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.unknown_length.dump
index 674a90ce14..e4142e68f0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 33377
   sample count = 125
+  track duration = 499875
   format 0:
     id = 1
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.0.dump
index 57d26cab0d..c17f580981 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 9529
   sample count = 45
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.1.dump
index 56df56391f..9744de70ae 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 7464
   sample count = 33
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.2.dump
index b813f5de23..e8b0998046 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 4019
   sample count = 18
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.3.dump
index 21d6d50cc0..8e07d87402 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 470
   sample count = 3
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.reading_within_gop_sample_dependencies.0.dump
index 981af73e50..140f8f238c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 9529
   sample count = 45
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.reading_within_gop_sample_dependencies.1.dump
index dc2a6c4b8c..d1c6cae4aa 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 7464
   sample count = 33
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.reading_within_gop_sample_dependencies.2.dump
index ae5084ece4..cfdc6f45b9 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 4019
   sample count = 18
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.reading_within_gop_sample_dependencies.3.dump
index 5a90b209c6..592614dc82 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 470
   sample count = 3
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 981af73e50..140f8f238c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 9529
   sample count = 45
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.unknown_length.dump
index 57d26cab0d..c17f580981 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 9529
   sample count = 45
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.0.dump
index f7bfb9c442..1faf6a19e4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2837
   sample count = 29
+  track duration = 600000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.1.dump
index f7bfb9c442..1faf6a19e4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2837
   sample count = 29
+  track duration = 600000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.2.dump
index f7bfb9c442..1faf6a19e4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2837
   sample count = 29
+  track duration = 600000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.3.dump
index 662779c99e..daffd11ae7 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 609
   sample count = 5
+  track duration = 600000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.0.dump
index f7bfb9c442..1faf6a19e4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2837
   sample count = 29
+  track duration = 600000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.1.dump
index f7bfb9c442..1faf6a19e4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2837
   sample count = 29
+  track duration = 600000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.2.dump
index f7bfb9c442..1faf6a19e4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2837
   sample count = 29
+  track duration = 600000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.3.dump
index 662779c99e..daffd11ae7 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 609
   sample count = 5
+  track duration = 600000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index f7bfb9c442..1faf6a19e4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2837
   sample count = 29
+  track duration = 600000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.unknown_length.dump
index f7bfb9c442..1faf6a19e4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2837
   sample count = 29
+  track duration = 600000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.0.dump
index a60ddd957a..fb9909945c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 38778
   sample count = 87
+  track duration = 1800000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.1.dump
index 2dc6323d6a..dc6bdadd11 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 33598
   sample count = 58
+  track duration = 1800000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.2.dump
index fbf71e0a3b..16ade566c1 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 13976
   sample count = 29
+  track duration = 1800000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.3.dump
index 58515b9892..3458d50eed 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 6712
   sample count = 13
+  track duration = 1800000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.0.dump
index a60ddd957a..fb9909945c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 38778
   sample count = 87
+  track duration = 1800000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.1.dump
index 2dc6323d6a..dc6bdadd11 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 33598
   sample count = 58
+  track duration = 1800000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.2.dump
index fbf71e0a3b..16ade566c1 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 13976
   sample count = 29
+  track duration = 1800000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.3.dump
index 58515b9892..3458d50eed 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 6712
   sample count = 13
+  track duration = 1800000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index a60ddd957a..fb9909945c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 38778
   sample count = 87
+  track duration = 1800000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.unknown_length.dump
index a60ddd957a..fb9909945c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 38778
   sample count = 87
+  track duration = 1800000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.0.dump
index 8e45890034..0dbba7ca36 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2837
   sample count = 29
+  track duration = 600000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.1.dump
index 8e45890034..0dbba7ca36 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2837
   sample count = 29
+  track duration = 600000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.2.dump
index 8e45890034..0dbba7ca36 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2837
   sample count = 29
+  track duration = 600000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.3.dump
index 5d94463aa5..e6ff0e95cf 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 613
   sample count = 5
+  track duration = 600000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.0.dump
index 8e45890034..0dbba7ca36 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2837
   sample count = 29
+  track duration = 600000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.1.dump
index 8e45890034..0dbba7ca36 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2837
   sample count = 29
+  track duration = 600000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.2.dump
index 8e45890034..0dbba7ca36 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2837
   sample count = 29
+  track duration = 600000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.3.dump
index 5d94463aa5..e6ff0e95cf 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 613
   sample count = 5
+  track duration = 600000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 8e45890034..0dbba7ca36 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2837
   sample count = 29
+  track duration = 600000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.unknown_length.dump
index 8e45890034..0dbba7ca36 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2837
   sample count = 29
+  track duration = 600000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.0.dump
index 1befd0293e..b0eb30b3cb 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 38778
   sample count = 87
+  track duration = 1800000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.1.dump
index 60c9b2564d..43c53291cd 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 33589
   sample count = 58
+  track duration = 1800000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.2.dump
index f8211a1989..67d97fab50 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 13960
   sample count = 29
+  track duration = 1800000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.3.dump
index 3081be263d..63aaa67617 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 6712
   sample count = 13
+  track duration = 1800000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.0.dump
index 1befd0293e..b0eb30b3cb 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 38778
   sample count = 87
+  track duration = 1800000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.1.dump
index 60c9b2564d..43c53291cd 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 33589
   sample count = 58
+  track duration = 1800000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.2.dump
index f8211a1989..67d97fab50 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 13960
   sample count = 29
+  track duration = 1800000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.3.dump
index 3081be263d..63aaa67617 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 6712
   sample count = 13
+  track duration = 1800000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 1befd0293e..b0eb30b3cb 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 38778
   sample count = 87
+  track duration = 1800000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.unknown_length.dump
index 1befd0293e..b0eb30b3cb 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 38778
   sample count = 87
+  track duration = 1800000
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.0.dump
index 34aad010a7..ec9fd692de 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 104853
   sample count = 58
+  track duration = 1168020
   format 0:
     id = 1
     sampleMimeType = audio/mha1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.1.dump
index 34aad010a7..ec9fd692de 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 104853
   sample count = 58
+  track duration = 1168020
   format 0:
     id = 1
     sampleMimeType = audio/mha1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.2.dump
index 08ca5906fb..2e0395dd26 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 59539
   sample count = 33
+  track duration = 1168020
   format 0:
     id = 1
     sampleMimeType = audio/mha1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.3.dump
index 19d3341933..9bdd4a8b84 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 14937
   sample count = 8
+  track duration = 1168020
   format 0:
     id = 1
     sampleMimeType = audio/mha1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.0.dump
index 34aad010a7..ec9fd692de 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 104853
   sample count = 58
+  track duration = 1168020
   format 0:
     id = 1
     sampleMimeType = audio/mha1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.1.dump
index 34aad010a7..ec9fd692de 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 104853
   sample count = 58
+  track duration = 1168020
   format 0:
     id = 1
     sampleMimeType = audio/mha1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.2.dump
index 08ca5906fb..2e0395dd26 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 59539
   sample count = 33
+  track duration = 1168020
   format 0:
     id = 1
     sampleMimeType = audio/mha1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.3.dump
index 19d3341933..9bdd4a8b84 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 14937
   sample count = 8
+  track duration = 1168020
   format 0:
     id = 1
     sampleMimeType = audio/mha1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 34aad010a7..ec9fd692de 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 104853
   sample count = 58
+  track duration = 1168020
   format 0:
     id = 1
     sampleMimeType = audio/mha1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.unknown_length.dump
index 34aad010a7..ec9fd692de 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 104853
   sample count = 58
+  track duration = 1168020
   format 0:
     id = 1
     sampleMimeType = audio/mha1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.0.dump
index e1752d5396..7a1217f978 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 105242
   sample count = 58
+  track duration = 1168020
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.1.dump
index e1752d5396..7a1217f978 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 105242
   sample count = 58
+  track duration = 1168020
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.2.dump
index 4eef118db3..3ae06406e7 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 59766
   sample count = 33
+  track duration = 1168020
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.3.dump
index 307d25017d..bf01367197 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 15008
   sample count = 8
+  track duration = 1168020
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.0.dump
index e1752d5396..7a1217f978 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 105242
   sample count = 58
+  track duration = 1168020
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.1.dump
index e1752d5396..7a1217f978 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 105242
   sample count = 58
+  track duration = 1168020
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.2.dump
index 4eef118db3..3ae06406e7 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 59766
   sample count = 33
+  track duration = 1168020
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.3.dump
index 307d25017d..bf01367197 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 15008
   sample count = 8
+  track duration = 1168020
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index e1752d5396..7a1217f978 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 105242
   sample count = 58
+  track duration = 1168020
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.unknown_length.dump
index e1752d5396..7a1217f978 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 105242
   sample count = 58
+  track duration = 1168020
   format 0:
     id = 1
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.0.dump
index 0841fad075..bca4f63fce 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 3651
   sample count = 101
+  track duration = 1460000
   format 0:
     id = 1
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.1.dump
index 6e8325d298..eb62eae137 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 3504
   sample count = 52
+  track duration = 1460000
   format 0:
     id = 1
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.2.dump
index e003409fed..b4b4b1e698 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 511
   sample count = 4
+  track duration = 1460000
   format 0:
     id = 1
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.3.dump
index b422b8f8ac..3b68ca2f60 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 129
   sample count = 1
+  track duration = 1460000
   format 0:
     id = 1
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.0.dump
index 0841fad075..bca4f63fce 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 3651
   sample count = 101
+  track duration = 1460000
   format 0:
     id = 1
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.1.dump
index 6e8325d298..eb62eae137 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 3504
   sample count = 52
+  track duration = 1460000
   format 0:
     id = 1
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.2.dump
index e003409fed..b4b4b1e698 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 511
   sample count = 4
+  track duration = 1460000
   format 0:
     id = 1
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.3.dump
index b422b8f8ac..3b68ca2f60 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 129
   sample count = 1
+  track duration = 1460000
   format 0:
     id = 1
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 0841fad075..bca4f63fce 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 3651
   sample count = 101
+  track duration = 1460000
   format 0:
     id = 1
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.unknown_length.dump
index 0841fad075..bca4f63fce 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 3651
   sample count = 101
+  track duration = 1460000
   format 0:
     id = 1
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.0.dump
index be12a050a0..8dd351f1bf 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.0.dump
@@ -6,6 +6,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 87715
   sample count = 30
+  track duration = 134000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -143,6 +144,7 @@ track 0:
 track 1:
   total output bytes = 10107
   sample count = 45
+  track duration = 134000
   format 0:
     averageBitrate = 1254
     peakBitrate = 69000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
index b691258093..0e595ed6df 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -6,6 +6,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 87715
   sample count = 30
+  track duration = 134000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -143,6 +144,7 @@ track 0:
 track 1:
   total output bytes = 10107
   sample count = 45
+  track duration = 134000
   format 0:
     averageBitrate = 1254
     peakBitrate = 69000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index b691258093..0e595ed6df 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -6,6 +6,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 87715
   sample count = 30
+  track duration = 134000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -143,6 +144,7 @@ track 0:
 track 1:
   total output bytes = 10107
   sample count = 45
+  track duration = 134000
   format 0:
     averageBitrate = 1254
     peakBitrate = 69000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.unknown_length.dump
index be12a050a0..8dd351f1bf 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.unknown_length.dump
@@ -6,6 +6,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 87715
   sample count = 30
+  track duration = 134000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -143,6 +144,7 @@ track 0:
 track 1:
   total output bytes = 10107
   sample count = 45
+  track duration = 134000
   format 0:
     averageBitrate = 1254
     peakBitrate = 69000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.0.dump
index 7fa89427db..3d156864eb 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 942
   sample count = 30
+  track duration = 1000000
   format 0:
     id = 1
     sampleMimeType = video/av01
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.1.dump
index 7fa89427db..3d156864eb 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 942
   sample count = 30
+  track duration = 1000000
   format 0:
     id = 1
     sampleMimeType = video/av01
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.2.dump
index 7fa89427db..3d156864eb 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 942
   sample count = 30
+  track duration = 1000000
   format 0:
     id = 1
     sampleMimeType = video/av01
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.3.dump
index 7fa89427db..3d156864eb 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 942
   sample count = 30
+  track duration = 1000000
   format 0:
     id = 1
     sampleMimeType = video/av01
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.reading_within_gop_sample_dependencies.0.dump
index 7fa89427db..3d156864eb 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 942
   sample count = 30
+  track duration = 1000000
   format 0:
     id = 1
     sampleMimeType = video/av01
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.reading_within_gop_sample_dependencies.1.dump
index 7fa89427db..3d156864eb 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 942
   sample count = 30
+  track duration = 1000000
   format 0:
     id = 1
     sampleMimeType = video/av01
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.reading_within_gop_sample_dependencies.2.dump
index 7fa89427db..3d156864eb 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 942
   sample count = 30
+  track duration = 1000000
   format 0:
     id = 1
     sampleMimeType = video/av01
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.reading_within_gop_sample_dependencies.3.dump
index 7fa89427db..3d156864eb 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 942
   sample count = 30
+  track duration = 1000000
   format 0:
     id = 1
     sampleMimeType = video/av01
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 7fa89427db..3d156864eb 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 942
   sample count = 30
+  track duration = 1000000
   format 0:
     id = 1
     sampleMimeType = video/av01
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.unknown_length.dump
index 7fa89427db..3d156864eb 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_av1c.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 942
   sample count = 30
+  track duration = 1000000
   format 0:
     id = 1
     sampleMimeType = video/av01
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.0.dump
index 406867d798..fccf5c4a4d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 122447
   sample count = 9
+  track duration = 298333
   format 0:
     id = 1
     sampleMimeType = video/dolby-vision
@@ -67,6 +68,7 @@ track 0:
 track 1:
   total output bytes = 5993
   sample count = 15
+  track duration = 298333
   format 0:
     peakBitrate = 192000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.1.dump
index cdbf7e499d..0d307d9105 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 122447
   sample count = 9
+  track duration = 298333
   format 0:
     id = 1
     sampleMimeType = video/dolby-vision
@@ -67,6 +68,7 @@ track 0:
 track 1:
   total output bytes = 4794
   sample count = 11
+  track duration = 298333
   format 0:
     peakBitrate = 192000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.2.dump
index 19d369fd50..1ba5b70fa2 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 122447
   sample count = 9
+  track duration = 298333
   format 0:
     id = 1
     sampleMimeType = video/dolby-vision
@@ -67,6 +68,7 @@ track 0:
 track 1:
   total output bytes = 3001
   sample count = 7
+  track duration = 298333
   format 0:
     peakBitrate = 192000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.3.dump
index 6560640552..b8c6ffafb3 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 122447
   sample count = 9
+  track duration = 298333
   format 0:
     id = 1
     sampleMimeType = video/dolby-vision
@@ -67,6 +68,7 @@ track 0:
 track 1:
   total output bytes = 1074
   sample count = 3
+  track duration = 298333
   format 0:
     peakBitrate = 192000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.0.dump
index 406867d798..fccf5c4a4d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 122447
   sample count = 9
+  track duration = 298333
   format 0:
     id = 1
     sampleMimeType = video/dolby-vision
@@ -67,6 +68,7 @@ track 0:
 track 1:
   total output bytes = 5993
   sample count = 15
+  track duration = 298333
   format 0:
     peakBitrate = 192000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.1.dump
index cdbf7e499d..0d307d9105 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 122447
   sample count = 9
+  track duration = 298333
   format 0:
     id = 1
     sampleMimeType = video/dolby-vision
@@ -67,6 +68,7 @@ track 0:
 track 1:
   total output bytes = 4794
   sample count = 11
+  track duration = 298333
   format 0:
     peakBitrate = 192000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.2.dump
index 19d369fd50..1ba5b70fa2 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 122447
   sample count = 9
+  track duration = 298333
   format 0:
     id = 1
     sampleMimeType = video/dolby-vision
@@ -67,6 +68,7 @@ track 0:
 track 1:
   total output bytes = 3001
   sample count = 7
+  track duration = 298333
   format 0:
     peakBitrate = 192000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.3.dump
index 6560640552..b8c6ffafb3 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 122447
   sample count = 9
+  track duration = 298333
   format 0:
     id = 1
     sampleMimeType = video/dolby-vision
@@ -67,6 +68,7 @@ track 0:
 track 1:
   total output bytes = 1074
   sample count = 3
+  track duration = 298333
   format 0:
     peakBitrate = 192000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 406867d798..fccf5c4a4d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 122447
   sample count = 9
+  track duration = 298333
   format 0:
     id = 1
     sampleMimeType = video/dolby-vision
@@ -67,6 +68,7 @@ track 0:
 track 1:
   total output bytes = 5993
   sample count = 15
+  track duration = 298333
   format 0:
     peakBitrate = 192000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.unknown_length.dump
index 406867d798..fccf5c4a4d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 122447
   sample count = 9
+  track duration = 298333
   format 0:
     id = 1
     sampleMimeType = video/dolby-vision
@@ -67,6 +68,7 @@ track 0:
 track 1:
   total output bytes = 5993
   sample count = 15
+  track duration = 298333
   format 0:
     peakBitrate = 192000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.0.dump
index 27270ee505..78f15fd071 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 266091
   sample count = 60
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/av01
@@ -269,6 +270,7 @@ track 0:
 track 1:
   total output bytes = 16638
   sample count = 44
+  track duration = 1022000
   format 0:
     averageBitrate = 130279
     peakBitrate = 130279
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.1.dump
index 8964d1697e..a0658b80d0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 266091
   sample count = 60
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/av01
@@ -269,6 +270,7 @@ track 0:
 track 1:
   total output bytes = 11156
   sample count = 30
+  track duration = 1022000
   format 0:
     averageBitrate = 130279
     peakBitrate = 130279
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.2.dump
index a36caf2967..44c1566193 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 266091
   sample count = 60
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/av01
@@ -269,6 +270,7 @@ track 0:
 track 1:
   total output bytes = 5567
   sample count = 15
+  track duration = 1022000
   format 0:
     averageBitrate = 130279
     peakBitrate = 130279
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.3.dump
index b755ded08d..74f990ddc3 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 266091
   sample count = 60
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/av01
@@ -269,6 +270,7 @@ track 0:
 track 1:
   total output bytes = 374
   sample count = 1
+  track duration = 1022000
   format 0:
     averageBitrate = 130279
     peakBitrate = 130279
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.reading_within_gop_sample_dependencies.0.dump
index 27270ee505..78f15fd071 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 266091
   sample count = 60
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/av01
@@ -269,6 +270,7 @@ track 0:
 track 1:
   total output bytes = 16638
   sample count = 44
+  track duration = 1022000
   format 0:
     averageBitrate = 130279
     peakBitrate = 130279
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.reading_within_gop_sample_dependencies.1.dump
index 8964d1697e..a0658b80d0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 266091
   sample count = 60
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/av01
@@ -269,6 +270,7 @@ track 0:
 track 1:
   total output bytes = 11156
   sample count = 30
+  track duration = 1022000
   format 0:
     averageBitrate = 130279
     peakBitrate = 130279
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.reading_within_gop_sample_dependencies.2.dump
index a36caf2967..44c1566193 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 266091
   sample count = 60
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/av01
@@ -269,6 +270,7 @@ track 0:
 track 1:
   total output bytes = 5567
   sample count = 15
+  track duration = 1022000
   format 0:
     averageBitrate = 130279
     peakBitrate = 130279
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.reading_within_gop_sample_dependencies.3.dump
index b755ded08d..74f990ddc3 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 266091
   sample count = 60
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/av01
@@ -269,6 +270,7 @@ track 0:
 track 1:
   total output bytes = 374
   sample count = 1
+  track duration = 1022000
   format 0:
     averageBitrate = 130279
     peakBitrate = 130279
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 27270ee505..78f15fd071 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 266091
   sample count = 60
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/av01
@@ -269,6 +270,7 @@ track 0:
 track 1:
   total output bytes = 16638
   sample count = 44
+  track duration = 1022000
   format 0:
     averageBitrate = 130279
     peakBitrate = 130279
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.unknown_length.dump
index 27270ee505..78f15fd071 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 266091
   sample count = 60
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/av01
@@ -269,6 +270,7 @@ track 0:
 track 1:
   total output bytes = 16638
   sample count = 44
+  track duration = 1022000
   format 0:
     averageBitrate = 130279
     peakBitrate = 130279
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.0.dump
index ad74f2fda6..11783384e4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.1.dump
index ad74f2fda6..11783384e4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.2.dump
index ad74f2fda6..11783384e4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.3.dump
index ad74f2fda6..11783384e4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.reading_within_gop_sample_dependencies.0.dump
index ad74f2fda6..11783384e4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.reading_within_gop_sample_dependencies.1.dump
index ad74f2fda6..11783384e4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.reading_within_gop_sample_dependencies.2.dump
index ad74f2fda6..11783384e4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.reading_within_gop_sample_dependencies.3.dump
index ad74f2fda6..11783384e4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index ad74f2fda6..11783384e4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.unknown_length.dump
index ad74f2fda6..11783384e4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4_with_flag_read_Editable_video_tracks b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4_with_flag_read_Editable_video_tracks
index 314929b91c..b27f9e1c10 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4_with_flag_read_Editable_video_tracks
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks.mp4_with_flag_read_Editable_video_tracks
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -50,6 +51,7 @@ track 0:
 track 1:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 2
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.0.dump
index 87f986254c..d25799f66b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.1.dump
index 87f986254c..d25799f66b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.2.dump
index 87f986254c..d25799f66b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.3.dump
index 87f986254c..d25799f66b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.reading_within_gop_sample_dependencies.0.dump
index 87f986254c..d25799f66b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.reading_within_gop_sample_dependencies.1.dump
index 87f986254c..d25799f66b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.reading_within_gop_sample_dependencies.2.dump
index 87f986254c..d25799f66b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.reading_within_gop_sample_dependencies.3.dump
index 87f986254c..d25799f66b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 87f986254c..d25799f66b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.unknown_length.dump
index 87f986254c..d25799f66b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4_with_flag_read_Editable_video_tracks b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4_with_flag_read_Editable_video_tracks
index 396722fb5d..f11fc66241 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4_with_flag_read_Editable_video_tracks
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_fake_editable_video_tracks_interleaved_with_primary_video_tracks.mp4_with_flag_read_Editable_video_tracks
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -50,6 +51,7 @@ track 0:
 track 1:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 2
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.0.dump
index 164892e2b6..f5457994d6 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 9529
   sample count = 45
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.1.dump
index 9e116f72dc..5cfb5c79ad 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 7464
   sample count = 33
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.2.dump
index b309a52b14..cd0b077e6f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 4019
   sample count = 18
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.3.dump
index 9cbeb777cb..f346a9d4a5 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 470
   sample count = 3
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.reading_within_gop_sample_dependencies.0.dump
index a57af70079..cd8455d4cf 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 9529
   sample count = 45
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.reading_within_gop_sample_dependencies.1.dump
index 067b746781..824d5b856e 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 7464
   sample count = 33
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.reading_within_gop_sample_dependencies.2.dump
index add7d54209..1097f31c0c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 4019
   sample count = 18
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.reading_within_gop_sample_dependencies.3.dump
index 12c594c53f..e6e1a125b1 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 470
   sample count = 3
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index a57af70079..cd8455d4cf 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 9529
   sample count = 45
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.unknown_length.dump
index 164892e2b6..f5457994d6 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_metadata.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 9529
   sample count = 45
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.0.dump
index 88233c343d..305b917651 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 9529
   sample count = 45
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.1.dump
index 1e9e56372f..0f25ab628c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 7464
   sample count = 33
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.2.dump
index 878ff9b14b..c3499bbb8c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 4019
   sample count = 18
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.3.dump
index e0744b6c80..b7f2d197f9 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 470
   sample count = 3
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.reading_within_gop_sample_dependencies.0.dump
index 45b39fb539..f0d026fe4c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 9529
   sample count = 45
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.reading_within_gop_sample_dependencies.1.dump
index dcd408c3f1..b63654cc29 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 7464
   sample count = 33
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.reading_within_gop_sample_dependencies.2.dump
index 4b21054079..90c0a49ec5 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 4019
   sample count = 18
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.reading_within_gop_sample_dependencies.3.dump
index 8224d63e12..abfe8bfc40 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 470
   sample count = 3
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 45b39fb539..f0d026fe4c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 9529
   sample count = 45
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.unknown_length.dump
index 88233c343d..305b917651 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_numeric_genre.mp4.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 89876
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -148,6 +149,7 @@ track 0:
 track 1:
   total output bytes = 9529
   sample count = 45
+  track duration = 1024000
   format 0:
     peakBitrate = 200000
     id = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.0.dump
index 156120910a..31113327d5 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 4478284
   sample count = 80
+  track duration = 2741666
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -350,6 +351,7 @@ track 0:
 track 1:
   total output bytes = 232260
   sample count = 29
+  track duration = 2633333
   format 0:
     id = 2
     sampleMimeType = audio/raw
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.1.dump
index 1e86850aff..a7f73773c9 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 3786256
   sample count = 66
+  track duration = 2741666
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -294,6 +295,7 @@ track 0:
 track 1:
   total output bytes = 158532
   sample count = 20
+  track duration = 2633333
   format 0:
     id = 2
     sampleMimeType = audio/raw
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.2.dump
index 45e8873527..708937a44c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 1881611
   sample count = 30
+  track duration = 2741666
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -150,6 +151,7 @@ track 0:
 track 1:
   total output bytes = 78524
   sample count = 10
+  track duration = 2633333
   format 0:
     id = 2
     sampleMimeType = audio/raw
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.3.dump
index ad3737f5dd..793d8c11cd 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 469433
   sample count = 8
+  track duration = 2741666
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -62,6 +63,7 @@ track 0:
 track 1:
   total output bytes = 6708
   sample count = 1
+  track duration = 2633333
   format 0:
     id = 2
     sampleMimeType = audio/raw
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.0.dump
index 156120910a..31113327d5 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 4478284
   sample count = 80
+  track duration = 2741666
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -350,6 +351,7 @@ track 0:
 track 1:
   total output bytes = 232260
   sample count = 29
+  track duration = 2633333
   format 0:
     id = 2
     sampleMimeType = audio/raw
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.1.dump
index 1e86850aff..a7f73773c9 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 3786256
   sample count = 66
+  track duration = 2741666
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -294,6 +295,7 @@ track 0:
 track 1:
   total output bytes = 158532
   sample count = 20
+  track duration = 2633333
   format 0:
     id = 2
     sampleMimeType = audio/raw
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.2.dump
index 45e8873527..708937a44c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 1881611
   sample count = 30
+  track duration = 2741666
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -150,6 +151,7 @@ track 0:
 track 1:
   total output bytes = 78524
   sample count = 10
+  track duration = 2633333
   format 0:
     id = 2
     sampleMimeType = audio/raw
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.3.dump
index ad3737f5dd..793d8c11cd 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 469433
   sample count = 8
+  track duration = 2741666
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -62,6 +63,7 @@ track 0:
 track 1:
   total output bytes = 6708
   sample count = 1
+  track duration = 2633333
   format 0:
     id = 2
     sampleMimeType = audio/raw
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.unknown_length.dump
index 156120910a..31113327d5 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 4478284
   sample count = 80
+  track duration = 2741666
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -350,6 +351,7 @@ track 0:
 track 1:
   total output bytes = 232260
   sample count = 29
+  track duration = 2633333
   format 0:
     id = 2
     sampleMimeType = audio/raw
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.unknown_length.dump
index 156120910a..31113327d5 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 4478284
   sample count = 80
+  track duration = 2741666
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -350,6 +351,7 @@ track 0:
 track 1:
   total output bytes = 232260
   sample count = 29
+  track duration = 2633333
   format 0:
     id = 2
     sampleMimeType = audio/raw
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.0.dump
index e6d18e8850..0d292fc451 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 86208
   sample count = 5
+  track duration = 55555
   format 0:
     id = 1
     sampleMimeType = video/mv-hevc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.1.dump
index e6d18e8850..0d292fc451 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 86208
   sample count = 5
+  track duration = 55555
   format 0:
     id = 1
     sampleMimeType = video/mv-hevc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.2.dump
index e6d18e8850..0d292fc451 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 86208
   sample count = 5
+  track duration = 55555
   format 0:
     id = 1
     sampleMimeType = video/mv-hevc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.3.dump
index e6d18e8850..0d292fc451 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 86208
   sample count = 5
+  track duration = 55555
   format 0:
     id = 1
     sampleMimeType = video/mv-hevc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.0.dump
index e6d18e8850..0d292fc451 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 86208
   sample count = 5
+  track duration = 55555
   format 0:
     id = 1
     sampleMimeType = video/mv-hevc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.1.dump
index e6d18e8850..0d292fc451 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 86208
   sample count = 5
+  track duration = 55555
   format 0:
     id = 1
     sampleMimeType = video/mv-hevc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.2.dump
index e6d18e8850..0d292fc451 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 86208
   sample count = 5
+  track duration = 55555
   format 0:
     id = 1
     sampleMimeType = video/mv-hevc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.3.dump
index e6d18e8850..0d292fc451 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 86208
   sample count = 5
+  track duration = 55555
   format 0:
     id = 1
     sampleMimeType = video/mv-hevc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.unknown_length.dump
index e6d18e8850..0d292fc451 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 86208
   sample count = 5
+  track duration = 55555
   format 0:
     id = 1
     sampleMimeType = video/mv-hevc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.unknown_length.dump
index e6d18e8850..0d292fc451 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 86208
   sample count = 5
+  track duration = 55555
   format 0:
     id = 1
     sampleMimeType = video/mv-hevc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/bbb_176x144_128kbps_15fps_h263.3gp.dump b/libraries/test_data/src/test/assets/muxerdumps/bbb_176x144_128kbps_15fps_h263.3gp.dump
index 8bf986aced..dae2488eb5 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/bbb_176x144_128kbps_15fps_h263.3gp.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/bbb_176x144_128kbps_15fps_h263.3gp.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 50100
   sample count = 15
+  track duration = 1000000
   format 0:
     id = 1
     sampleMimeType = video/3gpp
diff --git a/libraries/test_data/src/test/assets/muxerdumps/bbb_176x144_192kbps_15fps_mpeg4.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/bbb_176x144_192kbps_15fps_mpeg4.mp4.dump
index b1f99c8966..cd43ea0d48 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/bbb_176x144_192kbps_15fps_mpeg4.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/bbb_176x144_192kbps_15fps_mpeg4.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 45694
   sample count = 15
+  track duration = 1000000
   format 0:
     averageBitrate = 365552
     peakBitrate = 365552
diff --git a/libraries/test_data/src/test/assets/muxerdumps/bbb_1ch_16kHz_q10_vorbis.ogg.dump b/libraries/test_data/src/test/assets/muxerdumps/bbb_1ch_16kHz_q10_vorbis.ogg.dump
index 600f7364c7..e8aefec33c 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/bbb_1ch_16kHz_q10_vorbis.ogg.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/bbb_1ch_16kHz_q10_vorbis.ogg.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 24785
   sample count = 103
+  track duration = 3008000
   format 0:
     averageBitrate = 99992
     id = 1
diff --git a/libraries/test_data/src/test/assets/muxerdumps/bbb_642x642_768kbps_30fps_vp9.webm.dump b/libraries/test_data/src/test/assets/muxerdumps/bbb_642x642_768kbps_30fps_vp9.webm.dump
index 01eecc74fe..b3a91619b9 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/bbb_642x642_768kbps_30fps_vp9.webm.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/bbb_642x642_768kbps_30fps_vp9.webm.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 378802
   sample count = 90
+  track duration = 3000000
   format 0:
     id = 1
     sampleMimeType = video/x-vnd.on2.vp9
diff --git a/libraries/test_data/src/test/assets/muxerdumps/bbb_6ch_8kHz_opus.ogg.dump b/libraries/test_data/src/test/assets/muxerdumps/bbb_6ch_8kHz_opus.ogg.dump
index 63f06d56a0..eba2ba6fed 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/bbb_6ch_8kHz_opus.ogg.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/bbb_6ch_8kHz_opus.ogg.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 100872
   sample count = 151
+  track duration = 3013500
   format 0:
     id = 1
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_avc_2b_firstpts_10_sec.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_avc_2b_firstpts_10_sec.mp4.dump
index 5284a87a06..246dca8eac 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_avc_2b_firstpts_10_sec.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_avc_2b_firstpts_10_sec.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 299922
   sample count = 120
+  track duration = 4000000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_avc_non_reference_3b.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_avc_non_reference_3b.mp4.dump
index 4d43157db0..3a04628794 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_avc_non_reference_3b.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_avc_non_reference_3b.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 416333
   sample count = 120
+  track duration = 4000000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_avc_pyramid_3b.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_avc_pyramid_3b.mp4.dump
index 4ea3cfc38f..0bf89134fb 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_avc_pyramid_3b.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_avc_pyramid_3b.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 406132
   sample count = 120
+  track duration = 4000000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/bbb_mono_16kHz_23.05kbps_amrwb.3gp.dump b/libraries/test_data/src/test/assets/muxerdumps/bbb_mono_16kHz_23.05kbps_amrwb.3gp.dump
index c8eb4cfb14..fd96fea1b1 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/bbb_mono_16kHz_23.05kbps_amrwb.3gp.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/bbb_mono_16kHz_23.05kbps_amrwb.3gp.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 8850
   sample count = 150
+  track duration = 3000000
   format 0:
     id = 1
     sampleMimeType = audio/amr-wb
diff --git a/libraries/test_data/src/test/assets/muxerdumps/bbb_mono_8kHz_12.2kbps_amrnb.3gp.dump b/libraries/test_data/src/test/assets/muxerdumps/bbb_mono_8kHz_12.2kbps_amrnb.3gp.dump
index db6b3b6940..0875e287a7 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/bbb_mono_8kHz_12.2kbps_amrnb.3gp.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/bbb_mono_8kHz_12.2kbps_amrnb.3gp.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 4832
   sample count = 151
+  track duration = 3020000
   format 0:
     id = 1
     sampleMimeType = audio/3gpp
diff --git a/libraries/test_data/src/test/assets/muxerdumps/h265_with_metadata_track.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/h265_with_metadata_track.mp4.dump
index 3121d6adb4..97bbfeb31d 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/h265_with_metadata_track.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/h265_with_metadata_track.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 3
 track 0:
   total output bytes = 387
   sample count = 3
+  track duration = 100100
   format 0:
     id = 1
     sampleMimeType = application/meta
@@ -29,6 +30,7 @@ track 0:
 track 1:
   total output bytes = 1726
   sample count = 3
+  track duration = 80700
   format 0:
     averageBitrate = 192000
     peakBitrate = 192000
@@ -57,6 +59,7 @@ track 1:
 track 2:
   total output bytes = 678996
   sample count = 3
+  track duration = 100100
   format 0:
     id = 3
     sampleMimeType = video/hevc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4.dump
index 3524f1833b..956fe995b3 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 7944083
   sample count = 127
+  track duration = 4236600
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -538,6 +539,7 @@ track 0:
 track 1:
   total output bytes = 133209
   sample count = 195
+  track duration = 4159900
   format 0:
     averageBitrate = 256000
     peakBitrate = 256000
diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_0_orientation.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_0_orientation.mp4.dump
index d6e3f123ac..6748960022 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_0_orientation.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_0_orientation.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 56
   sample count = 1
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_180_orientation.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_180_orientation.mp4.dump
index df8155d6b8..45deec377f 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_180_orientation.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_180_orientation.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 56
   sample count = 1
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_270_orientation.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_270_orientation.mp4.dump
index 661abe051b..1c70f45916 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_270_orientation.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_270_orientation.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 56
   sample count = 1
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_90_orientation.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_90_orientation.mp4.dump
index 777c936c6d..ba069faed3 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_90_orientation.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_90_orientation.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 56
   sample count = 1
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_b_frame.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_b_frame.mp4.dump
index 4496470920..2bfdb56184 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_b_frame.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_b_frame.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 224
   sample count = 4
+  track duration = 4000
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_b_frame_large_pts.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_b_frame_large_pts.mp4.dump
index 4d981ef61f..9137af3d1f 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_b_frame_large_pts.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_b_frame_large_pts.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 224
   sample count = 4
+  track duration = 414900
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -45,6 +46,7 @@ track 0:
 track 1:
   total output bytes = 224
   sample count = 4
+  track duration = 414900
   format 0:
     id = 2
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_different_tracks_offset.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_different_tracks_offset.mp4.dump
index ca2ab52898..606640beb2 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_different_tracks_offset.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_different_tracks_offset.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 112
   sample count = 2
+  track duration = 100
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -37,6 +38,7 @@ track 0:
 track 1:
   total output bytes = 112
   sample count = 2
+  track duration = 100
   format 0:
     id = 2
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_editable_video_tracks.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_editable_video_tracks.mp4.dump
index 314929b91c..b27f9e1c10 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_editable_video_tracks.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_editable_video_tracks.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -50,6 +51,7 @@ track 0:
 track 1:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 2
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_editable_video_tracks_when_editable_track_samples_interleaved.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_editable_video_tracks_when_editable_track_samples_interleaved.mp4.dump
index 396722fb5d..f11fc66241 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_editable_video_tracks_when_editable_track_samples_interleaved.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_editable_video_tracks_when_editable_track_samples_interleaved.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -50,6 +51,7 @@ track 0:
 track 1:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 2
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_float_metadata.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_float_metadata.mp4.dump
index 162d30cd41..9e03b2f968 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_float_metadata.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_float_metadata.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 56
   sample count = 1
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_frame_rate.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_frame_rate.mp4.dump
index 0927f7cec6..c5b641baee 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_frame_rate.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_frame_rate.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 56
   sample count = 1
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_location.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_location.mp4.dump
index bb70e4d748..5e2c633b0b 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_location.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_location.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 56
   sample count = 1
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_negative_tracks_offset.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_negative_tracks_offset.mp4.dump
index fe253fbc38..c0d5eeef4f 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_negative_tracks_offset.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_negative_tracks_offset.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 168
   sample count = 3
+  track duration = 600
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_null_location.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_null_location.mp4.dump
index d6e3f123ac..6748960022 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_null_location.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_null_location.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 56
   sample count = 1
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_primary_tracks.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_primary_tracks.mp4.dump
index ad74f2fda6..11783384e4 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_primary_tracks.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_primary_tracks.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_primary_tracks_when_editable_track_samples_interleaved.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_primary_tracks_when_editable_track_samples_interleaved.mp4.dump
index 87f986254c..d25799f66b 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_primary_tracks_when_editable_track_samples_interleaved.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_primary_tracks_when_editable_track_samples_interleaved.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 280
   sample count = 5
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_same_tracks_offset.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_same_tracks_offset.mp4.dump
index ce044b9f9a..7bb15882d7 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_same_tracks_offset.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_same_tracks_offset.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 112
   sample count = 2
+  track duration = 100
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -37,6 +38,7 @@ track 0:
 track 1:
   total output bytes = 112
   sample count = 2
+  track duration = 200
   format 0:
     id = 2
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_string_metadata.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_string_metadata.mp4.dump
index 7302d44094..6b30c4a543 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_string_metadata.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_string_metadata.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 56
   sample count = 1
+  track duration = 0
   format 0:
     id = 1
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/partial_hdr10-720p.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/partial_hdr10-720p.mp4.dump
index 24b8ae2a00..2a6c93b6c8 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/partial_hdr10-720p.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/partial_hdr10-720p.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 7822354
   sample count = 125
+  track duration = 4171700
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -530,6 +531,7 @@ track 0:
 track 1:
   total output bytes = 131233
   sample count = 192
+  track duration = 4095900
   format 0:
     averageBitrate = 256000
     peakBitrate = 256000
diff --git a/libraries/test_data/src/test/assets/muxerdumps/sample_av1.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/sample_av1.mp4.dump
index ec659290d8..72394c9cd3 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/sample_av1.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/sample_av1.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 69084
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/av01
@@ -145,6 +146,7 @@ track 0:
 track 1:
   total output bytes = 9312
   sample count = 45
+  track duration = 1045300
   format 0:
     averageBitrate = 71295
     peakBitrate = 71295
diff --git a/libraries/test_data/src/test/assets/muxerdumps/sample_no_bframes.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/sample_no_bframes.mp4.dump
index 85d10973b7..aa2720a376 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/sample_no_bframes.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/sample_no_bframes.mp4.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 9529
   sample count = 45
+  track duration = 1045300
   format 0:
     id = 1
     sampleMimeType = audio/mp4a-latm
@@ -203,6 +204,7 @@ track 0:
 track 1:
   total output bytes = 301213
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 2
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_176x144_128kbps_15fps_h263.3gp/transmuxed_with_inappmuxer.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_176x144_128kbps_15fps_h263.3gp/transmuxed_with_inappmuxer.dump
index ae96a7da75..981b83a93b 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_176x144_128kbps_15fps_h263.3gp/transmuxed_with_inappmuxer.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_176x144_128kbps_15fps_h263.3gp/transmuxed_with_inappmuxer.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 50100
   sample count = 15
+  track duration = 1000000
   format 0:
     id = 1
     sampleMimeType = video/3gpp
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_176x144_192kbps_15fps_mpeg4.mp4/transmuxed_with_inappmuxer.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_176x144_192kbps_15fps_mpeg4.mp4/transmuxed_with_inappmuxer.dump
index 25c8c3428f..68e16edcaa 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_176x144_192kbps_15fps_mpeg4.mp4/transmuxed_with_inappmuxer.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_176x144_192kbps_15fps_mpeg4.mp4/transmuxed_with_inappmuxer.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 45694
   sample count = 15
+  track duration = 1000000
   format 0:
     averageBitrate = 365552
     peakBitrate = 365552
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_1ch_16kHz_q10_vorbis.ogg/transmuxed_with_inappmuxer.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_1ch_16kHz_q10_vorbis.ogg/transmuxed_with_inappmuxer.dump
index 0797ddc3a6..00e9bf7973 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_1ch_16kHz_q10_vorbis.ogg/transmuxed_with_inappmuxer.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_1ch_16kHz_q10_vorbis.ogg/transmuxed_with_inappmuxer.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 24785
   sample count = 103
+  track duration = 3008000
   format 0:
     averageBitrate = 99992
     id = 1
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_6ch_8kHz_opus.ogg/transmuxed_with_inappmuxer.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_6ch_8kHz_opus.ogg/transmuxed_with_inappmuxer.dump
index f4d1e6e2ad..c0a11ae0d7 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_6ch_8kHz_opus.ogg/transmuxed_with_inappmuxer.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_6ch_8kHz_opus.ogg/transmuxed_with_inappmuxer.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 100872
   sample count = 151
+  track duration = 3020000
   format 0:
     id = 1
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_mono_16kHz_23.05kbps_amrwb.3gp/transmuxed_with_inappmuxer.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_mono_16kHz_23.05kbps_amrwb.3gp/transmuxed_with_inappmuxer.dump
index 71c9a00b9a..a6c486c2e5 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_mono_16kHz_23.05kbps_amrwb.3gp/transmuxed_with_inappmuxer.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_mono_16kHz_23.05kbps_amrwb.3gp/transmuxed_with_inappmuxer.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 8850
   sample count = 150
+  track duration = 3000000
   format 0:
     id = 1
     sampleMimeType = audio/amr-wb
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_mono_8kHz_12.2kbps_amrnb.3gp/transmuxed_with_inappmuxer.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_mono_8kHz_12.2kbps_amrnb.3gp/transmuxed_with_inappmuxer.dump
index d6bb13c571..f014c95ba5 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_mono_8kHz_12.2kbps_amrnb.3gp/transmuxed_with_inappmuxer.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_mono_8kHz_12.2kbps_amrnb.3gp/transmuxed_with_inappmuxer.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 4832
   sample count = 151
+  track duration = 3020000
   format 0:
     id = 1
     sampleMimeType = audio/3gpp
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/h265_with_metadata_track.mp4/transmuxed_with_inappmuxer.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/h265_with_metadata_track.mp4/transmuxed_with_inappmuxer.dump
index 2e1ebeacd4..53ec4ecafc 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/h265_with_metadata_track.mp4/transmuxed_with_inappmuxer.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/h265_with_metadata_track.mp4/transmuxed_with_inappmuxer.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 678996
   sample count = 3
+  track duration = 100100
   format 0:
     id = 1
     sampleMimeType = video/hevc
@@ -43,6 +44,7 @@ track 0:
 track 1:
   total output bytes = 1726
   sample count = 3
+  track duration = 80700
   format 0:
     averageBitrate = 192000
     peakBitrate = 192000
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_av1.mp4/transmuxed_with_inappmuxer.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_av1.mp4/transmuxed_with_inappmuxer.dump
index 83170fd09c..5df56790ec 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_av1.mp4/transmuxed_with_inappmuxer.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_av1.mp4/transmuxed_with_inappmuxer.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 69084
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/av01
@@ -146,6 +147,7 @@ track 0:
 track 1:
   total output bytes = 9312
   sample count = 45
+  track duration = 1045300
   format 0:
     averageBitrate = 71295
     peakBitrate = 71295
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_no_bframes.mp4/transmuxed_with_inappmuxer.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_no_bframes.mp4/transmuxed_with_inappmuxer.dump
index cdbdf364a2..53c3073cf5 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_no_bframes.mp4/transmuxed_with_inappmuxer.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_no_bframes.mp4/transmuxed_with_inappmuxer.dump
@@ -9,6 +9,7 @@ numberOfTracks = 2
 track 0:
   total output bytes = 301213
   sample count = 30
+  track duration = 1001000
   format 0:
     id = 1
     sampleMimeType = video/avc
@@ -151,6 +152,7 @@ track 0:
 track 1:
   total output bytes = 9529
   sample count = 45
+  track duration = 1045300
   format 0:
     id = 2
     sampleMimeType = audio/mp4a-latm
diff --git a/libraries/test_data/src/test/assets/transformerdumps/ts/sample_h264.ts/transmuxed_with_inappmuxer.dump b/libraries/test_data/src/test/assets/transformerdumps/ts/sample_h264.ts/transmuxed_with_inappmuxer.dump
index bb32cc25ee..65f03b8478 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/ts/sample_h264.ts/transmuxed_with_inappmuxer.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/ts/sample_h264.ts/transmuxed_with_inappmuxer.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 41647
   sample count = 30
+  track duration = 1000000
   format 0:
     id = 1
     sampleMimeType = video/avc