diff --git a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/TsPlaybackTest.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/TsPlaybackTest.java
index c57a443f47..0587a105bd 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/TsPlaybackTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/TsPlaybackTest.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.e2etest;
 
+import android.content.Context;
 import android.graphics.SurfaceTexture;
 import android.view.Surface;
 import androidx.test.core.app.ApplicationProvider;
@@ -25,6 +26,7 @@ import com.google.android.exoplayer2.robolectric.PlaybackOutput;
 import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig;
 import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper;
 import com.google.android.exoplayer2.testutil.AutoAdvancingFakeClock;
+import com.google.android.exoplayer2.testutil.CapturingRenderersFactory;
 import com.google.android.exoplayer2.testutil.DumpFileAsserts;
 import com.google.common.collect.ImmutableList;
 import org.junit.Rule;
@@ -78,12 +80,15 @@ public class TsPlaybackTest {
 
   @Test
   public void test() throws Exception {
+    Context applicationContext = ApplicationProvider.getApplicationContext();
+    CapturingRenderersFactory capturingRenderersFactory =
+        new CapturingRenderersFactory(applicationContext);
     SimpleExoPlayer player =
-        new SimpleExoPlayer.Builder(ApplicationProvider.getApplicationContext())
+        new SimpleExoPlayer.Builder(applicationContext, capturingRenderersFactory)
             .setClock(new AutoAdvancingFakeClock())
             .build();
     player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
-    PlaybackOutput playbackOutput = PlaybackOutput.register(player, mediaCodecConfig);
+    PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
 
     player.setMediaItem(MediaItem.fromUri("asset:///media/ts/" + inputFile));
     player.prepare();
@@ -92,8 +97,6 @@ public class TsPlaybackTest {
     player.release();
 
     DumpFileAsserts.assertOutput(
-        ApplicationProvider.getApplicationContext(),
-        playbackOutput,
-        "playbackdumps/ts/" + inputFile + ".dump");
+        applicationContext, playbackOutput, "playbackdumps/ts/" + inputFile + ".dump");
   }
 }
diff --git a/testdata/src/test/assets/playbackdumps/ts/bbb_2500ms.ts.dump b/testdata/src/test/assets/playbackdumps/ts/bbb_2500ms.ts.dump
index 90fc237af8..1210c33e4c 100644
--- a/testdata/src/test/assets/playbackdumps/ts/bbb_2500ms.ts.dump
+++ b/testdata/src/test/assets/playbackdumps/ts/bbb_2500ms.ts.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/mpeg-L2):
+MediaCodecAdapter (exotest.audio.mpegl2):
   buffers.length = 94
   buffers[0] = length 1253, hash 2267F8F
   buffers[1] = length 1254, hash F01E8708
@@ -94,7 +94,7 @@ MediaCodec (audio/mpeg-L2):
   buffers[91] = length 1254, hash B74BCB59
   buffers[92] = length 1254, hash 1D10AC24
   buffers[93] = length 0, hash 1
-MediaCodec (video/mpeg2):
+MediaCodecAdapter (exotest.video.mpeg2):
   buffers.length = 58
   buffers[0] = length 32732, hash 7B7C01FD
   buffers[1] = length 1302, hash CE206BF9
diff --git a/testdata/src/test/assets/playbackdumps/ts/elephants_dream.mpg.dump b/testdata/src/test/assets/playbackdumps/ts/elephants_dream.mpg.dump
index c786049341..05264ba7b8 100644
--- a/testdata/src/test/assets/playbackdumps/ts/elephants_dream.mpg.dump
+++ b/testdata/src/test/assets/playbackdumps/ts/elephants_dream.mpg.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/mpeg-L2):
+MediaCodecAdapter (exotest.audio.mpegl2):
   buffers.length = 1150
   buffers[0] = length 1253, hash 2267F8F
   buffers[1] = length 1254, hash E64C3DE8
@@ -1150,7 +1150,7 @@ MediaCodec (audio/mpeg-L2):
   buffers[1147] = length 1254, hash 3955496B
   buffers[1148] = length 1254, hash A05AD3CE
   buffers[1149] = length 0, hash 1
