From 285cce629f827ab51a59442e1d25b021f4e3ecdf Mon Sep 17 00:00:00 2001 From: christosts Date: Thu, 11 Jun 2020 12:20:30 +0100 Subject: [PATCH] Rename DedicatedThreadAsyncMediaCodecAdapter Rename the DedicatedThreadAsyncMediaCodecAdapter to AsynchronousMediaCodecAdapter as it is the only asynchronous adapter implementation left after the clean-up. PiperOrigin-RevId: 315873431 --- ...decAdapter.java => AsynchronousMediaCodecAdapter.java} | 8 ++++---- .../android/exoplayer2/mediacodec/MediaCodecRenderer.java | 4 ++-- ...erTest.java => AsynchronousMediaCodecAdapterTest.java} | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) rename library/core/src/main/java/com/google/android/exoplayer2/mediacodec/{DedicatedThreadAsyncMediaCodecAdapter.java => AsynchronousMediaCodecAdapter.java} (96%) rename library/core/src/test/java/com/google/android/exoplayer2/mediacodec/{DedicatedThreadAsyncMediaCodecAdapterTest.java => AsynchronousMediaCodecAdapterTest.java} (98%) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/DedicatedThreadAsyncMediaCodecAdapter.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapter.java similarity index 96% rename from library/core/src/main/java/com/google/android/exoplayer2/mediacodec/DedicatedThreadAsyncMediaCodecAdapter.java rename to library/core/src/main/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapter.java index 88e3f56daa..35d3989c29 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/DedicatedThreadAsyncMediaCodecAdapter.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapter.java @@ -40,7 +40,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; *

This adapter supports queueing input buffers asynchronously. */ @RequiresApi(23) -/* package */ final class DedicatedThreadAsyncMediaCodecAdapter extends MediaCodec.Callback +/* package */ final class AsynchronousMediaCodecAdapter extends MediaCodec.Callback implements MediaCodecAdapter { @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 * labelling the internal thread accordingly. */ - /* package */ DedicatedThreadAsyncMediaCodecAdapter(MediaCodec codec, int trackType) { + /* package */ AsynchronousMediaCodecAdapter(MediaCodec codec, int trackType) { this( codec, /* 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 * labelling the internal thread accordingly. */ - /* package */ DedicatedThreadAsyncMediaCodecAdapter( + /* package */ AsynchronousMediaCodecAdapter( MediaCodec codec, boolean enableAsynchronousQueueing, int trackType) { this( codec, @@ -96,7 +96,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; } @VisibleForTesting - /* package */ DedicatedThreadAsyncMediaCodecAdapter( + /* package */ AsynchronousMediaCodecAdapter( MediaCodec codec, boolean enableAsynchronousQueueing, int trackType, diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java index 27f0621cfc..21cc04ec23 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java @@ -1075,12 +1075,12 @@ public abstract class MediaCodecRenderer extends BaseRenderer { codec = MediaCodec.createByCodecName(codecName); if (mediaCodecOperationMode == OPERATION_MODE_ASYNCHRONOUS_DEDICATED_THREAD && Util.SDK_INT >= 23) { - codecAdapter = new DedicatedThreadAsyncMediaCodecAdapter(codec, getTrackType()); + codecAdapter = new AsynchronousMediaCodecAdapter(codec, getTrackType()); } else if (mediaCodecOperationMode == OPERATION_MODE_ASYNCHRONOUS_DEDICATED_THREAD_ASYNCHRONOUS_QUEUEING && Util.SDK_INT >= 23) { codecAdapter = - new DedicatedThreadAsyncMediaCodecAdapter( + new AsynchronousMediaCodecAdapter( codec, /* enableAsynchronousQueueing= */ true, getTrackType()); } else { codecAdapter = new SynchronousMediaCodecAdapter(codec); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/DedicatedThreadAsyncMediaCodecAdapterTest.java b/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapterTest.java similarity index 98% rename from library/core/src/test/java/com/google/android/exoplayer2/mediacodec/DedicatedThreadAsyncMediaCodecAdapterTest.java rename to library/core/src/test/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapterTest.java index 7f61d7d67e..ee6f8690e2 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/DedicatedThreadAsyncMediaCodecAdapterTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapterTest.java @@ -40,11 +40,11 @@ import org.robolectric.Shadows; import org.robolectric.annotation.LooperMode; import org.robolectric.shadows.ShadowLooper; -/** Unit tests for {@link DedicatedThreadAsyncMediaCodecAdapter}. */ +/** Unit tests for {@link AsynchronousMediaCodecAdapter}. */ @LooperMode(LEGACY) @RunWith(AndroidJUnit4.class) -public class DedicatedThreadAsyncMediaCodecAdapterTest { - private DedicatedThreadAsyncMediaCodecAdapter adapter; +public class AsynchronousMediaCodecAdapterTest { + private AsynchronousMediaCodecAdapter adapter; private MediaCodec codec; private TestHandlerThread handlerThread; private MediaCodec.BufferInfo bufferInfo; @@ -54,7 +54,7 @@ public class DedicatedThreadAsyncMediaCodecAdapterTest { codec = MediaCodec.createByCodecName("h264"); handlerThread = new TestHandlerThread("TestHandlerThread"); adapter = - new DedicatedThreadAsyncMediaCodecAdapter( + new AsynchronousMediaCodecAdapter( codec, /* enableAsynchronousQueueing= */ false, /* trackType= */ C.TRACK_TYPE_VIDEO,