Use dumper.addIfNonDefault in CapturingAudioSink

If encoded audio is dumped, some of these values may not be set.

Also add a related TODO

PiperOrigin-RevId: 740357230
This commit is contained in:
ibaker 2025-03-25 08:23:09 -07:00 committed by Copybara-Service
parent 6e510c26df
commit 4338355422
2 changed files with 5 additions and 3 deletions

View File

@ -145,6 +145,7 @@ public final class OggOpusPlaybackTest {
} }
} }
// TODO: b/406216855 - Remove this and use CapturingAudioSink instead.
private static final class DumpingAudioSink extends ForwardingAudioSink private static final class DumpingAudioSink extends ForwardingAudioSink
implements Dumper.Dumpable { implements Dumper.Dumpable {
/** All handleBuffer interactions recorded with this audio sink. */ /** All handleBuffer interactions recorded with this audio sink. */

View File

@ -168,10 +168,11 @@ public class CapturingAudioSink extends ForwardingAudioSink implements Dumper.Du
&& !inputFormat.sampleMimeType.equals(MimeTypes.AUDIO_RAW)) { && !inputFormat.sampleMimeType.equals(MimeTypes.AUDIO_RAW)) {
dumper.add("mimeType", inputFormat.sampleMimeType); dumper.add("mimeType", inputFormat.sampleMimeType);
} }
dumper dumper
.add("pcmEncoding", inputFormat.pcmEncoding) .addIfNonDefault("pcmEncoding", inputFormat.pcmEncoding, Format.NO_VALUE)
.add("channelCount", inputFormat.channelCount) .addIfNonDefault("channelCount", inputFormat.channelCount, Format.NO_VALUE)
.add("sampleRate", inputFormat.sampleRate); .addIfNonDefault("sampleRate", inputFormat.sampleRate, Format.NO_VALUE);
if (outputChannels != null) { if (outputChannels != null) {
dumper.add("outputChannels", Arrays.toString(outputChannels)); dumper.add("outputChannels", Arrays.toString(outputChannels));
} }