-MediaCodec (video/mpeg2):
+MediaCodecAdapter (exotest.video.mpeg2):
   buffers.length = 898
   buffers[0] = length 5297, hash 3AB32925
   buffers[1] = length 288, hash F11B8CE4
diff --git a/testdata/src/test/assets/playbackdumps/ts/sample.ac3.dump b/testdata/src/test/assets/playbackdumps/ts/sample.ac3.dump
index 5d6268356f..28fcdafb6b 100644
--- a/testdata/src/test/assets/playbackdumps/ts/sample.ac3.dump
+++ b/testdata/src/test/assets/playbackdumps/ts/sample.ac3.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/ac3):
+MediaCodecAdapter (exotest.audio.ac3):
   buffers.length = 9
   buffers[0] = length 1536, hash 7108D5C2
   buffers[1] = length 1536, hash 80BF3B34
diff --git a/testdata/src/test/assets/playbackdumps/ts/sample.ac4.dump b/testdata/src/test/assets/playbackdumps/ts/sample.ac4.dump
index b9856b0e24..1326349a90 100644
--- a/testdata/src/test/assets/playbackdumps/ts/sample.ac4.dump
+++ b/testdata/src/test/assets/playbackdumps/ts/sample.ac4.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/ac4):
+MediaCodecAdapter (exotest.audio.ac4):
   buffers.length = 20
   buffers[0] = length 366, hash B4277F9E
   buffers[1] = length 366, hash E8E0A142
diff --git a/testdata/src/test/assets/playbackdumps/ts/sample.adts.dump b/testdata/src/test/assets/playbackdumps/ts/sample.adts.dump
index af1577d5b0..117c6a5368 100644
--- a/testdata/src/test/assets/playbackdumps/ts/sample.adts.dump
+++ b/testdata/src/test/assets/playbackdumps/ts/sample.adts.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/mp4a-latm):
+MediaCodecAdapter (exotest.audio.aac):
   buffers.length = 145
   buffers[0] = length 23, hash 47DE9131
   buffers[1] = length 6, hash 31CF3A46
diff --git a/testdata/src/test/assets/playbackdumps/ts/sample.eac3.dump b/testdata/src/test/assets/playbackdumps/ts/sample.eac3.dump
index 64f09a752b..69b8670a87 100644
--- a/testdata/src/test/assets/playbackdumps/ts/sample.eac3.dump
+++ b/testdata/src/test/assets/playbackdumps/ts/sample.eac3.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/eac3):
+MediaCodecAdapter (exotest.audio.eac3):
   buffers.length = 55
   buffers[0] = length 4000, hash BAEAFB2A
   buffers[1] = length 4000, hash E3C5EBF0
diff --git a/testdata/src/test/assets/playbackdumps/ts/sample_ac3.ts.dump b/testdata/src/test/assets/playbackdumps/ts/sample_ac3.ts.dump
index 5d6268356f..28fcdafb6b 100644
--- a/testdata/src/test/assets/playbackdumps/ts/sample_ac3.ts.dump
+++ b/testdata/src/test/assets/playbackdumps/ts/sample_ac3.ts.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/ac3):
+MediaCodecAdapter (exotest.audio.ac3):
   buffers.length = 9
   buffers[0] = length 1536, hash 7108D5C2
   buffers[1] = length 1536, hash 80BF3B34
diff --git a/testdata/src/test/assets/playbackdumps/ts/sample_ac4.ts.dump b/testdata/src/test/assets/playbackdumps/ts/sample_ac4.ts.dump
index b9856b0e24..1326349a90 100644
--- a/testdata/src/test/assets/playbackdumps/ts/sample_ac4.ts.dump
+++ b/testdata/src/test/assets/playbackdumps/ts/sample_ac4.ts.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/ac4):
+MediaCodecAdapter (exotest.audio.ac4):
   buffers.length = 20
   buffers[0] = length 366, hash B4277F9E
   buffers[1] = length 366, hash E8E0A142
