diff --git a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/AndroidTestUtil.java b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/AndroidTestUtil.java index eb07057031..5a2af177d0 100644 --- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/AndroidTestUtil.java +++ b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/AndroidTestUtil.java @@ -21,6 +21,7 @@ import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_H264; import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_H265; import android.content.Context; +import android.media.MediaFormat; import android.os.Build; import androidx.annotation.Nullable; import com.google.android.exoplayer2.C; @@ -43,6 +44,13 @@ import org.json.JSONObject; public final class AndroidTestUtil { private static final String TAG = "AndroidTestUtil"; + /** A realtime {@linkplain MediaFormat#KEY_PRIORITY encoder priority}. */ + public static final int MEDIA_CODEC_PRIORITY_REALTIME = 0; + /** + * A non-realtime (as fast as possible) {@linkplain MediaFormat#KEY_PRIORITY encoder priority}. + */ + public static final int MEDIA_CODEC_PRIORITY_NON_REALTIME = 1; + // Format values are sourced from `mediainfo` command. public static final String MP4_ASSET_URI_STRING = "asset:///media/mp4/sample.mp4"; diff --git a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/SsimHelper.java b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/SsimHelper.java index d2fb6a94da..ed97b26588 100644 --- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/SsimHelper.java +++ b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/SsimHelper.java @@ -16,6 +16,7 @@ package com.google.android.exoplayer2.transformer; +import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MEDIA_CODEC_PRIORITY_NON_REALTIME; import static com.google.android.exoplayer2.util.Assertions.checkNotNull; import static com.google.android.exoplayer2.util.Assertions.checkState; import static com.google.android.exoplayer2.util.Assertions.checkStateNotNull; @@ -232,6 +233,7 @@ public final class SsimHelper { String sampleMimeType = checkNotNull(mediaFormat.getString(MediaFormat.KEY_MIME)); mediaFormat.setInteger(MediaFormat.KEY_COLOR_FORMAT, MEDIA_CODEC_COLOR_SPACE); + mediaFormat.setInteger(MediaFormat.KEY_PRIORITY, MEDIA_CODEC_PRIORITY_NON_REALTIME); this.mediaFormat = mediaFormat; mediaCodec = MediaCodec.createDecoderByType(sampleMimeType); } diff --git a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/EncoderPerformanceAnalysisTest.java b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/EncoderPerformanceAnalysisTest.java index 60d7e40c8b..abb23bf434 100644 --- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/EncoderPerformanceAnalysisTest.java +++ b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/EncoderPerformanceAnalysisTest.java @@ -16,11 +16,12 @@ package com.google.android.exoplayer2.transformer.mh.analysis; +import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MEDIA_CODEC_PRIORITY_NON_REALTIME; +import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MEDIA_CODEC_PRIORITY_REALTIME; import static com.google.android.exoplayer2.transformer.AndroidTestUtil.recordTestSkipped; import static com.google.android.exoplayer2.util.Assertions.checkNotNull; import android.content.Context; -import android.media.MediaFormat; import android.net.Uri; import androidx.test.core.app.ApplicationProvider; import com.google.android.exoplayer2.MediaItem; @@ -44,13 +45,6 @@ import org.junit.runners.Parameterized.Parameters; @RunWith(Parameterized.class) public class EncoderPerformanceAnalysisTest { - /** A realtime {@linkplain MediaFormat#KEY_PRIORITY encoder priority}. */ - private static final int MEDIA_CODEC_PRIORITY_REALTIME = 0; - /** - * A non-realtime (as fast as possible) {@linkplain MediaFormat#KEY_PRIORITY encoder priority}. - */ - private static final int MEDIA_CODEC_PRIORITY_NON_REALTIME = 1; - private static final ImmutableList INPUT_FILES = ImmutableList.of( AndroidTestUtil.MP4_ASSET_WITH_INCREASING_TIMESTAMPS_320W_240H_15S_URI_STRING,