Skip to content

Allow to use float output in any case if output provider doesn't support 16-bit int #3104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nift4 wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −8
Open

Allow to use float output in any case if output provider doesn't support 16-bit int #3104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ public boolean supportsFormat(Format format) {
// For PCM formats, convert the format to what our audio processors will produce.
boolean transcodingViaAudioProcessors = false;
if (Util.isEncodingLinearPcm(format.pcmEncoding)) {
boolean usesFloatPcm = shouldUseFloatOutput(format.pcmEncoding);
boolean usesFloatPcm = shouldUseFloatOutput(format);
if (usesFloatPcm && format.pcmEncoding != C.ENCODING_PCM_FLOAT) {
format = format.buildUpon().setPcmEncoding(C.ENCODING_PCM_FLOAT).build();
transcodingViaAudioProcessors = true;
Expand Down Expand Up @@ -750,7 +750,7 @@ public void configure(AudioSinkConfig audioSinkConfig) throws ConfigurationExcep

ImmutableList.Builder<AudioProcessor> pipelineProcessors = new ImmutableList.Builder<>();
pipelineProcessors.addAll(availableAudioProcessors);
if (shouldUseFloatOutput(inputFormat.pcmEncoding)) {
if (shouldUseFloatOutput(inputFormat)) {
pipelineProcessors.add(toFloatPcmAudioProcessor);
} else {
pipelineProcessors.add(toInt16PcmAudioProcessor);
Expand Down Expand Up @@ -1667,21 +1667,33 @@ private boolean shouldApplyAudioProcessorPlaybackParameters() {
// - when playing encoded audio via passthrough/offload, because modifying the audio stream
// would require decoding/re-encoding; and
// - when outputting float PCM audio, because SonicAudioProcessor outputs 16-bit integer PCM.
return !tunneling
&& configuration.isPcm()
&& !shouldUseFloatOutput(configuration.inputFormat.pcmEncoding);
return !tunneling && configuration.isPcm() && !shouldUseFloatOutput(configuration.inputFormat);
}

private boolean useAudioOutputPlaybackParams() {
return configuration != null && configuration.outputConfig.usePlaybackParameters;
}

/**
* Returns whether audio in the specified PCM encoding should be written to the audio output as
* Returns whether audio in the specified PCM format should be written to the audio output as
* float PCM.
*/
private boolean shouldUseFloatOutput(@C.PcmEncoding int pcmEncoding) {
return enableFloatOutput && Util.isEncodingHighResolutionPcm(pcmEncoding);
private boolean shouldUseFloatOutput(Format format) {
boolean supportsFloat =
audioOutputProvider.getFormatSupport(
getFormatConfig(
format.buildUpon().setPcmEncoding(C.ENCODING_PCM_FLOAT).build()))
.supportLevel
!= AudioOutputProvider.FORMAT_UNSUPPORTED;
boolean preferFloat = Util.isEncodingHighResolutionPcm(format.pcmEncoding);
// If the AudioOutputProvider cannot output 16-bit PCM, we should use float output.
boolean supportsInt16 =
audioOutputProvider.getFormatSupport(
getFormatConfig(
format.buildUpon().setPcmEncoding(C.ENCODING_PCM_16BIT).build()))
.supportLevel
!= AudioOutputProvider.FORMAT_UNSUPPORTED;
return supportsFloat && enableFloatOutput && (preferFloat || !supportsInt16);
}

/**
Expand Down