Skip to content

SDK / exoplayer

Go to a project
Commit e7673d46 by kimvde Committed by Tofunmi Adigun-Hameed
Options

Remove unnecessary thread in AssetLoader tests 

Also queue textures from a different thread in TextureAssetLoader, to
have a behaviour closer to reality.

PiperOrigin-RevId: 538473089
(cherry picked from commit 01dbda1f768d0511c85fdcdb4a6972e85a477426)
parent 38030559
Inline Side-by-side
Showing with 18 additions and 27 deletions
library/transformer/src/test/java/com/google/android/exoplayer2/transformer/ExoPlayerAssetLoaderTest.java
......@@ -20,8 +20,6 @@ import static com.google.android.exoplayer2.transformer.TransformerUtil.getProce
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Looper;
import androidx.annotation.Nullable;
import androidx.test.core.app.ApplicationProvider;
......@@ -44,9 +42,6 @@ public class ExoPlayerAssetLoaderTest {
@Test
public void exoPlayerAssetLoader_callsListenerCallbacksInRightOrder() throws Exception {
HandlerThread assetLoaderThread = new HandlerThread("AssetLoaderThread");
assetLoaderThread.start();
Looper assetLoaderLooper = assetLoaderThread.getLooper();
AtomicReference<Exception> exceptionRef = new AtomicReference<>();
AtomicBoolean isAudioOutputFormatSet = new AtomicBoolean();
AtomicBoolean isVideoOutputFormatSet = new AtomicBoolean();
......@@ -128,9 +123,9 @@ public class ExoPlayerAssetLoaderTest {
// Use default clock so that messages sent on different threads are not always executed in the
// order in which they are received.
Clock clock = Clock.DEFAULT;
AssetLoader assetLoader = getAssetLoader(assetLoaderLooper, listener, clock);
AssetLoader assetLoader = getAssetLoader(listener, clock);
new Handler(assetLoaderLooper).post(assetLoader::start);
assetLoader.start();
runLooperUntil(
Looper.myLooper(),
() -> {
......@@ -142,15 +137,14 @@ public class ExoPlayerAssetLoaderTest {
assertThat(exceptionRef.get()).isNull();
}
private static AssetLoader getAssetLoader(
Looper looper, AssetLoader.Listener listener, Clock clock) {
private static AssetLoader getAssetLoader(AssetLoader.Listener listener, Clock clock) {
Context context = ApplicationProvider.getApplicationContext();
Codec.DecoderFactory decoderFactory = new DefaultDecoderFactory(context);
EditedMediaItem editedMediaItem =
new EditedMediaItem.Builder(MediaItem.fromUri("asset:///media/mp4/sample.mp4")).build();
return new ExoPlayerAssetLoader.Factory(
context, decoderFactory, /* forceInterpretHdrAsSdr= */ false, clock)
.createAssetLoader(editedMediaItem, looper, listener);
.createAssetLoader(editedMediaItem, Looper.myLooper(), listener);
}
private static final class FakeSampleConsumer implements SampleConsumer {
......
library/transformer/src/test/java/com/google/android/exoplayer2/transformer/ImageAssetLoaderTest.java
......@@ -19,8 +19,6 @@ import static com.google.android.exoplayer2.robolectric.RobolectricUtil.runLoope
import static com.google.common.truth.Truth.assertThat;
import android.graphics.Bitmap;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Looper;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
......@@ -39,9 +37,6 @@ public class ImageAssetLoaderTest {
@Test
public void imageAssetLoader_callsListenerCallbacksInRightOrder() throws Exception {
HandlerThread assetLoaderThread = new HandlerThread("AssetLoaderThread");
assetLoaderThread.start();
Looper assetLoaderLooper = assetLoaderThread.getLooper();
AtomicReference<Exception> exceptionRef = new AtomicReference<>();
AtomicBoolean isOutputFormatSet = new AtomicBoolean();
AssetLoader.Listener listener =
......@@ -103,9 +98,9 @@ public class ImageAssetLoaderTest {
}
}
};
AssetLoader assetLoader = getAssetLoader(assetLoaderLooper, listener);
AssetLoader assetLoader = getAssetLoader(listener);
new Handler(assetLoaderLooper).post(assetLoader::start);
assetLoader.start();
runLooperUntil(
Looper.myLooper(),
() -> {
......@@ -116,7 +111,7 @@ public class ImageAssetLoaderTest {
assertThat(exceptionRef.get()).isNull();
}
private static AssetLoader getAssetLoader(Looper looper, AssetLoader.Listener listener) {
private static AssetLoader getAssetLoader(AssetLoader.Listener listener) {
EditedMediaItem editedMediaItem =
new EditedMediaItem.Builder(
MediaItem.fromUri("asset:///media/bitmap/input_images/media3test.png"))
......@@ -124,7 +119,7 @@ public class ImageAssetLoaderTest {
.setFrameRate(30)
.build();
return new ImageAssetLoader.Factory(ApplicationProvider.getApplicationContext())
.createAssetLoader(editedMediaItem, looper, listener);
.createAssetLoader(editedMediaItem, Looper.myLooper(), listener);
}
private static final class FakeSampleConsumer implements SampleConsumer {
......
library/transformer/src/test/java/com/google/android/exoplayer2/transformer/TextureAssetLoaderTest.java
......@@ -18,8 +18,6 @@ package com.google.android.exoplayer2.transformer;
import static com.google.android.exoplayer2.robolectric.RobolectricUtil.runLooperUntil;
import static com.google.common.truth.Truth.assertThat;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Looper;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C;
......@@ -27,6 +25,7 @@ import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.util.OnInputFrameProcessedListener;
import java.time.Duration;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import org.junit.Test;
......@@ -39,9 +38,6 @@ public class TextureAssetLoaderTest {
@Test
public void textureAssetLoader_callsListenerCallbacksInRightOrder() throws Exception {
HandlerThread assetLoaderThread = new HandlerThread("AssetLoaderThread");
assetLoaderThread.start();
Looper assetLoaderLooper = assetLoaderThread.getLooper();
AtomicReference<Exception> exceptionRef = new AtomicReference<>();
AtomicBoolean isOutputFormatSet = new AtomicBoolean();
AssetLoader.Listener listener =
......@@ -105,7 +101,7 @@ public class TextureAssetLoaderTest {
};
TextureAssetLoader assetLoader = getAssetLoader(listener);
new Handler(assetLoaderLooper).post(() -> runTextureAssetLoader(assetLoader));
runTextureAssetLoader(assetLoader);
runLooperUntil(
Looper.myLooper(),
() -> {
......@@ -116,10 +112,16 @@ public class TextureAssetLoaderTest {
assertThat(exceptionRef.get()).isNull();
}
@SuppressWarnings("FutureReturnValueIgnored")
private static void runTextureAssetLoader(TextureAssetLoader assetLoader) {
assetLoader.start();
assetLoader.queueInputTexture(/* texId= */ 0, /* presentationTimeUs= */ 0);
assetLoader.signalEndOfVideoInput();
Executors.newSingleThreadExecutor()
.submit(
() -> {
assetLoader.queueInputTexture(/* texId= */ 0, /* presentationTimeUs= */ 0);
assetLoader.signalEndOfVideoInput();
});
}
private static TextureAssetLoader getAssetLoader(AssetLoader.Listener listener) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment