ShadowMediaCodecConfig: Replace "exotest" with "media3" in codec names

The "exotest" prefix was associated with decoders configured for ExoPlayer tests. However, after adding encoder support to ShadowMediaCodecConfig and migrating transcoding tests to use it, changing the prefix to "media3" makes it more expressive. Sump files were updated accordingly. This is a non-functional change. PiperOrigin-RevId: 751357719
[demo-compose] Even out the weight of Prev/Play/Next buttons
2025-04-29 22:36:54 +08:00 · 2025-04-25 04:07:49 -07:00 · 2025-04-25 03:09:39 -07:00
197 changed files with 325 additions and 323 deletions
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@ -99,6 +99,8 @@
        `transformer.TestUtil.addAudioEncoders(ShadowMediaCodec.CodecConfig,
        String...)`. Use `ShadowMediaCodecConfig` to configure shadow encoders
        and decoders instead.
+    *   Replaced the "exotest" prefix with "media3" in codec names reported by
+        `ShadowMediaCodecConfig`.
 *   Remove deprecated symbols:
    *   Removed deprecated `SegmentDownloader` constructor
        `SegmentDownloader(MediaItem, Parser<M>, CacheDataSource.Factory,
--- a/demos/compose/src/main/java/androidx/media3/demo/compose/buttons/MinimalControls.kt
+++ b/demos/compose/src/main/java/androidx/media3/demo/compose/buttons/MinimalControls.kt
@ -44,8 +44,8 @@ internal fun MinimalControls(player: Player, modifier: Modifier = Modifier) {
    horizontalArrangement = Arrangement.SpaceEvenly,
    verticalAlignment = Alignment.CenterVertically,
  ) {
-    PreviousButton(player, modifierForIconButton)
-    PlayPauseButton(player, modifierForIconButton)
-    NextButton(player, modifierForIconButton)
+    PreviousButton(player, Modifier.weight(1f).then(modifierForIconButton))
+    PlayPauseButton(player, Modifier.weight(1f).then(modifierForIconButton))
+    NextButton(player, Modifier.weight(1f).then(modifierForIconButton))
  }
 }
--- a/libraries/test_data/src/test/assets/playbackdumps/av1SampleDependencies/clippedMediaItem.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/av1SampleDependencies/clippedMediaItem.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.video.av1):
+MediaCodecAdapter (media3.video.av1):
  inputBuffers:
    count = 26
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/clipping/end_end.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/clipping/end_end.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 52
    input buffer #0:
@ -361,7 +361,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001589678
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 62
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/clipping/end_middle.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/clipping/end_middle.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 44
    input buffer #0:
@ -305,7 +305,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001418158
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 50
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/clipping/end_start.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/clipping/end_start.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 47
    input buffer #0:
@ -326,7 +326,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001509179
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 45
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/clipping/middle_end.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/clipping/middle_end.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 44
    input buffer #0:
@ -305,7 +305,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001265678
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 50
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/clipping/middle_middle.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/clipping/middle_middle.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 36
    input buffer #0:
@ -249,7 +249,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001094158
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 38
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/clipping/middle_start.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/clipping/middle_start.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 39
    input buffer #0:
@ -270,7 +270,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001185179
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 33
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/clipping/start_end.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/clipping/start_end.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 47
    input buffer #0:
@ -326,7 +326,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001065678
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 46
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/clipping/start_middle.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/clipping/start_middle.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 39
    input buffer #0:
@ -270,7 +270,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000000894158
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 34
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/clipping/start_start.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/clipping/start_start.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 42
    input buffer #0:
@ -291,7 +291,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000000985179
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 29
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/dash/cea608.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/dash/cea608.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 115
    input buffer #0:
@ -805,7 +805,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000002410666
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 59
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/dash/cmcd-enabled-with-init-segment.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/dash/cmcd-enabled-with-init-segment.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 31
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/dash/emsg.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/dash/emsg.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 92
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/dash/multi-period-with-offset.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/dash/multi-period-with-offset.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 46
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/dash/optimized_seek.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/dash/optimized_seek.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 24
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/dash/optimized_seek_h265.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/dash/optimized_seek_h265.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.video.hevc):
+MediaCodecAdapter (media3.video.hevc):
  inputBuffers:
    count = 56
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/dash/standalone-ttml.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/dash/standalone-ttml.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 31
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/dash/standalone-webvtt.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/dash/standalone-webvtt.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 31
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/dash/standalone-webvtt_load-error.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/dash/standalone-webvtt_load-error.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 31
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/dash/standalone-webvtt_parse-error.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/dash/standalone-webvtt_parse-error.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 31
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/dash/ttml-in-mp4.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/dash/ttml-in-mp4.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 31
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/dash/ttml-in-mp4_load-error.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/dash/ttml-in-mp4_load-error.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 31
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/dash/ttml-in-mp4_parse-error.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/dash/ttml-in-mp4_parse-error.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 31
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/dash/webvtt-in-mp4.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/dash/webvtt-in-mp4.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 31
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/flac/bear.flac.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/flac/bear.flac.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.flac):
+MediaCodecAdapter (media3.audio.flac):
  inputBuffers:
    count = 34
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/flac/bear_32bit.flac.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/flac/bear_32bit.flac.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.flac):
+MediaCodecAdapter (media3.audio.flac):
  inputBuffers:
    count = 30
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/flac/bear_no_min_max_frame_size.flac.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/flac/bear_no_min_max_frame_size.flac.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.flac):
+MediaCodecAdapter (media3.audio.flac):
  inputBuffers:
    count = 34
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/flac/bear_no_num_samples.flac.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/flac/bear_no_num_samples.flac.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.flac):
+MediaCodecAdapter (media3.audio.flac):
  inputBuffers:
    count = 34
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/flac/bear_no_seek_table_no_num_samples.flac.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/flac/bear_no_seek_table_no_num_samples.flac.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.flac):
+MediaCodecAdapter (media3.audio.flac):
  inputBuffers:
    count = 34
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/flac/bear_one_metadata_block.flac.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/flac/bear_one_metadata_block.flac.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.flac):
+MediaCodecAdapter (media3.audio.flac):
  inputBuffers:
    count = 34
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/flac/bear_uncommon_sample_rate.flac.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/flac/bear_uncommon_sample_rate.flac.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.flac):
+MediaCodecAdapter (media3.audio.flac):
  inputBuffers:
    count = 28
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/flac/bear_with_id3.flac.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/flac/bear_with_id3.flac.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.flac):
+MediaCodecAdapter (media3.audio.flac):
  inputBuffers:
    count = 34
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/flac/bear_with_picture.flac.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/flac/bear_with_picture.flac.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.flac):
+MediaCodecAdapter (media3.audio.flac):
  inputBuffers:
    count = 34
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/flac/bear_with_vorbis_comments.flac.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/flac/bear_with_vorbis_comments.flac.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.flac):
+MediaCodecAdapter (media3.audio.flac):
  inputBuffers:
    count = 34
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/flv/sample-with-key-frame-index.flv.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/flv/sample-with-key-frame-index.flv.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 72
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/flv/sample.flv.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/flv/sample.flv.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 46
    input buffer #0:
@ -322,7 +322,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001134000
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 31
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/hls/cea608.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/hls/cea608.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 115
    input buffer #0:
@ -805,7 +805,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000002410666
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 58
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/hls/cmcd-enabled-with-init-segment.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/hls/cmcd-enabled-with-init-segment.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 46
    input buffer #0:
@ -322,7 +322,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001021678
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.hevc):
+MediaCodecAdapter (media3.video.hevc):
  inputBuffers:
    count = 31
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/hls/multi-segment-with-seek.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/hls/multi-segment-with-seek.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 72
    input buffer #0:
@ -501,7 +501,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001021678
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.hevc):
+MediaCodecAdapter (media3.video.hevc):
  inputBuffers:
    count = 47
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/hls/standalone-webvtt-optimized-seek.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/hls/standalone-webvtt-optimized-seek.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 24
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/hls/standalone-webvtt.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/hls/standalone-webvtt.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 31
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/hls/standalone-webvtt_load-error.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/hls/standalone-webvtt_load-error.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 31
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/hls/standalone-webvtt_parse-error.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/hls/standalone-webvtt_parse-error.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 31
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/hls/ttml-in-mp4.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/hls/ttml-in-mp4.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 31
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/hls/ttml-in-mp4_load-error.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/hls/ttml-in-mp4_load-error.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 31
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/hls/ttml-in-mp4_parse-error.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/hls/ttml-in-mp4_parse-error.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 31
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/jpeg-motion-photo/pixel-motion-photo-2-hevc-tracks.jpg.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/jpeg-motion-photo/pixel-motion-photo-2-hevc-tracks.jpg.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.video.hevc):
+MediaCodecAdapter (media3.video.hevc):
  inputBuffers:
    count = 59
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/jpeg-motion-photo/pixel-motion-photo-jfif-segment-shortened.jpg.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/jpeg-motion-photo/pixel-motion-photo-jfif-segment-shortened.jpg.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 2
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/audio_false_false_false_false.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/audio_false_false_false_false.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 88
    input buffer #0:
@ -613,7 +613,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000002043238
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 61
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/audio_false_false_false_true.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/audio_false_false_false_true.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 58
    input buffer #0:
@ -403,7 +403,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001311038
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 38
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/audio_false_false_true_false.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/audio_false_false_true_false.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 57
    input buffer #0:
@ -396,7 +396,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001323419
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 50
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/audio_false_false_true_true.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/audio_false_false_true_true.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 58
    input buffer #0:
@ -403,7 +403,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001311038
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 50
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/audio_false_true_false_false.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/audio_false_true_false_false.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 58
    input buffer #0:
@ -403,7 +403,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001819238
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 38
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/audio_false_true_false_true.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/audio_false_true_false_true.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 28
    input buffer #0:
@ -193,7 +193,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001087038
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 15
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/audio_false_true_true_false.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/audio_false_true_true_false.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 27
    input buffer #0:
@ -186,7 +186,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001099419
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 27
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/audio_false_true_true_true.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/audio_false_true_true_true.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 28
    input buffer #0:
@ -193,7 +193,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001087038
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 27
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/audio_true_false_false_false.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/audio_true_false_false_false.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 57
    input buffer #0:
@ -396,7 +396,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001319238
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 49
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/audio_true_false_false_true.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/audio_true_false_false_true.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 27
    input buffer #0:
@ -186,7 +186,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000000587038
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 26
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/audio_true_false_true_false.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/audio_true_false_true_false.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 26
    input buffer #0:
@ -179,7 +179,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000000599419
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 38
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/audio_true_false_true_true.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/audio_true_false_true_true.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 27
    input buffer #0:
@ -186,7 +186,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000000587038
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 38
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/audio_true_true_false_false.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/audio_true_true_false_false.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 58
    input buffer #0:
@ -403,7 +403,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001819238
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 49
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/audio_true_true_false_true.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/audio_true_true_false_true.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 28
    input buffer #0:
@ -193,7 +193,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001087038
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 26
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/audio_true_true_true_false.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/audio_true_true_true_false.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 27
    input buffer #0:
@ -186,7 +186,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001099419
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 38
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/audio_true_true_true_true.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/audio_true_true_true_true.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 28
    input buffer #0:
@ -193,7 +193,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001087038
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 38
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/repeat_audio_false_false.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/repeat_audio_false_false.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 220
    input buffer #0:
@ -1528,7 +1528,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000005115238
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 151
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/repeat_audio_false_true.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/repeat_audio_false_true.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 70
    input buffer #0:
@ -478,7 +478,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001987038
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 36
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/repeat_audio_true_false.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/repeat_audio_true_false.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 65
    input buffer #0:
@ -443,7 +443,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001499419
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 95
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/repeat_audio_true_true.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/repeat_audio_true_true.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 70
    input buffer #0:
@ -478,7 +478,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001987038
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 95
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/repeat_video_false_false.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/repeat_video_false_false.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 220
    input buffer #0:
@ -1528,7 +1528,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000005115238
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 151
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/repeat_video_false_true.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/repeat_video_false_true.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 70
    input buffer #0:
@ -478,7 +478,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001487038
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 36
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/repeat_video_true_false.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/repeat_video_true_false.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 65
    input buffer #0:
@ -443,7 +443,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001799419
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 95
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/repeat_video_true_true.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/repeat_video_true_true.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 70
    input buffer #0:
@ -478,7 +478,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001787038
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 95
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/video_false_false_false_false.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/video_false_false_false_false.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 88
    input buffer #0:
@ -613,7 +613,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000002043238
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 61
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/video_false_false_false_true.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/video_false_false_false_true.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 58
    input buffer #0:
@ -403,7 +403,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001311038
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 38
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/video_false_false_true_false.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/video_false_false_true_false.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 57
    input buffer #0:
@ -396,7 +396,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001323419
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 50
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/video_false_false_true_true.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/video_false_false_true_true.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 58
    input buffer #0:
@ -403,7 +403,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001311038
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 50
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/video_false_true_false_false.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/video_false_true_false_false.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 58
    input buffer #0:
@ -403,7 +403,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001319238
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 38
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/video_false_true_false_true.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/video_false_true_false_true.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 28
    input buffer #0:
@ -193,7 +193,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000000587038
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 15
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/video_false_true_true_false.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/video_false_true_true_false.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 27
    input buffer #0:
@ -186,7 +186,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000000599419
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 27
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/video_false_true_true_true.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/video_false_true_true_true.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 28
    input buffer #0:
@ -193,7 +193,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000000587038
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 27
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/video_true_false_false_false.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/video_true_false_false_false.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 57
    input buffer #0:
@ -396,7 +396,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001619238
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 49
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/video_true_false_false_true.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/video_true_false_false_true.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 27
    input buffer #0:
@ -186,7 +186,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000000887038
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 26
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/video_true_false_true_false.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/video_true_false_true_false.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 26
    input buffer #0:
@ -179,7 +179,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000000899419
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 38
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/video_true_false_true_true.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/video_true_false_true_true.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 27
    input buffer #0:
@ -186,7 +186,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000000887038
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 38
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/video_true_true_false_false.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/video_true_true_false_false.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 58
    input buffer #0:
@ -403,7 +403,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000001619238
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 49
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/video_true_true_false_true.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/video_true_true_false_true.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 28
    input buffer #0:
@ -193,7 +193,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000000887038
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 26
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/video_true_true_true_false.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/video_true_true_true_false.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 27
    input buffer #0:
@ -186,7 +186,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000000899419
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 38
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/merging/video_true_true_true_true.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/merging/video_true_true_true_true.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.aac):
+MediaCodecAdapter (media3.audio.aac):
  inputBuffers:
    count = 28
    input buffer #0:
@ -193,7 +193,7 @@ MediaCodecAdapter (exotest.audio.aac):
      timeUs = 1000000887038
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 38
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/mka/bear-flac-16bit.mka.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/mka/bear-flac-16bit.mka.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.flac):
+MediaCodecAdapter (media3.audio.flac):
  inputBuffers:
    count = 30
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/mka/bear-flac-24bit.mka.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/mka/bear-flac-24bit.mka.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.flac):
+MediaCodecAdapter (media3.audio.flac):
  inputBuffers:
    count = 30
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/mka/bear-flac-32bit.mka.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/mka/bear-flac-32bit.mka.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.flac):
+MediaCodecAdapter (media3.audio.flac):
  inputBuffers:
    count = 30
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/mka/bear-opus-negative-gain.mka.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/mka/bear-opus-negative-gain.mka.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.opus):
+MediaCodecAdapter (media3.audio.opus):
  inputBuffers:
    count = 138
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/mka/bear-opus.mka.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/mka/bear-opus.mka.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.opus):
+MediaCodecAdapter (media3.audio.opus):
  inputBuffers:
    count = 138
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/mkv/sample.mkv.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/mkv/sample.mkv.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.ac3):
+MediaCodecAdapter (media3.audio.ac3):
  inputBuffers:
    count = 30
    input buffer #0:
@ -210,7 +210,7 @@ MediaCodecAdapter (exotest.audio.ac3):
      timeUs = 1000001104000
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 31
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/mkv/sample_with_htc_rotation_track_name.mkv.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/mkv/sample_with_htc_rotation_track_name.mkv.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.ac3):
+MediaCodecAdapter (media3.audio.ac3):
  inputBuffers:
    count = 30
    input buffer #0:
@ -210,7 +210,7 @@ MediaCodecAdapter (exotest.audio.ac3):
      timeUs = 1000001037000
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 31
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/mkv/sample_with_null_terminated_srt.mkv.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/mkv/sample_with_null_terminated_srt.mkv.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.ac3):
+MediaCodecAdapter (media3.audio.ac3):
  inputBuffers:
    count = 30
    input buffer #0:
@ -210,7 +210,7 @@ MediaCodecAdapter (exotest.audio.ac3):
      timeUs = 1000001037000
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 31
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.ac3):
+MediaCodecAdapter (media3.audio.ac3):
  inputBuffers:
    count = 30
    input buffer #0:
@ -210,7 +210,7 @@ MediaCodecAdapter (exotest.audio.ac3):
      timeUs = 1000001104319
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 31
    input buffer #0:
--- a/libraries/test_data/src/test/assets/playbackdumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.dump
@ -1,4 +1,4 @@
-MediaCodecAdapter (exotest.audio.ac3):
+MediaCodecAdapter (media3.audio.ac3):
  inputBuffers:
    count = 30
    input buffer #0:
@ -210,7 +210,7 @@ MediaCodecAdapter (exotest.audio.ac3):
      timeUs = 1000001037319
      size = 0
      rendered = false
-MediaCodecAdapter (exotest.video.avc):
+MediaCodecAdapter (media3.video.avc):
  inputBuffers:
    count = 31
    input buffer #0:
--- a/Show More
+++ b/Show More