Skip to content

Commit a8d2f5c

Browse files
icbakercopybara-github
authored andcommitted
Rollback of 62b212e
PiperOrigin-RevId: 826835585
1 parent fc88ba3 commit a8d2f5c

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/AudioTrackAudioOutputProvider.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -264,15 +264,6 @@ public OutputConfig getOutputConfig(FormatConfig formatConfig) throws Configurat
264264
}
265265
}
266266

267-
if (outputEncoding == C.ENCODING_INVALID) {
268-
throw new ConfigurationException(
269-
"Invalid output encoding (mode=" + outputMode + ") for: " + format);
270-
}
271-
if (outputChannelConfig == AudioFormat.CHANNEL_INVALID) {
272-
throw new ConfigurationException(
273-
"Invalid output channel config (mode=" + outputMode + ") for: " + format);
274-
}
275-
276267
// Replace unknown bitrate by maximum allowed bitrate for DTS Express to avoid allocating an
277268
// AudioTrack buffer for the much larger maximum bitrate of the underlying DTS-HD encoding.
278269
int bitrate = format.bitrate;

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
import android.content.Context;
3030
import android.media.AudioDeviceInfo;
31+
import android.media.AudioFormat;
3132
import android.media.AudioTrack;
3233
import android.media.PlaybackParams;
3334
import android.os.Handler;
@@ -770,6 +771,17 @@ public void configure(Format inputFormat, int specifiedBufferSize, @Nullable int
770771
throw new ConfigurationException(e, inputFormat);
771772
}
772773

774+
if (outputConfig.encoding == C.ENCODING_INVALID) {
775+
throw new ConfigurationException(
776+
"Invalid output encoding (isOffload=" + outputConfig.isOffload + ")",
777+
formatConfig.format);
778+
}
779+
if (outputConfig.channelConfig == AudioFormat.CHANNEL_INVALID) {
780+
throw new ConfigurationException(
781+
"Invalid output channel config (isOffload=" + outputConfig.isOffload + ")",
782+
formatConfig.format);
783+
}
784+
773785
offloadDisabledUntilNextConfiguration = false;
774786
Configuration pendingConfiguration =
775787
new Configuration(

0 commit comments

Comments
 (0)