loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-12 18:19:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

AudioCapabilities: Missing int class annotation

Browse Source 
PiperOrigin-RevId: 293565660
This commit is contained in:
krocard 2020-02-06 12:26:56 +00:00 committed by kim-vde
parent 04af8e60ba
commit 9875c5d2b4
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/common/src/test/java/com/google/android/exoplayer2/CTest.java
View File

@ -18,6 +18,7 @@ package com.google.android.exoplayer2;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.media.AudioFormat;
import android.media.MediaCodec; import android.media.MediaCodec;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test; import org.junit.Test;
@ -36,4 +37,12 @@ public class CTest {
assertThat(C.CRYPTO_MODE_AES_CTR).isEqualTo(MediaCodec.CRYPTO_MODE_AES_CTR); assertThat(C.CRYPTO_MODE_AES_CTR).isEqualTo(MediaCodec.CRYPTO_MODE_AES_CTR);
} }
@SuppressLint("InlinedApi")
@Test
public void testEncodingConstants() {
// Sanity check that encoding constant values match those defined by the platform.
assertThat(C.ENCODING_PCM_16BIT).isEqualTo(AudioFormat.ENCODING_PCM_16BIT);
assertThat(C.ENCODING_MP3).isEqualTo(AudioFormat.ENCODING_MP3);
assertThat(C.ENCODING_PCM_FLOAT).isEqualTo(AudioFormat.ENCODING_PCM_FLOAT);
}
} }

5
library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
View File

@ -24,6 +24,7 @@ import android.media.AudioManager;
import android.net.Uri; import android.net.Uri;
import android.provider.Settings.Global; import android.provider.Settings.Global;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.util.Arrays; import java.util.Arrays;
@ -115,10 +116,10 @@ public final class AudioCapabilities {
/** /**
* Returns whether this device supports playback of the specified audio {@code encoding}. * Returns whether this device supports playback of the specified audio {@code encoding}.
* *
* @param encoding One of {@link android.media.AudioFormat}'s {@code ENCODING_*} constants. * @param encoding One of {@link C.Encoding}'s {@code ENCODING_*} constants.
* @return Whether this device supports playback the specified audio {@code encoding}. * @return Whether this device supports playback the specified audio {@code encoding}.
*/ */
public boolean supportsEncoding(int encoding) { public boolean supportsEncoding(@C.Encoding int encoding) {
return Arrays.binarySearch(supportedEncodings, encoding) >= 0; return Arrays.binarySearch(supportedEncodings, encoding) >= 0;
} }