From 93b4c6ef4777cef5c47844f563c4b2e4ac0e2444 Mon Sep 17 00:00:00 2001
From: rohks <rohks@google.com>
Date: Thu, 14 Nov 2024 07:20:02 -0800
Subject: [PATCH] Set container MIME type in `Mp4Extractor` and
 `FragmentedMp4Extractor`

PiperOrigin-RevId: 696513199
---
 .../extractor/mp4/FragmentedMp4Extractor.java |  27 ++++-
 .../extractor/mp4/MimeTypeResolver.java       | 114 ++++++++++++++++++
 .../media3/extractor/mp4/Mp4Extractor.java    |   3 +
 ...ixel-motion-photo-2-hevc-tracks.jpg.0.dump |   4 +
 ...ixel-motion-photo-2-hevc-tracks.jpg.1.dump |   4 +
 ...ixel-motion-photo-2-hevc-tracks.jpg.2.dump |   4 +
 ...ixel-motion-photo-2-hevc-tracks.jpg.3.dump |   4 +
 ...on-photo-jfif-segment-shortened.jpg.0.dump |   1 +
 ...on-photo-jfif-segment-shortened.jpg.1.dump |   1 +
 ...on-photo-jfif-segment-shortened.jpg.2.dump |   1 +
 ...on-photo-jfif-segment-shortened.jpg.3.dump |   1 +
 .../extractordumps/mp4/bt601.mov.0.dump       |   2 +
 .../extractordumps/mp4/bt601.mov.1.dump       |   2 +
 .../extractordumps/mp4/bt601.mov.2.dump       |   2 +
 .../extractordumps/mp4/bt601.mov.3.dump       |   2 +
 ...ding_within_gop_sample_dependencies.0.dump |   2 +
 ...ding_within_gop_sample_dependencies.1.dump |   2 +
 ...ding_within_gop_sample_dependencies.2.dump |   2 +
 ...ding_within_gop_sample_dependencies.3.dump |   2 +
 ...op_sample_dependencies.unknown_length.dump |   2 +
 .../mp4/bt601.mov.unknown_length.dump         |   2 +
 ...ixel-motion-photo-2-hevc-tracks.mp4.0.dump |   4 +
 ...ixel-motion-photo-2-hevc-tracks.mp4.1.dump |   4 +
 ...ixel-motion-photo-2-hevc-tracks.mp4.2.dump |   4 +
 ...ixel-motion-photo-2-hevc-tracks.mp4.3.dump |   4 +
 ...ding_within_gop_sample_dependencies.0.dump |   4 +
 ...ding_within_gop_sample_dependencies.1.dump |   4 +
 ...ding_within_gop_sample_dependencies.2.dump |   4 +
 ...ding_within_gop_sample_dependencies.3.dump |   4 +
 ...op_sample_dependencies.unknown_length.dump |   4 +
 ...hoto-2-hevc-tracks.mp4.unknown_length.dump |   4 +
 .../extractordumps/mp4/sample.mp4.0.dump      |   2 +
 .../extractordumps/mp4/sample.mp4.1.dump      |   2 +
 .../extractordumps/mp4/sample.mp4.2.dump      |   2 +
 .../extractordumps/mp4/sample.mp4.3.dump      |   2 +
 ...ding_within_gop_sample_dependencies.0.dump |   2 +
 ...ding_within_gop_sample_dependencies.1.dump |   2 +
 ...ding_within_gop_sample_dependencies.2.dump |   2 +
 ...ding_within_gop_sample_dependencies.3.dump |   2 +
 ...op_sample_dependencies.unknown_length.dump |   2 +
 .../mp4/sample.mp4.unknown_length.dump        |   2 +
 ...e.mp4_with_flag_read_Editable_video_tracks |   2 +
 .../mp4/sample_18byte_nclx_colr.mp4.0.dump    |   1 +
 .../mp4/sample_18byte_nclx_colr.mp4.1.dump    |   1 +
 .../mp4/sample_18byte_nclx_colr.mp4.2.dump    |   1 +
 .../mp4/sample_18byte_nclx_colr.mp4.3.dump    |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 ...e_18byte_nclx_colr.mp4.unknown_length.dump |   1 +
 .../extractordumps/mp4/sample_ac3.mp4.0.dump  |   1 +
 .../extractordumps/mp4/sample_ac3.mp4.1.dump  |   1 +
 .../extractordumps/mp4/sample_ac3.mp4.2.dump  |   1 +
 .../extractordumps/mp4/sample_ac3.mp4.3.dump  |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 .../mp4/sample_ac3.mp4.unknown_length.dump    |   1 +
 .../mp4/sample_ac3_fragmented.mp4.0.dump      |   1 +
 .../mp4/sample_ac3_fragmented.mp4.1.dump      |   1 +
 .../mp4/sample_ac3_fragmented.mp4.2.dump      |   1 +
 .../mp4/sample_ac3_fragmented.mp4.3.dump      |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 ...ple_ac3_fragmented.mp4.unknown_length.dump |   1 +
 .../extractordumps/mp4/sample_ac4.mp4.0.dump  |   1 +
 .../extractordumps/mp4/sample_ac4.mp4.1.dump  |   1 +
 .../extractordumps/mp4/sample_ac4.mp4.2.dump  |   1 +
 .../extractordumps/mp4/sample_ac4.mp4.3.dump  |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 .../mp4/sample_ac4.mp4.unknown_length.dump    |   1 +
 .../mp4/sample_ac4_fragmented.mp4.0.dump      |   1 +
 .../mp4/sample_ac4_fragmented.mp4.1.dump      |   1 +
 .../mp4/sample_ac4_fragmented.mp4.2.dump      |   1 +
 .../mp4/sample_ac4_fragmented.mp4.3.dump      |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 ...ple_ac4_fragmented.mp4.unknown_length.dump |   1 +
 .../mp4/sample_ac4_level4.mp4.0.dump          |   1 +
 .../mp4/sample_ac4_level4.mp4.1.dump          |   1 +
 .../mp4/sample_ac4_level4.mp4.2.dump          |   1 +
 .../mp4/sample_ac4_level4.mp4.3.dump          |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 .../sample_ac4_level4.mp4.unknown_length.dump |   1 +
 .../mp4/sample_ac4_protected.mp4.0.dump       |   1 +
 .../mp4/sample_ac4_protected.mp4.1.dump       |   1 +
 .../mp4/sample_ac4_protected.mp4.2.dump       |   1 +
 .../mp4/sample_ac4_protected.mp4.3.dump       |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 ...mple_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 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 ...ndroid_slow_motion.mp4.unknown_length.dump |   1 +
 .../extractordumps/mp4/sample_dthd.mp4.0.dump |   1 +
 .../extractordumps/mp4/sample_dthd.mp4.1.dump |   1 +
 .../extractordumps/mp4/sample_dthd.mp4.2.dump |   1 +
 .../extractordumps/mp4/sample_dthd.mp4.3.dump |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 .../mp4/sample_dthd.mp4.unknown_length.dump   |   1 +
 .../extractordumps/mp4/sample_eac3.mp4.0.dump |   1 +
 .../extractordumps/mp4/sample_eac3.mp4.1.dump |   1 +
 .../extractordumps/mp4/sample_eac3.mp4.2.dump |   1 +
 .../extractordumps/mp4/sample_eac3.mp4.3.dump |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 .../mp4/sample_eac3.mp4.unknown_length.dump   |   1 +
 .../mp4/sample_eac3_fragmented.mp4.0.dump     |   1 +
 .../mp4/sample_eac3_fragmented.mp4.1.dump     |   1 +
 .../mp4/sample_eac3_fragmented.mp4.2.dump     |   1 +
 .../mp4/sample_eac3_fragmented.mp4.3.dump     |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 ...le_eac3_fragmented.mp4.unknown_length.dump |   1 +
 .../mp4/sample_eac3joc.mp4.0.dump             |   1 +
 .../mp4/sample_eac3joc.mp4.1.dump             |   1 +
 .../mp4/sample_eac3joc.mp4.2.dump             |   1 +
 .../mp4/sample_eac3joc.mp4.3.dump             |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 .../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 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 ...eac3joc_fragmented.mp4.unknown_length.dump |   1 +
 .../mp4/sample_edit_list.mp4.0.dump           |   2 +
 .../mp4/sample_edit_list.mp4.1.dump           |   2 +
 .../mp4/sample_edit_list.mp4.2.dump           |   2 +
 .../mp4/sample_edit_list.mp4.3.dump           |   2 +
 ...ding_within_gop_sample_dependencies.0.dump |   2 +
 ...ding_within_gop_sample_dependencies.1.dump |   2 +
 ...ding_within_gop_sample_dependencies.2.dump |   2 +
 ...ding_within_gop_sample_dependencies.3.dump |   2 +
 ...op_sample_dependencies.unknown_length.dump |   2 +
 .../sample_edit_list.mp4.unknown_length.dump  |   2 +
 .../mp4/sample_empty_track.mp4.0.dump         |   2 +
 .../mp4/sample_empty_track.mp4.1.dump         |   2 +
 .../mp4/sample_empty_track.mp4.2.dump         |   2 +
 .../mp4/sample_empty_track.mp4.3.dump         |   2 +
 ...ding_within_gop_sample_dependencies.0.dump |   2 +
 ...ding_within_gop_sample_dependencies.1.dump |   2 +
 ...ding_within_gop_sample_dependencies.2.dump |   2 +
 ...ding_within_gop_sample_dependencies.3.dump |   2 +
 ...op_sample_dependencies.unknown_length.dump |   2 +
 ...sample_empty_track.mp4.unknown_length.dump |   2 +
 .../mp4/sample_fragmented.mp4.0.dump          |   2 +
 ...ding_within_gop_sample_dependencies.0.dump |   2 +
 ...op_sample_dependencies.unknown_length.dump |   2 +
 .../sample_fragmented.mp4.unknown_length.dump |   2 +
 .../mp4/sample_fragmented_iamf.mp4.0.dump     |   1 +
 .../mp4/sample_fragmented_iamf.mp4.1.dump     |   1 +
 .../mp4/sample_fragmented_iamf.mp4.2.dump     |   1 +
 .../mp4/sample_fragmented_iamf.mp4.3.dump     |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 ...le_fragmented_iamf.mp4.unknown_length.dump |   1 +
 ...ample_fragmented_large_bitrates.mp4.0.dump |   2 +
 ...ample_fragmented_large_bitrates.mp4.1.dump |   2 +
 ...ample_fragmented_large_bitrates.mp4.2.dump |   2 +
 ...ample_fragmented_large_bitrates.mp4.3.dump |   2 +
 ...ding_within_gop_sample_dependencies.0.dump |   2 +
 ...ding_within_gop_sample_dependencies.1.dump |   2 +
 ...ding_within_gop_sample_dependencies.2.dump |   2 +
 ...ding_within_gop_sample_dependencies.3.dump |   2 +
 ...op_sample_dependencies.unknown_length.dump |   2 +
 ...ted_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 +
 ...ding_within_gop_sample_dependencies.0.dump |   2 +
 ...ding_within_gop_sample_dependencies.1.dump |   2 +
 ...ding_within_gop_sample_dependencies.2.dump |   2 +
 ...ding_within_gop_sample_dependencies.3.dump |   2 +
 ...op_sample_dependencies.unknown_length.dump |   2 +
 ...ragmented_seekable.mp4.unknown_length.dump |   2 +
 .../mp4/sample_fragmented_sei.mp4.0.dump      |   2 +
 ...ding_within_gop_sample_dependencies.0.dump |   2 +
 ...op_sample_dependencies.unknown_length.dump |   2 +
 ...ple_fragmented_sei.mp4.unknown_length.dump |   2 +
 ...ple_fragmented_sideloaded_track.mp4.0.dump |   1 +
 ...d_sideloaded_track.mp4.unknown_length.dump |   1 +
 .../extractordumps/mp4/sample_iamf.mp4.0.dump |   1 +
 .../extractordumps/mp4/sample_iamf.mp4.1.dump |   1 +
 .../extractordumps/mp4/sample_iamf.mp4.2.dump |   1 +
 .../extractordumps/mp4/sample_iamf.mp4.3.dump |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 .../mp4/sample_iamf.mp4.unknown_length.dump   |   1 +
 .../mp4/sample_mdat_too_long.mp4.0.dump       |   2 +
 .../mp4/sample_mdat_too_long.mp4.1.dump       |   2 +
 .../mp4/sample_mdat_too_long.mp4.2.dump       |   2 +
 .../mp4/sample_mdat_too_long.mp4.3.dump       |   2 +
 ...ding_within_gop_sample_dependencies.0.dump |   2 +
 ...ding_within_gop_sample_dependencies.1.dump |   2 +
 ...ding_within_gop_sample_dependencies.2.dump |   2 +
 ...ding_within_gop_sample_dependencies.3.dump |   2 +
 ...op_sample_dependencies.unknown_length.dump |   2 +
 ...mple_mdat_too_long.mp4.unknown_length.dump |   2 +
 .../mp4/sample_mhm1_bl_cicp1.mp4.0.dump       |   1 +
 .../mp4/sample_mhm1_bl_cicp1.mp4.1.dump       |   1 +
 .../mp4/sample_mhm1_bl_cicp1.mp4.2.dump       |   1 +
 .../mp4/sample_mhm1_bl_cicp1.mp4.3.dump       |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 ...mple_mhm1_bl_cicp1.mp4.unknown_length.dump |   1 +
 ...sample_mhm1_bl_cicp1_fragmented.mp4.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 ...l_cicp1_fragmented.mp4.unknown_length.dump |   1 +
 .../sample_mhm1_bl_configchange.mp4.0.dump    |   1 +
 .../sample_mhm1_bl_configchange.mp4.1.dump    |   1 +
 .../sample_mhm1_bl_configchange.mp4.2.dump    |   1 +
 .../sample_mhm1_bl_configchange.mp4.3.dump    |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 ...m1_bl_configchange.mp4.unknown_length.dump |   1 +
 ...mhm1_bl_configchange_fragmented.mp4.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 ...gchange_fragmented.mp4.unknown_length.dump |   1 +
 .../mp4/sample_mhm1_lcbl_cicp1.mp4.0.dump     |   1 +
 .../mp4/sample_mhm1_lcbl_cicp1.mp4.1.dump     |   1 +
 .../mp4/sample_mhm1_lcbl_cicp1.mp4.2.dump     |   1 +
 .../mp4/sample_mhm1_lcbl_cicp1.mp4.3.dump     |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 ...le_mhm1_lcbl_cicp1.mp4.unknown_length.dump |   1 +
 ...mple_mhm1_lcbl_cicp1_fragmented.mp4.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 ...l_cicp1_fragmented.mp4.unknown_length.dump |   1 +
 .../sample_mhm1_lcbl_configchange.mp4.0.dump  |   1 +
 .../sample_mhm1_lcbl_configchange.mp4.1.dump  |   1 +
 .../sample_mhm1_lcbl_configchange.mp4.2.dump  |   1 +
 .../sample_mhm1_lcbl_configchange.mp4.3.dump  |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 ..._lcbl_configchange.mp4.unknown_length.dump |   1 +
 ...m1_lcbl_configchange_fragmented.mp4.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 ...gchange_fragmented.mp4.unknown_length.dump |   1 +
 .../mp4/sample_mpegh_mha1.mp4.0.dump          |   1 +
 .../mp4/sample_mpegh_mha1.mp4.1.dump          |   1 +
 .../mp4/sample_mpegh_mha1.mp4.2.dump          |   1 +
 .../mp4/sample_mpegh_mha1.mp4.3.dump          |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 .../sample_mpegh_mha1.mp4.unknown_length.dump |   1 +
 .../mp4/sample_mpegh_mhm1.mp4.0.dump          |   1 +
 .../mp4/sample_mpegh_mhm1.mp4.1.dump          |   1 +
 .../mp4/sample_mpegh_mhm1.mp4.2.dump          |   1 +
 .../mp4/sample_mpegh_mhm1.mp4.3.dump          |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 .../sample_mpegh_mhm1.mp4.unknown_length.dump |   1 +
 .../extractordumps/mp4/sample_opus.mp4.0.dump |   1 +
 .../extractordumps/mp4/sample_opus.mp4.1.dump |   1 +
 .../extractordumps/mp4/sample_opus.mp4.2.dump |   1 +
 .../extractordumps/mp4/sample_opus.mp4.3.dump |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 .../mp4/sample_opus.mp4.unknown_length.dump   |   1 +
 .../mp4/sample_opus_fragmented.mp4.0.dump     |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 ...le_opus_fragmented.mp4.unknown_length.dump |   1 +
 .../sample_partially_fragmented.mp4.0.dump    |   2 +
 ...ding_within_gop_sample_dependencies.0.dump |   2 +
 ...op_sample_dependencies.unknown_length.dump |   2 +
 ...rtially_fragmented.mp4.unknown_length.dump |   2 +
 .../mp4/sample_with_apvc.mp4.0.dump           |   1 +
 .../mp4/sample_with_apvc.mp4.1.dump           |   1 +
 .../mp4/sample_with_apvc.mp4.2.dump           |   1 +
 .../mp4/sample_with_apvc.mp4.3.dump           |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 .../sample_with_apvc.mp4.unknown_length.dump  |   1 +
 .../mp4/sample_with_av1c.mp4.0.dump           |   1 +
 .../mp4/sample_with_av1c.mp4.1.dump           |   1 +
 .../mp4/sample_with_av1c.mp4.2.dump           |   1 +
 .../mp4/sample_with_av1c.mp4.3.dump           |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 .../sample_with_av1c.mp4.unknown_length.dump  |   1 +
 .../mp4/sample_with_color_info.mp4.0.dump     |   2 +
 .../mp4/sample_with_color_info.mp4.1.dump     |   2 +
 .../mp4/sample_with_color_info.mp4.2.dump     |   2 +
 .../mp4/sample_with_color_info.mp4.3.dump     |   2 +
 ...ding_within_gop_sample_dependencies.0.dump |   2 +
 ...ding_within_gop_sample_dependencies.1.dump |   2 +
 ...ding_within_gop_sample_dependencies.2.dump |   2 +
 ...ding_within_gop_sample_dependencies.3.dump |   2 +
 ...op_sample_dependencies.unknown_length.dump |   2 +
 ...le_with_color_info.mp4.unknown_length.dump |   2 +
 .../sample_with_colr_mdcv_and_clli.mp4.0.dump |   2 +
 .../sample_with_colr_mdcv_and_clli.mp4.1.dump |   2 +
 .../sample_with_colr_mdcv_and_clli.mp4.2.dump |   2 +
 .../sample_with_colr_mdcv_and_clli.mp4.3.dump |   2 +
 ...ding_within_gop_sample_dependencies.0.dump |   2 +
 ...ding_within_gop_sample_dependencies.1.dump |   2 +
 ...ding_within_gop_sample_dependencies.2.dump |   2 +
 ...ding_within_gop_sample_dependencies.3.dump |   2 +
 ...op_sample_dependencies.unknown_length.dump |   2 +
 ...colr_mdcv_and_clli.mp4.unknown_length.dump |   2 +
 ...with_fake_editable_video_tracks.mp4.0.dump |   1 +
 ...with_fake_editable_video_tracks.mp4.1.dump |   1 +
 ...with_fake_editable_video_tracks.mp4.2.dump |   1 +
 ...with_fake_editable_video_tracks.mp4.3.dump |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 ...table_video_tracks.mp4.unknown_length.dump |   1 +
 ...s.mp4_with_flag_read_Editable_video_tracks |   2 +
 ...eaved_with_primary_video_tracks.mp4.0.dump |   1 +
 ...eaved_with_primary_video_tracks.mp4.1.dump |   1 +
 ...eaved_with_primary_video_tracks.mp4.2.dump |   1 +
 ...eaved_with_primary_video_tracks.mp4.3.dump |   1 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 ...imary_video_tracks.mp4.unknown_length.dump |   1 +
 ...s.mp4_with_flag_read_Editable_video_tracks |   2 +
 .../mp4/sample_with_metadata.mp4.0.dump       |   2 +
 .../mp4/sample_with_metadata.mp4.1.dump       |   2 +
 .../mp4/sample_with_metadata.mp4.2.dump       |   2 +
 .../mp4/sample_with_metadata.mp4.3.dump       |   2 +
 ...ding_within_gop_sample_dependencies.0.dump |   2 +
 ...ding_within_gop_sample_dependencies.1.dump |   2 +
 ...ding_within_gop_sample_dependencies.2.dump |   2 +
 ...ding_within_gop_sample_dependencies.3.dump |   2 +
 ...op_sample_dependencies.unknown_length.dump |   2 +
 ...mple_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 +
 ...ding_within_gop_sample_dependencies.0.dump |   2 +
 ...ding_within_gop_sample_dependencies.1.dump |   2 +
 ...ding_within_gop_sample_dependencies.2.dump |   2 +
 ...ding_within_gop_sample_dependencies.3.dump |   2 +
 ...op_sample_dependencies.unknown_length.dump |   2 +
 ...with_numeric_genre.mp4.unknown_length.dump |   2 +
 ...riginal_quicktime_specification.mov.0.dump |   2 +
 ...riginal_quicktime_specification.mov.1.dump |   2 +
 ...riginal_quicktime_specification.mov.2.dump |   2 +
 ...riginal_quicktime_specification.mov.3.dump |   2 +
 ...ding_within_gop_sample_dependencies.0.dump |   2 +
 ...ding_within_gop_sample_dependencies.1.dump |   2 +
 ...ding_within_gop_sample_dependencies.2.dump |   2 +
 ...ding_within_gop_sample_dependencies.3.dump |   2 +
 ...op_sample_dependencies.unknown_length.dump |   2 +
 ...time_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 +
 ...ding_within_gop_sample_dependencies.0.dump |   1 +
 ...ding_within_gop_sample_dependencies.1.dump |   1 +
 ...ding_within_gop_sample_dependencies.2.dump |   1 +
 ...ding_within_gop_sample_dependencies.3.dump |   1 +
 ...op_sample_dependencies.unknown_length.dump |   1 +
 ...180_mvhevc_5frames.mov.unknown_length.dump |   1 +
 .../bbb_176x144_128kbps_15fps_h263.3gp.dump   |   1 +
 .../bbb_176x144_192kbps_15fps_mpeg4.mp4.dump  |   1 +
 .../bbb_1ch_16kHz_q10_vorbis.ogg.dump         |   1 +
 .../bbb_642x642_768kbps_30fps_vp9.webm.dump   |   1 +
 .../muxerdumps/bbb_6ch_8kHz_opus.ogg.dump     |   1 +
 ...kbps_30fps_avc_2b_firstpts_10_sec.mp4.dump |   1 +
 ...68kbps_30fps_avc_non_reference_3b.mp4.dump |   1 +
 ...x640_768kbps_30fps_avc_pyramid_3b.mp4.dump |   1 +
 ...s_30fps_avc_pyramid_3b.mp4_fragmented.dump |   1 +
 .../bbb_mono_16kHz_23.05kbps_amrwb.3gp.dump   |   1 +
 .../bbb_mono_8kHz_12.2kbps_amrnb.3gp.dump     |   1 +
 .../h265_with_metadata_track.mp4.dump         |   3 +
 .../assets/muxerdumps/hdr10-720p.mp4.dump     |   2 +
 .../muxerdumps/hdr10-720p.mp4_fragmented.dump |   2 +
 .../mp4_with_0_orientation.mp4.dump           |   1 +
 .../mp4_with_180_orientation.mp4.dump         |   1 +
 .../mp4_with_270_orientation.mp4.dump         |   1 +
 .../mp4_with_90_orientation.mp4.dump          |   1 +
 .../muxerdumps/mp4_with_b_frame.mp4.dump      |   1 +
 .../mp4_with_b_frame_large_pts.mp4.dump       |   2 +
 .../mp4_with_different_tracks_offset.mp4.dump |   2 +
 .../mp4_with_editable_video_tracks.mp4.dump   |   2 +
 ...ditable_track_samples_interleaved.mp4.dump |   2 +
 .../mp4_with_float_metadata.mp4.dump          |   1 +
 .../muxerdumps/mp4_with_frame_rate.mp4.dump   |   1 +
 .../muxerdumps/mp4_with_location.mp4.dump     |   1 +
 .../mp4_with_negative_tracks_offset.mp4.dump  |   1 +
 .../mp4_with_null_location.mp4.dump           |   1 +
 .../mp4_with_primary_tracks.mp4.dump          |   1 +
 ...ditable_track_samples_interleaved.mp4.dump |   1 +
 .../mp4_with_same_tracks_offset.mp4.dump      |   2 +
 .../mp4_with_string_metadata.mp4.dump         |   1 +
 .../muxerdumps/partial_hdr10-720p.mp4.dump    |   2 +
 .../assets/muxerdumps/sample_av1.mp4.dump     |   2 +
 ...amable_output_disabled_hdr10-720p.mp4.dump |   2 +
 ...mple_batching_disabled_hdr10-720p.mp4.dump |   2 +
 .../muxerdumps/sample_no_bframes.mp4.dump     |   2 +
 ...deo.mov+seq-gap_200ms-sample_rf64.wav.dump |   1 +
 ...deo.mov+seq-sample_rf64.wav-gap_100ms.dump |   1 +
 ...s-sample_rf64.wav_clipped300msTo800ms.dump |   1 +
 ...mixedWith_sample_18byte_nclx_colr.mp4.dump |   1 +
 .../transmuxed_with_inappmuxer.dump           |   1 +
 .../transmuxed_with_inappmuxer.dump           |   1 +
 .../transmuxed_with_inappmuxer.dump           |   1 +
 .../transmuxed_with_inappmuxer.dump           |   1 +
 .../transmuxed_with_inappmuxer.dump           |   1 +
 .../transmuxed_with_inappmuxer.dump           |   1 +
 .../transmuxed_with_inappmuxer.dump           |   2 +
 .../transmuxed_with_inappmuxer.dump           |   2 +
 .../transmuxed.dump                           |   1 +
 .../transmuxed.dump                           |   1 +
 .../mp4/sample.mp4/noaudio.dump               |   1 +
 .../mp4/sample.mp4/novideo.dump               |   1 +
 .../mp4/sample.mp4/original.dump              |   2 +
 .../original_original_transmux.dump           |   2 +
 .../mp4/sample.mp4/rotated.dump               |   2 +
 .../mp4/sample.mp4/silence.dump               |   1 +
 .../mp4/sample.mp4/silence_48000hz.dump       |   1 +
 ...ng_mixedWith_test-cbr-info-header.mp3.dump |   1 +
 .../sample_18byte_nclx_colr.mp4/original.dump |   1 +
 .../sample_18byte_nclx_colr.mp4/silence.dump  |   1 +
 .../transmuxed_with_inappmuxer.dump           |   2 +
 .../transmuxed_with_inappmuxer.dump           |   2 +
 .../sample_sef_slow_motion.mp4/noaudio.dump   |   1 +
 .../mp4/sample_twos_pcm.mp4/toInt16.dump      |   1 +
 .../clipped.dump                              |   2 +
 .../clipped_clipped_transmux.dump             |   2 +
 .../clipped_to_empty.dump                     |   2 +
 .../highPitch_silenceHighPitch.dump           |   1 +
 .../mixed_sample_rf64.wav.dump                |   1 +
 .../mp4/sowt-with-video.mov/original.dump     |   1 +
 .../sowt-with-video.mov/original_silence.dump |   1 +
 .../sequence_repeated3Times.dump              |   1 +
 ...mixed_loopingAudiosowt-with-video.mov.dump |   1 +
 .../mp4/sowt-with-video.mov/silence.dump      |   1 +
 .../silenceFromEffect.dump                    |   1 +
 .../silenceHighPitch_highPitch.dump           |   1 +
 .../silenceHighPitch_silence.dump             |   1 +
 .../silenceHighPitch_silenceHighPitch.dump    |   1 +
 .../sowt-with-video.mov/silence_original.dump |   1 +
 .../sowt-with-video.mov/silence_silence.dump  |   1 +
 .../silence_silenceHighPitch.dump             |   1 +
 .../sequence/sowt-with-video.mov.dump         |   1 +
 .../sowt-with-video.mov_halfPitch.dump        |   1 +
 .../sowt-with-video.mov_silence.dump          |   1 +
 ...sowt-with-video.mov_silence_halfPitch.dump |   1 +
 .../sowt-with-video.mov_silence.dump          |   1 +
 .../sowt-with-video.mov_halfPitch.dump        |   1 +
 ...sowt-with-video.mov_silence_halfPitch.dump |   1 +
 ...sowt-with-video.mov_silence_halfPitch.dump |   1 +
 .../sowt-with-video.mov_halfPitch.dump        |   1 +
 .../sowt-with-video.mov_silence.dump          |   1 +
 .../sowt-with-video.mov_halfPitch.dump        |   1 +
 .../sowt-with-video.mov.dump                  |   1 +
 .../sowt-with-video.mov_silence.dump          |   1 +
 ...sowt-with-video.mov_silence_halfPitch.dump |   1 +
 .../sowt-with-video.mov_silence.dump          |   1 +
 .../sowt-with-video.mov.dump                  |   1 +
 ...sowt-with-video.mov_silence_halfPitch.dump |   1 +
 ...sowt-with-video.mov_silence_halfPitch.dump |   1 +
 .../sowt-with-video.mov.dump                  |   1 +
 .../sowt-with-video.mov_silence.dump          |   1 +
 .../sequence/sowt-with-video.mov_silence.dump |   1 +
 .../sowt-with-video.mov.dump                  |   1 +
 .../sowt-with-video.mov_halfPitch.dump        |   1 +
 ...sowt-with-video.mov_silence_halfPitch.dump |   1 +
 .../sowt-with-video.mov_halfPitch.dump        |   1 +
 .../sowt-with-video.mov.dump                  |   1 +
 ...sowt-with-video.mov_silence_halfPitch.dump |   1 +
 ...sowt-with-video.mov_silence_halfPitch.dump |   1 +
 .../sowt-with-video.mov.dump                  |   1 +
 .../sowt-with-video.mov_halfPitch.dump        |   1 +
 ...sowt-with-video.mov_silence_halfPitch.dump |   1 +
 .../sowt-with-video.mov.dump                  |   1 +
 .../sowt-with-video.mov_halfPitch.dump        |   1 +
 .../sowt-with-video.mov_silence.dump          |   1 +
 .../sowt-with-video.mov_halfPitch.dump        |   1 +
 .../sowt-with-video.mov.dump                  |   1 +
 .../sowt-with-video.mov_silence.dump          |   1 +
 .../sowt-with-video.mov_silence.dump          |   1 +
 .../sowt-with-video.mov.dump                  |   1 +
 .../sowt-with-video.mov_halfPitch.dump        |   1 +
 .../transmuxed_with_inappmuxer.dump           |   1 +
 571 files changed, 908 insertions(+), 5 deletions(-)
 create mode 100644 libraries/extractor/src/main/java/androidx/media3/extractor/mp4/MimeTypeResolver.java

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 27b4e28ee3..104b54ce66 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
@@ -20,6 +20,7 @@ import static androidx.media3.common.util.Assertions.checkState;
 import static androidx.media3.common.util.Util.castNonNull;
 import static androidx.media3.common.util.Util.nullSafeArrayCopy;
 import static androidx.media3.extractor.mp4.BoxParser.parseTraks;
