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

libraries/test_data/src/test/assets/audiosinkdumps/mka/bear-flac-16bit.mka.audiosink.dump

@@ -1,3 +1,4 @@
+AudioSink:
   buffer count = 29
   discontinuity:
   config:

libraries/test_data/src/test/assets/audiosinkdumps/mka/bear-flac-24bit.mka.audiosink.dump

@@ -1,3 +1,4 @@
+AudioSink:
   buffer count = 29
   discontinuity:
   config:

libraries/test_data/src/test/assets/audiosinkdumps/wav/sample.wav_then_sample_rf64.wav.dump

@@ -1,3 +1,4 @@
+AudioSink:
   buffer count = 14
   config:
     pcmEncoding = 2

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

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

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

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

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:

libraries/test_data/src/test/assets/playbackdumps/silence/0ms.dump

@@ -1,2 +0,0 @@
-AudioSink:
-  buffer count = 0

libraries/test_data/src/test/assets/playbackdumps/ts/sample_h263.ts.dump

@@ -1,2 +0,0 @@
-AudioSink:
-  buffer count = 0

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

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

libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265.ts.dump

@@ -1,2 +0,0 @@
-AudioSink:
-  buffer count = 0

libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265_rps_pred.ts.dump

@@ -1,2 +0,0 @@
-AudioSink:
-  buffer count = 0

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

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

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

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

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 {

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();
   }
 }

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();
     }
   }