From 4760a034449476ebf5e732f627a26e583d3ce559 Mon Sep 17 00:00:00 2001 From: hschlueter Date: Thu, 17 Feb 2022 18:30:41 +0000 Subject: [PATCH] Only allow HEVC output MIME selection in demo for API>=24. The muxer doesn't support HEVC below API 24. The is documented in the TransformationRequest javadoc and the Transformer.Builder will throw if HEVC is requested below API 24 so the option should not be part of the demo for those devices. #mse-bug-week PiperOrigin-RevId: 429343805 --- .../transformerdemo/ConfigurationActivity.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/ConfigurationActivity.java b/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/ConfigurationActivity.java index d5e9985741..8a5bb4862e 100644 --- a/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/ConfigurationActivity.java +++ b/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/ConfigurationActivity.java @@ -33,6 +33,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.Util; import java.util.Arrays; import java.util.List; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; @@ -122,11 +123,10 @@ public final class ConfigurationActivity extends AppCompatActivity { videoMimeSpinner = findViewById(R.id.video_mime_spinner); videoMimeSpinner.setAdapter(videoMimeAdapter); videoMimeAdapter.addAll( - SAME_AS_INPUT_OPTION, - MimeTypes.VIDEO_H263, - MimeTypes.VIDEO_H264, - MimeTypes.VIDEO_H265, - MimeTypes.VIDEO_MP4V); + SAME_AS_INPUT_OPTION, MimeTypes.VIDEO_H263, MimeTypes.VIDEO_H264, MimeTypes.VIDEO_MP4V); + if (Util.SDK_INT >= 24) { + videoMimeAdapter.add(MimeTypes.VIDEO_H265); + } ArrayAdapter resolutionHeightAdapter = new ArrayAdapter<>(/* context= */ this, R.layout.spinner_item);