Remove misleading @CanIgnoreReturnValue
The return value of onConfigure must not be ignored as it specifies the output format of the processor, which may be different from the input format. #minor-release PiperOrigin-RevId: 601799440
This commit is contained in:
parent
ed5b7004b4
commit
2fc5590e7a
@ -21,7 +21,6 @@ import androidx.media3.common.Format;
|
|||||||
import androidx.media3.common.util.UnstableApi;
|
import androidx.media3.common.util.UnstableApi;
|
||||||
import androidx.media3.common.util.Util;
|
import androidx.media3.common.util.Util;
|
||||||
import com.google.common.base.Objects;
|
import com.google.common.base.Objects;
|
||||||
import com.google.errorprone.annotations.CanIgnoreReturnValue;
|
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
import java.nio.ByteOrder;
|
import java.nio.ByteOrder;
|
||||||
|
|
||||||
@ -144,7 +143,6 @@ public interface AudioProcessor {
|
|||||||
* @return The configured output audio format if this instance is {@link #isActive() active}.
|
* @return The configured output audio format if this instance is {@link #isActive() active}.
|
||||||
* @throws UnhandledAudioFormatException Thrown if the specified format can't be handled as input.
|
* @throws UnhandledAudioFormatException Thrown if the specified format can't be handled as input.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
|
||||||
AudioFormat configure(AudioFormat inputAudioFormat) throws UnhandledAudioFormatException;
|
AudioFormat configure(AudioFormat inputAudioFormat) throws UnhandledAudioFormatException;
|
||||||
|
|
||||||
/** Returns whether the processor is configured and will process input buffers. */
|
/** Returns whether the processor is configured and will process input buffers. */
|
||||||
|
@ -17,7 +17,6 @@ package androidx.media3.common.audio;
|
|||||||
|
|
||||||
import androidx.annotation.CallSuper;
|
import androidx.annotation.CallSuper;
|
||||||
import androidx.media3.common.util.UnstableApi;
|
import androidx.media3.common.util.UnstableApi;
|
||||||
import com.google.errorprone.annotations.CanIgnoreReturnValue;
|
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
import java.nio.ByteOrder;
|
import java.nio.ByteOrder;
|
||||||
|
|
||||||
@ -51,7 +50,6 @@ public abstract class BaseAudioProcessor implements AudioProcessor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@CanIgnoreReturnValue
|
|
||||||
public final AudioFormat configure(AudioFormat inputAudioFormat)
|
public final AudioFormat configure(AudioFormat inputAudioFormat)
|
||||||
throws UnhandledAudioFormatException {
|
throws UnhandledAudioFormatException {
|
||||||
pendingInputAudioFormat = inputAudioFormat;
|
pendingInputAudioFormat = inputAudioFormat;
|
||||||
@ -126,7 +124,6 @@ public abstract class BaseAudioProcessor implements AudioProcessor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** Called when the processor is configured for a new input format. */
|
/** Called when the processor is configured for a new input format. */
|
||||||
@CanIgnoreReturnValue
|
|
||||||
protected AudioFormat onConfigure(AudioFormat inputAudioFormat)
|
protected AudioFormat onConfigure(AudioFormat inputAudioFormat)
|
||||||
throws UnhandledAudioFormatException {
|
throws UnhandledAudioFormatException {
|
||||||
return AudioFormat.NOT_SET;
|
return AudioFormat.NOT_SET;
|
||||||
|
@ -22,7 +22,6 @@ import androidx.media3.common.C;
|
|||||||
import androidx.media3.common.Format;
|
import androidx.media3.common.Format;
|
||||||
import androidx.media3.common.util.UnstableApi;
|
import androidx.media3.common.util.UnstableApi;
|
||||||
import androidx.media3.common.util.Util;
|
import androidx.media3.common.util.Util;
|
||||||
import com.google.errorprone.annotations.CanIgnoreReturnValue;
|
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
import java.nio.ByteOrder;
|
import java.nio.ByteOrder;
|
||||||
import java.nio.ShortBuffer;
|
import java.nio.ShortBuffer;
|
||||||
@ -143,7 +142,6 @@ public class SonicAudioProcessor implements AudioProcessor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@CanIgnoreReturnValue
|
|
||||||
public final AudioFormat configure(AudioFormat inputAudioFormat)
|
public final AudioFormat configure(AudioFormat inputAudioFormat)
|
||||||
throws UnhandledAudioFormatException {
|
throws UnhandledAudioFormatException {
|
||||||
if (inputAudioFormat.encoding != C.ENCODING_PCM_16BIT) {
|
if (inputAudioFormat.encoding != C.ENCODING_PCM_16BIT) {
|
||||||
|
@ -21,7 +21,6 @@ import static java.lang.Math.min;
|
|||||||
import androidx.media3.common.C;
|
import androidx.media3.common.C;
|
||||||
import androidx.media3.common.util.UnstableApi;
|
import androidx.media3.common.util.UnstableApi;
|
||||||
import androidx.media3.common.util.Util;
|
import androidx.media3.common.util.Util;
|
||||||
import com.google.errorprone.annotations.CanIgnoreReturnValue;
|
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -53,7 +52,6 @@ public final class SpeedChangingAudioProcessor extends BaseAudioProcessor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@CanIgnoreReturnValue
|
|
||||||
public AudioFormat onConfigure(AudioFormat inputAudioFormat)
|
public AudioFormat onConfigure(AudioFormat inputAudioFormat)
|
||||||
throws UnhandledAudioFormatException {
|
throws UnhandledAudioFormatException {
|
||||||
return sonicAudioProcessor.configure(inputAudioFormat);
|
return sonicAudioProcessor.configure(inputAudioFormat);
|
||||||
|
@ -19,7 +19,6 @@ import androidx.media3.common.C;
|
|||||||
import androidx.media3.common.Format;
|
import androidx.media3.common.Format;
|
||||||
import androidx.media3.common.util.UnstableApi;
|
import androidx.media3.common.util.UnstableApi;
|
||||||
import androidx.media3.common.util.Util;
|
import androidx.media3.common.util.Util;
|
||||||
import com.google.errorprone.annotations.CanIgnoreReturnValue;
|
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -41,7 +40,6 @@ import java.nio.ByteBuffer;
|
|||||||
public final class ToInt16PcmAudioProcessor extends BaseAudioProcessor {
|
public final class ToInt16PcmAudioProcessor extends BaseAudioProcessor {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@CanIgnoreReturnValue
|
|
||||||
public AudioFormat onConfigure(AudioFormat inputAudioFormat)
|
public AudioFormat onConfigure(AudioFormat inputAudioFormat)
|
||||||
throws UnhandledAudioFormatException {
|
throws UnhandledAudioFormatException {
|
||||||
@C.PcmEncoding int encoding = inputAudioFormat.encoding;
|
@C.PcmEncoding int encoding = inputAudioFormat.encoding;
|
||||||
|
@ -21,7 +21,6 @@ import androidx.media3.common.Format;
|
|||||||
import androidx.media3.common.audio.AudioProcessor;
|
import androidx.media3.common.audio.AudioProcessor;
|
||||||
import androidx.media3.common.audio.BaseAudioProcessor;
|
import androidx.media3.common.audio.BaseAudioProcessor;
|
||||||
import androidx.media3.common.util.Assertions;
|
import androidx.media3.common.util.Assertions;
|
||||||
import com.google.errorprone.annotations.CanIgnoreReturnValue;
|
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -47,7 +46,6 @@ import java.nio.ByteBuffer;
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@CanIgnoreReturnValue
|
|
||||||
public AudioFormat onConfigure(AudioFormat inputAudioFormat)
|
public AudioFormat onConfigure(AudioFormat inputAudioFormat)
|
||||||
throws UnhandledAudioFormatException {
|
throws UnhandledAudioFormatException {
|
||||||
@Nullable int[] outputChannels = pendingOutputChannels;
|
@Nullable int[] outputChannels = pendingOutputChannels;
|
||||||
|
@ -25,7 +25,6 @@ import androidx.media3.common.audio.BaseAudioProcessor;
|
|||||||
import androidx.media3.common.util.Assertions;
|
import androidx.media3.common.util.Assertions;
|
||||||
import androidx.media3.common.util.UnstableApi;
|
import androidx.media3.common.util.UnstableApi;
|
||||||
import androidx.media3.common.util.Util;
|
import androidx.media3.common.util.Util;
|
||||||
import com.google.errorprone.annotations.CanIgnoreReturnValue;
|
|
||||||
import java.lang.annotation.Documented;
|
import java.lang.annotation.Documented;
|
||||||
import java.lang.annotation.Retention;
|
import java.lang.annotation.Retention;
|
||||||
import java.lang.annotation.RetentionPolicy;
|
import java.lang.annotation.RetentionPolicy;
|
||||||
@ -153,7 +152,6 @@ public final class SilenceSkippingAudioProcessor extends BaseAudioProcessor {
|
|||||||
// AudioProcessor implementation.
|
// AudioProcessor implementation.
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@CanIgnoreReturnValue
|
|
||||||
public AudioFormat onConfigure(AudioFormat inputAudioFormat)
|
public AudioFormat onConfigure(AudioFormat inputAudioFormat)
|
||||||
throws UnhandledAudioFormatException {
|
throws UnhandledAudioFormatException {
|
||||||
if (inputAudioFormat.encoding != C.ENCODING_PCM_16BIT) {
|
if (inputAudioFormat.encoding != C.ENCODING_PCM_16BIT) {
|
||||||
|
@ -20,7 +20,6 @@ import androidx.media3.common.Format;
|
|||||||
import androidx.media3.common.audio.AudioProcessor;
|
import androidx.media3.common.audio.AudioProcessor;
|
||||||
import androidx.media3.common.audio.BaseAudioProcessor;
|
import androidx.media3.common.audio.BaseAudioProcessor;
|
||||||
import androidx.media3.common.util.Util;
|
import androidx.media3.common.util.Util;
|
||||||
import com.google.errorprone.annotations.CanIgnoreReturnValue;
|
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -41,7 +40,6 @@ import java.nio.ByteBuffer;
|
|||||||
private static final double PCM_32_BIT_INT_TO_PCM_32_BIT_FLOAT_FACTOR = 1.0 / 0x7FFFFFFF;
|
private static final double PCM_32_BIT_INT_TO_PCM_32_BIT_FLOAT_FACTOR = 1.0 / 0x7FFFFFFF;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@CanIgnoreReturnValue
|
|
||||||
public AudioFormat onConfigure(AudioFormat inputAudioFormat)
|
public AudioFormat onConfigure(AudioFormat inputAudioFormat)
|
||||||
throws UnhandledAudioFormatException {
|
throws UnhandledAudioFormatException {
|
||||||
@C.PcmEncoding int encoding = inputAudioFormat.encoding;
|
@C.PcmEncoding int encoding = inputAudioFormat.encoding;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user