From 70ad637e52c7c57b8c924f1fcfe48a21f4f4fb68 Mon Sep 17 00:00:00 2001 From: christosts Date: Fri, 1 Sep 2023 09:23:55 -0700 Subject: [PATCH] Conditionally output captured data in CapturingRenderersFactory This change makes capturing components in CapturingRenderersFactory to dump data only they have previously captured any. This is so we can extend the CapturingRenderersFactory with more renderers that do not capture data in pre-existing tests and we don't have to change the golden files. PiperOrigin-RevId: 561973645 --- .../mka/bear-flac-16bit.mka.audiosink.dump | 187 +++++++++--------- .../mka/bear-flac-24bit.mka.audiosink.dump | 187 +++++++++--------- .../wav/sample.wav_then_sample_rf64.wav.dump | 105 +++++----- .../dash/metadata_from_early_output.dump | 2 - .../dash/metadata_from_timely_output.dump | 2 - .../flv/sample-with-key-frame-index.flv.dump | 2 - .../mp4/sample_android_slow_motion.mp4.dump | 2 - .../png/non-motion-photo-shortened.png.dump | 2 - .../assets/playbackdumps/silence/0ms.dump | 2 - .../playbackdumps/ts/sample_h263.ts.dump | 2 - .../ts/sample_h264_dts_audio.ts.dump | 2 - ...ple_h264_no_access_unit_delimiters.ts.dump | 2 - .../playbackdumps/ts/sample_h265.ts.dump | 2 - .../ts/sample_h265_rps_pred.ts.dump | 2 - .../vp9/bear-vp9-odd-dimensions.webm.dump | 2 - .../playbackdumps/vp9/bear-vp9.webm.dump | 2 - .../vp9/invalid-bitstream.webm.dump | 2 - .../vp9/roadtrip-vp92-10bit.webm.dump | 2 - .../media3/test/utils/CapturingAudioSink.java | 6 +- .../test/utils/CapturingImageOutput.java | 2 + .../test/utils/CapturingRenderersFactory.java | 4 - 21 files changed, 248 insertions(+), 273 deletions(-) diff --git a/libraries/test_data/src/test/assets/audiosinkdumps/mka/bear-flac-16bit.mka.audiosink.dump b/libraries/test_data/src/test/assets/audiosinkdumps/mka/bear-flac-16bit.mka.audiosink.dump index ea543daad7..77cfbea3fb 100644 --- a/libraries/test_data/src/test/assets/audiosinkdumps/mka/bear-flac-16bit.mka.audiosink.dump +++ b/libraries/test_data/src/test/assets/audiosinkdumps/mka/bear-flac-16bit.mka.audiosink.dump @@ -1,93 +1,94 @@ -buffer count = 29 -discontinuity: -config: - pcmEncoding = 2 - channelCount = 2 - sampleRate = 48000 -buffer #0: - time = 1000000001000 - data = 1217833679 -buffer #1: - time = 1000000097000 - data = 558614672 -buffer #2: - time = 1000000193000 - data = -709714787 -buffer #3: - time = 1000000289000 - data = 1367870571 -buffer #4: - time = 1000000385000 - data = -141229457 -buffer #5: - time = 1000000481000 - data = 1287758361 -buffer #6: - time = 1000000577000 - data = 1125289147 -buffer #7: - time = 1000000673000 - data = -1677383475 -buffer #8: - time = 1000000769000 - data = 2130742861 -buffer #9: - time = 1000000865000 - data = -1292320253 -buffer #10: - time = 1000000961000 - data = -456587163 -buffer #11: - time = 1000001057000 - data = 748981534 -buffer #12: - time = 1000001153000 - data = 1550456016 -buffer #13: - time = 1000001249000 - data = 1657906039 -buffer #14: - time = 1000001345000 - data = -762677083 -buffer #15: - time = 1000001441000 - data = -1343810763 -buffer #16: - time = 1000001537000 - data = 1137318783 -buffer #17: - time = 1000001633000 - data = -1891318229 -buffer #18: - time = 1000001729000 - data = -472068495 -buffer #19: - time = 1000001825000 - data = 832315001 -buffer #20: - time = 1000001921000 - data = 2054935175 -buffer #21: - time = 1000002017000 - data = 57921641 -buffer #22: - time = 1000002113000 - data = 2132759067 -buffer #23: - time = 1000002209000 - data = -1742540521 -buffer #24: - time = 1000002305000 - data = 1657024301 -buffer #25: - time = 1000002401000 - data = -585080145 -buffer #26: - time = 1000002497000 - data = 427271397 -buffer #27: - time = 1000002593000 - data = -364201340 -buffer #28: - time = 1000002689000 - data = -627965287 +AudioSink: + buffer count = 29 + discontinuity: + config: + pcmEncoding = 2 + channelCount = 2 + sampleRate = 48000 + buffer #0: + time = 1000000001000 + data = 1217833679 + buffer #1: + time = 1000000097000 + data = 558614672 + buffer #2: + time = 1000000193000 + data = -709714787 + buffer #3: + time = 1000000289000 + data = 1367870571 + buffer #4: + time = 1000000385000 + data = -141229457 + buffer #5: + time = 1000000481000 + data = 1287758361 + buffer #6: + time = 1000000577000 + data = 1125289147 + buffer #7: + time = 1000000673000 + data = -1677383475 + buffer #8: + time = 1000000769000 + data = 2130742861 + buffer #9: + time = 1000000865000 + data = -1292320253 + buffer #10: + time = 1000000961000 + data = -456587163 + buffer #11: + time = 1000001057000 + data = 748981534 + buffer #12: + time = 1000001153000 + data = 1550456016 + buffer #13: + time = 1000001249000 + data = 1657906039 + buffer #14: + time = 1000001345000 + data = -762677083 + buffer #15: + time = 1000001441000 + data = -1343810763 + buffer #16: + time = 1000001537000 + data = 1137318783 + buffer #17: + time = 1000001633000 + data = -1891318229 + buffer #18: + time = 1000001729000 + data = -472068495 + buffer #19: + time = 1000001825000 + data = 832315001 + buffer #20: + time = 1000001921000 + data = 2054935175 + buffer #21: + time = 1000002017000 + data = 57921641 + buffer #22: + time = 1000002113000 + data = 2132759067 + buffer #23: + time = 1000002209000 + data = -1742540521 + buffer #24: + time = 1000002305000 + data = 1657024301 + buffer #25: + time = 1000002401000 + data = -585080145 + buffer #26: + time = 1000002497000 + data = 427271397 + buffer #27: + time = 1000002593000 + data = -364201340 + buffer #28: + time = 1000002689000 + data = -627965287 diff --git a/libraries/test_data/src/test/assets/audiosinkdumps/mka/bear-flac-24bit.mka.audiosink.dump b/libraries/test_data/src/test/assets/audiosinkdumps/mka/bear-flac-24bit.mka.audiosink.dump index 89fe9b911e..f1c2238dea 100644 --- a/libraries/test_data/src/test/assets/audiosinkdumps/mka/bear-flac-24bit.mka.audiosink.dump +++ b/libraries/test_data/src/test/assets/audiosinkdumps/mka/bear-flac-24bit.mka.audiosink.dump @@ -1,93 +1,94 @@ -buffer count = 29 -discontinuity: -config: - pcmEncoding = 536870912 - channelCount = 2 - sampleRate = 48000 -buffer #0: - time = 1000000000000 - data = 225023649 -buffer #1: - time = 1000000096000 - data = 455106306 -buffer #2: - time = 1000000192000 - data = 2025727297 -buffer #3: - time = 1000000288000 - data = 758514657 -buffer #4: - time = 1000000384000 - data = 1044986473 -buffer #5: - time = 1000000480000 - data = -2030029695 -buffer #6: - time = 1000000576000 - data = 1907053281 -buffer #7: - time = 1000000672000 - data = -1974954431 -buffer #8: - time = 1000000768000 - data = -206248383 -buffer #9: - time = 1000000864000 - data = 1484984417 -buffer #10: - time = 1000000960000 - data = -1306117439 -buffer #11: - time = 1000001056000 - data = 692829792 -buffer #12: - time = 1000001152000 - data = 1070563058 -buffer #13: - time = 1000001248000 - data = -1444096479 -buffer #14: - time = 1000001344000 - data = 1753016419 -buffer #15: - time = 1000001440000 - data = 1947797953 -buffer #16: - time = 1000001536000 - data = 266121411 -buffer #17: - time = 1000001632000 - data = 1275494369 -buffer #18: - time = 1000001728000 - data = 372077825 -buffer #19: - time = 1000001824000 - data = -993079679 -buffer #20: - time = 1000001920000 - data = 177307937 -buffer #21: - time = 1000002016000 - data = 2037083009 -buffer #22: - time = 1000002112000 - data = -435776287 -buffer #23: - time = 1000002208000 - data = 1867447329 -buffer #24: - time = 1000002304000 - data = 1884495937 -buffer #25: - time = 1000002400000 - data = -804673375 -buffer #26: - time = 1000002496000 - data = -588531007 -buffer #27: - time = 1000002592000 - data = -1064642970 -buffer #28: - time = 1000002688000 - data = -1771406207 +AudioSink: + buffer count = 29 + discontinuity: + config: + pcmEncoding = 536870912 + channelCount = 2 + sampleRate = 48000 + buffer #0: + time = 1000000000000 + data = 225023649 + buffer #1: + time = 1000000096000 + data = 455106306 + buffer #2: + time = 1000000192000 + data = 2025727297 + buffer #3: + time = 1000000288000 + data = 758514657 + buffer #4: + time = 1000000384000 + data = 1044986473 + buffer #5: + time = 1000000480000 + data = -2030029695 + buffer #6: + time = 1000000576000 + data = 1907053281 + buffer #7: + time = 1000000672000 + data = -1974954431 + buffer #8: + time = 1000000768000 + data = -206248383 + buffer #9: + time = 1000000864000 + data = 1484984417 + buffer #10: + time = 1000000960000 + data = -1306117439 + buffer #11: + time = 1000001056000 + data = 692829792 + buffer #12: + time = 1000001152000 + data = 1070563058 + buffer #13: + time = 1000001248000 + data = -1444096479 + buffer #14: + time = 1000001344000 + data = 1753016419 + buffer #15: + time = 1000001440000 + data = 1947797953 + buffer #16: + time = 1000001536000 + data = 266121411 + buffer #17: + time = 1000001632000 + data = 1275494369 + buffer #18: + time = 1000001728000 + data = 372077825 + buffer #19: + time = 1000001824000 + data = -993079679 + buffer #20: + time = 1000001920000 + data = 177307937 + buffer #21: + time = 1000002016000 + data = 2037083009 + buffer #22: + time = 1000002112000 + data = -435776287 + buffer #23: + time = 1000002208000 + data = 1867447329 + buffer #24: + time = 1000002304000 + data = 1884495937 + buffer #25: + time = 1000002400000 + data = -804673375 + buffer #26: + time = 1000002496000 + data = -588531007 + buffer #27: + time = 1000002592000 + data = -1064642970 + buffer #28: + time = 1000002688000 + data = -1771406207 diff --git a/libraries/test_data/src/test/assets/audiosinkdumps/wav/sample.wav_then_sample_rf64.wav.dump b/libraries/test_data/src/test/assets/audiosinkdumps/wav/sample.wav_then_sample_rf64.wav.dump index 97625d6603..40fa1687fb 100644 --- a/libraries/test_data/src/test/assets/audiosinkdumps/wav/sample.wav_then_sample_rf64.wav.dump +++ b/libraries/test_data/src/test/assets/audiosinkdumps/wav/sample.wav_then_sample_rf64.wav.dump @@ -1,52 +1,53 @@ -buffer count = 14 -config: - pcmEncoding = 2 - channelCount = 1 - sampleRate = 44100 -buffer #0: - time = 1000000000000 - data = -85819864 -buffer #1: - time = 1000000100000 - data = 566487491 -buffer #2: - time = 1000000200000 - data = -1256531710 -buffer #3: - time = 1000000300000 - data = 793455796 -buffer #4: - time = 1000000400000 - data = -268235582 -buffer #5: - time = 1000000500000 - data = -8136122 -buffer #6: - time = 1000000600000 - data = 1750866613 -buffer #7: - time = 1000000700000 - data = -1100753636 -buffer #8: - time = 1000000800000 - data = 507833230 -buffer #9: - time = 1000000900000 - data = 1472467506 -discontinuity: -config: - pcmEncoding = 2 - channelCount = 2 - sampleRate = 48000 -buffer #10: - time = 1000001000000 - data = -278103001 -buffer #11: - time = 1000001100000 - data = 1522105084 -buffer #12: - time = 1000001200000 - data = 932319027 -buffer #13: - time = 1000001300000 - data = 325000240 +AudioSink: + buffer count = 14 + config: + pcmEncoding = 2 + channelCount = 1 + sampleRate = 44100 + buffer #0: + time = 1000000000000 + data = -85819864 + buffer #1: + time = 1000000100000 + data = 566487491 + buffer #2: + time = 1000000200000 + data = -1256531710 + buffer #3: + time = 1000000300000 + data = 793455796 + buffer #4: + time = 1000000400000 + data = -268235582 + buffer #5: + time = 1000000500000 + data = -8136122 + buffer #6: + time = 1000000600000 + data = 1750866613 + buffer #7: + time = 1000000700000 + data = -1100753636 + buffer #8: + time = 1000000800000 + data = 507833230 + buffer #9: + time = 1000000900000 + data = 1472467506 + discontinuity: + config: + pcmEncoding = 2 + channelCount = 2 + sampleRate = 48000 + buffer #10: + time = 1000001000000 + data = -278103001 + buffer #11: + time = 1000001100000 + data = 1522105084 + buffer #12: + time = 1000001200000 + data = 932319027 + buffer #13: + time = 1000001300000 + data = 325000240 diff --git a/libraries/test_data/src/test/assets/playbackdumps/dash/metadata_from_early_output.dump b/libraries/test_data/src/test/assets/playbackdumps/dash/metadata_from_early_output.dump index 8b0d752866..e8261bd2df 100644 --- a/libraries/test_data/src/test/assets/playbackdumps/dash/metadata_from_early_output.dump +++ b/libraries/test_data/src/test/assets/playbackdumps/dash/metadata_from_early_output.dump @@ -1,5 +1,3 @@ -AudioSink: - buffer count = 0 MetadataOutput: Metadata[0]: presentationTimeUs = 100000 diff --git a/libraries/test_data/src/test/assets/playbackdumps/dash/metadata_from_timely_output.dump b/libraries/test_data/src/test/assets/playbackdumps/dash/metadata_from_timely_output.dump index 2ac245f6f0..ebbd67120a 100644 --- a/libraries/test_data/src/test/assets/playbackdumps/dash/metadata_from_timely_output.dump +++ b/libraries/test_data/src/test/assets/playbackdumps/dash/metadata_from_timely_output.dump @@ -1,5 +1,3 @@ -AudioSink: - buffer count = 0 MetadataOutput: Metadata[0]: presentationTimeUs = 100000 diff --git 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 index c79e602b60..ea304dc8cd 100644 --- 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 @@ -504,5 +504,3 @@ MediaCodecAdapter (exotest.video.avc): timeUs = 1000002959000 size = 171 rendered = true -AudioSink: - buffer count = 0 diff --git a/libraries/test_data/src/test/assets/playbackdumps/mp4/sample_android_slow_motion.mp4.dump b/libraries/test_data/src/test/assets/playbackdumps/mp4/sample_android_slow_motion.mp4.dump index 59f0fc5bbf..8567ed2d40 100644 --- a/libraries/test_data/src/test/assets/playbackdumps/mp4/sample_android_slow_motion.mp4.dump +++ b/libraries/test_data/src/test/assets/playbackdumps/mp4/sample_android_slow_motion.mp4.dump @@ -56,5 +56,3 @@ MediaCodecAdapter (exotest.video.avc): timeUs = 1000000492011 size = 2400 rendered = true -AudioSink: - buffer count = 0 diff --git a/libraries/test_data/src/test/assets/playbackdumps/png/non-motion-photo-shortened.png.dump b/libraries/test_data/src/test/assets/playbackdumps/png/non-motion-photo-shortened.png.dump index a27ce7c543..0094b367a4 100644 --- a/libraries/test_data/src/test/assets/playbackdumps/png/non-motion-photo-shortened.png.dump +++ b/libraries/test_data/src/test/assets/playbackdumps/png/non-motion-photo-shortened.png.dump @@ -1,5 +1,3 @@ -AudioSink: - buffer count = 0 ImageOutput: rendered image count = 1 image output #1: diff --git a/libraries/test_data/src/test/assets/playbackdumps/silence/0ms.dump b/libraries/test_data/src/test/assets/playbackdumps/silence/0ms.dump index d1e0a5e5ea..e69de29bb2 100644 --- a/libraries/test_data/src/test/assets/playbackdumps/silence/0ms.dump +++ b/libraries/test_data/src/test/assets/playbackdumps/silence/0ms.dump @@ -1,2 +0,0 @@ -AudioSink: - buffer count = 0 diff --git a/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h263.ts.dump b/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h263.ts.dump index d1e0a5e5ea..e69de29bb2 100644 --- a/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h263.ts.dump +++ b/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h263.ts.dump @@ -1,2 +0,0 @@ -AudioSink: - buffer count = 0 diff --git a/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_dts_audio.ts.dump b/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_dts_audio.ts.dump index 99cfa5093a..e68e9f59a9 100644 --- a/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_dts_audio.ts.dump +++ b/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_dts_audio.ts.dump @@ -28,5 +28,3 @@ MediaCodecAdapter (exotest.video.avc): timeUs = 1000000133466 size = 442 rendered = true -AudioSink: - buffer count = 0 diff --git a/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_no_access_unit_delimiters.ts.dump b/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_no_access_unit_delimiters.ts.dump index 68d18ed7d1..bbd8851e79 100644 --- a/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_no_access_unit_delimiters.ts.dump +++ b/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_no_access_unit_delimiters.ts.dump @@ -28,5 +28,3 @@ MediaCodecAdapter (exotest.video.avc): timeUs = 1000000100100 size = 254 rendered = true -AudioSink: - buffer count = 0 diff --git a/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265.ts.dump b/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265.ts.dump index d1e0a5e5ea..e69de29bb2 100644 --- a/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265.ts.dump +++ b/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265.ts.dump @@ -1,2 +0,0 @@ -AudioSink: - buffer count = 0 diff --git a/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265_rps_pred.ts.dump b/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265_rps_pred.ts.dump index d1e0a5e5ea..e69de29bb2 100644 --- a/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265_rps_pred.ts.dump +++ b/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265_rps_pred.ts.dump @@ -1,2 +0,0 @@ -AudioSink: - buffer count = 0 diff --git a/libraries/test_data/src/test/assets/playbackdumps/vp9/bear-vp9-odd-dimensions.webm.dump b/libraries/test_data/src/test/assets/playbackdumps/vp9/bear-vp9-odd-dimensions.webm.dump index 59b01b8620..e7480556d7 100644 --- a/libraries/test_data/src/test/assets/playbackdumps/vp9/bear-vp9-odd-dimensions.webm.dump +++ b/libraries/test_data/src/test/assets/playbackdumps/vp9/bear-vp9-odd-dimensions.webm.dump @@ -217,5 +217,3 @@ MediaCodecAdapter (exotest.video.vp9): timeUs = 1000000968000 size = 547 rendered = true -AudioSink: - buffer count = 0 diff --git a/libraries/test_data/src/test/assets/playbackdumps/vp9/bear-vp9.webm.dump b/libraries/test_data/src/test/assets/playbackdumps/vp9/bear-vp9.webm.dump index 8de51814b3..bbaa922fd7 100644 --- a/libraries/test_data/src/test/assets/playbackdumps/vp9/bear-vp9.webm.dump +++ b/libraries/test_data/src/test/assets/playbackdumps/vp9/bear-vp9.webm.dump @@ -581,5 +581,3 @@ MediaCodecAdapter (exotest.video.vp9): timeUs = 1000002703000 size = 1427 rendered = true -AudioSink: - buffer count = 0 diff --git a/libraries/test_data/src/test/assets/playbackdumps/vp9/invalid-bitstream.webm.dump b/libraries/test_data/src/test/assets/playbackdumps/vp9/invalid-bitstream.webm.dump index de8e98e4b9..bba2f37198 100644 --- a/libraries/test_data/src/test/assets/playbackdumps/vp9/invalid-bitstream.webm.dump +++ b/libraries/test_data/src/test/assets/playbackdumps/vp9/invalid-bitstream.webm.dump @@ -364,5 +364,3 @@ MediaCodecAdapter (exotest.video.vp9): timeUs = 1000002000000 size = 1477 rendered = true -AudioSink: - buffer count = 0 diff --git a/libraries/test_data/src/test/assets/playbackdumps/vp9/roadtrip-vp92-10bit.webm.dump b/libraries/test_data/src/test/assets/playbackdumps/vp9/roadtrip-vp92-10bit.webm.dump index e57a5b64c1..9baaff57dc 100644 --- a/libraries/test_data/src/test/assets/playbackdumps/vp9/roadtrip-vp92-10bit.webm.dump +++ b/libraries/test_data/src/test/assets/playbackdumps/vp9/roadtrip-vp92-10bit.webm.dump @@ -567,5 +567,3 @@ MediaCodecAdapter (exotest.video.vp9): timeUs = 1000002961000 size = 807 rendered = true -AudioSink: - buffer count = 0 diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingAudioSink.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingAudioSink.java index e322354ad1..c56108e660 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingAudioSink.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingAudioSink.java @@ -88,10 +88,14 @@ public final class CapturingAudioSink extends ForwardingAudioSink implements Dum @Override public void dump(Dumper dumper) { - dumper.add("buffer count", bufferCount); + if (interceptedData.isEmpty()) { + return; + } + dumper.startBlock("AudioSink").add("buffer count", bufferCount); for (int i = 0; i < interceptedData.size(); i++) { interceptedData.get(i).dump(dumper); } + dumper.endBlock(); } private static final class DumpableConfiguration implements Dumper.Dumpable { diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingImageOutput.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingImageOutput.java index f53b77bff6..bae9ae9424 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingImageOutput.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingImageOutput.java @@ -59,9 +59,11 @@ public final class CapturingImageOutput implements Dumpable, ImageOutput { @Override public void dump(Dumper dumper) { + dumper.startBlock("ImageOutput"); dumper.add("rendered image count", imageCount); for (Dumpable dumpable : renderedBitmaps) { dumpable.dump(dumper); } + dumper.endBlock(); } } diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingRenderersFactory.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingRenderersFactory.java index 6814b7cb6d..d5752d24c8 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingRenderersFactory.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingRenderersFactory.java @@ -157,13 +157,9 @@ public class CapturingRenderersFactory implements RenderersFactory, Dumper.Dumpa @Override public void dump(Dumper dumper) { mediaCodecAdapterFactory.dump(dumper); - dumper.startBlock("AudioSink"); audioSink.dump(dumper); - dumper.endBlock(); if (addImageRenderer) { - dumper.startBlock("ImageOutput"); imageOutput.dump(dumper); - dumper.endBlock(); } }