loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some warnings.

Browse Source
This commit is contained in:
Oliver Woodman 2015-11-17 16:03:10 +00:00
parent 8234a25110
commit 80e829d7d1
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
library/src/main/java/com/google/android/exoplayer/C.java
View File

@ -15,6 +15,8 @@
*/ */
package com.google.android.exoplayer; package com.google.android.exoplayer;
import com.google.android.exoplayer.util.Util;
import android.media.AudioFormat; import android.media.AudioFormat;
import android.media.MediaCodec; import android.media.MediaCodec;
import android.media.MediaExtractor; import android.media.MediaExtractor;
@ -73,6 +75,15 @@ public final class C {
public static final int ENCODING_DTS = 7; public static final int ENCODING_DTS = 7;
public static final int ENCODING_DTS_HD = 8; public static final int ENCODING_DTS_HD = 8;
// TODO: Change 6396 to AudioFormat.CHANNEL_OUT_7POINT1_SURROUND when the target API version is
// >= 23.
/**
* @see AudioFormat#CHANNEL_OUT_7POINT1_SURROUND
*/
@SuppressWarnings({"InlinedApi", "deprecation"})
public static final int CHANNEL_OUT_7POINT1_SURROUND = Util.SDK_INT < 23
? AudioFormat.CHANNEL_OUT_7POINT1 : 6396;
/** /**
* @see MediaExtractor#SAMPLE_FLAG_SYNC * @see MediaExtractor#SAMPLE_FLAG_SYNC
*/ */

2
library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java
View File

@ -398,7 +398,7 @@ public final class AudioTrack {
channelConfig = AudioFormat.CHANNEL_OUT_5POINT1; channelConfig = AudioFormat.CHANNEL_OUT_5POINT1;
break; break;
case 8: case 8:
channelConfig = AudioFormat.CHANNEL_OUT_7POINT1; channelConfig = C.CHANNEL_OUT_7POINT1_SURROUND;
break; break;
default: default:
throw new IllegalArgumentException("Unsupported channel count: " + channelCount); throw new IllegalArgumentException("Unsupported channel count: " + channelCount);

1
library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java
View File

@ -434,6 +434,7 @@ public class StreamingDrmSessionManager implements DrmSessionManager {
super(looper); super(looper);
} }
@SuppressWarnings("deprecation")
@Override @Override
public void handleMessage(Message msg) { public void handleMessage(Message msg) {
if (openCount == 0 || (state != STATE_OPENED && state != STATE_OPENED_WITH_KEYS)) { if (openCount == 0 || (state != STATE_OPENED && state != STATE_OPENED_WITH_KEYS)) {