From 153974e06c64f028efe4014cf33e94298dcd822d Mon Sep 17 00:00:00 2001
From: rohks <rohks@google.com>
Date: Fri, 11 Apr 2025 09:56:57 -0700
Subject: [PATCH] Derive average bitrate from `stsz` sample size and `mdhd`
 duration

Compute a precise average bitrate using total sample size (from `stsz`) and media duration (from `mdhd`), overriding any existing bitrate read from `btrt` or `esds` boxes.

PiperOrigin-RevId: 746497934
(cherry picked from commit 6f5982792aadc9fa795629758015d952323d5654)
---
 .../media3/extractor/mp4/BoxParser.java        | 18 ++++++++++++++++++
 .../mp4/FixedSampleSizeRechunker.java          |  9 +++++++--
 ...pixel-motion-photo-2-hevc-tracks.jpg.0.dump |  4 ++++
 ...pixel-motion-photo-2-hevc-tracks.jpg.1.dump |  4 ++++
 ...pixel-motion-photo-2-hevc-tracks.jpg.2.dump |  4 ++++
 ...pixel-motion-photo-2-hevc-tracks.jpg.3.dump |  4 ++++
 ...ion-photo-jfif-segment-shortened.jpg.0.dump |  1 +
 ...ion-photo-jfif-segment-shortened.jpg.1.dump |  1 +
 ...ion-photo-jfif-segment-shortened.jpg.2.dump |  1 +
 ...ion-photo-jfif-segment-shortened.jpg.3.dump |  1 +
 .../assets/extractordumps/mp4/bt601.mov.0.dump |  2 ++
 .../assets/extractordumps/mp4/bt601.mov.1.dump |  2 ++
 .../assets/extractordumps/mp4/bt601.mov.2.dump |  2 ++
 .../assets/extractordumps/mp4/bt601.mov.3.dump |  2 ++
 ...ading_within_gop_sample_dependencies.0.dump |  2 ++
 ...ading_within_gop_sample_dependencies.1.dump |  2 ++
 ...ading_within_gop_sample_dependencies.2.dump |  2 ++
 ...ading_within_gop_sample_dependencies.3.dump |  2 ++
 ...gop_sample_dependencies.unknown_length.dump |  2 ++
 .../mp4/bt601.mov.unknown_length.dump          |  2 ++
 ...pixel-motion-photo-2-hevc-tracks.mp4.0.dump |  4 ++++
 ...pixel-motion-photo-2-hevc-tracks.mp4.1.dump |  4 ++++
 ...pixel-motion-photo-2-hevc-tracks.mp4.2.dump |  4 ++++
 ...pixel-motion-photo-2-hevc-tracks.mp4.3.dump |  4 ++++
 ...ading_within_gop_sample_dependencies.0.dump |  4 ++++
 ...ading_within_gop_sample_dependencies.1.dump |  4 ++++
 ...ading_within_gop_sample_dependencies.2.dump |  4 ++++
 ...ading_within_gop_sample_dependencies.3.dump |  4 ++++
 ...gop_sample_dependencies.unknown_length.dump |  4 ++++
 ...photo-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 ++
 ...ading_within_gop_sample_dependencies.0.dump |  2 ++
 ...ading_within_gop_sample_dependencies.1.dump |  2 ++
 ...ading_within_gop_sample_dependencies.2.dump |  2 ++
 ...ading_within_gop_sample_dependencies.3.dump |  2 ++
 ...gop_sample_dependencies.unknown_length.dump |  2 ++
 .../mp4/sample.mp4.unknown_length.dump         |  2 ++
 .../sample.mp4_with_flag_read_auxiliary_tracks |  2 ++
 .../mp4/sample_18byte_nclx_colr.mp4.0.dump     |  2 +-
 .../mp4/sample_18byte_nclx_colr.mp4.1.dump     |  2 +-
 .../mp4/sample_18byte_nclx_colr.mp4.2.dump     |  2 +-
 .../mp4/sample_18byte_nclx_colr.mp4.3.dump     |  2 +-
 ...ading_within_gop_sample_dependencies.0.dump |  2 +-
 ...ading_within_gop_sample_dependencies.1.dump |  2 +-
 ...ading_within_gop_sample_dependencies.2.dump |  2 +-
 ...ading_within_gop_sample_dependencies.3.dump |  2 +-
 ...gop_sample_dependencies.unknown_length.dump |  2 +-
 ...le_18byte_nclx_colr.mp4.unknown_length.dump |  2 +-
 .../mp4/sample_2_byte_NAL_length.mp4.0.dump    |  2 ++
 .../mp4/sample_2_byte_NAL_length.mp4.1.dump    |  2 ++
 .../mp4/sample_2_byte_NAL_length.mp4.2.dump    |  2 ++
 .../mp4/sample_2_byte_NAL_length.mp4.3.dump    |  2 ++
 ...ading_within_gop_sample_dependencies.0.dump |  2 ++
 ...ading_within_gop_sample_dependencies.1.dump |  2 ++
 ...ading_within_gop_sample_dependencies.2.dump |  2 ++
 ...ading_within_gop_sample_dependencies.3.dump |  2 ++
 ...gop_sample_dependencies.unknown_length.dump |  2 ++
 ...e_2_byte_NAL_length.mp4.unknown_length.dump |  2 ++
 .../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 +
 ...ading_within_gop_sample_dependencies.0.dump |  1 +
 ...ading_within_gop_sample_dependencies.1.dump |  1 +
 ...ading_within_gop_sample_dependencies.2.dump |  1 +
 ...ading_within_gop_sample_dependencies.3.dump |  1 +
 ...gop_sample_dependencies.unknown_length.dump |  1 +
 .../mp4/sample_ac4.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 +
 ...ading_within_gop_sample_dependencies.0.dump |  1 +
 ...ading_within_gop_sample_dependencies.1.dump |  1 +
 ...ading_within_gop_sample_dependencies.2.dump |  1 +
 ...ading_within_gop_sample_dependencies.3.dump |  1 +
 ...gop_sample_dependencies.unknown_length.dump |  1 +
 .../sample_ac4_level4.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 +
 ...ading_within_gop_sample_dependencies.0.dump |  1 +
 ...ading_within_gop_sample_dependencies.1.dump |  1 +
 ...ading_within_gop_sample_dependencies.2.dump |  1 +
 ...ading_within_gop_sample_dependencies.3.dump |  1 +
 ...gop_sample_dependencies.unknown_length.dump |  1 +
 ...android_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 +
 ...ading_within_gop_sample_dependencies.0.dump |  1 +
 ...ading_within_gop_sample_dependencies.1.dump |  1 +
 ...ading_within_gop_sample_dependencies.2.dump |  1 +
 ...ading_within_gop_sample_dependencies.3.dump |  1 +
 ...gop_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 +
 ...ading_within_gop_sample_dependencies.0.dump |  1 +
 ...ading_within_gop_sample_dependencies.1.dump |  1 +
 ...ading_within_gop_sample_dependencies.2.dump |  1 +
 ...ading_within_gop_sample_dependencies.3.dump |  1 +
 ...gop_sample_dependencies.unknown_length.dump |  1 +
 .../mp4/sample_eac3.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 +
 ...ading_within_gop_sample_dependencies.0.dump |  1 +
 ...ading_within_gop_sample_dependencies.1.dump |  1 +
 ...ading_within_gop_sample_dependencies.2.dump |  1 +
 ...ading_within_gop_sample_dependencies.3.dump |  1 +
 ...gop_sample_dependencies.unknown_length.dump |  1 +
 .../mp4/sample_eac3joc.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 ++
 ...ading_within_gop_sample_dependencies.0.dump |  2 ++
 ...ading_within_gop_sample_dependencies.1.dump |  2 ++
 ...ading_within_gop_sample_dependencies.2.dump |  2 ++
 ...ading_within_gop_sample_dependencies.3.dump |  2 ++
 ...gop_sample_dependencies.unknown_length.dump |  2 ++
 .../sample_edit_list.mp4.unknown_length.dump   |  2 ++
 ...t_list_no_sync_frame_before_edit.mp4.0.dump |  2 ++
 ...t_list_no_sync_frame_before_edit.mp4.1.dump |  2 ++
 ...t_list_no_sync_frame_before_edit.mp4.2.dump |  2 ++
 ...t_list_no_sync_frame_before_edit.mp4.3.dump |  2 ++
 ...ading_within_gop_sample_dependencies.0.dump |  2 ++
 ...ading_within_gop_sample_dependencies.1.dump |  2 ++
 ...ading_within_gop_sample_dependencies.2.dump |  2 ++
 ...ading_within_gop_sample_dependencies.3.dump |  2 ++
 ...gop_sample_dependencies.unknown_length.dump |  2 ++
 ...c_frame_before_edit.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 ++
 ...ading_within_gop_sample_dependencies.0.dump |  2 ++
 ...ading_within_gop_sample_dependencies.1.dump |  2 ++
 ...ading_within_gop_sample_dependencies.2.dump |  2 ++
 ...ading_within_gop_sample_dependencies.3.dump |  2 ++
 ...gop_sample_dependencies.unknown_length.dump |  2 ++
 .../sample_empty_track.mp4.unknown_length.dump |  2 ++
 .../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 +
 ...ading_within_gop_sample_dependencies.0.dump |  1 +
 ...ading_within_gop_sample_dependencies.1.dump |  1 +
 ...ading_within_gop_sample_dependencies.2.dump |  1 +
 ...ading_within_gop_sample_dependencies.3.dump |  1 +
 ...gop_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 ++
 ...ading_within_gop_sample_dependencies.0.dump |  2 ++
 ...ading_within_gop_sample_dependencies.1.dump |  2 ++
 ...ading_within_gop_sample_dependencies.2.dump |  2 ++
 ...ading_within_gop_sample_dependencies.3.dump |  2 ++
 ...gop_sample_dependencies.unknown_length.dump |  2 ++
 ...ample_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 +
 ...ading_within_gop_sample_dependencies.0.dump |  1 +
 ...ading_within_gop_sample_dependencies.1.dump |  1 +
 ...ading_within_gop_sample_dependencies.2.dump |  1 +
 ...ading_within_gop_sample_dependencies.3.dump |  1 +
 ...gop_sample_dependencies.unknown_length.dump |  1 +
 ...ample_mhm1_bl_cicp1.mp4.unknown_length.dump |  1 +
 .../mp4/sample_mhm1_bl_configchange.mp4.0.dump |  1 +
 .../mp4/sample_mhm1_bl_configchange.mp4.1.dump |  1 +
 .../mp4/sample_mhm1_bl_configchange.mp4.2.dump |  1 +
 .../mp4/sample_mhm1_bl_configchange.mp4.3.dump |  1 +
 ...ading_within_gop_sample_dependencies.0.dump |  1 +
 ...ading_within_gop_sample_dependencies.1.dump |  1 +
 ...ading_within_gop_sample_dependencies.2.dump |  1 +
 ...ading_within_gop_sample_dependencies.3.dump |  1 +
 ...gop_sample_dependencies.unknown_length.dump |  1 +
 ...hm1_bl_configchange.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 +
 ...ading_within_gop_sample_dependencies.0.dump |  1 +
 ...ading_within_gop_sample_dependencies.1.dump |  1 +
 ...ading_within_gop_sample_dependencies.2.dump |  1 +
 ...ading_within_gop_sample_dependencies.3.dump |  1 +
 ...gop_sample_dependencies.unknown_length.dump |  1 +
 ...ple_mhm1_lcbl_cicp1.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 +
 ...ading_within_gop_sample_dependencies.0.dump |  1 +
 ...ading_within_gop_sample_dependencies.1.dump |  1 +
 ...ading_within_gop_sample_dependencies.2.dump |  1 +
 ...ading_within_gop_sample_dependencies.3.dump |  1 +
 ...gop_sample_dependencies.unknown_length.dump |  1 +
 ...1_lcbl_configchange.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 +
 ...ading_within_gop_sample_dependencies.0.dump |  1 +
 ...ading_within_gop_sample_dependencies.1.dump |  1 +
 ...ading_within_gop_sample_dependencies.2.dump |  1 +
 ...ading_within_gop_sample_dependencies.3.dump |  1 +
 ...gop_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 +
 ...ading_within_gop_sample_dependencies.0.dump |  1 +
 ...ading_within_gop_sample_dependencies.1.dump |  1 +
 ...ading_within_gop_sample_dependencies.2.dump |  1 +
 ...ading_within_gop_sample_dependencies.3.dump |  1 +
 ...gop_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 +
 ...ading_within_gop_sample_dependencies.0.dump |  1 +
 ...ading_within_gop_sample_dependencies.1.dump |  1 +
 ...ading_within_gop_sample_dependencies.2.dump |  1 +
 ...ading_within_gop_sample_dependencies.3.dump |  1 +
 ...gop_sample_dependencies.unknown_length.dump |  1 +
 .../mp4/sample_opus.mp4.unknown_length.dump    |  1 +
 .../mp4/sample_partially_fragmented.mp4.0.dump |  1 +
 ...ading_within_gop_sample_dependencies.0.dump |  1 +
 ...gop_sample_dependencies.unknown_length.dump |  1 +
 ...artially_fragmented.mp4.unknown_length.dump |  1 +
 .../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 +
 ...ading_within_gop_sample_dependencies.0.dump |  1 +
 ...ading_within_gop_sample_dependencies.1.dump |  1 +
 ...ading_within_gop_sample_dependencies.2.dump |  1 +
 ...ading_within_gop_sample_dependencies.3.dump |  1 +
 ...gop_sample_dependencies.unknown_length.dump |  1 +
 .../sample_with_apvc.mp4.unknown_length.dump   |  1 +
 .../mp4/sample_with_btrt.mp4.0.dump            |  2 +-
 .../mp4/sample_with_btrt.mp4.1.dump            |  2 +-
 .../mp4/sample_with_btrt.mp4.2.dump            |  2 +-
 .../mp4/sample_with_btrt.mp4.3.dump            |  2 +-
 ...ading_within_gop_sample_dependencies.0.dump |  2 +-
 ...ading_within_gop_sample_dependencies.1.dump |  2 +-
 ...ading_within_gop_sample_dependencies.2.dump |  2 +-
 ...ading_within_gop_sample_dependencies.3.dump |  2 +-
 ...gop_sample_dependencies.unknown_length.dump |  2 +-
 .../sample_with_btrt.mp4.unknown_length.dump   |  2 +-
 .../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 ++
 ...ading_within_gop_sample_dependencies.0.dump |  2 ++
 ...ading_within_gop_sample_dependencies.1.dump |  2 ++
 ...ading_within_gop_sample_dependencies.2.dump |  2 ++
 ...ading_within_gop_sample_dependencies.3.dump |  2 ++
 ...gop_sample_dependencies.unknown_length.dump |  2 ++
 ...ple_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 +-
 ...ading_within_gop_sample_dependencies.0.dump |  2 +-
 ...ading_within_gop_sample_dependencies.1.dump |  2 +-
 ...ading_within_gop_sample_dependencies.2.dump |  2 +-
 ...ading_within_gop_sample_dependencies.3.dump |  2 +-
 ...gop_sample_dependencies.unknown_length.dump |  2 +-
 ..._colr_mdcv_and_clli.mp4.unknown_length.dump |  2 +-
 .../mp4/sample_with_invalid_nalu.mp4.0.dump    |  2 +-
 .../mp4/sample_with_invalid_nalu.mp4.1.dump    |  2 +-
 .../mp4/sample_with_invalid_nalu.mp4.2.dump    |  2 +-
 .../mp4/sample_with_invalid_nalu.mp4.3.dump    |  2 +-
 ...ading_within_gop_sample_dependencies.0.dump |  2 +-
 ...ading_within_gop_sample_dependencies.1.dump |  2 +-
 ...ading_within_gop_sample_dependencies.2.dump |  2 +-
 ...ading_within_gop_sample_dependencies.3.dump |  2 +-
 ...gop_sample_dependencies.unknown_length.dump |  2 +-
 ...e_with_invalid_nalu.mp4.unknown_length.dump |  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 ++
 ...ading_within_gop_sample_dependencies.0.dump |  2 ++
 ...ading_within_gop_sample_dependencies.1.dump |  2 ++
 ...ading_within_gop_sample_dependencies.2.dump |  2 ++
 ...ading_within_gop_sample_dependencies.3.dump |  2 ++
 ...gop_sample_dependencies.unknown_length.dump |  2 ++
 ...ample_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 ++
 ...ading_within_gop_sample_dependencies.0.dump |  2 ++
 ...ading_within_gop_sample_dependencies.1.dump |  2 ++
 ...ading_within_gop_sample_dependencies.2.dump |  2 ++
 ...ading_within_gop_sample_dependencies.3.dump |  2 ++
 ...gop_sample_dependencies.unknown_length.dump |  2 ++
 ..._with_numeric_genre.mp4.unknown_length.dump |  2 ++
 ...original_quicktime_specification.mov.0.dump |  2 ++
 ...original_quicktime_specification.mov.1.dump |  2 ++
 ...original_quicktime_specification.mov.2.dump |  2 ++
 ...original_quicktime_specification.mov.3.dump |  2 ++
 ...ading_within_gop_sample_dependencies.0.dump |  2 ++
 ...ading_within_gop_sample_dependencies.1.dump |  2 ++
 ...ading_within_gop_sample_dependencies.2.dump |  2 ++
 ...ading_within_gop_sample_dependencies.3.dump |  2 ++
 ...gop_sample_dependencies.unknown_length.dump |  2 ++
 ...ktime_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 +
 ...ading_within_gop_sample_dependencies.0.dump |  1 +
 ...ading_within_gop_sample_dependencies.1.dump |  1 +
 ...ading_within_gop_sample_dependencies.2.dump |  1 +
 ...ading_within_gop_sample_dependencies.3.dump |  1 +
 ...gop_sample_dependencies.unknown_length.dump |  1 +
 ..._180_mvhevc_5frames.mov.unknown_length.dump |  1 +
 .../bbb_176x144_128kbps_15fps_h263.3gp.dump    |  1 +
 .../bbb_1ch_16kHz_q10_vorbis.ogg.dump          |  2 +-
 .../assets/muxerdumps/bbb_2ch_44kHz.wav.dump   |  1 +
 .../bbb_642x642_768kbps_30fps_vp9.webm.dump    |  1 +
 .../muxerdumps/bbb_6ch_8kHz_opus.ogg.dump      |  1 +
 ...8kbps_30fps_avc_2b_firstpts_10_sec.mp4.dump |  1 +
 ...768kbps_30fps_avc_non_reference_3b.mp4.dump |  1 +
 ...0x640_768kbps_30fps_avc_pyramid_3b.mp4.dump |  1 +
 .../bbb_800x640_768kbps_30fps_vp9.mp4.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          |  4 +++-
 .../test/assets/muxerdumps/hdr10-720p.mp4.dump |  3 ++-
 .../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_negative_tracks_offset.mp4.dump   |  1 +
 .../mp4_with_same_tracks_offset.mp4.dump       |  2 ++
 .../muxerdumps/partial_hdr10-720p.mp4.dump     |  3 ++-
 .../test/assets/muxerdumps/sample_av1.mp4.dump |  3 ++-
 ...eamable_output_disabled_hdr10-720p.mp4.dump |  3 ++-
 ...ample_batching_disabled_hdr10-720p.mp4.dump |  3 ++-
 .../muxerdumps/sample_no_bframes.mp4.dump      |  2 ++
 .../muxerdumps/sample_with_apvc.mp4.dump       |  1 +
 ...ideo.mov+seq-gap_200ms-sample_rf64.wav.dump |  1 +
 ...ideo.mov+seq-sample_rf64.wav-gap_100ms.dump |  1 +
 ...ms-sample_rf64.wav_clipped300msTo800ms.dump |  1 +
 ..._mixedWith_sample_18byte_nclx_colr.mp4.dump |  2 +-
 .../transmuxed_with_inappmuxer.dump            |  1 +
 .../transmuxed_with_inappmuxer.dump            |  2 +-
 .../transmuxed_with_inappmuxer.dump            |  1 +
 .../transmuxed_with_inappmuxer.dump            |  1 +
 .../transmuxed_with_inappmuxer.dump            |  1 +
 .../transmuxed_with_inappmuxer.dump            |  2 ++
 .../transmuxed_with_inappmuxer.dump            |  3 ++-
 .../transmuxed.dump                            |  2 +-
 .../transmuxed.dump                            |  2 +-
 .../mp4/sample.mp4/noaudio.dump                |  1 +
 .../mp4/sample.mp4/novideo.dump                |  1 +
 .../mp4/sample.mp4/original.dump               |  2 ++
 .../sample.mp4/original_original_transmux.dump |  2 ++
 .../mp4/sample.mp4/rotated.dump                |  2 ++
 .../mp4/sample.mp4/silence.dump                |  1 +
 .../mp4/sample.mp4/silence_48000hz.dump        |  1 +
 ...ing_mixedWith_test-cbr-info-header.mp3.dump |  2 +-
 .../sample_18byte_nclx_colr.mp4/original.dump  |  2 +-
 .../sample_18byte_nclx_colr.mp4/silence.dump   |  2 +-
 .../transmuxed_with_inappmuxer.dump            |  3 ++-
 .../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 +
 .../sowt-with-video.mov/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 +
 444 files changed, 638 insertions(+), 61 deletions(-)

diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/BoxParser.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/BoxParser.java
index 0beff55dd5..813773b2fe 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/BoxParser.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/BoxParser.java
@@ -55,6 +55,7 @@ import androidx.media3.extractor.VorbisUtil;
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.Ints;
+import java.math.RoundingMode;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
@@ -527,6 +528,7 @@ public final class BoxParser {
     int[] flags;
     long timestampTimeUnits = 0;
     long duration;
+    long totalSize = 0;
 
     if (rechunkFixedSizeSamples) {
       long[] chunkOffsetsBytes = new long[chunkIterator.length];
@@ -544,6 +546,7 @@ public final class BoxParser {
       timestamps = rechunkedResults.timestamps;
       flags = rechunkedResults.flags;
       duration = rechunkedResults.duration;
+      totalSize = rechunkedResults.totalSize;
     } else {
       offsets = new long[sampleCount];
       sizes = new int[sampleCount];
@@ -586,6 +589,7 @@ public final class BoxParser {
 
         offsets[i] = offset;
         sizes[i] = sampleSizeBox.readNextSampleSize();
+        totalSize += sizes[i];
         if (sizes[i] > maximumSize) {
           maximumSize = sizes[i];
         }
@@ -657,6 +661,20 @@ public final class BoxParser {
                 + (!isCttsValid ? ", ctts invalid" : ""));
       }
     }
+
+    if (track.mediaDurationUs > 0) {
+      long averageBitrate =
+          Util.scaleLargeValue(
+              totalSize * C.BITS_PER_BYTE,
+              C.MICROS_PER_SECOND,
+              track.mediaDurationUs,
+              RoundingMode.HALF_DOWN);
+      if (averageBitrate > 0 && averageBitrate < Integer.MAX_VALUE) {
+        Format format = track.format.buildUpon().setAverageBitrate((int) averageBitrate).build();
+        track = track.copyWithFormat(format);
+      }
+    }
+
     long durationUs = Util.scaleLargeTimestamp(duration, C.MICROS_PER_SECOND, track.timescale);
 
     if (track.editListDurations == null) {
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/FixedSampleSizeRechunker.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/FixedSampleSizeRechunker.java
index fabbbedba4..6ee36efbcd 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/FixedSampleSizeRechunker.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/FixedSampleSizeRechunker.java
@@ -35,6 +35,7 @@ import androidx.media3.common.util.Util;
     public final long[] timestamps;
     public final int[] flags;
     public final long duration;
+    public final long totalSize;
 
     private Results(
         long[] offsets,
@@ -42,13 +43,15 @@ import androidx.media3.common.util.Util;
         int maximumSize,
         long[] timestamps,
         int[] flags,
-        long duration) {
+        long duration,
+        long totalSize) {
       this.offsets = offsets;
       this.sizes = sizes;
       this.maximumSize = maximumSize;
       this.timestamps = timestamps;
       this.flags = flags;
       this.duration = duration;
+      this.totalSize = totalSize;
     }
   }
 
@@ -81,6 +84,7 @@ import androidx.media3.common.util.Util;
     int maximumSize = 0;
     long[] timestamps = new long[rechunkedSampleCount];
     int[] flags = new int[rechunkedSampleCount];
+    int totalSize = 0;
 
     int originalSampleIndex = 0;
     int newSampleIndex = 0;
@@ -93,6 +97,7 @@ import androidx.media3.common.util.Util;
 
         offsets[newSampleIndex] = sampleOffset;
         sizes[newSampleIndex] = fixedSampleSize * bufferSampleCount;
+        totalSize += sizes[newSampleIndex];
         maximumSize = max(maximumSize, sizes[newSampleIndex]);
         timestamps[newSampleIndex] = (timestampDeltaInTimeUnits * originalSampleIndex);
         flags[newSampleIndex] = C.BUFFER_FLAG_KEY_FRAME;
@@ -106,7 +111,7 @@ import androidx.media3.common.util.Util;
     }
     long duration = timestampDeltaInTimeUnits * originalSampleIndex;
 
-    return new Results(offsets, sizes, maximumSize, timestamps, flags, duration);
+    return new Results(offsets, sizes, maximumSize, timestamps, flags, duration, totalSize);
   }
 
   private FixedSampleSizeRechunker() {
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 430ce1651a..fa1cbe8a47 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 58
   track duration = 2100700
   format 0:
+    averageBitrate = 12593505
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -269,6 +270,7 @@ track 1:
   sample count = 1
   track duration = 466800
   format 0:
+    averageBitrate = 2593047
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -299,6 +301,7 @@ track 2:
   sample count = 58
   track duration = 2100700
   format 0:
+    averageBitrate = 99395
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
@@ -541,6 +544,7 @@ track 3:
   sample count = 1
   track duration = 1133700
   format 0:
+    averageBitrate = 416
     id = 4
     containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.1.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.1.dump
index 319d59568b..a89e4567c5 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 44
   track duration = 2100700
   format 0:
+    averageBitrate = 12593505
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -213,6 +214,7 @@ track 1:
   sample count = 1
   track duration = 466800
   format 0:
+    averageBitrate = 2593047
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -243,6 +245,7 @@ track 2:
   sample count = 38
   track duration = 2100700
   format 0:
+    averageBitrate = 99395
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
@@ -405,6 +408,7 @@ track 3:
   sample count = 1
   track duration = 1133700
   format 0:
+    averageBitrate = 416
     id = 4
     containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.2.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.2.dump
index 2b6a37d60f..67a325da7a 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 23
   track duration = 2100700
   format 0:
+    averageBitrate = 12593505
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -129,6 +130,7 @@ track 1:
   sample count = 1
   track duration = 466800
   format 0:
+    averageBitrate = 2593047
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -159,6 +161,7 @@ track 2:
   sample count = 17
   track duration = 2100700
   format 0:
+    averageBitrate = 99395
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
@@ -237,6 +240,7 @@ track 3:
   sample count = 1
   track duration = 1133700
   format 0:
+    averageBitrate = 416
     id = 4
     containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.3.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.3.dump
index 538f86a21d..83777a832a 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 2
   track duration = 2100700
   format 0:
+    averageBitrate = 12593505
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -45,6 +46,7 @@ track 1:
   sample count = 1
   track duration = 466800
   format 0:
+    averageBitrate = 2593047
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -75,6 +77,7 @@ track 2:
   sample count = 1
   track duration = 2100700
   format 0:
+    averageBitrate = 99395
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
@@ -89,6 +92,7 @@ track 3:
   sample count = 1
   track duration = 1133700
   format 0:
+    averageBitrate = 416
     id = 4
     containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.0.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.0.dump
index 55cf6a176b..4cc8e5e7d5 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 1
   track duration = 867000
   format 0:
+    averageBitrate = 35692
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.1.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.1.dump
index 55cf6a176b..4cc8e5e7d5 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 1
   track duration = 867000
   format 0:
+    averageBitrate = 35692
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.2.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.2.dump
index 55cf6a176b..4cc8e5e7d5 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 1
   track duration = 867000
   format 0:
+    averageBitrate = 35692
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.3.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.3.dump
index 55cf6a176b..4cc8e5e7d5 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 1
   track duration = 867000
   format 0:
+    averageBitrate = 35692
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.0.dump
index b4d4bce62a..42dd4e4893 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 43
   track duration = 1019300
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 1
     containerMimeType = video/mp4
@@ -200,6 +201,7 @@ track 1:
   sample count = 30
   track duration = 1020100
   format 0:
+    averageBitrate = 1026770
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.1.dump
index e430de23de..009d1be427 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 31
   track duration = 1019300
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 1
     containerMimeType = video/mp4
@@ -152,6 +153,7 @@ track 1:
   sample count = 30
   track duration = 1020100
   format 0:
+    averageBitrate = 1026770
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.2.dump
index 00beaeeacb..2b2555aaf5 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 16
   track duration = 1019300
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 1
     containerMimeType = video/mp4
@@ -92,6 +93,7 @@ track 1:
   sample count = 30
   track duration = 1020100
   format 0:
+    averageBitrate = 1026770
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.3.dump
index c06161f085..3dab46b34f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 1
   track duration = 1019300
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 1
     containerMimeType = video/mp4
@@ -32,6 +33,7 @@ track 1:
   sample count = 30
   track duration = 1020100
   format 0:
+    averageBitrate = 1026770
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.0.dump
index 6b0d9f131a..32e32cc664 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 43
   track duration = 1019300
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 1
     containerMimeType = video/mp4
@@ -200,6 +201,7 @@ track 1:
   sample count = 30
   track duration = 1020100
   format 0:
+    averageBitrate = 1026770
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.1.dump
index 7dcf390957..4a962a30a8 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 31
   track duration = 1019300
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 1
     containerMimeType = video/mp4
@@ -152,6 +153,7 @@ track 1:
   sample count = 30
   track duration = 1020100
   format 0:
+    averageBitrate = 1026770
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.2.dump
index a627ca6b37..4a281b2dd4 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 16
   track duration = 1019300
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 1
     containerMimeType = video/mp4
@@ -92,6 +93,7 @@ track 1:
   sample count = 30
   track duration = 1020100
   format 0:
+    averageBitrate = 1026770
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.3.dump
index 5e206a7484..cb0765f7d6 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 1
   track duration = 1019300
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 1
     containerMimeType = video/mp4
@@ -32,6 +33,7 @@ track 1:
   sample count = 30
   track duration = 1020100
   format 0:
+    averageBitrate = 1026770
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.unknown_length.dump
index 6b0d9f131a..32e32cc664 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 43
   track duration = 1019300
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 1
     containerMimeType = video/mp4
@@ -200,6 +201,7 @@ track 1:
   sample count = 30
   track duration = 1020100
   format 0:
+    averageBitrate = 1026770
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.unknown_length.dump
index b4d4bce62a..42dd4e4893 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 43
   track duration = 1019300
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 1
     containerMimeType = video/mp4
@@ -200,6 +201,7 @@ track 1:
   sample count = 30
   track duration = 1020100
   format 0:
+    averageBitrate = 1026770
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.0.dump
index a52c367791..95d9ca55b1 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 58
   track duration = 2100700
   format 0:
+    averageBitrate = 12593505
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -268,6 +269,7 @@ track 1:
   sample count = 1
   track duration = 466800
   format 0:
+    averageBitrate = 2593047
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -297,6 +299,7 @@ track 2:
   sample count = 58
   track duration = 2100700
   format 0:
+    averageBitrate = 99395
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
@@ -539,6 +542,7 @@ track 3:
   sample count = 1
   track duration = 1133700
   format 0:
+    averageBitrate = 416
     id = 4
     containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.1.dump
index c6dd781377..f47a39726e 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 44
   track duration = 2100700
   format 0:
+    averageBitrate = 12593505
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -212,6 +213,7 @@ track 1:
   sample count = 1
   track duration = 466800
   format 0:
+    averageBitrate = 2593047
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -241,6 +243,7 @@ track 2:
   sample count = 38
   track duration = 2100700
   format 0:
+    averageBitrate = 99395
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
@@ -403,6 +406,7 @@ track 3:
   sample count = 1
   track duration = 1133700
   format 0:
+    averageBitrate = 416
     id = 4
     containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.2.dump
index 40dfe60e61..9c356fbbd1 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 23
   track duration = 2100700
   format 0:
+    averageBitrate = 12593505
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -128,6 +129,7 @@ track 1:
   sample count = 1
   track duration = 466800
   format 0:
+    averageBitrate = 2593047
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -157,6 +159,7 @@ track 2:
   sample count = 17
   track duration = 2100700
   format 0:
+    averageBitrate = 99395
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
@@ -235,6 +238,7 @@ track 3:
   sample count = 1
   track duration = 1133700
   format 0:
+    averageBitrate = 416
     id = 4
     containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.3.dump
index 235c7cc121..b7e1baba9f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 2
   track duration = 2100700
   format 0:
+    averageBitrate = 12593505
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -44,6 +45,7 @@ track 1:
   sample count = 1
   track duration = 466800
   format 0:
+    averageBitrate = 2593047
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -73,6 +75,7 @@ track 2:
   sample count = 1
   track duration = 2100700
   format 0:
+    averageBitrate = 99395
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
@@ -87,6 +90,7 @@ track 3:
   sample count = 1
   track duration = 1133700
   format 0:
+    averageBitrate = 416
     id = 4
     containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.0.dump
index a52c367791..95d9ca55b1 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 58
   track duration = 2100700
   format 0:
+    averageBitrate = 12593505
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -268,6 +269,7 @@ track 1:
   sample count = 1
   track duration = 466800
   format 0:
+    averageBitrate = 2593047
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -297,6 +299,7 @@ track 2:
   sample count = 58
   track duration = 2100700
   format 0:
+    averageBitrate = 99395
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
@@ -539,6 +542,7 @@ track 3:
   sample count = 1
   track duration = 1133700
   format 0:
+    averageBitrate = 416
     id = 4
     containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.1.dump
index c6dd781377..f47a39726e 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 44
   track duration = 2100700
   format 0:
+    averageBitrate = 12593505
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -212,6 +213,7 @@ track 1:
   sample count = 1
   track duration = 466800
   format 0:
+    averageBitrate = 2593047
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -241,6 +243,7 @@ track 2:
   sample count = 38
   track duration = 2100700
   format 0:
+    averageBitrate = 99395
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
@@ -403,6 +406,7 @@ track 3:
   sample count = 1
   track duration = 1133700
   format 0:
+    averageBitrate = 416
     id = 4
     containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.2.dump
index 40dfe60e61..9c356fbbd1 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 23
   track duration = 2100700
   format 0:
+    averageBitrate = 12593505
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -128,6 +129,7 @@ track 1:
   sample count = 1
   track duration = 466800
   format 0:
+    averageBitrate = 2593047
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -157,6 +159,7 @@ track 2:
   sample count = 17
   track duration = 2100700
   format 0:
+    averageBitrate = 99395
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
@@ -235,6 +238,7 @@ track 3:
   sample count = 1
   track duration = 1133700
   format 0:
+    averageBitrate = 416
     id = 4
     containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.3.dump
index 235c7cc121..b7e1baba9f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 2
   track duration = 2100700
   format 0:
+    averageBitrate = 12593505
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -44,6 +45,7 @@ track 1:
   sample count = 1
   track duration = 466800
   format 0:
+    averageBitrate = 2593047
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -73,6 +75,7 @@ track 2:
   sample count = 1
   track duration = 2100700
   format 0:
+    averageBitrate = 99395
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
@@ -87,6 +90,7 @@ track 3:
   sample count = 1
   track duration = 1133700
   format 0:
+    averageBitrate = 416
     id = 4
     containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index a52c367791..95d9ca55b1 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 58
   track duration = 2100700
   format 0:
+    averageBitrate = 12593505
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -268,6 +269,7 @@ track 1:
   sample count = 1
   track duration = 466800
   format 0:
+    averageBitrate = 2593047
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -297,6 +299,7 @@ track 2:
   sample count = 58
   track duration = 2100700
   format 0:
+    averageBitrate = 99395
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
@@ -539,6 +542,7 @@ track 3:
   sample count = 1
   track duration = 1133700
   format 0:
+    averageBitrate = 416
     id = 4
     containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.unknown_length.dump
index a52c367791..95d9ca55b1 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 58
   track duration = 2100700
   format 0:
+    averageBitrate = 12593505
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -268,6 +269,7 @@ track 1:
   sample count = 1
   track duration = 466800
   format 0:
+    averageBitrate = 2593047
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -297,6 +299,7 @@ track 2:
   sample count = 58
   track duration = 2100700
   format 0:
+    averageBitrate = 99395
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
@@ -539,6 +542,7 @@ track 3:
   sample count = 1
   track duration = 1133700
   format 0:
+    averageBitrate = 416
     id = 4
     containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.0.dump
index f5b03f21d3..386679d19d 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 45
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 1bfc463180..851aac2e38 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 33
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 de0c65b1cc..5166056d7d 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 18
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 108f7b1032..168baa7dd8 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 3
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 8b35ce8307..b3f0a2b198 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 45
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 01f5829356..2a6cd81431 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 33
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 7e44eff2ba..0bb1be8339 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 18
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 3dd45d969e..163fb4582c 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 3
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 8b35ce8307..b3f0a2b198 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 45
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 f5b03f21d3..386679d19d 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 45
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4_with_flag_read_auxiliary_tracks b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4_with_flag_read_auxiliary_tracks
index f5b03f21d3..386679d19d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4_with_flag_read_auxiliary_tracks
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4_with_flag_read_auxiliary_tracks
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 45
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 33fcc6675b..401fcf3d3c 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
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718288
+    averageBitrate = 718290
     peakBitrate = 718288
     id = 1
     containerMimeType = video/mp4
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 33fcc6675b..401fcf3d3c 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
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718288
+    averageBitrate = 718290
     peakBitrate = 718288
     id = 1
     containerMimeType = video/mp4
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 33fcc6675b..401fcf3d3c 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
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718288
+    averageBitrate = 718290
     peakBitrate = 718288
     id = 1
     containerMimeType = video/mp4
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 33fcc6675b..401fcf3d3c 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
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718288
+    averageBitrate = 718290
     peakBitrate = 718288
     id = 1
     containerMimeType = video/mp4
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 7c718da5b3..824371d3d6 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
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718288
+    averageBitrate = 718290
     peakBitrate = 718288
     id = 1
     containerMimeType = video/mp4
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 7c718da5b3..824371d3d6 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
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718288
+    averageBitrate = 718290
     peakBitrate = 718288
     id = 1
     containerMimeType = video/mp4
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 7c718da5b3..824371d3d6 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
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718288
+    averageBitrate = 718290
     peakBitrate = 718288
     id = 1
     containerMimeType = video/mp4
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 7c718da5b3..824371d3d6 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
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718288
+    averageBitrate = 718290
     peakBitrate = 718288
     id = 1
     containerMimeType = video/mp4
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 7c718da5b3..824371d3d6 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
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718288
+    averageBitrate = 718290
     peakBitrate = 718288
     id = 1
     containerMimeType = video/mp4
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 33fcc6675b..401fcf3d3c 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
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718288
+    averageBitrate = 718290
     peakBitrate = 718288
     id = 1
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.0.dump
index 8d01b8844d..05b53c404e 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.0.dump
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 717794
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -155,6 +156,7 @@ track 1:
   sample count = 45
   track duration = 1045300
   format 0:
+    averageBitrate = 72928
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.1.dump
index 80a14bbc91..190f5809bd 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.1.dump
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 717794
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -155,6 +156,7 @@ track 1:
   sample count = 32
   track duration = 1045300
   format 0:
+    averageBitrate = 72928
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.2.dump
index 98948f4a8a..980b11d3dd 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.2.dump
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 717794
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -155,6 +156,7 @@ track 1:
   sample count = 17
   track duration = 1045300
   format 0:
+    averageBitrate = 72928
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.3.dump
index c1de6429b4..4f2fcd4fad 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.3.dump
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 717794
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -155,6 +156,7 @@ track 1:
   sample count = 2
   track duration = 1045300
   format 0:
+    averageBitrate = 72928
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.reading_within_gop_sample_dependencies.0.dump
index cce331d9a6..47730d5de7 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 717794
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -155,6 +156,7 @@ track 1:
   sample count = 45
   track duration = 1045300
   format 0:
+    averageBitrate = 72928
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.reading_within_gop_sample_dependencies.1.dump
index 5118579e6d..b9e5671d16 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 717794
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -155,6 +156,7 @@ track 1:
   sample count = 32
   track duration = 1045300
   format 0:
+    averageBitrate = 72928
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.reading_within_gop_sample_dependencies.2.dump
index 0f51c20d5e..bed5eb7587 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 717794
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -155,6 +156,7 @@ track 1:
   sample count = 17
   track duration = 1045300
   format 0:
+    averageBitrate = 72928
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.reading_within_gop_sample_dependencies.3.dump
index 81bb7e8154..c9ce496381 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 717794
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -155,6 +156,7 @@ track 1:
   sample count = 2
   track duration = 1045300
   format 0:
+    averageBitrate = 72928
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index cce331d9a6..47730d5de7 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 717794
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -155,6 +156,7 @@ track 1:
   sample count = 45
   track duration = 1045300
   format 0:
+    averageBitrate = 72928
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.unknown_length.dump
index 8d01b8844d..05b53c404e 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_2_byte_NAL_length.mp4.unknown_length.dump
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 717794
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -155,6 +156,7 @@ track 1:
   sample count = 45
   track duration = 1045300
   format 0:
+    averageBitrate = 72928
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 7a7a32a466..c18e428a9a 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 19
   track duration = 760000
   format 0:
+    averageBitrate = 78737
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.1.dump
index 7a7a32a466..c18e428a9a 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 19
   track duration = 760000
   format 0:
+    averageBitrate = 78737
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.2.dump
index 7a7a32a466..c18e428a9a 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 19
   track duration = 760000
   format 0:
+    averageBitrate = 78737
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.3.dump
index 7a7a32a466..c18e428a9a 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 19
   track duration = 760000
   format 0:
+    averageBitrate = 78737
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.0.dump
index 7a7a32a466..c18e428a9a 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 19
   track duration = 760000
   format 0:
+    averageBitrate = 78737
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.1.dump
index 7a7a32a466..c18e428a9a 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 19
   track duration = 760000
   format 0:
+    averageBitrate = 78737
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.2.dump
index 7a7a32a466..c18e428a9a 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 19
   track duration = 760000
   format 0:
+    averageBitrate = 78737
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.3.dump
index 7a7a32a466..c18e428a9a 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 19
   track duration = 760000
   format 0:
+    averageBitrate = 78737
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 7a7a32a466..c18e428a9a 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 19
   track duration = 760000
   format 0:
+    averageBitrate = 78737
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.unknown_length.dump
index 7a7a32a466..c18e428a9a 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 19
   track duration = 760000
   format 0:
+    averageBitrate = 78737
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
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 e387304994..674cec80ea 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 20
   track duration = 853333
   format 0:
+    averageBitrate = 1524001
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
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 e387304994..674cec80ea 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 20
   track duration = 853333
   format 0:
+    averageBitrate = 1524001
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
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 b0e8973bbe..54e190aefb 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 10
   track duration = 853333
   format 0:
+    averageBitrate = 1524001
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
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 b0e8973bbe..54e190aefb 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 10
   track duration = 853333
   format 0:
+    averageBitrate = 1524001
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
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 e387304994..674cec80ea 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 20
   track duration = 853333
   format 0:
+    averageBitrate = 1524001
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
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 e387304994..674cec80ea 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 20
   track duration = 853333
   format 0:
+    averageBitrate = 1524001
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
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 b0e8973bbe..54e190aefb 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 10
   track duration = 853333
   format 0:
+    averageBitrate = 1524001
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
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 b0e8973bbe..54e190aefb 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 10
   track duration = 853333
   format 0:
+    averageBitrate = 1524001
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
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 e387304994..674cec80ea 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 20
   track duration = 853333
   format 0:
+    averageBitrate = 1524001
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
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 e387304994..674cec80ea 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 20
   track duration = 853333
   format 0:
+    averageBitrate = 1524001
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.0.dump
index 92c2c90ca7..2fb6a5208f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 7
   track duration = 526000
   format 0:
+    averageBitrate = 644454
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.1.dump
index 92c2c90ca7..2fb6a5208f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 7
   track duration = 526000
   format 0:
+    averageBitrate = 644454
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.2.dump
index 92c2c90ca7..2fb6a5208f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 7
   track duration = 526000
   format 0:
+    averageBitrate = 644454
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.3.dump
index 92c2c90ca7..2fb6a5208f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 7
   track duration = 526000
   format 0:
+    averageBitrate = 644454
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.0.dump
index 3017e59328..6141f6be8f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 7
   track duration = 526000
   format 0:
+    averageBitrate = 644454
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.1.dump
index 3017e59328..6141f6be8f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 7
   track duration = 526000
   format 0:
+    averageBitrate = 644454
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.2.dump
index 3017e59328..6141f6be8f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 7
   track duration = 526000
   format 0:
+    averageBitrate = 644454
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.3.dump
index 3017e59328..6141f6be8f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 7
   track duration = 526000
   format 0:
+    averageBitrate = 644454
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 3017e59328..6141f6be8f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 7
   track duration = 526000
   format 0:
+    averageBitrate = 644454
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.unknown_length.dump
index 92c2c90ca7..2fb6a5208f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 7
   track duration = 526000
   format 0:
+    averageBitrate = 644454
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.0.dump
index 0cd1b46f4b..70061aa38b 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 32
   track duration = 418333
   format 0:
+    averageBitrate = 1810156
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/true-hd
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.1.dump
index b6b7aa85b8..fb68ef8a5d 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 24
   track duration = 418333
   format 0:
+    averageBitrate = 1810156
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/true-hd
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.2.dump
index 9993dc0f10..a2e5043d57 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 16
   track duration = 418333
   format 0:
+    averageBitrate = 1810156
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/true-hd
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.3.dump
index cc1704ffa5..b20625f984 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 8
   track duration = 418333
   format 0:
+    averageBitrate = 1810156
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/true-hd
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.0.dump
index 0cd1b46f4b..70061aa38b 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 32
   track duration = 418333
   format 0:
+    averageBitrate = 1810156
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/true-hd
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.1.dump
index b6b7aa85b8..fb68ef8a5d 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 24
   track duration = 418333
   format 0:
+    averageBitrate = 1810156
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/true-hd
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.2.dump
index 9993dc0f10..a2e5043d57 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 16
   track duration = 418333
   format 0:
+    averageBitrate = 1810156
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/true-hd
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.3.dump
index cc1704ffa5..b20625f984 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 8
   track duration = 418333
   format 0:
+    averageBitrate = 1810156
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/true-hd
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 0cd1b46f4b..70061aa38b 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 32
   track duration = 418333
   format 0:
+    averageBitrate = 1810156
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/true-hd
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_dthd.mp4.unknown_length.dump
index 0cd1b46f4b..70061aa38b 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 32
   track duration = 418333
   format 0:
+    averageBitrate = 1810156
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/true-hd
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_eac3.mp4.0.dump
index dfc9cf05cb..18be5b4841 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 54
   track duration = 1728000
   format 0:
+    averageBitrate = 1000000
     peakBitrate = 1000000
     id = 1
     containerMimeType = audio/mp4
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 ed25c589f7..5553d6aacc 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 36
   track duration = 1728000
   format 0:
+    averageBitrate = 1000000
     peakBitrate = 1000000
     id = 1
     containerMimeType = audio/mp4
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 7864799bb2..70065cd5b7 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 18
   track duration = 1728000
   format 0:
+    averageBitrate = 1000000
     peakBitrate = 1000000
     id = 1
     containerMimeType = audio/mp4
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 64064c12c9..debb18e351 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 1
   track duration = 1728000
   format 0:
+    averageBitrate = 1000000
     peakBitrate = 1000000
     id = 1
     containerMimeType = audio/mp4
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 dfc9cf05cb..18be5b4841 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 54
   track duration = 1728000
   format 0:
+    averageBitrate = 1000000
     peakBitrate = 1000000
     id = 1
     containerMimeType = audio/mp4
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 ed25c589f7..5553d6aacc 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 36
   track duration = 1728000
   format 0:
+    averageBitrate = 1000000
     peakBitrate = 1000000
     id = 1
     containerMimeType = audio/mp4
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 7864799bb2..70065cd5b7 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 18
   track duration = 1728000
   format 0:
+    averageBitrate = 1000000
     peakBitrate = 1000000
     id = 1
     containerMimeType = audio/mp4
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 64064c12c9..debb18e351 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 1
   track duration = 1728000
   format 0:
+    averageBitrate = 1000000
     peakBitrate = 1000000
     id = 1
     containerMimeType = audio/mp4
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 dfc9cf05cb..18be5b4841 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 54
   track duration = 1728000
   format 0:
+    averageBitrate = 1000000
     peakBitrate = 1000000
     id = 1
     containerMimeType = audio/mp4
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 dfc9cf05cb..18be5b4841 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 54
   track duration = 1728000
   format 0:
+    averageBitrate = 1000000
     peakBitrate = 1000000
     id = 1
     containerMimeType = audio/mp4
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 bf9ff46606..722eacf394 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 64
   track duration = 2048000
   format 0:
+    averageBitrate = 640000
     peakBitrate = 640000
     id = 1
     containerMimeType = audio/mp4
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 80ea152a36..0c4e9324c2 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 43
   track duration = 2048000
   format 0:
+    averageBitrate = 640000
     peakBitrate = 640000
     id = 1
     containerMimeType = audio/mp4
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 5a14117f0f..8391f76657 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 22
   track duration = 2048000
   format 0:
+    averageBitrate = 640000
     peakBitrate = 640000
     id = 1
     containerMimeType = audio/mp4
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 419cc441d4..adac41cf3e 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 1
   track duration = 2048000
   format 0:
+    averageBitrate = 640000
     peakBitrate = 640000
     id = 1
     containerMimeType = audio/mp4
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 bf9ff46606..722eacf394 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 64
   track duration = 2048000
   format 0:
+    averageBitrate = 640000
     peakBitrate = 640000
     id = 1
     containerMimeType = audio/mp4
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 80ea152a36..0c4e9324c2 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 43
   track duration = 2048000
   format 0:
+    averageBitrate = 640000
     peakBitrate = 640000
     id = 1
     containerMimeType = audio/mp4
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 5a14117f0f..8391f76657 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 22
   track duration = 2048000
   format 0:
+    averageBitrate = 640000
     peakBitrate = 640000
     id = 1
     containerMimeType = audio/mp4
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 419cc441d4..adac41cf3e 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 1
   track duration = 2048000
   format 0:
+    averageBitrate = 640000
     peakBitrate = 640000
     id = 1
     containerMimeType = audio/mp4
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 bf9ff46606..722eacf394 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 64
   track duration = 2048000
   format 0:
+    averageBitrate = 640000
     peakBitrate = 640000
     id = 1
     containerMimeType = audio/mp4
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 bf9ff46606..722eacf394 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 64
   track duration = 2048000
   format 0:
+    averageBitrate = 640000
     peakBitrate = 640000
     id = 1
     containerMimeType = audio/mp4
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 9c9b20510e..156ede6552 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 85
   track duration = 2548333
   format 0:
+    averageBitrate = 8413134
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
@@ -377,6 +378,7 @@ track 1:
   sample count = 112
   track duration = 2548333
   format 0:
+    averageBitrate = 140781
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
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 b16c3cf3a4..abe77f6c18 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 62
   track duration = 2548333
   format 0:
+    averageBitrate = 8413134
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
@@ -285,6 +286,7 @@ track 1:
   sample count = 76
   track duration = 2548333
   format 0:
+    averageBitrate = 140781
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
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 793e2d6276..e949390ead 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 2548333
   format 0:
+    averageBitrate = 8413134
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
@@ -157,6 +158,7 @@ track 1:
   sample count = 39
   track duration = 2548333
   format 0:
+    averageBitrate = 140781
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
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 55dadc33bb..126ede3666 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 2548333
   format 0:
+    averageBitrate = 8413134
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
@@ -157,6 +158,7 @@ track 1:
   sample count = 3
   track duration = 2548333
   format 0:
+    averageBitrate = 140781
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
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 9c9b20510e..156ede6552 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 85
   track duration = 2548333
   format 0:
+    averageBitrate = 8413134
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
@@ -377,6 +378,7 @@ track 1:
   sample count = 112
   track duration = 2548333
   format 0:
+    averageBitrate = 140781
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
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 b16c3cf3a4..abe77f6c18 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 62
   track duration = 2548333
   format 0:
+    averageBitrate = 8413134
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
@@ -285,6 +286,7 @@ track 1:
   sample count = 76
   track duration = 2548333
   format 0:
+    averageBitrate = 140781
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
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 793e2d6276..e949390ead 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 2548333
   format 0:
+    averageBitrate = 8413134
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
@@ -157,6 +158,7 @@ track 1:
   sample count = 39
   track duration = 2548333
   format 0:
+    averageBitrate = 140781
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
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 55dadc33bb..126ede3666 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 2548333
   format 0:
+    averageBitrate = 8413134
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
@@ -157,6 +158,7 @@ track 1:
   sample count = 3
   track duration = 2548333
   format 0:
+    averageBitrate = 140781
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
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 9c9b20510e..156ede6552 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 85
   track duration = 2548333
   format 0:
+    averageBitrate = 8413134
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
@@ -377,6 +378,7 @@ track 1:
   sample count = 112
   track duration = 2548333
   format 0:
+    averageBitrate = 140781
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
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 9c9b20510e..156ede6552 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 85
   track duration = 2548333
   format 0:
+    averageBitrate = 8413134
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
@@ -377,6 +378,7 @@ track 1:
   sample count = 112
   track duration = 2548333
   format 0:
+    averageBitrate = 140781
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.0.dump
index c5c98e5c74..060902d188 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.0.dump
@@ -11,6 +11,7 @@ track 0:
   sample count = 62
   track duration = 2772200
   format 0:
+    averageBitrate = 8365494
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -285,6 +286,7 @@ track 1:
   sample count = 100
   track duration = 2257700
   format 0:
+    averageBitrate = 139197
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.1.dump
index edfb8f88a5..6bd6681834 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.1.dump
@@ -11,6 +11,7 @@ track 0:
   sample count = 62
   track duration = 2772200
   format 0:
+    averageBitrate = 8365494
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -285,6 +286,7 @@ track 1:
   sample count = 61
   track duration = 2257700
   format 0:
+    averageBitrate = 139197
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.2.dump
index 73d1ee2616..197e851b53 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.2.dump
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 2772200
   format 0:
+    averageBitrate = 8365494
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -157,6 +158,7 @@ track 1:
   sample count = 21
   track duration = 2257700
   format 0:
+    averageBitrate = 139197
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.3.dump
index 091d56de6c..153b537009 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.3.dump
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 2772200
   format 0:
+    averageBitrate = 8365494
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -157,6 +158,7 @@ track 1:
   sample count = 1
   track duration = 2257700
   format 0:
+    averageBitrate = 139197
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.0.dump
index c5c98e5c74..060902d188 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -11,6 +11,7 @@ track 0:
   sample count = 62
   track duration = 2772200
   format 0:
+    averageBitrate = 8365494
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -285,6 +286,7 @@ track 1:
   sample count = 100
   track duration = 2257700
   format 0:
+    averageBitrate = 139197
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.1.dump
index edfb8f88a5..6bd6681834 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -11,6 +11,7 @@ track 0:
   sample count = 62
   track duration = 2772200
   format 0:
+    averageBitrate = 8365494
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -285,6 +286,7 @@ track 1:
   sample count = 61
   track duration = 2257700
   format 0:
+    averageBitrate = 139197
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.2.dump
index 73d1ee2616..197e851b53 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 2772200
   format 0:
+    averageBitrate = 8365494
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -157,6 +158,7 @@ track 1:
   sample count = 21
   track duration = 2257700
   format 0:
+    averageBitrate = 139197
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.3.dump
index 091d56de6c..153b537009 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 2772200
   format 0:
+    averageBitrate = 8365494
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -157,6 +158,7 @@ track 1:
   sample count = 1
   track duration = 2257700
   format 0:
+    averageBitrate = 139197
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index c5c98e5c74..060902d188 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -11,6 +11,7 @@ track 0:
   sample count = 62
   track duration = 2772200
   format 0:
+    averageBitrate = 8365494
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -285,6 +286,7 @@ track 1:
   sample count = 100
   track duration = 2257700
   format 0:
+    averageBitrate = 139197
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.unknown_length.dump
index c5c98e5c74..060902d188 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.unknown_length.dump
@@ -11,6 +11,7 @@ track 0:
   sample count = 62
   track duration = 2772200
   format 0:
+    averageBitrate = 8365494
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -285,6 +286,7 @@ track 1:
   sample count = 100
   track duration = 2257700
   format 0:
+    averageBitrate = 139197
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
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 c06868308a..24eca414e3 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 967600
   format 0:
+    averageBitrate = 2491816
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -155,6 +156,7 @@ track 1:
   sample count = 45
   track duration = 1065600
   format 0:
+    averageBitrate = 71535
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.1.dump
index 9ffbb3213d..040f1ec13a 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 967600
   format 0:
+    averageBitrate = 2491816
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -155,6 +156,7 @@ track 1:
   sample count = 32
   track duration = 1065600
   format 0:
+    averageBitrate = 71535
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.2.dump
index bed94df4f8..39c60050dc 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 967600
   format 0:
+    averageBitrate = 2491816
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -155,6 +156,7 @@ track 1:
   sample count = 17
   track duration = 1065600
   format 0:
+    averageBitrate = 71535
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.3.dump
index 4f9b4b7fa8..2b909d064f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 967600
   format 0:
+    averageBitrate = 2491816
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -155,6 +156,7 @@ track 1:
   sample count = 2
   track duration = 1065600
   format 0:
+    averageBitrate = 71535
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.0.dump
index c06868308a..24eca414e3 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 967600
   format 0:
+    averageBitrate = 2491816
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -155,6 +156,7 @@ track 1:
   sample count = 45
   track duration = 1065600
   format 0:
+    averageBitrate = 71535
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.1.dump
index 9ffbb3213d..040f1ec13a 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 967600
   format 0:
+    averageBitrate = 2491816
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -155,6 +156,7 @@ track 1:
   sample count = 32
   track duration = 1065600
   format 0:
+    averageBitrate = 71535
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.2.dump
index bed94df4f8..39c60050dc 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 967600
   format 0:
+    averageBitrate = 2491816
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -155,6 +156,7 @@ track 1:
   sample count = 17
   track duration = 1065600
   format 0:
+    averageBitrate = 71535
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.3.dump
index 4f9b4b7fa8..2b909d064f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 967600
   format 0:
+    averageBitrate = 2491816
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -155,6 +156,7 @@ track 1:
   sample count = 2
   track duration = 1065600
   format 0:
+    averageBitrate = 71535
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index c06868308a..24eca414e3 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 967600
   format 0:
+    averageBitrate = 2491816
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -155,6 +156,7 @@ track 1:
   sample count = 45
   track duration = 1065600
   format 0:
+    averageBitrate = 71535
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.unknown_length.dump
index c06868308a..24eca414e3 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 967600
   format 0:
+    averageBitrate = 2491816
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -155,6 +156,7 @@ track 1:
   sample count = 45
   track duration = 1065600
   format 0:
+    averageBitrate = 71535
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
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 5c54629737..dc01361772 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 125
   track duration = 499875
   format 0:
+    averageBitrate = 534166
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.1.dump
index 4d18c095ef..b594e72e49 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 84
   track duration = 499875
   format 0:
+    averageBitrate = 534166
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.2.dump
index a5aefd3ef4..6359704b97 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 42
   track duration = 499875
   format 0:
+    averageBitrate = 534166
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.3.dump
index 5154aad7b0..83f90dc495 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 1
   track duration = 499875
   format 0:
+    averageBitrate = 534166
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.0.dump
index 5c54629737..dc01361772 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 125
   track duration = 499875
   format 0:
+    averageBitrate = 534166
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.1.dump
index 4d18c095ef..b594e72e49 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 84
   track duration = 499875
   format 0:
+    averageBitrate = 534166
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.2.dump
index a5aefd3ef4..6359704b97 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 42
   track duration = 499875
   format 0:
+    averageBitrate = 534166
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.3.dump
index 5154aad7b0..83f90dc495 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 1
   track duration = 499875
   format 0:
+    averageBitrate = 534166
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 5c54629737..dc01361772 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 125
   track duration = 499875
   format 0:
+    averageBitrate = 534166
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_iamf.mp4.unknown_length.dump
index 5c54629737..dc01361772 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 125
   track duration = 499875
   format 0:
+    averageBitrate = 534166
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/iamf
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.0.dump
index d0b30b8fa7..88a86693eb 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 45
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 4a5ac34b08..4241ea7bc6 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 33
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 3b4d7d74c0..01b3769d1f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 18
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 bcd00884b4..e2b02e1db6 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 3
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 f037777ee2..f421985812 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 45
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 61d93a3e42..a86bc49098 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 33
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 f983cf0710..0cda2b5e44 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 18
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 9e552d979c..25cc996ae1 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 3
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 f037777ee2..f421985812 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 45
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 d0b30b8fa7..88a86693eb 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 45
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 0244543145..f7eb1d4dc4 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 29
   track duration = 600000
   format 0:
+    averageBitrate = 37827
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.1.dump
index 0244543145..f7eb1d4dc4 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 29
   track duration = 600000
   format 0:
+    averageBitrate = 37827
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.2.dump
index 0244543145..f7eb1d4dc4 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 29
   track duration = 600000
   format 0:
+    averageBitrate = 37827
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.3.dump
index f05fa66c0c..95bcd596d5 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 5
   track duration = 600000
   format 0:
+    averageBitrate = 37827
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.0.dump
index 0244543145..f7eb1d4dc4 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 29
   track duration = 600000
   format 0:
+    averageBitrate = 37827
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.1.dump
index 0244543145..f7eb1d4dc4 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 29
   track duration = 600000
   format 0:
+    averageBitrate = 37827
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.2.dump
index 0244543145..f7eb1d4dc4 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 29
   track duration = 600000
   format 0:
+    averageBitrate = 37827
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.3.dump
index f05fa66c0c..95bcd596d5 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 5
   track duration = 600000
   format 0:
+    averageBitrate = 37827
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 0244543145..f7eb1d4dc4 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 29
   track duration = 600000
   format 0:
+    averageBitrate = 37827
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_cicp1.mp4.unknown_length.dump
index 0244543145..f7eb1d4dc4 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 29
   track duration = 600000
   format 0:
+    averageBitrate = 37827
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.0.dump
index 544c906adb..741a4cff9e 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 87
   track duration = 1800000
   format 0:
+    averageBitrate = 172347
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.1.dump
index 780cc8e493..40ce84c48c 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 58
   track duration = 1800000
   format 0:
+    averageBitrate = 172347
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.2.dump
index 577d0ac2e3..11ad8a809e 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 29
   track duration = 1800000
   format 0:
+    averageBitrate = 172347
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.3.dump
index b35f8ad324..541f57e0e8 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 13
   track duration = 1800000
   format 0:
+    averageBitrate = 172347
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.0.dump
index 544c906adb..741a4cff9e 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 87
   track duration = 1800000
   format 0:
+    averageBitrate = 172347
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.1.dump
index 780cc8e493..40ce84c48c 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 58
   track duration = 1800000
   format 0:
+    averageBitrate = 172347
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.2.dump
index 577d0ac2e3..11ad8a809e 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 29
   track duration = 1800000
   format 0:
+    averageBitrate = 172347
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.3.dump
index b35f8ad324..541f57e0e8 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 13
   track duration = 1800000
   format 0:
+    averageBitrate = 172347
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 544c906adb..741a4cff9e 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 87
   track duration = 1800000
   format 0:
+    averageBitrate = 172347
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_bl_configchange.mp4.unknown_length.dump
index 544c906adb..741a4cff9e 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 87
   track duration = 1800000
   format 0:
+    averageBitrate = 172347
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.0.dump
index c83a0fe947..80e40f0e15 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 29
   track duration = 600000
   format 0:
+    averageBitrate = 37827
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.1.dump
index c83a0fe947..80e40f0e15 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 29
   track duration = 600000
   format 0:
+    averageBitrate = 37827
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.2.dump
index c83a0fe947..80e40f0e15 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 29
   track duration = 600000
   format 0:
+    averageBitrate = 37827
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.3.dump
index a02d3dcff4..e2bd760c48 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 5
   track duration = 600000
   format 0:
+    averageBitrate = 37827
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.0.dump
index c83a0fe947..80e40f0e15 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 29
   track duration = 600000
   format 0:
+    averageBitrate = 37827
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.1.dump
index c83a0fe947..80e40f0e15 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 29
   track duration = 600000
   format 0:
+    averageBitrate = 37827
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.2.dump
index c83a0fe947..80e40f0e15 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 29
   track duration = 600000
   format 0:
+    averageBitrate = 37827
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.3.dump
index a02d3dcff4..e2bd760c48 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 5
   track duration = 600000
   format 0:
+    averageBitrate = 37827
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index c83a0fe947..80e40f0e15 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 29
   track duration = 600000
   format 0:
+    averageBitrate = 37827
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_cicp1.mp4.unknown_length.dump
index c83a0fe947..80e40f0e15 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 29
   track duration = 600000
   format 0:
+    averageBitrate = 37827
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.0.dump
index fe2d2d5915..ecce7da89b 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 87
   track duration = 1800000
   format 0:
+    averageBitrate = 172347
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.1.dump
index 8cae6cf305..01c759e81e 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 58
   track duration = 1800000
   format 0:
+    averageBitrate = 172347
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.2.dump
index d246c7b93a..b5f7fb42dd 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 29
   track duration = 1800000
   format 0:
+    averageBitrate = 172347
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.3.dump
index 39db912aea..a263acc503 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 13
   track duration = 1800000
   format 0:
+    averageBitrate = 172347
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.0.dump
index fe2d2d5915..ecce7da89b 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 87
   track duration = 1800000
   format 0:
+    averageBitrate = 172347
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.1.dump
index 8cae6cf305..01c759e81e 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 58
   track duration = 1800000
   format 0:
+    averageBitrate = 172347
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.2.dump
index d246c7b93a..b5f7fb42dd 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 29
   track duration = 1800000
   format 0:
+    averageBitrate = 172347
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.3.dump
index 39db912aea..a263acc503 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 13
   track duration = 1800000
   format 0:
+    averageBitrate = 172347
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index fe2d2d5915..ecce7da89b 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 87
   track duration = 1800000
   format 0:
+    averageBitrate = 172347
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mhm1_lcbl_configchange.mp4.unknown_length.dump
index fe2d2d5915..ecce7da89b 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 87
   track duration = 1800000
   format 0:
+    averageBitrate = 172347
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.0.dump
index 54bb42cd17..7a7e01c3ef 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 58
   track duration = 1168020
   format 0:
+    averageBitrate = 677929
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mha1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.1.dump
index 54bb42cd17..7a7e01c3ef 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 58
   track duration = 1168020
   format 0:
+    averageBitrate = 677929
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mha1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.2.dump
index 3d83bac859..d64a01b918 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 33
   track duration = 1168020
   format 0:
+    averageBitrate = 677929
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mha1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.3.dump
index 02326506e0..f626d7bfae 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 8
   track duration = 1168020
   format 0:
+    averageBitrate = 677929
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mha1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.0.dump
index 54bb42cd17..7a7e01c3ef 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 58
   track duration = 1168020
   format 0:
+    averageBitrate = 677929
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mha1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.1.dump
index 54bb42cd17..7a7e01c3ef 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 58
   track duration = 1168020
   format 0:
+    averageBitrate = 677929
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mha1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.2.dump
index 3d83bac859..d64a01b918 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 33
   track duration = 1168020
   format 0:
+    averageBitrate = 677929
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mha1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.3.dump
index 02326506e0..f626d7bfae 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 8
   track duration = 1168020
   format 0:
+    averageBitrate = 677929
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mha1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 54bb42cd17..7a7e01c3ef 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 58
   track duration = 1168020
   format 0:
+    averageBitrate = 677929
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mha1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mha1.mp4.unknown_length.dump
index 54bb42cd17..7a7e01c3ef 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 58
   track duration = 1168020
   format 0:
+    averageBitrate = 677929
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mha1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.0.dump
index c0bad92c14..e266f0de8f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 58
   track duration = 1168020
   format 0:
+    averageBitrate = 680444
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.1.dump
index c0bad92c14..e266f0de8f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 58
   track duration = 1168020
   format 0:
+    averageBitrate = 680444
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.2.dump
index 72eaae64a4..c0b37b91c1 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 33
   track duration = 1168020
   format 0:
+    averageBitrate = 680444
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.3.dump
index 6e90ed3a17..61286e7811 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 8
   track duration = 1168020
   format 0:
+    averageBitrate = 680444
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.0.dump
index c0bad92c14..e266f0de8f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 58
   track duration = 1168020
   format 0:
+    averageBitrate = 680444
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.1.dump
index c0bad92c14..e266f0de8f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 58
   track duration = 1168020
   format 0:
+    averageBitrate = 680444
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.2.dump
index 72eaae64a4..c0b37b91c1 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 33
   track duration = 1168020
   format 0:
+    averageBitrate = 680444
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.3.dump
index 6e90ed3a17..61286e7811 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 8
   track duration = 1168020
   format 0:
+    averageBitrate = 680444
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index c0bad92c14..e266f0de8f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 58
   track duration = 1168020
   format 0:
+    averageBitrate = 680444
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mpegh_mhm1.mp4.unknown_length.dump
index c0bad92c14..e266f0de8f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 58
   track duration = 1168020
   format 0:
+    averageBitrate = 680444
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/mhm1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.0.dump
index 52ae096f79..72410da0dd 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 101
   track duration = 1460000
   format 0:
+    averageBitrate = 20745
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.1.dump
index eef0232c80..9ba1cd47f4 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 52
   track duration = 1460000
   format 0:
+    averageBitrate = 20745
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.2.dump
index b5c6b93d21..b60d8c0e5b 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 4
   track duration = 1460000
   format 0:
+    averageBitrate = 20745
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.3.dump
index e7ee40a082..5d2b03c341 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 1
   track duration = 1460000
   format 0:
+    averageBitrate = 20745
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.0.dump
index 52ae096f79..72410da0dd 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 101
   track duration = 1460000
   format 0:
+    averageBitrate = 20745
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.1.dump
index eef0232c80..9ba1cd47f4 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 52
   track duration = 1460000
   format 0:
+    averageBitrate = 20745
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.2.dump
index b5c6b93d21..b60d8c0e5b 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 4
   track duration = 1460000
   format 0:
+    averageBitrate = 20745
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.3.dump
index e7ee40a082..5d2b03c341 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 1
   track duration = 1460000
   format 0:
+    averageBitrate = 20745
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 52ae096f79..72410da0dd 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 101
   track duration = 1460000
   format 0:
+    averageBitrate = 20745
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_opus.mp4.unknown_length.dump
index 52ae096f79..72410da0dd 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 101
   track duration = 1460000
   format 0:
+    averageBitrate = 20745
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.0.dump
index 35804e9500..90bc77cd09 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
@@ -8,6 +8,7 @@ track 0:
   sample count = 30
   track duration = 134000
   format 0:
+    averageBitrate = 2939595
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
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 31f655c736..35e39b7df4 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
@@ -8,6 +8,7 @@ track 0:
   sample count = 30
   track duration = 134000
   format 0:
+    averageBitrate = 2939595
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
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 31f655c736..35e39b7df4 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
@@ -8,6 +8,7 @@ track 0:
   sample count = 30
   track duration = 134000
   format 0:
+    averageBitrate = 2939595
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
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 35804e9500..90bc77cd09 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
@@ -8,6 +8,7 @@ track 0:
   sample count = 30
   track duration = 134000
   format 0:
+    averageBitrate = 2939595
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
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 01857ecd5d..508fdd7c8b 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 125
   track duration = 4166600
   format 0:
+    averageBitrate = 16235575
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
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 71967aaf0b..e086a218c1 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 84
   track duration = 4166600
   format 0:
+    averageBitrate = 16235575
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
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 63c624e2c4..509a9df5c4 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 42
   track duration = 4166600
   format 0:
+    averageBitrate = 16235575
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
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 d73186211c..a4515a72f5 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 1
   track duration = 4166600
   format 0:
+    averageBitrate = 16235575
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
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 01857ecd5d..508fdd7c8b 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 125
   track duration = 4166600
   format 0:
+    averageBitrate = 16235575
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
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 71967aaf0b..e086a218c1 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 84
   track duration = 4166600
   format 0:
+    averageBitrate = 16235575
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
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 63c624e2c4..509a9df5c4 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 42
   track duration = 4166600
   format 0:
+    averageBitrate = 16235575
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
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 d73186211c..a4515a72f5 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 1
   track duration = 4166600
   format 0:
+    averageBitrate = 16235575
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
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 01857ecd5d..508fdd7c8b 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 125
   track duration = 4166600
   format 0:
+    averageBitrate = 16235575
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
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 01857ecd5d..508fdd7c8b 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 125
   track duration = 4166600
   format 0:
+    averageBitrate = 16235575
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.0.dump
index a7a0d91177..2c032b95af 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.0.dump
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718289
+    averageBitrate = 718290
     peakBitrate = 718289
     id = 1
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.1.dump
index e8e653448f..7cd290181d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.1.dump
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718289
+    averageBitrate = 718290
     peakBitrate = 718289
     id = 1
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.2.dump
index 009dc6eb5a..3a7b7edb82 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.2.dump
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718289
+    averageBitrate = 718290
     peakBitrate = 718289
     id = 1
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.3.dump
index a6f5457969..e38bab0029 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.3.dump
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718289
+    averageBitrate = 718290
     peakBitrate = 718289
     id = 1
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.reading_within_gop_sample_dependencies.0.dump
index 2ae7bdfba1..05de123676 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718289
+    averageBitrate = 718290
     peakBitrate = 718289
     id = 1
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.reading_within_gop_sample_dependencies.1.dump
index 70054040b1..9a644c1a00 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718289
+    averageBitrate = 718290
     peakBitrate = 718289
     id = 1
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.reading_within_gop_sample_dependencies.2.dump
index 0c3eacd656..cf5afb1a0a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718289
+    averageBitrate = 718290
     peakBitrate = 718289
     id = 1
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.reading_within_gop_sample_dependencies.3.dump
index ee488930c1..3c394b52cf 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718289
+    averageBitrate = 718290
     peakBitrate = 718289
     id = 1
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 2ae7bdfba1..05de123676 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718289
+    averageBitrate = 718290
     peakBitrate = 718289
     id = 1
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.unknown_length.dump
index a7a0d91177..2c032b95af 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_btrt.mp4.unknown_length.dump
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718289
+    averageBitrate = 718290
     peakBitrate = 718289
     id = 1
     containerMimeType = video/mp4
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 a695c39076..416817c896 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 9
   track duration = 298333
   format 0:
+    averageBitrate = 3265253
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
@@ -73,6 +74,7 @@ track 1:
   sample count = 15
   track duration = 298333
   format 0:
+    averageBitrate = 137652
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
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 39bebf511b..831e715898 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 9
   track duration = 298333
   format 0:
+    averageBitrate = 3265253
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
@@ -73,6 +74,7 @@ track 1:
   sample count = 11
   track duration = 298333
   format 0:
+    averageBitrate = 137652
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
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 8e5b00fc7a..1b2e5f55ba 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 9
   track duration = 298333
   format 0:
+    averageBitrate = 3265253
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
@@ -73,6 +74,7 @@ track 1:
   sample count = 7
   track duration = 298333
   format 0:
+    averageBitrate = 137652
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
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 0e1856105f..9d530f137a 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 9
   track duration = 298333
   format 0:
+    averageBitrate = 3265253
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
@@ -73,6 +74,7 @@ track 1:
   sample count = 3
   track duration = 298333
   format 0:
+    averageBitrate = 137652
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
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 a695c39076..416817c896 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 9
   track duration = 298333
   format 0:
+    averageBitrate = 3265253
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
@@ -73,6 +74,7 @@ track 1:
   sample count = 15
   track duration = 298333
   format 0:
+    averageBitrate = 137652
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
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 39bebf511b..831e715898 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 9
   track duration = 298333
   format 0:
+    averageBitrate = 3265253
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
@@ -73,6 +74,7 @@ track 1:
   sample count = 11
   track duration = 298333
   format 0:
+    averageBitrate = 137652
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
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 8e5b00fc7a..1b2e5f55ba 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 9
   track duration = 298333
   format 0:
+    averageBitrate = 3265253
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
@@ -73,6 +74,7 @@ track 1:
   sample count = 7
   track duration = 298333
   format 0:
+    averageBitrate = 137652
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
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 0e1856105f..9d530f137a 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 9
   track duration = 298333
   format 0:
+    averageBitrate = 3265253
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
@@ -73,6 +74,7 @@ track 1:
   sample count = 3
   track duration = 298333
   format 0:
+    averageBitrate = 137652
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
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 a695c39076..416817c896 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 9
   track duration = 298333
   format 0:
+    averageBitrate = 3265253
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
@@ -73,6 +74,7 @@ track 1:
   sample count = 15
   track duration = 298333
   format 0:
+    averageBitrate = 137652
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
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 a695c39076..416817c896 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 9
   track duration = 298333
   format 0:
+    averageBitrate = 3265253
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/dolby-vision
@@ -73,6 +74,7 @@ track 1:
   sample count = 15
   track duration = 298333
   format 0:
+    averageBitrate = 137652
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
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 5e658612c2..9eba7f70ba 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
@@ -276,7 +276,7 @@ track 1:
   sample count = 44
   track duration = 1022000
   format 0:
-    averageBitrate = 130279
+    averageBitrate = 130280
     peakBitrate = 130279
     id = 2
     containerMimeType = video/mp4
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 952ba03291..35e0f857a7 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
@@ -276,7 +276,7 @@ track 1:
   sample count = 30
   track duration = 1022000
   format 0:
-    averageBitrate = 130279
+    averageBitrate = 130280
     peakBitrate = 130279
     id = 2
     containerMimeType = video/mp4
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 a0967f9cd8..1108dde5b5 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
@@ -276,7 +276,7 @@ track 1:
   sample count = 15
   track duration = 1022000
   format 0:
-    averageBitrate = 130279
+    averageBitrate = 130280
     peakBitrate = 130279
     id = 2
     containerMimeType = video/mp4
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 d7e3cf5f1d..ea4cec0741 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
@@ -276,7 +276,7 @@ track 1:
   sample count = 1
   track duration = 1022000
   format 0:
-    averageBitrate = 130279
+    averageBitrate = 130280
     peakBitrate = 130279
     id = 2
     containerMimeType = video/mp4
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 5e658612c2..9eba7f70ba 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
@@ -276,7 +276,7 @@ track 1:
   sample count = 44
   track duration = 1022000
   format 0:
-    averageBitrate = 130279
+    averageBitrate = 130280
     peakBitrate = 130279
     id = 2
     containerMimeType = video/mp4
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 952ba03291..35e0f857a7 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
@@ -276,7 +276,7 @@ track 1:
   sample count = 30
   track duration = 1022000
   format 0:
-    averageBitrate = 130279
+    averageBitrate = 130280
     peakBitrate = 130279
     id = 2
     containerMimeType = video/mp4
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 a0967f9cd8..1108dde5b5 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
@@ -276,7 +276,7 @@ track 1:
   sample count = 15
   track duration = 1022000
   format 0:
-    averageBitrate = 130279
+    averageBitrate = 130280
     peakBitrate = 130279
     id = 2
     containerMimeType = video/mp4
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 d7e3cf5f1d..ea4cec0741 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
@@ -276,7 +276,7 @@ track 1:
   sample count = 1
   track duration = 1022000
   format 0:
-    averageBitrate = 130279
+    averageBitrate = 130280
     peakBitrate = 130279
     id = 2
     containerMimeType = video/mp4
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 5e658612c2..9eba7f70ba 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
@@ -276,7 +276,7 @@ track 1:
   sample count = 44
   track duration = 1022000
   format 0:
-    averageBitrate = 130279
+    averageBitrate = 130280
     peakBitrate = 130279
     id = 2
     containerMimeType = video/mp4
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 5e658612c2..9eba7f70ba 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
@@ -276,7 +276,7 @@ track 1:
   sample count = 44
   track duration = 1022000
   format 0:
-    averageBitrate = 130279
+    averageBitrate = 130280
     peakBitrate = 130279
     id = 2
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.0.dump
index c50a66b1c2..48eb35aa4a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.0.dump
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718289
+    averageBitrate = 718290
     peakBitrate = 718289
     id = 1
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.1.dump
index c50a66b1c2..48eb35aa4a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.1.dump
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718289
+    averageBitrate = 718290
     peakBitrate = 718289
     id = 1
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.2.dump
index c50a66b1c2..48eb35aa4a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.2.dump
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718289
+    averageBitrate = 718290
     peakBitrate = 718289
     id = 1
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.3.dump
index c50a66b1c2..48eb35aa4a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.3.dump
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718289
+    averageBitrate = 718290
     peakBitrate = 718289
     id = 1
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.reading_within_gop_sample_dependencies.0.dump
index e7c2caa9aa..ab1531c4c5 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718289
+    averageBitrate = 718290
     peakBitrate = 718289
     id = 1
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.reading_within_gop_sample_dependencies.1.dump
index e7c2caa9aa..ab1531c4c5 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718289
+    averageBitrate = 718290
     peakBitrate = 718289
     id = 1
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.reading_within_gop_sample_dependencies.2.dump
index e7c2caa9aa..ab1531c4c5 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718289
+    averageBitrate = 718290
     peakBitrate = 718289
     id = 1
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.reading_within_gop_sample_dependencies.3.dump
index e7c2caa9aa..ab1531c4c5 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718289
+    averageBitrate = 718290
     peakBitrate = 718289
     id = 1
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index e7c2caa9aa..ab1531c4c5 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718289
+    averageBitrate = 718290
     peakBitrate = 718289
     id = 1
     containerMimeType = video/mp4
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.unknown_length.dump
index c50a66b1c2..48eb35aa4a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_invalid_nalu.mp4.unknown_length.dump
@@ -11,7 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
-    averageBitrate = 718289
+    averageBitrate = 718290
     peakBitrate = 718289
     id = 1
     containerMimeType = video/mp4
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 db131083c6..704066f431 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 45
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 5829b59574..e6944dad4f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 33
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 f33974671f..29f0e2b369 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 18
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 f05af39b4f..a6b6d048c3 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 3
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 da6cecf7af..9d0e4a6ecb 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 45
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 2349fe5cef..56b9c7b4a6 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 33
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 b7bf9feb09..80ea03fc2a 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 18
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 c1aebbba9e..796470c5fe 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 3
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 da6cecf7af..9d0e4a6ecb 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 45
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 db131083c6..704066f431 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 45
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 17bb7a080b..8612b7dd58 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 45
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 ce86b03bd0..16f09a2f24 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 33
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 ff95acc738..9dd573bfe4 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 18
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 fb296baf2d..91530e6957 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 3
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 7c27a6eea9..bdd3ea5db3 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 45
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 17708c4b53..cd28d3490f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 33
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 e6f20ebc5d..852324e565 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 18
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 cdd23d5044..d5d38a406b 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 3
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 7c27a6eea9..bdd3ea5db3 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 45
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 17bb7a080b..8612b7dd58 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 718290
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -153,6 +154,7 @@ track 1:
   sample count = 45
   track duration = 1024000
   format 0:
+    averageBitrate = 74502
     peakBitrate = 200000
     id = 2
     containerMimeType = video/mp4
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 53feee8337..d9cdd7950e 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 80
   track duration = 2741666
   format 0:
+    averageBitrate = 12902622
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -356,6 +357,7 @@ track 1:
   sample count = 29
   track duration = 2633333
   format 0:
+    averageBitrate = 705600
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = audio/raw
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.1.dump
index 9fc128a49e..b9709c032b 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 66
   track duration = 2741666
   format 0:
+    averageBitrate = 12902622
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -300,6 +301,7 @@ track 1:
   sample count = 20
   track duration = 2633333
   format 0:
+    averageBitrate = 705600
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = audio/raw
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.2.dump
index 2991b6ae85..75ec7874c0 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 2741666
   format 0:
+    averageBitrate = 12902622
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -156,6 +157,7 @@ track 1:
   sample count = 10
   track duration = 2633333
   format 0:
+    averageBitrate = 705600
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = audio/raw
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.3.dump
index 18057770ac..ca57062e3b 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 8
   track duration = 2741666
   format 0:
+    averageBitrate = 12902622
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -68,6 +69,7 @@ track 1:
   sample count = 1
   track duration = 2633333
   format 0:
+    averageBitrate = 705600
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = audio/raw
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.0.dump
index 53feee8337..d9cdd7950e 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 80
   track duration = 2741666
   format 0:
+    averageBitrate = 12902622
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -356,6 +357,7 @@ track 1:
   sample count = 29
   track duration = 2633333
   format 0:
+    averageBitrate = 705600
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = audio/raw
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.1.dump
index 9fc128a49e..b9709c032b 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 66
   track duration = 2741666
   format 0:
+    averageBitrate = 12902622
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -300,6 +301,7 @@ track 1:
   sample count = 20
   track duration = 2633333
   format 0:
+    averageBitrate = 705600
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = audio/raw
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.2.dump
index 2991b6ae85..75ec7874c0 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 2741666
   format 0:
+    averageBitrate = 12902622
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -156,6 +157,7 @@ track 1:
   sample count = 10
   track duration = 2633333
   format 0:
+    averageBitrate = 705600
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = audio/raw
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.3.dump
index 18057770ac..ca57062e3b 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 8
   track duration = 2741666
   format 0:
+    averageBitrate = 12902622
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -68,6 +69,7 @@ track 1:
   sample count = 1
   track duration = 2633333
   format 0:
+    averageBitrate = 705600
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = audio/raw
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.unknown_length.dump
index 53feee8337..d9cdd7950e 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 80
   track duration = 2741666
   format 0:
+    averageBitrate = 12902622
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -356,6 +357,7 @@ track 1:
   sample count = 29
   track duration = 2633333
   format 0:
+    averageBitrate = 705600
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = audio/raw
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.unknown_length.dump
index 53feee8337..d9cdd7950e 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 80
   track duration = 2741666
   format 0:
+    averageBitrate = 12902622
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -356,6 +357,7 @@ track 1:
   sample count = 29
   track duration = 2633333
   format 0:
+    averageBitrate = 705600
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = audio/raw
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.0.dump
index 0980ce85d1..7ef19dc698 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 5
   track duration = 55555
   format 0:
+    averageBitrate = 12414076
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/mv-hevc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.1.dump
index 0980ce85d1..7ef19dc698 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 5
   track duration = 55555
   format 0:
+    averageBitrate = 12414076
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/mv-hevc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.2.dump
index 0980ce85d1..7ef19dc698 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 5
   track duration = 55555
   format 0:
+    averageBitrate = 12414076
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/mv-hevc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.3.dump
index 0980ce85d1..7ef19dc698 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 5
   track duration = 55555
   format 0:
+    averageBitrate = 12414076
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/mv-hevc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.0.dump
index 0980ce85d1..7ef19dc698 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 5
   track duration = 55555
   format 0:
+    averageBitrate = 12414076
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/mv-hevc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.1.dump
index 0980ce85d1..7ef19dc698 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 5
   track duration = 55555
   format 0:
+    averageBitrate = 12414076
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/mv-hevc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.2.dump
index 0980ce85d1..7ef19dc698 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 5
   track duration = 55555
   format 0:
+    averageBitrate = 12414076
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/mv-hevc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.3.dump
index 0980ce85d1..7ef19dc698 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 5
   track duration = 55555
   format 0:
+    averageBitrate = 12414076
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/mv-hevc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.unknown_length.dump
index 0980ce85d1..7ef19dc698 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 5
   track duration = 55555
   format 0:
+    averageBitrate = 12414076
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/mv-hevc
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.unknown_length.dump
index 0980ce85d1..7ef19dc698 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 5
   track duration = 55555
   format 0:
+    averageBitrate = 12414076
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/mv-hevc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/bbb_176x144_128kbps_15fps_h263.3gp.dump b/libraries/test_data/src/test/assets/muxerdumps/bbb_176x144_128kbps_15fps_h263.3gp.dump
index da3bf70991..08008523b3 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 15
   track duration = 1000000
   format 0:
+    averageBitrate = 400800
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/3gpp
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 1c46c1f415..43bbf49e93 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
@@ -11,7 +11,7 @@ track 0:
   sample count = 103
   track duration = 3008000
   format 0:
-    averageBitrate = 99992
+    averageBitrate = 65918
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/vorbis
diff --git a/libraries/test_data/src/test/assets/muxerdumps/bbb_2ch_44kHz.wav.dump b/libraries/test_data/src/test/assets/muxerdumps/bbb_2ch_44kHz.wav.dump
index 7c44e32ced..765be86c60 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/bbb_2ch_44kHz.wav.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/bbb_2ch_44kHz.wav.dump
@@ -11,6 +11,7 @@ track 0:
   sample count = 10
   track duration = 1000000
   format 0:
+    averageBitrate = 320
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/raw
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 a3244a622b..f2c1d95bef 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 90
   track duration = 3000000
   format 0:
+    averageBitrate = 1010139
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/x-vnd.on2.vp9
diff --git a/libraries/test_data/src/test/assets/muxerdumps/bbb_6ch_8kHz_opus.ogg.dump b/libraries/test_data/src/test/assets/muxerdumps/bbb_6ch_8kHz_opus.ogg.dump
index ac490cbee0..08d1c956df 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 151
   track duration = 3020000
   format 0:
+    averageBitrate = 267211
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_avc_2b_firstpts_10_sec.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_avc_2b_firstpts_10_sec.mp4.dump
index e4ad2a16ce..866dbc4633 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 120
   track duration = 4000000
   format 0:
+    averageBitrate = 599844
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_avc_non_reference_3b.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_avc_non_reference_3b.mp4.dump
index 893f853868..7f972d3b4a 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 120
   track duration = 4000000
   format 0:
+    averageBitrate = 832666
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_avc_pyramid_3b.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_avc_pyramid_3b.mp4.dump
index f3224c2e9a..09815b45c1 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 120
   track duration = 4000000
   format 0:
+    averageBitrate = 812264
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_vp9.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_vp9.mp4.dump
index 0bd783a8f5..4c6cfb8e98 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_vp9.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/bbb_800x640_768kbps_30fps_vp9.mp4.dump
@@ -11,6 +11,7 @@ track 0:
   sample count = 120
   track duration = 4000000
   format 0:
+    averageBitrate = 611612
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/x-vnd.on2.vp9
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 a331017a64..9258aa97f9 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 150
   track duration = 3000000
   format 0:
+    averageBitrate = 23600
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/amr-wb
diff --git a/libraries/test_data/src/test/assets/muxerdumps/bbb_mono_8kHz_12.2kbps_amrnb.3gp.dump b/libraries/test_data/src/test/assets/muxerdumps/bbb_mono_8kHz_12.2kbps_amrnb.3gp.dump
index 7ba70f3568..d9c0602231 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 151
   track duration = 3020000
   format 0:
+    averageBitrate = 12800
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/3gpp
diff --git a/libraries/test_data/src/test/assets/muxerdumps/h265_with_metadata_track.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/h265_with_metadata_track.mp4.dump
index d9213a63f3..7fd0ad2170 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 3
   track duration = 100100
   format 0:
+    averageBitrate = 30940
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = application/meta
@@ -33,7 +34,7 @@ track 1:
   sample count = 3
   track duration = 80700
   format 0:
-    averageBitrate = 192000
+    averageBitrate = 171041
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
@@ -62,6 +63,7 @@ track 2:
   sample count = 3
   track duration = 100100
   format 0:
+    averageBitrate = 54283853
     id = 3
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4.dump
index 32c2eb7596..8a2ecbeac6 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 127
   track duration = 4236600
   format 0:
+    averageBitrate = 15000907
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -543,7 +544,7 @@ track 1:
   sample count = 195
   track duration = 4159900
   format 0:
-    averageBitrate = 256000
+    averageBitrate = 256175
     peakBitrate = 256000
     id = 2
     containerMimeType = video/mp4
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 85d1e77e4e..72b0b779bb 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 4
   track duration = 4000
   format 0:
+    averageBitrate = 448000
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_b_frame_large_pts.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_b_frame_large_pts.mp4.dump
index 6717db814b..4923a8669b 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 4
   track duration = 414900
   format 0:
+    averageBitrate = 4319
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -49,6 +50,7 @@ track 1:
   sample count = 4
   track duration = 414900
   format 0:
+    averageBitrate = 4319
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_different_tracks_offset.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_different_tracks_offset.mp4.dump
index 7b2dbdca85..6f188fe343 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 2
   track duration = 100
   format 0:
+    averageBitrate = 8960000
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -41,6 +42,7 @@ track 1:
   sample count = 2
   track duration = 100
   format 0:
+    averageBitrate = 8960000
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_negative_tracks_offset.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_negative_tracks_offset.mp4.dump
index 9272c148d8..bb96e0b704 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 3
   track duration = 600
   format 0:
+    averageBitrate = 2240000
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_same_tracks_offset.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_same_tracks_offset.mp4.dump
index 5b3c1662ac..999951fb89 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 2
   track duration = 100
   format 0:
+    averageBitrate = 8960000
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -41,6 +42,7 @@ track 1:
   sample count = 2
   track duration = 200
   format 0:
+    averageBitrate = 4480000
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/partial_hdr10-720p.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/partial_hdr10-720p.mp4.dump
index 141c44dd68..b61aeae8ab 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 93
   track duration = 3103400
   format 0:
+    averageBitrate = 15063320
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -407,7 +408,7 @@ track 1:
   sample count = 187
   track duration = 3989300
   format 0:
-    averageBitrate = 256000
+    averageBitrate = 256416
     peakBitrate = 256000
     id = 2
     containerMimeType = video/mp4
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 5cd14811e6..9088839b5f 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 552120
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/av01
@@ -150,7 +151,7 @@ track 1:
   sample count = 45
   track duration = 1045300
   format 0:
-    averageBitrate = 71295
+    averageBitrate = 71267
     peakBitrate = 71295
     id = 2
     containerMimeType = video/mp4
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 b60163ac36..fa4e28a222 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 127
   track duration = 4236600
   format 0:
+    averageBitrate = 15000907
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -543,7 +544,7 @@ track 1:
   sample count = 195
   track duration = 4159900
   format 0:
-    averageBitrate = 256000
+    averageBitrate = 256175
     peakBitrate = 256000
     id = 2
     containerMimeType = video/mp4
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 32c2eb7596..8a2ecbeac6 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 127
   track duration = 4236600
   format 0:
+    averageBitrate = 15000907
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -543,7 +544,7 @@ track 1:
   sample count = 195
   track duration = 4159900
   format 0:
-    averageBitrate = 256000
+    averageBitrate = 256175
     peakBitrate = 256000
     id = 2
     containerMimeType = video/mp4
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 5c9a7e69e9..aaf45d747e 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 45
   track duration = 1045300
   format 0:
+    averageBitrate = 72928
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
@@ -207,6 +208,7 @@ track 1:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 2407297
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = video/avc
diff --git a/libraries/test_data/src/test/assets/muxerdumps/sample_with_apvc.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/sample_with_apvc.mp4.dump
index 9d39154d90..d997dcb8da 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/sample_with_apvc.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/sample_with_apvc.mp4.dump
@@ -11,6 +11,7 @@ track 0:
   sample count = 125
   track duration = 4166600
   format 0:
+    averageBitrate = 16235575
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/apv
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 a1099cbc91..281ce5558b 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 ebebded54e..b92e330102 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 28ccf12dab..36157aa0f3 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 6504f6edf6..1af542bbaa 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,7 +9,7 @@ format audio:
   encoderPadding = 1404
   metadata = entries=[TSSE: description=null: values=[Lavf58.45.100]]
 format video:
-  averageBitrate = 718288
+  averageBitrate = 718290
   peakBitrate = 718288
   id = 1
   containerMimeType = video/mp4
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 30aec51062..6cf40aaea8 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 15
   track duration = 1000000
   format 0:
+    averageBitrate = 400800
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/3gpp
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 ea2626d4be..619a3cf2be 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
@@ -11,7 +11,7 @@ track 0:
   sample count = 103
   track duration = 3008000
   format 0:
-    averageBitrate = 99992
+    averageBitrate = 65918
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/vorbis
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 a82a152e3b..3ee427ef18 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 151
   track duration = 3020000
   format 0:
+    averageBitrate = 267211
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/opus
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_mono_16kHz_23.05kbps_amrwb.3gp/transmuxed_with_inappmuxer.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_mono_16kHz_23.05kbps_amrwb.3gp/transmuxed_with_inappmuxer.dump
index df1e7bb0e9..88d5ecf932 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 150
   track duration = 3000000
   format 0:
+    averageBitrate = 23600
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/amr-wb
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_mono_8kHz_12.2kbps_amrnb.3gp/transmuxed_with_inappmuxer.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/bbb_mono_8kHz_12.2kbps_amrnb.3gp/transmuxed_with_inappmuxer.dump
index 4a02c40030..b86c144761 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 151
   track duration = 3020000
   format 0:
+    averageBitrate = 12800
     id = 1
     containerMimeType = audio/mp4
     sampleMimeType = audio/3gpp
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 2259a838e8..2ffe315288 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 5
   track duration = 166700
   format 0:
+    averageBitrate = 2690171
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -57,6 +58,7 @@ track 1:
   sample count = 7
   track duration = 162600
   format 0:
+    averageBitrate = 131559
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
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 5e664e9d96..08b6f9827a 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 3
   track duration = 100100
   format 0:
+    averageBitrate = 54283853
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/hevc
@@ -48,7 +49,7 @@ track 1:
   sample count = 3
   track duration = 80700
   format 0:
-    averageBitrate = 192000
+    averageBitrate = 171041
     peakBitrate = 192000
     id = 2
     containerMimeType = video/mp4
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 acfe87bf91..8eee7eb5b8 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,5 @@
 format video:
-  averageBitrate = 29211
+  averageBitrate = 29212
   peakBitrate = 29211
   id = 1
   containerMimeType = video/mp4
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 b5f2eae9da..69a580b538 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
@@ -1,5 +1,5 @@
 format audio:
-  averageBitrate = 140021
+  averageBitrate = 140022
   peakBitrate = 140781
   id = 1
   containerMimeType = audio/mp4
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 a2fe9072d6..cec1fcdd5b 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,4 +1,5 @@
 format video:
+  averageBitrate = 718290
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 72f1e3ca2a..cfb0f15eb3 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,4 +1,5 @@
 format audio:
+  averageBitrate = 74502
   peakBitrate = 200000
   id = 2
   containerMimeType = video/mp4
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 f4da4518f2..3812d58202 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,4 +1,5 @@
 format audio:
+  averageBitrate = 74502
   peakBitrate = 200000
   id = 2
   containerMimeType = video/mp4
@@ -12,6 +13,7 @@ format audio:
   initializationData:
     data = length 2, hash 5F7
 format video:
+  averageBitrate = 718290
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 6c992695a9..fd13f8e909 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,4 +1,5 @@
 format audio:
+  averageBitrate = 74502
   peakBitrate = 200000
   id = 2
   containerMimeType = video/mp4
@@ -12,6 +13,7 @@ format audio:
   initializationData:
     data = length 2, hash 5F7
 format video:
+  averageBitrate = 718290
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 3fe2c3026d..8f792d8df3 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,4 +1,5 @@
 format audio:
+  averageBitrate = 74502
   peakBitrate = 200000
   id = 2
   containerMimeType = video/mp4
@@ -12,6 +13,7 @@ format audio:
   initializationData:
     data = length 2, hash 5F7
 format video:
+  averageBitrate = 718290
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 f4db4a8c98..5d44057d79 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 718290
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 398f18dd3f..4f83911e9f 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 48000
   pcmEncoding = 2
 format video:
+  averageBitrate = 718290
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 321a74cd86..1df14752ca 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,7 +9,7 @@ format audio:
   encoderPadding = 1404
   metadata = entries=[TSSE: description=null: values=[Lavf58.45.100]]
 format video:
-  averageBitrate = 718288
+  averageBitrate = 718290
   peakBitrate = 718288
   id = 1
   containerMimeType = video/mp4
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 4f7481b46f..609f5baf1e 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,5 @@
 format video:
-  averageBitrate = 718288
+  averageBitrate = 718290
   peakBitrate = 718288
   id = 1
   containerMimeType = video/mp4
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 c540bbfbb4..11481a7876 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
@@ -5,7 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
-  averageBitrate = 718288
+  averageBitrate = 718290
   peakBitrate = 718288
   id = 1
   containerMimeType = video/mp4
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 6870fed25a..15208553bb 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 552120
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/av01
@@ -153,7 +154,7 @@ track 1:
   sample count = 45
   track duration = 1045300
   format 0:
-    averageBitrate = 71295
+    averageBitrate = 71267
     peakBitrate = 71295
     id = 2
     containerMimeType = video/mp4
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 f25c210d29..8e5dd759a3 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1001000
   format 0:
+    averageBitrate = 2407297
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc
@@ -155,6 +156,7 @@ track 1:
   sample count = 45
   track duration = 1045300
   format 0:
+    averageBitrate = 72928
     id = 2
     containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
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 c5ba64fe71..f75b059604 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,4 +1,5 @@
 format video:
+  averageBitrate = 118406
   id = 2
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 b700e44c31..1cc1e43288 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 718290
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 f894bdf609..9890b89c9f 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
@@ -1,5 +1,5 @@
 format audio:
-  averageBitrate = 192181
+  averageBitrate = 192182
   peakBitrate = 192181
   id = 2
   containerMimeType = video/mp4
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 a1c5ba5461..3d5e191fe2 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
@@ -1,5 +1,5 @@
 format audio:
-  averageBitrate = 192181
+  averageBitrate = 192182
   peakBitrate = 192181
   id = 2
   containerMimeType = video/mp4
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 ce0742001d..c1273fdcbd 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
@@ -1,5 +1,5 @@
 format audio:
-  averageBitrate = 192181
+  averageBitrate = 192182
   peakBitrate = 192181
   id = 2
   containerMimeType = video/mp4
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 9a3fe38096..c606c5cd77 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 ebebded54e..b92e330102 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 c75cfb1966..c7b61e8572 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 5db75b00d4..5937559b70 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 f1a055bd2c..608fb70b37 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 37a7ca3601..7716a97fe5 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 586b06914a..076daa6302 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 44adde5899..578fca6ec2 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 c419ac055f..89b17eeb85 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 fa284b4e82..67d39a8465 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 1b61e96d7e..724ee0c134 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 9cec9d5eac..0f873cccb8 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 b90fc65327..a3f971a0ee 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 fa284b4e82..67d39a8465 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 c75cfb1966..c7b61e8572 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 74f594f729..745e954935 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 bb6f40ee61..bc76cda151 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 bb6f40ee61..bc76cda151 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 5db75b00d4..5937559b70 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 baa132adc5..b96cdd20cd 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 65234809a9..f92737d525 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 5db75b00d4..5937559b70 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 baa132adc5..b96cdd20cd 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 65234809a9..f92737d525 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 4a7dbd29c1..b0027a5d5d 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 de85fd4753..a0c59107b6 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 252af65b35..a3c4d436a6 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 252af65b35..a3c4d436a6 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 68652613e2..6172d3b12c 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 0e6a4aa18f..66621d4092 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 3ee335a4d3..49d0fc010e 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 68652613e2..6172d3b12c 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 0e6a4aa18f..66621d4092 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 3ee335a4d3..49d0fc010e 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
@@ -6,6 +6,7 @@ format audio:
   pcmEncoding = 2
   metadata = entries=[Mp4AlternateGroup: 1, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 586b06914a..076daa6302 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 9cec9d5eac..0f873cccb8 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 d6ecc0a4c9..464311e8d2 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 cd9e5dc149..f07da7d380 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 48445af41a..e3e1b26243 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 fa8ae813ec..87075b85d5 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 4a0c550e5a..ad4c79dc89 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 b90fc65327..a3f971a0ee 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 3ecc2af868..02517cc862 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 7e6ab45668..56c0b8340a 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 586b06914a..076daa6302 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 9cec9d5eac..0f873cccb8 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 d6ecc0a4c9..464311e8d2 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 cd9e5dc149..f07da7d380 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 48445af41a..e3e1b26243 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 fa8ae813ec..87075b85d5 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 4a0c550e5a..ad4c79dc89 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 b90fc65327..a3f971a0ee 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 3ecc2af868..02517cc862 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 7e6ab45668..56c0b8340a 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
@@ -5,6 +5,7 @@ format audio:
   sampleRate = 44100
   pcmEncoding = 2
 format video:
+  averageBitrate = 5946664
   id = 1
   containerMimeType = video/mp4
   sampleMimeType = video/avc
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 9560ab0734..8f109ccb12 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
@@ -11,6 +11,7 @@ track 0:
   sample count = 30
   track duration = 1000000
   format 0:
+    averageBitrate = 332944
     id = 1
     containerMimeType = video/mp4
     sampleMimeType = video/avc