diff --git a/testdata/src/test/assets/playbackdumps/ts/sample_ait.ts.dump b/testdata/src/test/assets/playbackdumps/ts/sample_ait.ts.dump
index cd32d80789..5e351ddba3 100644
--- a/testdata/src/test/assets/playbackdumps/ts/sample_ait.ts.dump
+++ b/testdata/src/test/assets/playbackdumps/ts/sample_ait.ts.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/eac3):
+MediaCodecAdapter (exotest.audio.eac3):
   buffers.length = 20
   buffers[0] = length 512, hash E47547D4
   buffers[1] = length 512, hash F6A537AC
diff --git a/testdata/src/test/assets/playbackdumps/ts/sample_cbs_truncated.adts.dump b/testdata/src/test/assets/playbackdumps/ts/sample_cbs_truncated.adts.dump
index a55133f482..ceeb3708c7 100644
--- a/testdata/src/test/assets/playbackdumps/ts/sample_cbs_truncated.adts.dump
+++ b/testdata/src/test/assets/playbackdumps/ts/sample_cbs_truncated.adts.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/mp4a-latm):
+MediaCodecAdapter (exotest.audio.aac):
   buffers.length = 144
   buffers[0] = length 23, hash 47DE9131
   buffers[1] = length 6, hash 31CF3A46
diff --git a/testdata/src/test/assets/playbackdumps/ts/sample_eac3.ts.dump b/testdata/src/test/assets/playbackdumps/ts/sample_eac3.ts.dump
index 64f09a752b..69b8670a87 100644
--- a/testdata/src/test/assets/playbackdumps/ts/sample_eac3.ts.dump
+++ b/testdata/src/test/assets/playbackdumps/ts/sample_eac3.ts.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/eac3):
+MediaCodecAdapter (exotest.audio.eac3):
   buffers.length = 55
   buffers[0] = length 4000, hash BAEAFB2A
   buffers[1] = length 4000, hash E3C5EBF0
diff --git a/testdata/src/test/assets/playbackdumps/ts/sample_eac3joc.ec3.dump b/testdata/src/test/assets/playbackdumps/ts/sample_eac3joc.ec3.dump
index 6b2dc20c4f..d2c63d4633 100644
--- a/testdata/src/test/assets/playbackdumps/ts/sample_eac3joc.ec3.dump
+++ b/testdata/src/test/assets/playbackdumps/ts/sample_eac3joc.ec3.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/eac3-joc):
+MediaCodecAdapter (exotest.audio.eac3joc):
   buffers.length = 65
   buffers[0] = length 2560, hash 882594AD
   buffers[1] = length 2560, hash 41EC8B22
diff --git a/testdata/src/test/assets/playbackdumps/ts/sample_eac3joc.ts.dump b/testdata/src/test/assets/playbackdumps/ts/sample_eac3joc.ts.dump
index 6b2dc20c4f..d2c63d4633 100644
--- a/testdata/src/test/assets/playbackdumps/ts/sample_eac3joc.ts.dump
+++ b/testdata/src/test/assets/playbackdumps/ts/sample_eac3joc.ts.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/eac3-joc):
+MediaCodecAdapter (exotest.audio.eac3joc):
   buffers.length = 65
   buffers[0] = length 2560, hash 882594AD
   buffers[1] = length 2560, hash 41EC8B22
diff --git a/testdata/src/test/assets/playbackdumps/ts/sample_h262_mpeg_audio.ps.dump b/testdata/src/test/assets/playbackdumps/ts/sample_h262_mpeg_audio.ps.dump
index c27d6d383d..7ac384091c 100644
--- a/testdata/src/test/assets/playbackdumps/ts/sample_h262_mpeg_audio.ps.dump
+++ b/testdata/src/test/assets/playbackdumps/ts/sample_h262_mpeg_audio.ps.dump
@@ -1,11 +1,11 @@
-MediaCodec (audio/mpeg-L2):
+MediaCodecAdapter (exotest.audio.mpegl2):
   buffers.length = 5
   buffers[0] = length 417, hash 5C710F78
   buffers[1] = length 418, hash 79CF71F8
   buffers[2] = length 418, hash 79CF71F8
   buffers[3] = length 418, hash 79CF71F8
   buffers[4] = length 0, hash 1
