diff --git a/libraries/test_data/src/test/assets/media/jpeg/white-1x1.jpg b/libraries/test_data/src/test/assets/media/jpeg/white-1x1.jpg new file mode 100644 index 0000000000..392269c49c Binary files /dev/null and b/libraries/test_data/src/test/assets/media/jpeg/white-1x1.jpg differ diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/performance/PerformanceTestListener.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/PlayerTestListener.java similarity index 93% rename from libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/performance/PerformanceTestListener.java rename to libraries/transformer/src/androidTest/java/androidx/media3/transformer/PlayerTestListener.java index a89fbe0cfc..087188c089 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/performance/PerformanceTestListener.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/PlayerTestListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.transformer.mh.performance; +package androidx.media3.transformer; import android.os.ConditionVariable; import androidx.annotation.Nullable; @@ -26,8 +26,8 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; -/** A listener for testing previewing performance. */ -/* package */ class PerformanceTestListener implements Player.Listener, AnalyticsListener { +/** Utility {@link Player.Listener} for testing. */ +public final class PlayerTestListener implements Player.Listener, AnalyticsListener { private final ConditionVariable playerReady; private final ConditionVariable playerEnded; @@ -41,7 +41,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; * @param testTimeoutMs The timeout value in milliseconds for which {@link * #waitUntilPlayerReady()} and {@link #waitUntilPlayerEnded()} waits. */ - public PerformanceTestListener(long testTimeoutMs) { + public PlayerTestListener(long testTimeoutMs) { playerReady = new ConditionVariable(); playerEnded = new ConditionVariable(); playbackException = new AtomicReference<>(); diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/performance/VideoEffectsPreviewPerformanceTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/performance/VideoEffectsPreviewPerformanceTest.java index 0fc7e616e3..f43b96ace4 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/performance/VideoEffectsPreviewPerformanceTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/performance/VideoEffectsPreviewPerformanceTest.java @@ -28,6 +28,7 @@ import androidx.media3.common.PlaybackException; import androidx.media3.exoplayer.DecoderCounters; import androidx.media3.exoplayer.ExoPlayer; import androidx.media3.exoplayer.util.EventLogger; +import androidx.media3.transformer.PlayerTestListener; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.platform.app.InstrumentationRegistry; @@ -66,7 +67,7 @@ public class VideoEffectsPreviewPerformanceTest { */ @Test public void exoplayerEffectsPreviewTest() throws PlaybackException, TimeoutException { - PerformanceTestListener listener = new PerformanceTestListener(TEST_TIMEOUT_MS); + PlayerTestListener listener = new PlayerTestListener(TEST_TIMEOUT_MS); instrumentation.runOnMainSync( () -> { player = new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build();