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

Rename DedicatedThreadAsyncMediaCodecAdapter

Browse Source 
Rename the DedicatedThreadAsyncMediaCodecAdapter to
AsynchronousMediaCodecAdapter as it is the only asynchronous adapter
implementation left after the clean-up.

PiperOrigin-RevId: 315873431
This commit is contained in:
christosts 2020-06-11 12:20:30 +01:00 committed by Oliver Woodman
parent e111f850d0
commit 285cce629f
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/DedicatedThreadAsyncMediaCodecAdapter.java → library/core/src/main/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapter.java
View File

@ -40,7 +40,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
* <p>This adapter supports queueing input buffers asynchronously. * <p>This adapter supports queueing input buffers asynchronously.
*/ */
@RequiresApi(23) @RequiresApi(23)
/* package */ final class DedicatedThreadAsyncMediaCodecAdapter extends MediaCodec.Callback /* package */ final class AsynchronousMediaCodecAdapter extends MediaCodec.Callback
implements MediaCodecAdapter { implements MediaCodecAdapter {
@Documented @Documented
@ -70,7 +70,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
* @param trackType One of {@link C#TRACK_TYPE_AUDIO} or {@link C#TRACK_TYPE_VIDEO}. Used for * @param trackType One of {@link C#TRACK_TYPE_AUDIO} or {@link C#TRACK_TYPE_VIDEO}. Used for
* labelling the internal thread accordingly. * labelling the internal thread accordingly.
*/ */
/* package */ DedicatedThreadAsyncMediaCodecAdapter(MediaCodec codec, int trackType) { /* package */ AsynchronousMediaCodecAdapter(MediaCodec codec, int trackType) {
this( this(
codec, codec,
/* enableAsynchronousQueueing= */ false, /* enableAsynchronousQueueing= */ false,
@ -86,7 +86,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
* @param trackType One of {@link C#TRACK_TYPE_AUDIO} or {@link C#TRACK_TYPE_VIDEO}. Used for * @param trackType One of {@link C#TRACK_TYPE_AUDIO} or {@link C#TRACK_TYPE_VIDEO}. Used for
* labelling the internal thread accordingly. * labelling the internal thread accordingly.
*/ */
/* package */ DedicatedThreadAsyncMediaCodecAdapter( /* package */ AsynchronousMediaCodecAdapter(
MediaCodec codec, boolean enableAsynchronousQueueing, int trackType) { MediaCodec codec, boolean enableAsynchronousQueueing, int trackType) {
this( this(
codec, codec,
@ -96,7 +96,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
} }
@VisibleForTesting @VisibleForTesting
/* package */ DedicatedThreadAsyncMediaCodecAdapter( /* package */ AsynchronousMediaCodecAdapter(
MediaCodec codec, MediaCodec codec,
boolean enableAsynchronousQueueing, boolean enableAsynchronousQueueing,
int trackType, int trackType,

4
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
View File

@ -1075,12 +1075,12 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
codec = MediaCodec.createByCodecName(codecName); codec = MediaCodec.createByCodecName(codecName);
if (mediaCodecOperationMode == OPERATION_MODE_ASYNCHRONOUS_DEDICATED_THREAD if (mediaCodecOperationMode == OPERATION_MODE_ASYNCHRONOUS_DEDICATED_THREAD
&& Util.SDK_INT >= 23) { && Util.SDK_INT >= 23) {
codecAdapter = new DedicatedThreadAsyncMediaCodecAdapter(codec, getTrackType()); codecAdapter = new AsynchronousMediaCodecAdapter(codec, getTrackType());
} else if (mediaCodecOperationMode } else if (mediaCodecOperationMode
== OPERATION_MODE_ASYNCHRONOUS_DEDICATED_THREAD_ASYNCHRONOUS_QUEUEING == OPERATION_MODE_ASYNCHRONOUS_DEDICATED_THREAD_ASYNCHRONOUS_QUEUEING
&& Util.SDK_INT >= 23) { && Util.SDK_INT >= 23) {
codecAdapter = codecAdapter =
new DedicatedThreadAsyncMediaCodecAdapter( new AsynchronousMediaCodecAdapter(
codec, /* enableAsynchronousQueueing= */ true, getTrackType()); codec, /* enableAsynchronousQueueing= */ true, getTrackType());
} else { } else {
codecAdapter = new SynchronousMediaCodecAdapter(codec); codecAdapter = new SynchronousMediaCodecAdapter(codec);

8
library/core/src/test/java/com/google/android/exoplayer2/mediacodec/DedicatedThreadAsyncMediaCodecAdapterTest.java → library/core/src/test/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapterTest.java
View File

@ -40,11 +40,11 @@ import org.robolectric.Shadows;
import org.robolectric.annotation.LooperMode; import org.robolectric.annotation.LooperMode;
import org.robolectric.shadows.ShadowLooper; import org.robolectric.shadows.ShadowLooper;
/** Unit tests for {@link DedicatedThreadAsyncMediaCodecAdapter}. */ /** Unit tests for {@link AsynchronousMediaCodecAdapter}. */
@LooperMode(LEGACY) @LooperMode(LEGACY)
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class DedicatedThreadAsyncMediaCodecAdapterTest { public class AsynchronousMediaCodecAdapterTest {
private DedicatedThreadAsyncMediaCodecAdapter adapter; private AsynchronousMediaCodecAdapter adapter;
private MediaCodec codec; private MediaCodec codec;
private TestHandlerThread handlerThread; private TestHandlerThread handlerThread;
private MediaCodec.BufferInfo bufferInfo; private MediaCodec.BufferInfo bufferInfo;
@ -54,7 +54,7 @@ public class DedicatedThreadAsyncMediaCodecAdapterTest {
codec = MediaCodec.createByCodecName("h264"); codec = MediaCodec.createByCodecName("h264");
handlerThread = new TestHandlerThread("TestHandlerThread"); handlerThread = new TestHandlerThread("TestHandlerThread");
adapter = adapter =
new DedicatedThreadAsyncMediaCodecAdapter( new AsynchronousMediaCodecAdapter(
codec, codec,
/* enableAsynchronousQueueing= */ false, /* enableAsynchronousQueueing= */ false,
/* trackType= */ C.TRACK_TYPE_VIDEO, /* trackType= */ C.TRACK_TYPE_VIDEO,