-MediaCodec (video/mpeg2):
+MediaCodecAdapter (exotest.video.mpeg2):
   buffers.length = 3
   buffers[0] = length 20646, hash 576390B
   buffers[1] = length 17831, hash 5C5A57F5
diff --git a/testdata/src/test/assets/playbackdumps/ts/sample_h262_mpeg_audio.ts.dump b/testdata/src/test/assets/playbackdumps/ts/sample_h262_mpeg_audio.ts.dump
index 7c9cff84d1..9f225da2f4 100644
--- a/testdata/src/test/assets/playbackdumps/ts/sample_h262_mpeg_audio.ts.dump
+++ b/testdata/src/test/assets/playbackdumps/ts/sample_h262_mpeg_audio.ts.dump
@@ -1,11 +1,11 @@
-MediaCodec (audio/mpeg-L2):
+MediaCodecAdapter (exotest.audio.mpegl2):
   buffers.length = 5
   buffers[0] = length 1253, hash 727FD1C6
   buffers[1] = length 1254, hash 73FB07B8
   buffers[2] = length 1254, hash 73FB07B8
   buffers[3] = length 1254, hash 73FB07B8
   buffers[4] = length 0, hash 1
-MediaCodec (video/mpeg2):
+MediaCodecAdapter (exotest.video.mpeg2):
   buffers.length = 3
   buffers[0] = length 20711, hash 34341E8
   buffers[1] = length 18112, hash EC44B35B
diff --git a/testdata/src/test/assets/playbackdumps/ts/sample_h264_dts_audio.ts.dump b/testdata/src/test/assets/playbackdumps/ts/sample_h264_dts_audio.ts.dump
index 5148c819dc..269ea0a086 100644
--- a/testdata/src/test/assets/playbackdumps/ts/sample_h264_dts_audio.ts.dump
+++ b/testdata/src/test/assets/playbackdumps/ts/sample_h264_dts_audio.ts.dump
@@ -1,4 +1,4 @@
-MediaCodec (video/avc):
+MediaCodecAdapter (exotest.video.avc):
   buffers.length = 3
   buffers[0] = length 12394, hash A39F5311
   buffers[1] = length 813, hash 99F7B4FA
diff --git a/testdata/src/test/assets/playbackdumps/ts/sample_h264_mpeg_audio.ts.dump b/testdata/src/test/assets/playbackdumps/ts/sample_h264_mpeg_audio.ts.dump
index fd18315acd..c57a125b48 100644
--- a/testdata/src/test/assets/playbackdumps/ts/sample_h264_mpeg_audio.ts.dump
+++ b/testdata/src/test/assets/playbackdumps/ts/sample_h264_mpeg_audio.ts.dump
@@ -1,11 +1,11 @@
-MediaCodec (audio/mpeg-L2):
+MediaCodecAdapter (exotest.audio.mpegl2):
   buffers.length = 5
   buffers[0] = length 1253, hash 727FD1C6
   buffers[1] = length 1254, hash 73FB07B8
   buffers[2] = length 1254, hash 73FB07B8
   buffers[3] = length 1254, hash 73FB07B8
   buffers[4] = length 0, hash 1
-MediaCodec (video/avc):
+MediaCodecAdapter (exotest.video.avc):
   buffers.length = 3
   buffers[0] = length 12394, hash A39F5311
   buffers[1] = length 813, hash 99F7B4FA