+import static androidx.media3.extractor.mp4.MimeTypeResolver.getContainerMimeType;
 import static java.lang.Math.max;
 import static java.lang.annotation.ElementType.TYPE_USE;
 
@@ -461,7 +462,8 @@ public class FragmentedMp4Extractor implements Extractor {
                   /* sampleDescriptionIndex= */ 0,
                   /* duration= */ 0,
                   /* size= */ 0,
-                  /* flags= */ 0));
+                  /* flags= */ 0),
+              getContainerMimeType(sideloadedTrack.format));
       trackBundles.put(0, bundle);
       extractorOutput.endTracks();
     }
@@ -687,6 +689,7 @@ public class FragmentedMp4Extractor implements Extractor {
     int trackCount = sampleTables.size();
     if (trackBundles.size() == 0) {
       // We need to create the track bundles.
+      String containerMimeType = getContainerMimeType(sampleTables);
       for (int i = 0; i < trackCount; i++) {
         TrackSampleTable sampleTable = sampleTables.get(i);
         Track track = sampleTable.track;
@@ -694,7 +697,10 @@ public class FragmentedMp4Extractor implements Extractor {
         output.durationUs(track.durationUs);
         TrackBundle trackBundle =
             new TrackBundle(
-                output, sampleTable, getDefaultSampleValues(defaultSampleValuesArray, track.id));
+                output,
+                sampleTable,
+                getDefaultSampleValues(defaultSampleValuesArray, track.id),
+                containerMimeType);
         trackBundles.put(track.id, trackBundle);
         durationUs = max(durationUs, track.durationUs);
       }
@@ -1844,6 +1850,7 @@ public class FragmentedMp4Extractor implements Extractor {
     public int currentTrackRunIndex;
     public int firstSampleToOutputIndex;
 
+    private final String containerMimeType;
     private final ParsableByteArray encryptionSignalByte;
     private final ParsableByteArray defaultInitializationVector;
 
@@ -1852,10 +1859,12 @@ public class FragmentedMp4Extractor implements Extractor {
     public TrackBundle(
         TrackOutput output,
         TrackSampleTable moovSampleTable,
-        DefaultSampleValues defaultSampleValues) {
+        DefaultSampleValues defaultSampleValues,
+        String containerMimeType) {
       this.output = output;
       this.moovSampleTable = moovSampleTable;
       this.defaultSampleValues = defaultSampleValues;
+      this.containerMimeType = containerMimeType;
       fragment = new TrackFragment();
       scratch = new ParsableByteArray();
       encryptionSignalByte = new ParsableByteArray(1);
@@ -1866,7 +1875,9 @@ public class FragmentedMp4Extractor implements Extractor {
     public void reset(TrackSampleTable moovSampleTable, DefaultSampleValues defaultSampleValues) {
       this.moovSampleTable = moovSampleTable;
       this.defaultSampleValues = defaultSampleValues;
-      output.format(moovSampleTable.track.format);
+      Format format =
+          moovSampleTable.track.format.buildUpon().setContainerMimeType(containerMimeType).build();
+      output.format(format);
       resetFragmentInfo();
     }
 
@@ -1878,7 +1889,13 @@ public class FragmentedMp4Extractor implements Extractor {
       @Nullable String schemeType = encryptionBox != null ? encryptionBox.schemeType : null;
       DrmInitData updatedDrmInitData = drmInitData.copyWithSchemeType(schemeType);
       Format format =
-          moovSampleTable.track.format.buildUpon().setDrmInitData(updatedDrmInitData).build();
+          moovSampleTable
+              .track
+              .format
+              .buildUpon()
+              .setContainerMimeType(containerMimeType)
+              .setDrmInitData(updatedDrmInitData)
+              .build();
       output.format(format);
     }
 
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/MimeTypeResolver.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/MimeTypeResolver.java
new file mode 100644
index 0000000000..c123bb15a4
--- /dev/null
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/MimeTypeResolver.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.media3.extractor.mp4;
+
+import androidx.annotation.Nullable;
+import androidx.media3.common.Format;
+import androidx.media3.common.MimeTypes;
+import java.util.List;
+import java.util.Objects;
+
+/** A helper class for resolving the MIME type of an MP4 container based on its tracks. */
+/* package */ final class MimeTypeResolver {
+
+  /**
+   * Determines the container MIME type based on a single track's {@link Format}.
+   *
+   * <p>This method should only be used when there is a single track available to determine the
+   * container MIME type. If multiple tracks are present, use {@link #getContainerMimeType(List)}
+   * instead.
+   *
+   * <p>The container MIME type is determined by the guidelines specified in:
+   *
+   * <ul>
+   *   <li><a href="https://www.rfc-editor.org/rfc/rfc4337.html#section-2">RFC 4337, Section 2</a>.
+   *   <li>HEIC as specified in ISO/IEC 23008-12, E.2, often treated as HEIF for compatibility.
+   *   <li><a href="https://aomediacodec.github.io/av1-avif/#mime-registration">AVIF spec</a>.
+   * </ul>
+   *
+   * @param format The {@link Format} instance representing a single track's format.
+   * @return The inferred container MIME type for the track's format.
+   */
+  public static String getContainerMimeType(Format format) {
+    @Nullable String sampleMimeType = format.sampleMimeType;
+
+    if (MimeTypes.isVideo(sampleMimeType)) {
+      return MimeTypes.VIDEO_MP4;
+    }
+
+    if (MimeTypes.isAudio(sampleMimeType)) {
+      return MimeTypes.AUDIO_MP4;
+    }
+
+    if (MimeTypes.isImage(sampleMimeType)) {
+      if (Objects.equals(sampleMimeType, MimeTypes.IMAGE_HEIC)) {
+        return MimeTypes.IMAGE_HEIF;
+      } else if (Objects.equals(sampleMimeType, MimeTypes.IMAGE_AVIF)) {
+        return MimeTypes.IMAGE_AVIF;
+      }
+    }
+
+    return MimeTypes.APPLICATION_MP4;
+  }
+
+  /**
+   * Determines the container MIME type for an MP4 file based on its tracks.
+   *
+   * <p>The container MIME type is determined by the guidelines specified in:
+   *
+   * <ul>
+   *   <li><a href="https://www.rfc-editor.org/rfc/rfc4337.html#section-2">RFC 4337, Section 2</a>.
+   *   <li>HEIC as specified in ISO/IEC 23008-12, E.2, often treated as HEIF for compatibility.
+   *   <li><a href="https://aomediacodec.github.io/av1-avif/#mime-registration">AVIF spec</a>.
+   * </ul>
+   *
+   * @param trackSampleTables A list of {@link TrackSampleTable} instances, each representing a
+   *     track with {@link Format} information for an MP4 file.
+   * @return The inferred container MIME type for the MP4 file.
+   */
+  public static String getContainerMimeType(List<TrackSampleTable> trackSampleTables) {
+    boolean hasAudio = false;
+    @Nullable String imageMimeType = null;
+
+    for (TrackSampleTable trackSampleTable : trackSampleTables) {
+      @Nullable String sampleMimeType = trackSampleTable.track.format.sampleMimeType;
+
+      if (MimeTypes.isVideo(sampleMimeType)) {
+        return MimeTypes.VIDEO_MP4;
+      }
+
+      if (MimeTypes.isAudio(sampleMimeType)) {
+        hasAudio = true;
+      } else if (MimeTypes.isImage(sampleMimeType)) {
+        if (Objects.equals(sampleMimeType, MimeTypes.IMAGE_HEIC)) {
+          imageMimeType = MimeTypes.IMAGE_HEIF;
+        } else if (Objects.equals(sampleMimeType, MimeTypes.IMAGE_AVIF)) {
+          imageMimeType = MimeTypes.IMAGE_AVIF;
+        }
+      }
+    }
+
+    if (hasAudio) {
+      return MimeTypes.AUDIO_MP4;
+    } else if (imageMimeType != null) {
+      return imageMimeType;
+    }
+
+    return MimeTypes.APPLICATION_MP4;
+  }
+
+  private MimeTypeResolver() {}
+}
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 35b24cf080..f0be73801c 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
@@ -30,6 +30,7 @@ import static androidx.media3.container.Mp4Util.EDITABLE_TRACK_TYPE_DEPTH_METADA
 import static androidx.media3.container.Mp4Util.EDITABLE_TRACK_TYPE_SHARP;
 import static androidx.media3.extractor.mp4.BoxParser.parseTraks;
 import static androidx.media3.extractor.mp4.MetadataUtil.findMdtaMetadataEntryWithKey;
+import static androidx.media3.extractor.mp4.MimeTypeResolver.getContainerMimeType;
 import static androidx.media3.extractor.mp4.Sniffer.BRAND_HEIC;
 import static androidx.media3.extractor.mp4.Sniffer.BRAND_QUICKTIME;
 import static java.lang.Math.max;
@@ -708,6 +709,7 @@ public final class Mp4Extractor implements Extractor, SeekMap {
               trackSampleTables.size()));
     }
     int trackIndex = 0;
+    String containerMimeType = getContainerMimeType(trackSampleTables);
     for (int i = 0; i < trackSampleTables.size(); i++) {
       TrackSampleTable trackSampleTable = trackSampleTables.get(i);
       if (trackSampleTable.sampleCount == 0) {
@@ -761,6 +763,7 @@ public final class Mp4Extractor implements Extractor, SeekMap {
           slowMotionMetadataEntries.isEmpty() ? null : new Metadata(slowMotionMetadataEntries),
           udtaMetadata,
           mvhdMetadata);
+      formatBuilder.setContainerMimeType(containerMimeType);
       mp4Track.trackOutput.format(formatBuilder.build());
 
       if (track.type == C.TRACK_TYPE_VIDEO && firstVideoTrackIndex == C.INDEX_UNSET) {
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 d8987f2dc2..fc47d14348 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -268,6 +269,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -296,6 +298,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -537,6 +540,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
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 b970650e98..983cf13d8c 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -212,6 +213,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -240,6 +242,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -401,6 +404,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
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 818f706cfd..030e99216f 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -128,6 +129,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -156,6 +158,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -233,6 +236,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
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 28ec0a9bff..476b939c85 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -44,6 +45,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -72,6 +74,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -85,6 +88,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
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 13b3a508de..6fd4b0ed73 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 867000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64000A
     maxInputSize = 3895
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 13b3a508de..6fd4b0ed73 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 867000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64000A
     maxInputSize = 3895
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 13b3a508de..6fd4b0ed73 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 867000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64000A
     maxInputSize = 3895
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 13b3a508de..6fd4b0ed73 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 867000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64000A
     maxInputSize = 3895
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 1d07f4a441..df965352d0 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 200000
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
@@ -200,6 +201,7 @@ track 1:
   track duration = 1020100
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.4D001E
     maxInputSize = 25345
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 d0ae34eb7f..e88dcdce05 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 200000
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
@@ -152,6 +153,7 @@ track 1:
   track duration = 1020100
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.4D001E
     maxInputSize = 25345
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 f027fb9348..242ccb9c18 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 200000
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
@@ -92,6 +93,7 @@ track 1:
   track duration = 1020100
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.4D001E
     maxInputSize = 25345
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 f3c46e915a..87249ffe56 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 200000
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
@@ -32,6 +33,7 @@ track 1:
   track duration = 1020100
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.4D001E
     maxInputSize = 25345
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 727ec3af69..1ff22cf5d9 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 200000
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
@@ -200,6 +201,7 @@ track 1:
   track duration = 1020100
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.4D001E
     maxInputSize = 25345
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 d4720fb0f2..6aa412e56d 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 200000
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
@@ -152,6 +153,7 @@ track 1:
   track duration = 1020100
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.4D001E
     maxInputSize = 25345
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 d6affc874c..51f44d06e7 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 200000
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
@@ -92,6 +93,7 @@ track 1:
   track duration = 1020100
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.4D001E
     maxInputSize = 25345
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 2fb5eaeeaa..5dd9712edc 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 200000
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
@@ -32,6 +33,7 @@ track 1:
   track duration = 1020100
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.4D001E
     maxInputSize = 25345
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 727ec3af69..1ff22cf5d9 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 200000
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
@@ -200,6 +201,7 @@ track 1:
   track duration = 1020100
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.4D001E
     maxInputSize = 25345
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 1d07f4a441..df965352d0 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 200000
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
@@ -200,6 +201,7 @@ track 1:
   track duration = 1020100
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.4D001E
     maxInputSize = 25345
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 f7afbeca95..cbb9444460 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -267,6 +268,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -294,6 +296,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -535,6 +538,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
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 dd1ac53e4f..1e9a0b9c05 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -211,6 +212,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -238,6 +240,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -399,6 +402,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
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 6aa62c9e8c..7321164e03 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -127,6 +128,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -154,6 +156,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -231,6 +234,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
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 a785cb75d3..7064089a21 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -43,6 +44,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -70,6 +72,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -83,6 +86,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
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 f7afbeca95..cbb9444460 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -267,6 +268,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -294,6 +296,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -535,6 +538,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
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 dd1ac53e4f..1e9a0b9c05 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -211,6 +212,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -238,6 +240,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -399,6 +402,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
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 6aa62c9e8c..7321164e03 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -127,6 +128,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -154,6 +156,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -231,6 +234,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
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 a785cb75d3..7064089a21 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -43,6 +44,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -70,6 +72,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -83,6 +86,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
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 f7afbeca95..cbb9444460 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -267,6 +268,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -294,6 +296,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -535,6 +538,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
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 f7afbeca95..cbb9444460 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -267,6 +268,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -294,6 +296,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -535,6 +538,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
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 e01f7a8636..ce092e208c 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 4cf1fcc8fb..6d71372887 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 88a235e7d9..dc21b28676 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 5315d45a8e..3211e8f279 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 a085e135c7..1fff74c002 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 0f109ce9a3..62e488955e 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 57a4dddeec..5772298425 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 54cfb1303b..c5f274ec8b 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 a085e135c7..1fff74c002 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 e01f7a8636..ce092e208c 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 e01f7a8636..ce092e208c 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 879b698b0d..d1daf77470 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
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 879b698b0d..d1daf77470 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
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 879b698b0d..d1daf77470 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
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 879b698b0d..d1daf77470 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
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 c09c445e45..f0dc292eca 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
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 c09c445e45..f0dc292eca 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
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 c09c445e45..f0dc292eca 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
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 c09c445e45..f0dc292eca 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
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 c09c445e45..f0dc292eca 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
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 879b698b0d..d1daf77470 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
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 a0d0062631..3421554f45 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
@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     maxInputSize = 1566
     channelCount = 6
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 b9d4465ca0..420ec53a85 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
@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     maxInputSize = 1566
     channelCount = 6
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 ea8896834d..fe630734a6 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
@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     maxInputSize = 1566
     channelCount = 6
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 e25b4083e2..16828c49e1 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
@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     maxInputSize = 1566
     channelCount = 6
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 a0d0062631..3421554f45 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
@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     maxInputSize = 1566
     channelCount = 6
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 b9d4465ca0..420ec53a85 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
@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     maxInputSize = 1566
     channelCount = 6
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 ea8896834d..fe630734a6 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
@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     maxInputSize = 1566
     channelCount = 6
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 e25b4083e2..16828c49e1 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
@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     maxInputSize = 1566
     channelCount = 6
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 a0d0062631..3421554f45 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
@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     maxInputSize = 1566
     channelCount = 6
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 a0d0062631..3421554f45 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
@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     maxInputSize = 1566
     channelCount = 6
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 1d5af213b8..8ba6c24b7b 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
@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     channelCount = 6
     sampleRate = 48000
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 c8e7669f9e..cf376b7567 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
@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     channelCount = 6
     sampleRate = 48000
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 159065624b..3f047e5888 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
@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     channelCount = 6
     sampleRate = 48000
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 2020e71359..e4cdafa482 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
@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     channelCount = 6
     sampleRate = 48000
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 1d5af213b8..8ba6c24b7b 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
@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     channelCount = 6
     sampleRate = 48000
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 c8e7669f9e..cf376b7567 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
@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     channelCount = 6
     sampleRate = 48000
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 159065624b..3f047e5888 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
@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     channelCount = 6
     sampleRate = 48000
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 2020e71359..e4cdafa482 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
@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     channelCount = 6
     sampleRate = 48000
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 1d5af213b8..8ba6c24b7b 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
@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     channelCount = 6
     sampleRate = 48000
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 1d5af213b8..8ba6c24b7b 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
@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     channelCount = 6
     sampleRate = 48000
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 2afbfc8d92..336b805122 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 622
     channelCount = 2
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 2afbfc8d92..336b805122 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 622
     channelCount = 2
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 2afbfc8d92..336b805122 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 622
     channelCount = 2
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 2afbfc8d92..336b805122 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 622
     channelCount = 2
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 2afbfc8d92..336b805122 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 622
     channelCount = 2
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 2afbfc8d92..336b805122 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 622
     channelCount = 2
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 2afbfc8d92..336b805122 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 622
     channelCount = 2
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 2afbfc8d92..336b805122 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 622
     channelCount = 2
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 2afbfc8d92..336b805122 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 622
     channelCount = 2
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 2afbfc8d92..336b805122 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 622
     channelCount = 2
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 7f5dc0e5f0..5d21866967 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000
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 bd1be5adfc..30957e6d59 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000
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 06b968186d..0cb4dad117 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000
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 bc945ba75b..d253bb5105 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000
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 7f5dc0e5f0..5d21866967 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000
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 bd1be5adfc..30957e6d59 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000
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 06b968186d..0cb4dad117 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000
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 bc945ba75b..d253bb5105 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000
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 7f5dc0e5f0..5d21866967 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000
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 7f5dc0e5f0..5d21866967 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.0.dump
index e9f8bd2a62..c351b1a4bc 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.0.dump
@@ -12,6 +12,7 @@ track 0:
   track duration = 853333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 8158
     channelCount = 21
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.1.dump
index e9f8bd2a62..c351b1a4bc 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.1.dump
@@ -12,6 +12,7 @@ track 0:
   track duration = 853333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 8158
     channelCount = 21
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.2.dump
index f7359f2c82..27a451e780 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.2.dump
@@ -12,6 +12,7 @@ track 0:
   track duration = 853333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 8158
     channelCount = 21
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.3.dump
index f7359f2c82..27a451e780 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.3.dump
@@ -12,6 +12,7 @@ track 0:
   track duration = 853333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 8158
     channelCount = 21
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.0.dump
index e9f8bd2a62..c351b1a4bc 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -12,6 +12,7 @@ track 0:
   track duration = 853333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 8158
     channelCount = 21
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.1.dump
index e9f8bd2a62..c351b1a4bc 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -12,6 +12,7 @@ track 0:
   track duration = 853333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 8158
     channelCount = 21
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.2.dump
index f7359f2c82..27a451e780 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -12,6 +12,7 @@ track 0:
   track duration = 853333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 8158
     channelCount = 21
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.3.dump
index f7359f2c82..27a451e780 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -12,6 +12,7 @@ track 0:
   track duration = 853333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 8158
     channelCount = 21
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index e9f8bd2a62..c351b1a4bc 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -12,6 +12,7 @@ track 0:
   track duration = 853333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 8158
     channelCount = 21
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.unknown_length.dump
index e9f8bd2a62..c351b1a4bc 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.unknown_length.dump
@@ -12,6 +12,7 @@ track 0:
   track duration = 853333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 8158
     channelCount = 21
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 59e8c5f3f8..353b386b78 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000
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 94d06251df..a04f9c1772 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000
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 818c5622eb..33a31f9826 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000
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 64c4bd67d8..37e7775960 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000
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 59e8c5f3f8..353b386b78 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000
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 94d06251df..a04f9c1772 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000
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 818c5622eb..33a31f9826 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000
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 64c4bd67d8..37e7775960 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000
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 59e8c5f3f8..353b386b78 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000
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 59e8c5f3f8..353b386b78 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000
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 5f381367f3..338dd72c1c 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 526000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.640033
     maxInputSize = 34686
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 5f381367f3..338dd72c1c 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 526000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.640033
     maxInputSize = 34686
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 5f381367f3..338dd72c1c 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 526000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.640033
     maxInputSize = 34686
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 5f381367f3..338dd72c1c 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 526000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.640033
     maxInputSize = 34686
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 04c11de22a..25d994ea05 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 526000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.640033
     maxInputSize = 34686
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 04c11de22a..25d994ea05 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 526000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.640033
     maxInputSize = 34686
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 04c11de22a..25d994ea05 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 526000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.640033
     maxInputSize = 34686
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 04c11de22a..25d994ea05 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 526000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.640033
     maxInputSize = 34686
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 04c11de22a..25d994ea05 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 526000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.640033
     maxInputSize = 34686
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 5f381367f3..338dd72c1c 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 526000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.640033
     maxInputSize = 34686
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 da418782a6..0cd1b46f4b 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 418333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/true-hd
     maxInputSize = 12480
     channelCount = 2
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 edec4d8aae..b6b7aa85b8 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 418333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/true-hd
     maxInputSize = 12480
     channelCount = 2
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 909347a4d6..9993dc0f10 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 418333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/true-hd
     maxInputSize = 12480
     channelCount = 2
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 4063e8c9d4..cc1704ffa5 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 418333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/true-hd
     maxInputSize = 12480
     channelCount = 2
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 da418782a6..0cd1b46f4b 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 418333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/true-hd
     maxInputSize = 12480
     channelCount = 2
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 edec4d8aae..b6b7aa85b8 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 418333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/true-hd
     maxInputSize = 12480
     channelCount = 2
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 909347a4d6..9993dc0f10 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 418333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/true-hd
     maxInputSize = 12480
     channelCount = 2
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 4063e8c9d4..cc1704ffa5 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 418333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/true-hd
     maxInputSize = 12480
     channelCount = 2
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 da418782a6..0cd1b46f4b 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 418333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/true-hd
     maxInputSize = 12480
     channelCount = 2
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 da418782a6..0cd1b46f4b 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 418333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/true-hd
     maxInputSize = 12480
     channelCount = 2
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 91f9886dd0..dfc9cf05cb 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 1000000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3
     maxInputSize = 4030
     channelCount = 6
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 c7f24a3081..ed25c589f7 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 1000000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3
     maxInputSize = 4030
     channelCount = 6
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 ca25d7245e..7864799bb2 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 1000000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3
     maxInputSize = 4030
     channelCount = 6
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 2f4bf06307..64064c12c9 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 1000000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3
     maxInputSize = 4030
     channelCount = 6
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 91f9886dd0..dfc9cf05cb 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 1000000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3
     maxInputSize = 4030
     channelCount = 6
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 c7f24a3081..ed25c589f7 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 1000000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3
     maxInputSize = 4030
     channelCount = 6
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 ca25d7245e..7864799bb2 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 1000000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3
     maxInputSize = 4030
     channelCount = 6
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 2f4bf06307..64064c12c9 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 1000000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3
     maxInputSize = 4030
     channelCount = 6
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 91f9886dd0..dfc9cf05cb 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 1000000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3
     maxInputSize = 4030
     channelCount = 6
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 91f9886dd0..dfc9cf05cb 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 1000000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3
     maxInputSize = 4030
     channelCount = 6
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 b00deaab7a..ff4e78a870 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 1000000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3
     channelCount = 6
     sampleRate = 48000
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 47d58bafaf..816c58012c 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 1000000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3
     channelCount = 6
     sampleRate = 48000
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 fc48a87e9e..a50bf3a4ec 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 1000000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3
     channelCount = 6
     sampleRate = 48000
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 d42df24401..8a6f4e592f 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 1000000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3
     channelCount = 6
     sampleRate = 48000
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 b00deaab7a..ff4e78a870 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 1000000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3
     channelCount = 6
     sampleRate = 48000
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 47d58bafaf..816c58012c 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 1000000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3
     channelCount = 6
     sampleRate = 48000
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 fc48a87e9e..a50bf3a4ec 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 1000000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3
     channelCount = 6
     sampleRate = 48000
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 d42df24401..8a6f4e592f 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 1000000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3
     channelCount = 6
     sampleRate = 48000
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 b00deaab7a..ff4e78a870 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 1000000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3
     channelCount = 6
     sampleRate = 48000
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 b00deaab7a..ff4e78a870 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 1000000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3
     channelCount = 6
     sampleRate = 48000
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 1220803347..bf9ff46606 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 640000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3-joc
     maxInputSize = 2590
     channelCount = 6
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 95e15cb5f5..80ea152a36 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 640000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3-joc
     maxInputSize = 2590
     channelCount = 6
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 3194a7bb3e..5a14117f0f 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 640000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3-joc
     maxInputSize = 2590
     channelCount = 6
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 c5ef6fa2c5..419cc441d4 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 640000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3-joc
     maxInputSize = 2590
     channelCount = 6
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 1220803347..bf9ff46606 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 640000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3-joc
     maxInputSize = 2590
     channelCount = 6
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 95e15cb5f5..80ea152a36 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 640000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3-joc
     maxInputSize = 2590
     channelCount = 6
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 3194a7bb3e..5a14117f0f 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 640000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3-joc
     maxInputSize = 2590
     channelCount = 6
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 c5ef6fa2c5..419cc441d4 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 640000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3-joc
     maxInputSize = 2590
     channelCount = 6
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 1220803347..bf9ff46606 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 640000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3-joc
     maxInputSize = 2590
     channelCount = 6
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 1220803347..bf9ff46606 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 640000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3-joc
     maxInputSize = 2590
     channelCount = 6
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 2a043e5039..e3b2165cb4 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 640000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3-joc
     channelCount = 6
     sampleRate = 48000
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 baab49a246..dec9e3be4f 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 640000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3-joc
     channelCount = 6
     sampleRate = 48000
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 25a1e087d7..0df5e48778 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 640000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3-joc
     channelCount = 6
     sampleRate = 48000
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 d76b75e550..0f5044e631 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 640000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3-joc
     channelCount = 6
     sampleRate = 48000
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 2a043e5039..e3b2165cb4 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 640000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3-joc
     channelCount = 6
     sampleRate = 48000
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 baab49a246..dec9e3be4f 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 640000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3-joc
     channelCount = 6
     sampleRate = 48000
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 25a1e087d7..0df5e48778 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 640000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3-joc
     channelCount = 6
     sampleRate = 48000
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 d76b75e550..0f5044e631 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 640000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3-joc
     channelCount = 6
     sampleRate = 48000
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 2a043e5039..e3b2165cb4 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 640000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3-joc
     channelCount = 6
     sampleRate = 48000
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 2a043e5039..e3b2165cb4 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 640000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/eac3-joc
     channelCount = 6
     sampleRate = 48000
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 41237f0403..562858157b 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2548333
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
     codecs = hev1.08.04
     maxInputSize = 196379
@@ -376,6 +377,7 @@ track 1:
   format 0:
     peakBitrate = 192000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 832
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 54d5a8b955..b6e32820ee 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2548333
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
     codecs = hev1.08.04
     maxInputSize = 196379
@@ -284,6 +285,7 @@ track 1:
   format 0:
     peakBitrate = 192000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 832
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 130240b824..2f22401f57 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2548333
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
     codecs = hev1.08.04
     maxInputSize = 196379
@@ -156,6 +157,7 @@ track 1:
   format 0:
     peakBitrate = 192000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 832
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 d76e2661e3..be9895f354 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2548333
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
     codecs = hev1.08.04
     maxInputSize = 196379
@@ -156,6 +157,7 @@ track 1:
   format 0:
     peakBitrate = 192000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 832
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 41237f0403..562858157b 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2548333
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
     codecs = hev1.08.04
     maxInputSize = 196379
@@ -376,6 +377,7 @@ track 1:
   format 0:
     peakBitrate = 192000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 832
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 54d5a8b955..b6e32820ee 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2548333
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
     codecs = hev1.08.04
     maxInputSize = 196379
@@ -284,6 +285,7 @@ track 1:
   format 0:
     peakBitrate = 192000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 832
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 130240b824..2f22401f57 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2548333
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
     codecs = hev1.08.04
     maxInputSize = 196379
@@ -156,6 +157,7 @@ track 1:
   format 0:
     peakBitrate = 192000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 832
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 d76e2661e3..be9895f354 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2548333
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
     codecs = hev1.08.04
     maxInputSize = 196379
@@ -156,6 +157,7 @@ track 1:
   format 0:
     peakBitrate = 192000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 832
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 41237f0403..562858157b 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2548333
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
     codecs = hev1.08.04
     maxInputSize = 196379
@@ -376,6 +377,7 @@ track 1:
   format 0:
     peakBitrate = 192000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 832
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 41237f0403..562858157b 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2548333
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
     codecs = hev1.08.04
     maxInputSize = 196379
@@ -376,6 +377,7 @@ track 1:
   format 0:
     peakBitrate = 192000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 832
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 56fd09d9c4..c06868308a 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 967600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.640034
     maxInputSize = 22910
@@ -155,6 +156,7 @@ track 1:
   track duration = 1065600
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 db53899a5a..9ffbb3213d 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 967600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.640034
     maxInputSize = 22910
@@ -155,6 +156,7 @@ track 1:
   track duration = 1065600
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 226fa24c60..bed94df4f8 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 967600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.640034
     maxInputSize = 22910
@@ -155,6 +156,7 @@ track 1:
   track duration = 1065600
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 caaa1b8ded..4f9b4b7fa8 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 967600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.640034
     maxInputSize = 22910
@@ -155,6 +156,7 @@ track 1:
   track duration = 1065600
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 56fd09d9c4..c06868308a 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 967600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.640034
     maxInputSize = 22910
@@ -155,6 +156,7 @@ track 1:
   track duration = 1065600
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 db53899a5a..9ffbb3213d 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 967600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.640034
     maxInputSize = 22910
@@ -155,6 +156,7 @@ track 1:
   track duration = 1065600
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 226fa24c60..bed94df4f8 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 967600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.640034
     maxInputSize = 22910
@@ -155,6 +156,7 @@ track 1:
   track duration = 1065600
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 caaa1b8ded..4f9b4b7fa8 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 967600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.640034
     maxInputSize = 22910
@@ -155,6 +156,7 @@ track 1:
   track duration = 1065600
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 56fd09d9c4..c06868308a 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 967600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.640034
     maxInputSize = 22910
@@ -155,6 +156,7 @@ track 1:
   track duration = 1065600
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 56fd09d9c4..c06868308a 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 967600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.640034
     maxInputSize = 22910
@@ -155,6 +156,7 @@ track 1:
   track duration = 1065600
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.0.dump
index 460760d6cc..d9a25efa00 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.0.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 30
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -145,6 +146,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
index 839cb7aa25..6e8180246d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 30
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -145,6 +146,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 839cb7aa25..6e8180246d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 30
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -145,6 +146,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.unknown_length.dump
index 460760d6cc..d9a25efa00 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.unknown_length.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 30
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -145,6 +146,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
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 bbfde290b6..5c44f2581c 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 499875
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
     language = und
     initializationData:
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 07585bd9e5..6bcf994bbd 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 499875
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
     language = und
     initializationData:
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 f1ff9578f0..aeeefd0d83 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 499875
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
     language = und
     initializationData:
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 339684d0d6..fbe7a690dd 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 499875
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
     language = und
     initializationData:
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 bbfde290b6..5c44f2581c 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 499875
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
     language = und
     initializationData:
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 07585bd9e5..6bcf994bbd 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 499875
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
     language = und
     initializationData:
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 f1ff9578f0..aeeefd0d83 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 499875
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
     language = und
     initializationData:
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 339684d0d6..fbe7a690dd 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 499875
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
     language = und
     initializationData:
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 bbfde290b6..5c44f2581c 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 499875
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
     language = und
     initializationData:
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 bbfde290b6..5c44f2581c 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 499875
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
     language = und
     initializationData:
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 40cc74544c..1e8032c103 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1068000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -151,6 +152,7 @@ track 1:
     averageBitrate = 2147483647
     peakBitrate = 2147483647
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
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 3f8c9e8160..79f433eb3c 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1068000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -151,6 +152,7 @@ track 1:
     averageBitrate = 2147483647
     peakBitrate = 2147483647
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
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 457779b83c..5c8e1457ae 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1068000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -151,6 +152,7 @@ track 1:
     averageBitrate = 2147483647
     peakBitrate = 2147483647
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
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 550948fd50..25eba08ffc 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1068000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -151,6 +152,7 @@ track 1:
     averageBitrate = 2147483647
     peakBitrate = 2147483647
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
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 bfce9c63fc..b35cd11501 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1068000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -151,6 +152,7 @@ track 1:
     averageBitrate = 2147483647
     peakBitrate = 2147483647
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
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 d686df0e68..007dd01789 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1068000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -151,6 +152,7 @@ track 1:
     averageBitrate = 2147483647
     peakBitrate = 2147483647
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
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 c28423b2d6..1499f36e22 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1068000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -151,6 +152,7 @@ track 1:
     averageBitrate = 2147483647
     peakBitrate = 2147483647
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
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 4dec414eee..c96ec212d1 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1068000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -151,6 +152,7 @@ track 1:
     averageBitrate = 2147483647
     peakBitrate = 2147483647
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
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 bfce9c63fc..b35cd11501 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1068000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -151,6 +152,7 @@ track 1:
     averageBitrate = 2147483647
     peakBitrate = 2147483647
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
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 40cc74544c..1e8032c103 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1068000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -151,6 +152,7 @@ track 1:
     averageBitrate = 2147483647
     peakBitrate = 2147483647
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
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 64003f99d0..bd7f4a1e50 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1068000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -151,6 +152,7 @@ track 1:
     averageBitrate = 136736
     peakBitrate = 145976
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
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 7026d02548..ea2ffc8d83 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1068000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -151,6 +152,7 @@ track 1:
     averageBitrate = 136736
     peakBitrate = 145976
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
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 3e45baf2f9..48f108a434 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1068000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -151,6 +152,7 @@ track 1:
     averageBitrate = 136736
     peakBitrate = 145976
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
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 9cd5fc9828..feb56812d5 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1068000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -151,6 +152,7 @@ track 1:
     averageBitrate = 136736
     peakBitrate = 145976
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
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 893b7105db..a992d16add 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1068000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -151,6 +152,7 @@ track 1:
     averageBitrate = 136736
     peakBitrate = 145976
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
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 f059c2d002..3e7be9e082 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1068000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -151,6 +152,7 @@ track 1:
     averageBitrate = 136736
     peakBitrate = 145976
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
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 9a348f485d..e66acb5ade 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1068000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -151,6 +152,7 @@ track 1:
     averageBitrate = 136736
     peakBitrate = 145976
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
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 2a07029760..cb4e5afce8 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1068000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -151,6 +152,7 @@ track 1:
     averageBitrate = 136736
     peakBitrate = 145976
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
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 893b7105db..a992d16add 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1068000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -151,6 +152,7 @@ track 1:
     averageBitrate = 136736
     peakBitrate = 145976
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
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 64003f99d0..bd7f4a1e50 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1068000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -151,6 +152,7 @@ track 1:
     averageBitrate = 136736
     peakBitrate = 145976
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.0.dump
index a3b0901c83..caecfd256f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.0.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 30
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -145,6 +146,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.reading_within_gop_sample_dependencies.0.dump
index 6f243807a0..6b6bc85d84 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 30
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -145,6 +146,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 6f243807a0..6b6bc85d84 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 30
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -145,6 +146,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.unknown_length.dump
index a3b0901c83..caecfd256f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.unknown_length.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 30
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -145,6 +146,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sideloaded_track.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sideloaded_track.mp4.0.dump
index c1b45465ee..a9ef2b3b58 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sideloaded_track.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sideloaded_track.mp4.0.dump
@@ -7,6 +7,7 @@ track 0:
   total output bytes = 85933
   sample count = 30
   format 0:
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
   sample 0:
     time = 66733
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sideloaded_track.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sideloaded_track.mp4.unknown_length.dump
index c1b45465ee..a9ef2b3b58 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sideloaded_track.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sideloaded_track.mp4.unknown_length.dump
@@ -7,6 +7,7 @@ track 0:
   total output bytes = 85933
   sample count = 30
   format 0:
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
   sample 0:
     time = 66733
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 e4142e68f0..5c54629737 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 499875
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
     maxInputSize = 299
     language = und
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 bda897b6ef..4d18c095ef 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 499875
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
     maxInputSize = 299
     language = und
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 29dc9e3dda..a5aefd3ef4 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 499875
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
     maxInputSize = 299
     language = und
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 515f525889..5154aad7b0 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 499875
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
     maxInputSize = 299
     language = und
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 e4142e68f0..5c54629737 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 499875
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
     maxInputSize = 299
     language = und
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 bda897b6ef..4d18c095ef 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 499875
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
     maxInputSize = 299
     language = und
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 29dc9e3dda..a5aefd3ef4 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 499875
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
     maxInputSize = 299
     language = und
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 515f525889..5154aad7b0 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 499875
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
     maxInputSize = 299
     language = und
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 e4142e68f0..5c54629737 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 499875
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
     maxInputSize = 299
     language = und
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 e4142e68f0..5c54629737 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 499875
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
     maxInputSize = 299
     language = und
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 c17f580981..c3cfba7f49 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 9744de70ae..b5da33f0a2 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 e8b0998046..ba3f8c9091 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 8e07d87402..e2cad34a30 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 140f8f238c..07ecbcd428 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 d1c6cae4aa..447ac12d78 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 cfdc6f45b9..f5884cd2fc 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 592614dc82..513ab6af3f 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 140f8f238c..07ecbcd428 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 c17f580981..c3cfba7f49 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 1faf6a19e4..0244543145 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 600000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     maxInputSize = 365
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 1faf6a19e4..0244543145 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 600000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     maxInputSize = 365
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 1faf6a19e4..0244543145 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 600000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     maxInputSize = 365
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 daffd11ae7..f05fa66c0c 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 600000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     maxInputSize = 365
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 1faf6a19e4..0244543145 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 600000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     maxInputSize = 365
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 1faf6a19e4..0244543145 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 600000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     maxInputSize = 365
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 1faf6a19e4..0244543145 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 600000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     maxInputSize = 365
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 daffd11ae7..f05fa66c0c 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 600000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     maxInputSize = 365
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 1faf6a19e4..0244543145 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 600000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     maxInputSize = 365
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 1faf6a19e4..0244543145 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 600000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     maxInputSize = 365
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1_fragmented.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1_fragmented.mp4.0.dump
index e91cd986d1..284df2f026 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1_fragmented.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1_fragmented.mp4.0.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 29
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     channelCount = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
index e91cd986d1..284df2f026 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 29
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     channelCount = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index e91cd986d1..284df2f026 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 29
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     channelCount = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1_fragmented.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1_fragmented.mp4.unknown_length.dump
index e91cd986d1..284df2f026 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1_fragmented.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1_fragmented.mp4.unknown_length.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 29
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     channelCount = 0
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 fb9909945c..544c906adb 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1800000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     maxInputSize = 1476
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 dc6bdadd11..780cc8e493 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1800000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     maxInputSize = 1476
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 16ade566c1..577d0ac2e3 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1800000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     maxInputSize = 1476
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 3458d50eed..b35f8ad324 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1800000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     maxInputSize = 1476
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 fb9909945c..544c906adb 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1800000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     maxInputSize = 1476
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 dc6bdadd11..780cc8e493 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1800000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     maxInputSize = 1476
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 16ade566c1..577d0ac2e3 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1800000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     maxInputSize = 1476
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 3458d50eed..b35f8ad324 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1800000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     maxInputSize = 1476
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 fb9909945c..544c906adb 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1800000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     maxInputSize = 1476
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 fb9909945c..544c906adb 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1800000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     maxInputSize = 1476
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange_fragmented.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange_fragmented.mp4.0.dump
index 2ae108b09d..5decd316e8 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange_fragmented.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange_fragmented.mp4.0.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 87
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     channelCount = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
index 2ae108b09d..5decd316e8 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 87
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     channelCount = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 2ae108b09d..5decd316e8 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 87
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     channelCount = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange_fragmented.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange_fragmented.mp4.unknown_length.dump
index 2ae108b09d..5decd316e8 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange_fragmented.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange_fragmented.mp4.unknown_length.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 87
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.10
     channelCount = 0
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 0dbba7ca36..c83a0fe947 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 600000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     maxInputSize = 368
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 0dbba7ca36..c83a0fe947 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 600000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     maxInputSize = 368
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 0dbba7ca36..c83a0fe947 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 600000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     maxInputSize = 368
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 e6ff0e95cf..a02d3dcff4 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 600000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     maxInputSize = 368
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 0dbba7ca36..c83a0fe947 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 600000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     maxInputSize = 368
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 0dbba7ca36..c83a0fe947 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 600000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     maxInputSize = 368
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 0dbba7ca36..c83a0fe947 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 600000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     maxInputSize = 368
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 e6ff0e95cf..a02d3dcff4 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 600000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     maxInputSize = 368
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 0dbba7ca36..c83a0fe947 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 600000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     maxInputSize = 368
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 0dbba7ca36..c83a0fe947 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 600000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     maxInputSize = 368
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1_fragmented.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1_fragmented.mp4.0.dump
index 431719a58d..719f5229f0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1_fragmented.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1_fragmented.mp4.0.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 29
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     channelCount = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
index 431719a58d..719f5229f0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 29
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     channelCount = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 431719a58d..719f5229f0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 29
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     channelCount = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1_fragmented.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1_fragmented.mp4.unknown_length.dump
index 431719a58d..719f5229f0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1_fragmented.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1_fragmented.mp4.unknown_length.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 29
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     channelCount = 0
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 b0eb30b3cb..fe2d2d5915 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1800000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     maxInputSize = 1479
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 43c53291cd..8cae6cf305 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1800000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     maxInputSize = 1479
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 67d97fab50..d246c7b93a 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1800000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     maxInputSize = 1479
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 63aaa67617..39db912aea 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1800000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     maxInputSize = 1479
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 b0eb30b3cb..fe2d2d5915 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1800000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     maxInputSize = 1479
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 43c53291cd..8cae6cf305 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1800000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     maxInputSize = 1479
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 67d97fab50..d246c7b93a 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1800000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     maxInputSize = 1479
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 63aaa67617..39db912aea 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1800000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     maxInputSize = 1479
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 b0eb30b3cb..fe2d2d5915 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1800000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     maxInputSize = 1479
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 b0eb30b3cb..fe2d2d5915 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1800000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     maxInputSize = 1479
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange_fragmented.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange_fragmented.mp4.0.dump
index fc7a4a1dd8..7e77e2768c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange_fragmented.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange_fragmented.mp4.0.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 87
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     channelCount = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
index fc7a4a1dd8..7e77e2768c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 87
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     channelCount = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index fc7a4a1dd8..7e77e2768c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 87
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     channelCount = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange_fragmented.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange_fragmented.mp4.unknown_length.dump
index fc7a4a1dd8..7e77e2768c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange_fragmented.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange_fragmented.mp4.unknown_length.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 87
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0B
     channelCount = 0
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 ec9fd692de..54bb42cd17 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1168020
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mha1
     codecs = mha1.0D
     maxInputSize = 3528
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 ec9fd692de..54bb42cd17 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1168020
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mha1
     codecs = mha1.0D
     maxInputSize = 3528
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 2e0395dd26..3d83bac859 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1168020
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mha1
     codecs = mha1.0D
     maxInputSize = 3528
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 9bdd4a8b84..02326506e0 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1168020
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mha1
     codecs = mha1.0D
     maxInputSize = 3528
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 ec9fd692de..54bb42cd17 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1168020
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mha1
     codecs = mha1.0D
     maxInputSize = 3528
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 ec9fd692de..54bb42cd17 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1168020
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mha1
     codecs = mha1.0D
     maxInputSize = 3528
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 2e0395dd26..3d83bac859 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1168020
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mha1
     codecs = mha1.0D
     maxInputSize = 3528
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 9bdd4a8b84..02326506e0 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1168020
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mha1
     codecs = mha1.0D
     maxInputSize = 3528
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 ec9fd692de..54bb42cd17 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1168020
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mha1
     codecs = mha1.0D
     maxInputSize = 3528
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 ec9fd692de..54bb42cd17 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1168020
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mha1
     codecs = mha1.0D
     maxInputSize = 3528
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 7a1217f978..c0bad92c14 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1168020
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0D
     maxInputSize = 3564
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 7a1217f978..c0bad92c14 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1168020
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0D
     maxInputSize = 3564
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 3ae06406e7..72eaae64a4 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1168020
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0D
     maxInputSize = 3564
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 bf01367197..6e90ed3a17 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1168020
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0D
     maxInputSize = 3564
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 7a1217f978..c0bad92c14 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1168020
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0D
     maxInputSize = 3564
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 7a1217f978..c0bad92c14 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1168020
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0D
     maxInputSize = 3564
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 3ae06406e7..72eaae64a4 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1168020
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0D
     maxInputSize = 3564
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 bf01367197..6e90ed3a17 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1168020
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0D
     maxInputSize = 3564
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 7a1217f978..c0bad92c14 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1168020
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0D
     maxInputSize = 3564
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 7a1217f978..c0bad92c14 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1168020
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
     codecs = mhm1.0D
     maxInputSize = 3564
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 bca4f63fce..40ce3f55fb 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1460000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/opus
     maxInputSize = 278
     channelCount = 2
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 eb62eae137..e395812c64 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1460000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/opus
     maxInputSize = 278
     channelCount = 2
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 b4b4b1e698..59fe7bef66 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1460000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/opus
     maxInputSize = 278
     channelCount = 2
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 3b68ca2f60..1c13964549 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1460000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/opus
     maxInputSize = 278
     channelCount = 2
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 bca4f63fce..40ce3f55fb 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1460000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/opus
     maxInputSize = 278
     channelCount = 2
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 eb62eae137..e395812c64 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1460000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/opus
     maxInputSize = 278
     channelCount = 2
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 b4b4b1e698..59fe7bef66 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1460000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/opus
     maxInputSize = 278
     channelCount = 2
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 3b68ca2f60..1c13964549 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1460000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/opus
     maxInputSize = 278
     channelCount = 2
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 bca4f63fce..40ce3f55fb 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1460000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/opus
     maxInputSize = 278
     channelCount = 2
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 bca4f63fce..40ce3f55fb 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1460000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/opus
     maxInputSize = 278
     channelCount = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus_fragmented.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus_fragmented.mp4.0.dump
index 4f1fb74586..bb71b35529 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus_fragmented.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus_fragmented.mp4.0.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 250
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/opus
     channelCount = 2
     sampleRate = 16000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
index 4f1fb74586..bb71b35529 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 250
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/opus
     channelCount = 2
     sampleRate = 16000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 4f1fb74586..bb71b35529 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 250
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/opus
     channelCount = 2
     sampleRate = 16000
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus_fragmented.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus_fragmented.mp4.unknown_length.dump
index 4f1fb74586..bb71b35529 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus_fragmented.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus_fragmented.mp4.unknown_length.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 250
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/opus
     channelCount = 2
     sampleRate = 16000
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 8dd351f1bf..a212a58d78 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
@@ -9,6 +9,7 @@ track 0:
   track duration = 134000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -149,6 +150,7 @@ track 1:
     averageBitrate = 1254
     peakBitrate = 69000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
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 0e595ed6df..1a3d7e13cc 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
@@ -9,6 +9,7 @@ track 0:
   track duration = 134000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -149,6 +150,7 @@ track 1:
     averageBitrate = 1254
     peakBitrate = 69000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
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 0e595ed6df..1a3d7e13cc 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
@@ -9,6 +9,7 @@ track 0:
   track duration = 134000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -149,6 +150,7 @@ track 1:
     averageBitrate = 1254
     peakBitrate = 69000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
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 8dd351f1bf..a212a58d78 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
@@ -9,6 +9,7 @@ track 0:
   track duration = 134000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
@@ -149,6 +150,7 @@ track 1:
     averageBitrate = 1254
     peakBitrate = 69000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.0.dump
index 53eccede22..93f15e3c66 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.0.dump
@@ -12,6 +12,7 @@ track 0:
   track duration = 4166600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/apv
     maxInputSize = 46321
     width = 640
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.1.dump
index 24276c9df5..2e035eee61 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.1.dump
@@ -12,6 +12,7 @@ track 0:
   track duration = 4166600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/apv
     maxInputSize = 46321
     width = 640
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.2.dump
index 166520ea03..8db92d17f4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.2.dump
@@ -12,6 +12,7 @@ track 0:
   track duration = 4166600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/apv
     maxInputSize = 46321
     width = 640
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.3.dump
index 4a265e4314..e3e1d88dc9 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.3.dump
@@ -12,6 +12,7 @@ track 0:
   track duration = 4166600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/apv
     maxInputSize = 46321
     width = 640
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.0.dump
index 53eccede22..93f15e3c66 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -12,6 +12,7 @@ track 0:
   track duration = 4166600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/apv
     maxInputSize = 46321
     width = 640
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.1.dump
index 24276c9df5..2e035eee61 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -12,6 +12,7 @@ track 0:
   track duration = 4166600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/apv
     maxInputSize = 46321
     width = 640
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.2.dump
index 166520ea03..8db92d17f4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -12,6 +12,7 @@ track 0:
   track duration = 4166600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/apv
     maxInputSize = 46321
     width = 640
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.3.dump
index 4a265e4314..e3e1d88dc9 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -12,6 +12,7 @@ track 0:
   track duration = 4166600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/apv
     maxInputSize = 46321
     width = 640
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 53eccede22..93f15e3c66 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -12,6 +12,7 @@ track 0:
   track duration = 4166600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/apv
     maxInputSize = 46321
     width = 640
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.unknown_length.dump
index 53eccede22..93f15e3c66 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_apvc.mp4.unknown_length.dump
@@ -12,6 +12,7 @@ track 0:
   track duration = 4166600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/apv
     maxInputSize = 46321
     width = 640
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 3d156864eb..16692e6284 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1000000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/av01
     maxInputSize = 188
     width = 720
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 3d156864eb..16692e6284 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1000000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/av01
     maxInputSize = 188
     width = 720
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 3d156864eb..16692e6284 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1000000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/av01
     maxInputSize = 188
     width = 720
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 3d156864eb..16692e6284 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1000000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/av01
     maxInputSize = 188
     width = 720
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 3d156864eb..16692e6284 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1000000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/av01
     maxInputSize = 188
     width = 720
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 3d156864eb..16692e6284 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1000000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/av01
     maxInputSize = 188
     width = 720
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 3d156864eb..16692e6284 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1000000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/av01
     maxInputSize = 188
     width = 720
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 3d156864eb..16692e6284 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1000000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/av01
     maxInputSize = 188
     width = 720
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 3d156864eb..16692e6284 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1000000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/av01
     maxInputSize = 188
     width = 720
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 3d156864eb..16692e6284 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1000000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/av01
     maxInputSize = 188
     width = 720
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 fccf5c4a4d..3c92611ee0 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 298333
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
     codecs = hev1.08.04
     maxInputSize = 40550
@@ -72,6 +73,7 @@ track 1:
   format 0:
     peakBitrate = 192000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 568
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 0d307d9105..da89c03c3e 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 298333
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
     codecs = hev1.08.04
     maxInputSize = 40550
@@ -72,6 +73,7 @@ track 1:
   format 0:
     peakBitrate = 192000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 568
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 1ba5b70fa2..6e971000b2 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 298333
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
     codecs = hev1.08.04
     maxInputSize = 40550
@@ -72,6 +73,7 @@ track 1:
   format 0:
     peakBitrate = 192000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 568
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 b8c6ffafb3..4a1a3bc888 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 298333
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
     codecs = hev1.08.04
     maxInputSize = 40550
@@ -72,6 +73,7 @@ track 1:
   format 0:
     peakBitrate = 192000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 568
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 fccf5c4a4d..3c92611ee0 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 298333
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
     codecs = hev1.08.04
     maxInputSize = 40550
@@ -72,6 +73,7 @@ track 1:
   format 0:
     peakBitrate = 192000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 568
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 0d307d9105..da89c03c3e 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 298333
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
     codecs = hev1.08.04
     maxInputSize = 40550
@@ -72,6 +73,7 @@ track 1:
   format 0:
     peakBitrate = 192000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 568
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 1ba5b70fa2..6e971000b2 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 298333
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
     codecs = hev1.08.04
     maxInputSize = 40550
@@ -72,6 +73,7 @@ track 1:
   format 0:
     peakBitrate = 192000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 568
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 b8c6ffafb3..4a1a3bc888 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 298333
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
     codecs = hev1.08.04
     maxInputSize = 40550
@@ -72,6 +73,7 @@ track 1:
   format 0:
     peakBitrate = 192000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 568
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 fccf5c4a4d..3c92611ee0 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 298333
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
     codecs = hev1.08.04
     maxInputSize = 40550
@@ -72,6 +73,7 @@ track 1:
   format 0:
     peakBitrate = 192000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 568
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 fccf5c4a4d..3c92611ee0 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 298333
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
     codecs = hev1.08.04
     maxInputSize = 40550
@@ -72,6 +73,7 @@ track 1:
   format 0:
     peakBitrate = 192000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 568
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 78f15fd071..82ce3d211d 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/av01
     maxInputSize = 144656
     width = 1920
@@ -275,6 +276,7 @@ track 1:
     averageBitrate = 130279
     peakBitrate = 130279
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 441
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 a0658b80d0..6c51b45bd6 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/av01
     maxInputSize = 144656
     width = 1920
@@ -275,6 +276,7 @@ track 1:
     averageBitrate = 130279
     peakBitrate = 130279
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 441
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 44c1566193..c5482fbcbe 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/av01
     maxInputSize = 144656
     width = 1920
@@ -275,6 +276,7 @@ track 1:
     averageBitrate = 130279
     peakBitrate = 130279
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 441
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 74f990ddc3..322d0da46d 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/av01
     maxInputSize = 144656
     width = 1920
@@ -275,6 +276,7 @@ track 1:
     averageBitrate = 130279
     peakBitrate = 130279
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 441
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 78f15fd071..82ce3d211d 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/av01
     maxInputSize = 144656
     width = 1920
@@ -275,6 +276,7 @@ track 1:
     averageBitrate = 130279
     peakBitrate = 130279
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 441
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 a0658b80d0..6c51b45bd6 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/av01
     maxInputSize = 144656
     width = 1920
@@ -275,6 +276,7 @@ track 1:
     averageBitrate = 130279
     peakBitrate = 130279
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 441
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 44c1566193..c5482fbcbe 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/av01
     maxInputSize = 144656
     width = 1920
@@ -275,6 +276,7 @@ track 1:
     averageBitrate = 130279
     peakBitrate = 130279
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 441
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 74f990ddc3..322d0da46d 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/av01
     maxInputSize = 144656
     width = 1920
@@ -275,6 +276,7 @@ track 1:
     averageBitrate = 130279
     peakBitrate = 130279
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 441
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 78f15fd071..82ce3d211d 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/av01
     maxInputSize = 144656
     width = 1920
@@ -275,6 +276,7 @@ track 1:
     averageBitrate = 130279
     peakBitrate = 130279
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 441
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 78f15fd071..82ce3d211d 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/av01
     maxInputSize = 144656
     width = 1920
@@ -275,6 +276,7 @@ track 1:
     averageBitrate = 130279
     peakBitrate = 130279
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 441
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 11783384e4..50671d1674 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 11783384e4..50671d1674 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 11783384e4..50671d1674 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 11783384e4..50671d1674 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 11783384e4..50671d1674 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 11783384e4..50671d1674 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 11783384e4..50671d1674 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 11783384e4..50671d1674 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 11783384e4..50671d1674 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 11783384e4..50671d1674 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 b27f9e1c10..4ce38943d1 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
@@ -54,6 +55,7 @@ track 1:
   track duration = 0
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 d25799f66b..9dce77ecea 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 d25799f66b..9dce77ecea 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 d25799f66b..9dce77ecea 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 d25799f66b..9dce77ecea 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 d25799f66b..9dce77ecea 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 d25799f66b..9dce77ecea 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 d25799f66b..9dce77ecea 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 d25799f66b..9dce77ecea 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 d25799f66b..9dce77ecea 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 d25799f66b..9dce77ecea 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 f11fc66241..a4a47a3e90 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
@@ -54,6 +55,7 @@ track 1:
   track duration = 0
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 f5457994d6..b6895df216 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 5cfb5c79ad..61c07ad2dc 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 cd0b077e6f..c8f9eaee70 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 f346a9d4a5..ef9dd29615 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 cd8455d4cf..180ac4cf9f 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 824d5b856e..adbef36425 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 1097f31c0c..69bc49ad82 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 e6e1a125b1..75d674f230 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 cd8455d4cf..180ac4cf9f 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 f5457994d6..b6895df216 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 305b917651..3ab858219d 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 0f25ab628c..18b6c71f4d 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 c3499bbb8c..66137cf1c7 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 b7f2d197f9..58336ba0ec 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 f0d026fe4c..33040d2433 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 b63654cc29..de0f1952fa 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 90c0a49ec5..a3dc6cffd4 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 abfe8bfc40..dec9a59349 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 f0d026fe4c..33040d2433 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 305b917651..3ab858219d 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
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 31113327d5..8affc9273b 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2741666
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L150.B0
     maxInputSize = 364750
@@ -354,6 +355,7 @@ track 1:
   track duration = 2633333
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/raw
     maxInputSize = 8222
     channelCount = 1
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 a7f73773c9..c70735befc 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2741666
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L150.B0
     maxInputSize = 364750
@@ -298,6 +299,7 @@ track 1:
   track duration = 2633333
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/raw
     maxInputSize = 8222
     channelCount = 1
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 708937a44c..e201ad2a53 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2741666
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L150.B0
     maxInputSize = 364750
@@ -154,6 +155,7 @@ track 1:
   track duration = 2633333
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/raw
     maxInputSize = 8222
     channelCount = 1
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 793d8c11cd..491d33e906 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2741666
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L150.B0
     maxInputSize = 364750
@@ -66,6 +67,7 @@ track 1:
   track duration = 2633333
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/raw
     maxInputSize = 8222
     channelCount = 1
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 31113327d5..8affc9273b 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2741666
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L150.B0
     maxInputSize = 364750
@@ -354,6 +355,7 @@ track 1:
   track duration = 2633333
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/raw
     maxInputSize = 8222
     channelCount = 1
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 a7f73773c9..c70735befc 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2741666
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L150.B0
     maxInputSize = 364750
@@ -298,6 +299,7 @@ track 1:
   track duration = 2633333
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/raw
     maxInputSize = 8222
     channelCount = 1
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 708937a44c..e201ad2a53 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2741666
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L150.B0
     maxInputSize = 364750
@@ -154,6 +155,7 @@ track 1:
   track duration = 2633333
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/raw
     maxInputSize = 8222
     channelCount = 1
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 793d8c11cd..491d33e906 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2741666
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L150.B0
     maxInputSize = 364750
@@ -66,6 +67,7 @@ track 1:
   track duration = 2633333
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/raw
     maxInputSize = 8222
     channelCount = 1
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 31113327d5..8affc9273b 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2741666
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L150.B0
     maxInputSize = 364750
@@ -354,6 +355,7 @@ track 1:
   track duration = 2633333
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/raw
     maxInputSize = 8222
     channelCount = 1
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 31113327d5..8affc9273b 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 2741666
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L150.B0
     maxInputSize = 364750
@@ -354,6 +355,7 @@ track 1:
   track duration = 2633333
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/raw
     maxInputSize = 8222
     channelCount = 1
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 0d292fc451..147ced1239 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 55555
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/mv-hevc
     codecs = hvc1.6.40.L156.BF.80
     maxInputSize = 40098
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 0d292fc451..147ced1239 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 55555
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/mv-hevc
     codecs = hvc1.6.40.L156.BF.80
     maxInputSize = 40098
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 0d292fc451..147ced1239 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 55555
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/mv-hevc
     codecs = hvc1.6.40.L156.BF.80
     maxInputSize = 40098
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 0d292fc451..147ced1239 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 55555
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/mv-hevc
     codecs = hvc1.6.40.L156.BF.80
     maxInputSize = 40098
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 0d292fc451..147ced1239 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 55555
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/mv-hevc
     codecs = hvc1.6.40.L156.BF.80
     maxInputSize = 40098
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 0d292fc451..147ced1239 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 55555
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/mv-hevc
     codecs = hvc1.6.40.L156.BF.80
     maxInputSize = 40098
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 0d292fc451..147ced1239 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 55555
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/mv-hevc
     codecs = hvc1.6.40.L156.BF.80
     maxInputSize = 40098
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 0d292fc451..147ced1239 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 55555
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/mv-hevc
     codecs = hvc1.6.40.L156.BF.80
     maxInputSize = 40098
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 0d292fc451..147ced1239 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 55555
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/mv-hevc
     codecs = hvc1.6.40.L156.BF.80
     maxInputSize = 40098
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 0d292fc451..147ced1239 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 55555
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/mv-hevc
     codecs = hvc1.6.40.L156.BF.80
     maxInputSize = 40098
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 dae2488eb5..a3d5a94b9b 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1000000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/3gpp
     maxInputSize = 10464
     width = 176
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 cd43ea0d48..3b741b90fb 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
@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 365552
     peakBitrate = 365552
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/mp4v-es
     maxInputSize = 9256
     width = 176
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 e8aefec33c..d894205389 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 99992
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/vorbis
     maxInputSize = 295
     channelCount = 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 b3a91619b9..8ebdb9702e 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 3000000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/x-vnd.on2.vp9
     maxInputSize = 115022
     width = 642
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 eba2ba6fed..203ea13ce5 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 3013500
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/opus
     maxInputSize = 1185
     channelCount = 6
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 246dca8eac..0373ca3605 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 4000000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 56252
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 3a04628794..ca7b92b8e1 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 4000000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 74696
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 0bf89134fb..fc083d7f2d 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 4000000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 74696
diff --git a/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_avc_pyramid_3b.mp4_fragmented.dump b/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_avc_pyramid_3b.mp4_fragmented.dump
index b130335097..59463af38b 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_avc_pyramid_3b.mp4_fragmented.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_avc_pyramid_3b.mp4_fragmented.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 120
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxNumReorderSamples = 2
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 fd96fea1b1..51439fe405 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 3000000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/amr-wb
     maxInputSize = 89
     channelCount = 1
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 0875e287a7..a1c938be72 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 3020000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/3gpp
     maxInputSize = 62
     channelCount = 1
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 97bbfeb31d..420a477442 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 100100
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = application/meta
     maxInputSize = 161
     metadata = entries=[Mp4Timestamp: creation time=100000000, modification time=500000000, timescale=10000]
@@ -35,6 +36,7 @@ track 1:
     averageBitrate = 192000
     peakBitrate = 192000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 627
@@ -62,6 +64,7 @@ track 2:
   track duration = 100100
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153.B0
     maxInputSize = 420494
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 956fe995b3..117b95939c 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 4236600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.2.4.L153
     maxInputSize = 157952
@@ -544,6 +545,7 @@ track 1:
     averageBitrate = 256000
     peakBitrate = 256000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 877
diff --git a/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4_fragmented.dump b/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4_fragmented.dump
index 929a624049..3109ca5c88 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4_fragmented.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4_fragmented.dump
@@ -8,6 +8,7 @@ track 0:
   sample count = 127
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.2.4.L153
     maxNumReorderSamples = 0
@@ -536,6 +537,7 @@ track 1:
     averageBitrate = 256000
     peakBitrate = 256000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     channelCount = 2
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 6748960022..7dcec161cb 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 45deec377f..67adc28975 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 1c70f45916..bfcab25eae 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 ba069faed3..dfaef7d34a 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 2bfdb56184..85d1e77e4e 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 4000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 9137af3d1f..6717db814b 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 414900
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
@@ -49,6 +50,7 @@ track 1:
   track duration = 414900
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 606640beb2..7b2dbdca85 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 100
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
@@ -41,6 +42,7 @@ track 1:
   track duration = 100
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 b27f9e1c10..4ce38943d1 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
@@ -54,6 +55,7 @@ track 1:
   track duration = 0
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 f11fc66241..a4a47a3e90 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
@@ -54,6 +55,7 @@ track 1:
   track duration = 0
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 9e03b2f968..db43018ef6 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 c5b641baee..ddb04e2640 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 5e2c633b0b..8561084213 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 c0d5eeef4f..9272c148d8 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 6748960022..7dcec161cb 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 11783384e4..50671d1674 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 d25799f66b..9dce77ecea 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 7bb15882d7..5b3c1662ac 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 100
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
@@ -41,6 +42,7 @@ track 1:
   track duration = 200
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 6b30c4a543..057bd63ed4 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 0
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.F4000A
     maxInputSize = 86
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 2a6c93b6c8..1752e8f219 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 4171700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.2.4.L153
     maxInputSize = 157952
@@ -536,6 +537,7 @@ track 1:
     averageBitrate = 256000
     peakBitrate = 256000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 877
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 72394c9cd3..a7c9c967b7 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/av01
     maxInputSize = 46460
     width = 1080
@@ -151,6 +152,7 @@ track 1:
     averageBitrate = 71295
     peakBitrate = 71295
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 612
diff --git a/libraries/test_data/src/test/assets/muxerdumps/sample_batching_and_attempt_streamable_output_disabled_hdr10-720p.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/sample_batching_and_attempt_streamable_output_disabled_hdr10-720p.mp4.dump
index ed88c911d8..38a28611f8 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/sample_batching_and_attempt_streamable_output_disabled_hdr10-720p.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/sample_batching_and_attempt_streamable_output_disabled_hdr10-720p.mp4.dump
@@ -12,6 +12,7 @@ track 0:
   track duration = 4236600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.2.4.L153
     maxInputSize = 157952
@@ -544,6 +545,7 @@ track 1:
     averageBitrate = 256000
     peakBitrate = 256000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 877
diff --git a/libraries/test_data/src/test/assets/muxerdumps/sample_batching_disabled_hdr10-720p.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/sample_batching_disabled_hdr10-720p.mp4.dump
index 27303edf04..3be5335140 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/sample_batching_disabled_hdr10-720p.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/sample_batching_disabled_hdr10-720p.mp4.dump
@@ -12,6 +12,7 @@ track 0:
   track duration = 4236600
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.2.4.L153
     maxInputSize = 157952
@@ -544,6 +545,7 @@ track 1:
     averageBitrate = 256000
     peakBitrate = 256000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 877
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 aa2720a376..5c9a7e69e9 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1045300
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
@@ -207,6 +208,7 @@ track 1:
   track duration = 1001000
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.640034
     maxInputSize = 22904
diff --git a/libraries/test_data/src/test/assets/transformerdumps/composition/seq-sowt-with-video.mov+seq-gap_200ms-sample_rf64.wav.dump b/libraries/test_data/src/test/assets/transformerdumps/composition/seq-sowt-with-video.mov+seq-gap_200ms-sample_rf64.wav.dump
index c67c949313..a1b199df40 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/composition/seq-sowt-with-video.mov+seq-gap_200ms-sample_rf64.wav.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/composition/seq-sowt-with-video.mov+seq-gap_200ms-sample_rf64.wav.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/composition/seq-sowt-with-video.mov+seq-sample_rf64.wav-gap_100ms.dump b/libraries/test_data/src/test/assets/transformerdumps/composition/seq-sowt-with-video.mov+seq-sample_rf64.wav-gap_100ms.dump
index 2a74a92b67..7798e691a0 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/composition/seq-sowt-with-video.mov+seq-sample_rf64.wav-gap_100ms.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/composition/seq-sowt-with-video.mov+seq-sample_rf64.wav-gap_100ms.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/composition/seq-sowt-with-video.mov+seq-sample_rf64.wav_clipped0msTo300ms-gap_200ms-sample_rf64.wav_clipped300msTo800ms.dump b/libraries/test_data/src/test/assets/transformerdumps/composition/seq-sowt-with-video.mov+seq-sample_rf64.wav_clipped0msTo300ms-gap_200ms-sample_rf64.wav_clipped300msTo800ms.dump
index 35816d02d9..36334fec33 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/composition/seq-sowt-with-video.mov+seq-sample_rf64.wav_clipped0msTo300ms-gap_200ms-sample_rf64.wav_clipped300msTo800ms.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/composition/seq-sowt-with-video.mov+seq-sample_rf64.wav_clipped0msTo300ms-gap_200ms-sample_rf64.wav_clipped300msTo800ms.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp3/test-cbr-info-header.mp3/looping_mixedWith_sample_18byte_nclx_colr.mp4.dump b/libraries/test_data/src/test/assets/transformerdumps/mp3/test-cbr-info-header.mp3/looping_mixedWith_sample_18byte_nclx_colr.mp4.dump
index 7eabb4a3a9..577f21d882 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp3/test-cbr-info-header.mp3/looping_mixedWith_sample_18byte_nclx_colr.mp4.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp3/test-cbr-info-header.mp3/looping_mixedWith_sample_18byte_nclx_colr.mp4.dump
@@ -9,6 +9,7 @@ format audio:
   metadata = entries=[TSSE: description=null: values=[Lavf58.45.100]]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64001F
   maxInputSize = 36722
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 981b83a93b..782b157bfc 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1000000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/3gpp
     maxInputSize = 10464
     width = 176
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 68e16edcaa..2aa9fd9f07 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
@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 365552
     peakBitrate = 365552
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/mp4v-es
     maxInputSize = 9256
     width = 176
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 00e9bf7973..3c4f0a8400 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
@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 99992
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/vorbis
     maxInputSize = 295
     channelCount = 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 c0a11ae0d7..2818dceb29 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 3020000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/opus
     maxInputSize = 1185
     channelCount = 6
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 a6c486c2e5..1d2f43d2da 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 3000000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/amr-wb
     maxInputSize = 89
     channelCount = 2
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 f014c95ba5..fe68598338 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 3020000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/3gpp
     maxInputSize = 62
     channelCount = 2
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/dolbyVision-hdr.MOV/transmuxed_with_inappmuxer.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/dolbyVision-hdr.MOV/transmuxed_with_inappmuxer.dump
index 8c600a6ebf..d5105e74f2 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/dolbyVision-hdr.MOV/transmuxed_with_inappmuxer.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/dolbyVision-hdr.MOV/transmuxed_with_inappmuxer.dump
@@ -12,6 +12,7 @@ track 0:
   track duration = 166700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.2.4.L93.B0
     maxInputSize = 30755
@@ -56,6 +57,7 @@ track 1:
   format 0:
     peakBitrate = 192000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 616
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 53ec4ecafc..3b262eb219 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 100100
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153.B0
     maxInputSize = 420494
@@ -49,6 +50,7 @@ track 1:
     averageBitrate = 192000
     peakBitrate = 192000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 627
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/iibbibb_editlist_videoonly.mp4/transmuxed.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/iibbibb_editlist_videoonly.mp4/transmuxed.dump
index 35fbdf6be4..e3dd029d4c 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/iibbibb_editlist_videoonly.mp4/transmuxed.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/iibbibb_editlist_videoonly.mp4/transmuxed.dump
@@ -1,5 +1,6 @@
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.F40016
   maxInputSize = 7838
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/long_edit_list_audioonly.mp4/transmuxed.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/long_edit_list_audioonly.mp4/transmuxed.dump
index 6f771244f0..1a871c624b 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/long_edit_list_audioonly.mp4/transmuxed.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/long_edit_list_audioonly.mp4/transmuxed.dump
@@ -2,6 +2,7 @@ format audio:
   averageBitrate = 140021
   peakBitrate = 140781
   id = 1
+  containerMimeType = audio/mp4
   sampleMimeType = audio/mp4a-latm
   codecs = mp4a.40.2
   maxInputSize = 476
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/noaudio.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/noaudio.dump
index 6e131a6187..332309ef04 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/noaudio.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/noaudio.dump
@@ -1,5 +1,6 @@
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64001F
   maxInputSize = 36722
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/novideo.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/novideo.dump
index 7f858a9629..6de2e34084 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/novideo.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/novideo.dump
@@ -1,6 +1,7 @@
 format audio:
   peakBitrate = 200000
   id = 2
+  containerMimeType = video/mp4
   sampleMimeType = audio/mp4a-latm
   codecs = mp4a.40.2
   maxInputSize = 294
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/original.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/original.dump
index 0b877c7932..02198843a5 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/original.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/original.dump
@@ -1,6 +1,7 @@
 format audio:
   peakBitrate = 200000
   id = 2
+  containerMimeType = video/mp4
   sampleMimeType = audio/mp4a-latm
   codecs = mp4a.40.2
   maxInputSize = 294
@@ -12,6 +13,7 @@ format audio:
     data = length 2, hash 5F7
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64001F
   maxInputSize = 36722
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/original_original_transmux.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/original_original_transmux.dump
index 5a1af046ad..f87628264f 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/original_original_transmux.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/original_original_transmux.dump
@@ -1,6 +1,7 @@
 format audio:
   peakBitrate = 200000
   id = 2
+  containerMimeType = video/mp4
   sampleMimeType = audio/mp4a-latm
   codecs = mp4a.40.2
   maxInputSize = 294
@@ -12,6 +13,7 @@ format audio:
     data = length 2, hash 5F7
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64001F
   maxInputSize = 36722
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/rotated.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/rotated.dump
index 0c182e2cb8..dea1fcf4d0 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/rotated.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/rotated.dump
@@ -1,6 +1,7 @@
 format audio:
   peakBitrate = 200000
   id = 2
+  containerMimeType = video/mp4
   sampleMimeType = audio/mp4a-latm
   codecs = mp4a.40.2
   maxInputSize = 294
@@ -12,6 +13,7 @@ format audio:
     data = length 2, hash 5F7
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64001F
   maxInputSize = 36722
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence.dump
index 6a5d303e38..c50e49bc0b 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64001F
   maxInputSize = 36722
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence_48000hz.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence_48000hz.dump
index 2c698a4cff..4621b27e21 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence_48000hz.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence_48000hz.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64001F
   maxInputSize = 36722
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/looping_mixedWith_test-cbr-info-header.mp3.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/looping_mixedWith_test-cbr-info-header.mp3.dump
index b42953eb23..3c6fc7b2db 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/looping_mixedWith_test-cbr-info-header.mp3.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/looping_mixedWith_test-cbr-info-header.mp3.dump
@@ -9,6 +9,7 @@ format audio:
   metadata = entries=[TSSE: description=null: values=[Lavf58.45.100]]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64001F
   maxInputSize = 36722
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/original.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/original.dump
index bdccbe9da5..7c719bcb9e 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/original.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/original.dump
@@ -1,5 +1,6 @@
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64001F
   maxInputSize = 36722
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/silence.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/silence.dump
index f052e53ed0..f4fa2a52ca 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/silence.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/silence.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64001F
   maxInputSize = 36722
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 5df56790ec..1159425fde 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/av01
     maxInputSize = 46460
     width = 1080
@@ -152,6 +153,7 @@ track 1:
     averageBitrate = 71295
     peakBitrate = 71295
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 612
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 53c3073cf5..f25c210d29 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.640034
     maxInputSize = 22904
@@ -155,6 +156,7 @@ track 1:
   track duration = 1045300
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_sef_slow_motion.mp4/noaudio.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_sef_slow_motion.mp4/noaudio.dump
index 8b1378db28..c5ba64fe71 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_sef_slow_motion.mp4/noaudio.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_sef_slow_motion.mp4/noaudio.dump
@@ -1,5 +1,6 @@
 format video:
   id = 2
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64000D
   maxInputSize = 5476
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_twos_pcm.mp4/toInt16.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_twos_pcm.mp4/toInt16.dump
index c7b7838c3d..fdd98b757a 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_twos_pcm.mp4/toInt16.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_twos_pcm.mp4/toInt16.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64001F
   maxInputSize = 36722
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped.dump
index 5643deb7c2..cd9cb5bf42 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped.dump
@@ -2,6 +2,7 @@ format audio:
   averageBitrate = 192181
   peakBitrate = 192181
   id = 2
+  containerMimeType = video/mp4
   sampleMimeType = audio/mp4a-latm
   codecs = mp4a.40.2
   maxInputSize = 643
@@ -13,6 +14,7 @@ format audio:
     data = length 2, hash 560
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.42C015
   maxInputSize = 14839
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped_clipped_transmux.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped_clipped_transmux.dump
index e4db4db8cb..5df1964ba1 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped_clipped_transmux.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped_clipped_transmux.dump
@@ -2,6 +2,7 @@ format audio:
   averageBitrate = 192181
   peakBitrate = 192181
   id = 2
+  containerMimeType = video/mp4
   sampleMimeType = audio/mp4a-latm
   codecs = mp4a.40.2
   maxInputSize = 643
@@ -13,6 +14,7 @@ format audio:
     data = length 2, hash 560
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.42C015
   maxInputSize = 14839
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped_to_empty.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped_to_empty.dump
index 94accc03c6..ee14ae0997 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped_to_empty.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped_to_empty.dump
@@ -2,6 +2,7 @@ format audio:
   averageBitrate = 192181
   peakBitrate = 192181
   id = 2
+  containerMimeType = video/mp4
   sampleMimeType = audio/mp4a-latm
   codecs = mp4a.40.2
   maxInputSize = 643
@@ -13,6 +14,7 @@ format audio:
     data = length 2, hash 560
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.42C015
   maxInputSize = 14839
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/highPitch_silenceHighPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/highPitch_silenceHighPitch.dump
index d30ed159a3..15e666412f 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/highPitch_silenceHighPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/highPitch_silenceHighPitch.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/mixed_sample_rf64.wav.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/mixed_sample_rf64.wav.dump
index 2a74a92b67..7798e691a0 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/mixed_sample_rf64.wav.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/mixed_sample_rf64.wav.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/original.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/original.dump
index 5838a5360b..e783ed559f 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/original.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/original.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/original_silence.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/original_silence.dump
index 25371daa62..b76fbb2617 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/original_silence.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/original_silence.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times.dump
index ddd2af90cc..0edcf28e28 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times_mixed_loopingAudiosowt-with-video.mov.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times_mixed_loopingAudiosowt-with-video.mov.dump
index 922ebf6c9a..673a51122b 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times_mixed_loopingAudiosowt-with-video.mov.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times_mixed_loopingAudiosowt-with-video.mov.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence.dump
index cc50ffa35a..586b06914a 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceFromEffect.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceFromEffect.dump
index 4f915d6bb5..75e75a21f4 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceFromEffect.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceFromEffect.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_highPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_highPitch.dump
index f3b5785333..c419ac055f 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_highPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_highPitch.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silence.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silence.dump
index 19be2f2cc7..fa284b4e82 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silence.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silence.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silenceHighPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silenceHighPitch.dump
index 4cfcb581d8..1b61e96d7e 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silenceHighPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silenceHighPitch.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_original.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_original.dump
index de3b080ea5..9cec9d5eac 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_original.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_original.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silence.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silence.dump
index bd6afc3851..b90fc65327 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silence.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silence.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silenceHighPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silenceHighPitch.dump
index 19be2f2cc7..fa284b4e82 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silenceHighPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silenceHighPitch.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov.dump
index 5838a5360b..e783ed559f 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_halfPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_halfPitch.dump
index 2b3d378b68..774c43dd46 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_halfPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_halfPitch.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence.dump
index afe729bb68..8465ad0e16 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence_halfPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence_halfPitch.dump
index afe729bb68..8465ad0e16 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence_halfPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence_halfPitch.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence.dump
index 25371daa62..b76fbb2617 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence/sowt-with-video.mov_halfPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence/sowt-with-video.mov_halfPitch.dump
index 588d9251e2..c53fffd4cb 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence/sowt-with-video.mov_halfPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence/sowt-with-video.mov_halfPitch.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence/sowt-with-video.mov_silence_halfPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence/sowt-with-video.mov_silence_halfPitch.dump
index 072338389d..37729e7adc 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence/sowt-with-video.mov_silence_halfPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence/sowt-with-video.mov_silence_halfPitch.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence_halfPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence_halfPitch.dump
index 25371daa62..b76fbb2617 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence_halfPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence_halfPitch.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_halfPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_halfPitch.dump
index 588d9251e2..c53fffd4cb 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_halfPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_halfPitch.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_silence.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_silence.dump
index 072338389d..37729e7adc 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_silence.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_silence.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch.dump
index e49516dcd4..a1199e266b 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov.dump
index ff758114a9..87dc3e995d 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov/sowt-with-video.mov_silence.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov/sowt-with-video.mov_silence.dump
index 62fb4c0d91..049fe12c6a 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov/sowt-with-video.mov_silence.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov/sowt-with-video.mov_silence.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov/sowt-with-video.mov_silence_halfPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov/sowt-with-video.mov_silence_halfPitch.dump
index 62fb4c0d91..049fe12c6a 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov/sowt-with-video.mov_silence_halfPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov/sowt-with-video.mov_silence_halfPitch.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence.dump
index b90d5641f4..f56d0384f1 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence/sowt-with-video.mov.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence/sowt-with-video.mov.dump
index 10b6118b44..1ac3bd1ee0 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence/sowt-with-video.mov.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence/sowt-with-video.mov.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence/sowt-with-video.mov_silence_halfPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence/sowt-with-video.mov_silence_halfPitch.dump
index 9e7757b6ef..d8963a0002 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence/sowt-with-video.mov_silence_halfPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence/sowt-with-video.mov_silence_halfPitch.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence_halfPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence_halfPitch.dump
index b90d5641f4..f56d0384f1 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence_halfPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence_halfPitch.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov.dump
index 10b6118b44..1ac3bd1ee0 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_silence.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_silence.dump
index 9e7757b6ef..d8963a0002 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_silence.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_silence.dump
@@ -7,6 +7,7 @@ format audio:
   metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence.dump
index cc50ffa35a..586b06914a 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov.dump
index de3b080ea5..9cec9d5eac 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov/sowt-with-video.mov_halfPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov/sowt-with-video.mov_halfPitch.dump
index 2b675b021c..d6ecc0a4c9 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov/sowt-with-video.mov_halfPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov/sowt-with-video.mov_halfPitch.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov/sowt-with-video.mov_silence_halfPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov/sowt-with-video.mov_silence_halfPitch.dump
index 0cce83ae84..cd9e5dc149 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov/sowt-with-video.mov_silence_halfPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov/sowt-with-video.mov_silence_halfPitch.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_halfPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_halfPitch.dump
index 95f52a4c81..48445af41a 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_halfPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_halfPitch.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_halfPitch/sowt-with-video.mov.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_halfPitch/sowt-with-video.mov.dump
index e588e6c474..fa8ae813ec 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_halfPitch/sowt-with-video.mov.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_halfPitch/sowt-with-video.mov.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence_halfPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence_halfPitch.dump
index 8655c1a394..4a0c550e5a 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence_halfPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence_halfPitch.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_silence_halfPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_silence_halfPitch.dump
index bd6afc3851..b90fc65327 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_silence_halfPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_silence_halfPitch.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov.dump
index bcd52e3377..3ecc2af868 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_halfPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_halfPitch.dump
index e64a3946fc..7e6ab45668 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_halfPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_halfPitch.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch.dump
index cc50ffa35a..586b06914a 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov.dump
index de3b080ea5..9cec9d5eac 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov/sowt-with-video.mov_halfPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov/sowt-with-video.mov_halfPitch.dump
index 2b675b021c..d6ecc0a4c9 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov/sowt-with-video.mov_halfPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov/sowt-with-video.mov_halfPitch.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov/sowt-with-video.mov_silence.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov/sowt-with-video.mov_silence.dump
index 0cce83ae84..cd9e5dc149 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov/sowt-with-video.mov_silence.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov/sowt-with-video.mov_silence.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_halfPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_halfPitch.dump
index 95f52a4c81..48445af41a 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_halfPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_halfPitch.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_halfPitch/sowt-with-video.mov.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_halfPitch/sowt-with-video.mov.dump
index e588e6c474..fa8ae813ec 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_halfPitch/sowt-with-video.mov.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_halfPitch/sowt-with-video.mov.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence.dump
index 8655c1a394..4a0c550e5a 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_halfPitch/sowt-with-video.mov_silence.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_silence.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_silence.dump
index bd6afc3851..b90fc65327 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_silence.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_silence.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_silence/sowt-with-video.mov.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_silence/sowt-with-video.mov.dump
index bcd52e3377..3ecc2af868 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_silence/sowt-with-video.mov.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_silence/sowt-with-video.mov.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_silence/sowt-with-video.mov_halfPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_silence/sowt-with-video.mov_halfPitch.dump
index e64a3946fc..7e6ab45668 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_silence/sowt-with-video.mov_halfPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/sequence/sowt-with-video.mov_silence_halfPitch/sowt-with-video.mov_silence/sowt-with-video.mov_halfPitch.dump
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
 format video:
   id = 1
+  containerMimeType = video/mp4
   sampleMimeType = video/avc
   codecs = avc1.64002A
   maxInputSize = 41084
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 65f03b8478..8f836ff2b6 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
@@ -12,6 +12,7 @@ track 0:
   track duration = 1000000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 11267