From 0cba160c22a1a675d2fac1e6f87bc50a7328eb7d Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Tue, 25 Mar 2025 06:50:43 -0700
Subject: [PATCH] Add non-raw MIME type to audio sink dumps

We currently don't have audio sink dumps for non raw audio, but this
change will make it more clear if we do in future (e.g. for testing
audio offload).

PiperOrigin-RevId: 740330118
---
 .../media3/test/utils/CapturingAudioSink.java | 33 +++++++------------
 1 file changed, 12 insertions(+), 21 deletions(-)

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 0153d39742..dc869ee5ea 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
@@ -80,12 +80,7 @@ public class CapturingAudioSink extends ForwardingAudioSink implements Dumper.Du
   public void configure(Format inputFormat, int specifiedBufferSize, @Nullable int[] outputChannels)
       throws ConfigurationException {
     this.format = inputFormat;
-    interceptedData.add(
-        new DumpableConfiguration(
-            inputFormat.pcmEncoding,
-            inputFormat.channelCount,
-            inputFormat.sampleRate,
-            outputChannels));
+    interceptedData.add(new DumpableConfiguration(inputFormat, outputChannels));
     super.configure(inputFormat, specifiedBufferSize, outputChannels);
   }
 
@@ -158,29 +153,25 @@ public class CapturingAudioSink extends ForwardingAudioSink implements Dumper.Du
 
   private static final class DumpableConfiguration implements Dumper.Dumpable {
 
-    private final @C.PcmEncoding int inputPcmEncoding;
-    private final int inputChannelCount;
-    private final int inputSampleRate;
+    private final Format inputFormat;
     @Nullable private final int[] outputChannels;
 
-    public DumpableConfiguration(
-        @C.PcmEncoding int inputPcmEncoding,
-        int inputChannelCount,
-        int inputSampleRate,
-        @Nullable int[] outputChannels) {
-      this.inputPcmEncoding = inputPcmEncoding;
-      this.inputChannelCount = inputChannelCount;
-      this.inputSampleRate = inputSampleRate;
+    public DumpableConfiguration(Format inputFormat, @Nullable int[] outputChannels) {
+      this.inputFormat = inputFormat;
       this.outputChannels = outputChannels;
     }
 
     @Override
     public void dump(Dumper dumper) {
+      dumper.startBlock("config");
+      if (inputFormat.sampleMimeType != null
+          && !inputFormat.sampleMimeType.equals(MimeTypes.AUDIO_RAW)) {
+        dumper.add("mimeType", inputFormat.sampleMimeType);
+      }
       dumper
-          .startBlock("config")
-          .add("pcmEncoding", inputPcmEncoding)
-          .add("channelCount", inputChannelCount)
-          .add("sampleRate", inputSampleRate);
+          .add("pcmEncoding", inputFormat.pcmEncoding)
+          .add("channelCount", inputFormat.channelCount)
+          .add("sampleRate", inputFormat.sampleRate);
       if (outputChannels != null) {
         dumper.add("outputChannels", Arrays.toString(outputChannels));
       }