diff --git a/testdata/src/test/assets/playbackdumps/ts/sample_h264_no_access_unit_delimiters.ts.dump b/testdata/src/test/assets/playbackdumps/ts/sample_h264_no_access_unit_delimiters.ts.dump
index aaa7935a46..6ec91b3741 100644
--- a/testdata/src/test/assets/playbackdumps/ts/sample_h264_no_access_unit_delimiters.ts.dump
+++ b/testdata/src/test/assets/playbackdumps/ts/sample_h264_no_access_unit_delimiters.ts.dump
@@ -1,4 +1,4 @@
-MediaCodec (video/avc):
+MediaCodecAdapter (exotest.video.avc):
   buffers.length = 3
   buffers[0] = length 11672, hash 476AEFF9
   buffers[1] = length 524, hash 184416EF
diff --git a/testdata/src/test/assets/playbackdumps/ts/sample_latm.ts.dump b/testdata/src/test/assets/playbackdumps/ts/sample_latm.ts.dump
index bf418b0da8..9732591ea4 100644
--- a/testdata/src/test/assets/playbackdumps/ts/sample_latm.ts.dump
+++ b/testdata/src/test/assets/playbackdumps/ts/sample_latm.ts.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/mp4a-latm):
+MediaCodecAdapter (exotest.audio.aac):
   buffers.length = 6
   buffers[0] = length 279, hash 79BF9F9B
   buffers[1] = length 279, hash C96F4684
diff --git a/testdata/src/test/assets/playbackdumps/ts/sample_scte35.ts.dump b/testdata/src/test/assets/playbackdumps/ts/sample_scte35.ts.dump
index 9e850d0f14..ef0f2405ef 100644
--- a/testdata/src/test/assets/playbackdumps/ts/sample_scte35.ts.dump
+++ b/testdata/src/test/assets/playbackdumps/ts/sample_scte35.ts.dump
@@ -1,11 +1,11 @@
-MediaCodec (audio/mpeg-L2):
+MediaCodecAdapter (exotest.audio.mpegl2):
   buffers.length = 5
   buffers[0] = length 1253, hash 727FD1C6
   buffers[1] = length 1254, hash 73FB07B8
   buffers[2] = length 1254, hash 73FB07B8
   buffers[3] = length 1254, hash 73FB07B8
   buffers[4] = length 0, hash 1
-MediaCodec (video/mpeg2):
+MediaCodecAdapter (exotest.video.mpeg2):
   buffers.length = 3
   buffers[0] = length 20711, hash 34341E8
   buffers[1] = length 18112, hash EC44B35B
diff --git a/testdata/src/test/assets/playbackdumps/ts/sample_with_id3.adts.dump b/testdata/src/test/assets/playbackdumps/ts/sample_with_id3.adts.dump
index b372b47d36..9385ac2c57 100644
--- a/testdata/src/test/assets/playbackdumps/ts/sample_with_id3.adts.dump
+++ b/testdata/src/test/assets/playbackdumps/ts/sample_with_id3.adts.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/mp4a-latm):
+MediaCodecAdapter (exotest.audio.aac):
   buffers.length = 145
   buffers[0] = length 23, hash 47DE9131
   buffers[1] = length 6, hash 31CF3A46
diff --git a/testdata/src/test/assets/playbackdumps/ts/sample_with_junk.dump b/testdata/src/test/assets/playbackdumps/ts/sample_with_junk.dump
index 7c9cff84d1..9f225da2f4 100644
--- a/testdata/src/test/assets/playbackdumps/ts/sample_with_junk.dump
+++ b/testdata/src/test/assets/playbackdumps/ts/sample_with_junk.dump
@@ -1,11 +1,11 @@
-MediaCodec (audio/mpeg-L2):
+MediaCodecAdapter (exotest.audio.mpegl2):
   buffers.length = 5
   buffers[0] = length 1253, hash 727FD1C6
   buffers[1] = length 1254, hash 73FB07B8
   buffers[2] = length 1254, hash 73FB07B8
   buffers[3] = length 1254, hash 73FB07B8
   buffers[4] = length 0, hash 1
-MediaCodec (video/mpeg2):
+MediaCodecAdapter (exotest.video.mpeg2):
   buffers.length = 3
   buffers[0] = length 20711, hash 34341E8
   buffers[1] = length 18112, hash EC44B35B