Skip to content

Remove hardcoded SDK 29 checks in MCAR and DefaultAudioSink #2971

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
Open

Remove hardcoded SDK 29 checks in MCAR and DefaultAudioSink #2971

Show file tree
Hide file tree
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
13 changes: 5 additions & 8 deletions libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/AudioSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import android.media.AudioTrack;
import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.media3.common.AudioAttributes;
import androidx.media3.common.AuxEffectInfo;
import androidx.media3.common.C;
Expand Down Expand Up @@ -646,18 +645,16 @@ default void setOutputStreamOffsetUs(long outputStreamOffsetUs) {}
void disableTunneling();

/**
* Sets audio offload mode, if possible. Enabling offload is only possible if the sink is based on
* a platform {@link AudioTrack}, and requires platform API version 29 onwards.
* Sets audio offload mode, if possible. If the sink is based on a platform {@link AudioTrack},
* enabling offload requires platform API version 29 onwards.
*/
@RequiresApi(29)
default void setOffloadMode(@OffloadMode int offloadMode) {}

/**
* Sets offload delay padding on the {@link AudioTrack}, if possible. Setting the offload delay
* padding is only possible if the sink is based on a platform {@link AudioTrack} in offload mode.
* Also requires platform API version 29 onwards.
* Sets offload delay padding on the {@link AudioTrack}, if possible. If the sink is based on a
* platform {@link AudioTrack}, setting the offload delay padding requires platform API version 29
* onwards and the {@link AudioTrack} must be in offload mode.
*/
@RequiresApi(29)
default void setOffloadDelayPadding(int delayInFrames, int paddingInFrames) {}

/** Sets the {@link AudioOutputProvider} to use as the output path. */
Expand Down
7 changes: 1 addition & 6 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 @@ -1260,9 +1260,7 @@ public boolean isEnded() {
@Override
public boolean hasPendingData() {
return isAudioOutputInitialized()
&& (SDK_INT < 29
|| !audioOutput.isOffloadedPlayback()
|| !handledOffloadOnPresentationEnded)
&& (!audioOutput.isOffloadedPlayback() || !handledOffloadOnPresentationEnded)
&& hasAudioOutputPendingData(getWrittenFrames());
}

Expand Down Expand Up @@ -1399,14 +1397,11 @@ public void disableTunneling() {
}
}

@RequiresApi(29)
@Override
public void setOffloadMode(@OffloadMode int offloadMode) {
checkState(SDK_INT >= 29);
this.offloadMode = offloadMode;
}

@RequiresApi(29)
@Override
public void setOffloadDelayPadding(int delayInFrames, int paddingInFrames) {
if (audioOutput != null
Expand Down
3 changes: 0 additions & 3 deletions libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/ForwardingAudioSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import android.media.AudioDeviceInfo;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.media3.common.AudioAttributes;
import androidx.media3.common.AuxEffectInfo;
import androidx.media3.common.Format;
Expand Down Expand Up @@ -182,13 +181,11 @@ public void disableTunneling() {
}

@Override
@RequiresApi(29)
public void setOffloadMode(@OffloadMode int offloadMode) {
sink.setOffloadMode(offloadMode);
}

@Override
@RequiresApi(29)
public void setOffloadDelayPadding(int delayInFrames, int paddingInFrames) {
sink.setOffloadDelayPadding(delayInFrames, paddingInFrames);
}
Expand Down
19 changes: 8 additions & 11 deletions ...ries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/MediaCodecAudioRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,15 +669,13 @@ protected void onOutputFormatChanged(Format format, @Nullable MediaFormat mediaF
}
}
try {
if (SDK_INT >= 29) {
if (isBypassEnabled()
&& getConfiguration().offloadModePreferred != AudioSink.OFFLOAD_MODE_DISABLED) {
// TODO(b/280050553): Investigate potential issue where bypass is enabled for passthrough
// but offload is not supported
audioSink.setOffloadMode(getConfiguration().offloadModePreferred);
} else {
audioSink.setOffloadMode(AudioSink.OFFLOAD_MODE_DISABLED);
}
if (isBypassEnabled()
&& getConfiguration().offloadModePreferred != AudioSink.OFFLOAD_MODE_DISABLED) {
// TODO(b/280050553): Investigate potential issue where bypass is enabled for passthrough
// but offload is not supported
audioSink.setOffloadMode(getConfiguration().offloadModePreferred);
} else {
audioSink.setOffloadMode(AudioSink.OFFLOAD_MODE_DISABLED);
}
audioSink.configure(audioSinkInputFormat, /* specifiedBufferSize= */ 0, channelMap);
} catch (AudioSink.ConfigurationException e) {
Expand Down Expand Up @@ -979,8 +977,7 @@ public void handleMessage(@MessageType int messageType, @Nullable Object message

@Override
protected void handleInputBufferSupplementalData(DecoderInputBuffer buffer) {
if (SDK_INT >= 29
&& buffer.format != null
if (buffer.format != null
&& Objects.equals(buffer.format.sampleMimeType, MimeTypes.AUDIO_OPUS)
&& isBypassEnabled()) {
ByteBuffer data = checkNotNull(buffer.supplementalData);
Expand Down