diff --git a/library/common/src/main/java/com/google/android/exoplayer2/C.java b/library/common/src/main/java/com/google/android/exoplayer2/C.java index 6b0d4ce6f7..10d9d3ba34 100644 --- a/library/common/src/main/java/com/google/android/exoplayer2/C.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/C.java @@ -329,12 +329,16 @@ public final class C { @IntDef({SPATIALIZATION_BEHAVIOR_AUTO, SPATIALIZATION_BEHAVIOR_NEVER}) public @interface SpatializationBehavior {} - // TODO[b/190759307]: Update constant values and javadoc to use SDK once compile SDK target is set - // to 32. - /** See AudioAttributes#SPATIALIZATION_BEHAVIOR_AUTO */ - public static final int SPATIALIZATION_BEHAVIOR_AUTO = 0; - /** See AudioAttributes#SPATIALIZATION_BEHAVIOR_NEVER */ - public static final int SPATIALIZATION_BEHAVIOR_NEVER = 1; + /** + * @see AudioAttributes#SPATIALIZATION_BEHAVIOR_AUTO + */ + public static final int SPATIALIZATION_BEHAVIOR_AUTO = + AudioAttributes.SPATIALIZATION_BEHAVIOR_AUTO; + /** + * @see AudioAttributes#SPATIALIZATION_BEHAVIOR_NEVER + */ + public static final int SPATIALIZATION_BEHAVIOR_NEVER = + AudioAttributes.SPATIALIZATION_BEHAVIOR_NEVER; /** * Stream types for an {@link android.media.AudioTrack}. One of {@link #STREAM_TYPE_ALARM}, {@link diff --git a/library/common/src/main/java/com/google/android/exoplayer2/audio/AudioAttributes.java b/library/common/src/main/java/com/google/android/exoplayer2/audio/AudioAttributes.java index 8f5fee8ce5..db5ddf8b45 100644 --- a/library/common/src/main/java/com/google/android/exoplayer2/audio/AudioAttributes.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/audio/AudioAttributes.java @@ -29,7 +29,6 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import java.lang.reflect.Method; /** * Attributes for audio playback, which configure the underlying platform {@link @@ -98,9 +97,7 @@ public final class AudioAttributes implements Bundleable { return this; } - // TODO[b/190759307] Update javadoc to link to AudioAttributes.Builder#setSpatializationBehavior - // once compile SDK target is set to 32. - /** See {@code android.media.AudioAttributes.Builder.setSpatializationBehavior(int)}. */ + /** See {@link android.media.AudioAttributes.Builder#setSpatializationBehavior(int)}. */ public Builder setSpatializationBehavior(@C.SpatializationBehavior int spatializationBehavior) { this.spatializationBehavior = spatializationBehavior; return this; @@ -268,14 +265,7 @@ public final class AudioAttributes implements Bundleable { public static void setSpatializationBehavior( android.media.AudioAttributes.Builder builder, @C.SpatializationBehavior int spatializationBehavior) { - try { - // TODO[b/190759307]: Remove reflection once compile SDK target is set to 32. - Method setSpatializationBehavior = - builder.getClass().getMethod("setSpatializationBehavior", Integer.TYPE); - setSpatializationBehavior.invoke(builder, spatializationBehavior); - } catch (Exception e) { - // Do nothing if reflection fails. - } + builder.setSpatializationBehavior(spatializationBehavior); } } } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java index 4a135e3b6c..b715838a8f 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java @@ -852,9 +852,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media mediaFormat.setInteger(MediaFormat.KEY_PCM_ENCODING, AudioFormat.ENCODING_PCM_FLOAT); } if (Util.SDK_INT >= 32) { - // TODO[b/190759307] Use MediaFormat.KEY_MAX_OUTPUT_CHANNEL_COUNT once the - // compile SDK target is set to 32. - mediaFormat.setInteger("max-output-channel-count", 99); + mediaFormat.setInteger(MediaFormat.KEY_MAX_OUTPUT_CHANNEL_COUNT, 99); } return mediaFormat;