loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move non-player specific classes to common

Browse Source 
These will all be needed in common to break dependencies
between decoder extension modules and the core module.

PiperOrigin-RevId: 389871983
This commit is contained in:
olly 2021-08-10 14:51:19 +01:00 committed by Christos Tsilopoulos
parent b4e99304c4
commit 31a839c848
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java → library/common/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java
View File

@ -40,9 +40,9 @@ public abstract class SimpleDecoder<
private int availableInputBufferCount; private int availableInputBufferCount;
private int availableOutputBufferCount; private int availableOutputBufferCount;
private I dequeuedInputBuffer; @Nullable private I dequeuedInputBuffer;
private E exception; @Nullable private E exception;
private boolean flushed; private boolean flushed;
private boolean released; private boolean released;
private int skippedOutputBufferCount; private int skippedOutputBufferCount;
@ -51,6 +51,7 @@ public abstract class SimpleDecoder<
* @param inputBuffers An array of nulls that will be used to store references to input buffers. * @param inputBuffers An array of nulls that will be used to store references to input buffers.
* @param outputBuffers An array of nulls that will be used to store references to output buffers. * @param outputBuffers An array of nulls that will be used to store references to output buffers.
*/ */
@SuppressWarnings("nullness:method.invocation")
protected SimpleDecoder(I[] inputBuffers, O[] outputBuffers) { protected SimpleDecoder(I[] inputBuffers, O[] outputBuffers) {
lock = new Object(); lock = new Object();
queuedInputBuffers = new ArrayDeque<>(); queuedInputBuffers = new ArrayDeque<>();
@ -178,6 +179,7 @@ public abstract class SimpleDecoder<
* @throws E The decode exception. * @throws E The decode exception.
*/ */
private void maybeThrowException() throws E { private void maybeThrowException() throws E {
@Nullable E exception = this.exception;
if (exception != null) { if (exception != null) {
throw exception; throw exception;
} }

0
library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleOutputBuffer.java → library/common/src/main/java/com/google/android/exoplayer2/decoder/SimpleOutputBuffer.java
View File

0
library/core/src/main/java/com/google/android/exoplayer2/drm/DecryptionException.java → library/common/src/main/java/com/google/android/exoplayer2/drm/DecryptionException.java
View File

0
library/core/src/main/java/com/google/android/exoplayer2/util/LibraryLoader.java → library/common/src/main/java/com/google/android/exoplayer2/util/LibraryLoader.java
View File