Add enable fallback option to transformer demo.

Also invert disableFallback parameter in DefaultEncoderFactory
to enableFallback. Fallback is still enabled by default.

PiperOrigin-RevId: 429253266

demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/ConfigurationActivity.java

@@ -54,6 +54,7 @@ public final class ConfigurationActivity extends AppCompatActivity {
   public static final String SCALE_X = "scale_x";
   public static final String SCALE_Y = "scale_y";
   public static final String ROTATE_DEGREES = "rotate_degrees";
+  public static final String ENABLE_FALLBACK = "enable_fallback";
   public static final String ENABLE_HDR_EDITING = "enable_hdr_editing";
   private static final String[] INPUT_URIS = {
     "https://html5demos.com/assets/dizzy.mp4",
@@ -80,6 +81,7 @@ public final class ConfigurationActivity extends AppCompatActivity {
   private @MonotonicNonNull Spinner translateSpinner;
   private @MonotonicNonNull Spinner scaleSpinner;
   private @MonotonicNonNull Spinner rotateSpinner;
+  private @MonotonicNonNull CheckBox enableFallbackCheckBox;
   private @MonotonicNonNull CheckBox enableHdrEditingCheckBox;
   private int inputUriPosition;
 
@@ -154,6 +156,7 @@ public final class ConfigurationActivity extends AppCompatActivity {
     rotateSpinner.setAdapter(rotateAdapter);
     rotateAdapter.addAll(SAME_AS_INPUT_OPTION, "0", "10", "45", "60", "90", "180");
 
+    enableFallbackCheckBox = findViewById(R.id.enable_fallback_checkbox);
     enableHdrEditingCheckBox = findViewById(R.id.hdr_editing_checkbox);
   }
 
@@ -183,6 +186,7 @@ public final class ConfigurationActivity extends AppCompatActivity {
     "translateSpinner",
     "scaleSpinner",
     "rotateSpinner",
+    "enableFallbackCheckBox",
     "enableHdrEditingCheckBox"
   })
   private void startTransformation(View view) {
@@ -221,6 +225,7 @@ public final class ConfigurationActivity extends AppCompatActivity {
     if (!SAME_AS_INPUT_OPTION.equals(selectedRotate)) {
       bundle.putFloat(ROTATE_DEGREES, Float.parseFloat(selectedRotate));
     }
+    bundle.putBoolean(ENABLE_FALLBACK, enableFallbackCheckBox.isChecked());
     bundle.putBoolean(ENABLE_HDR_EDITING, enableHdrEditingCheckBox.isChecked());
     transformerIntent.putExtras(bundle);
 

demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/TransformerActivity.java

@@ -36,6 +36,8 @@ import androidx.appcompat.app.AppCompatActivity;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.MediaItem;
+import com.google.android.exoplayer2.transformer.DefaultEncoderFactory;
+import com.google.android.exoplayer2.transformer.EncoderSelector;
 import com.google.android.exoplayer2.transformer.ProgressHolder;
 import com.google.android.exoplayer2.transformer.TransformationException;
 import com.google.android.exoplayer2.transformer.TransformationRequest;
@@ -224,7 +226,11 @@ public final class TransformerActivity extends AppCompatActivity {
       transformerBuilder
           .setTransformationRequest(requestBuilder.build())
           .setRemoveAudio(bundle.getBoolean(ConfigurationActivity.SHOULD_REMOVE_AUDIO))
-          .setRemoveVideo(bundle.getBoolean(ConfigurationActivity.SHOULD_REMOVE_VIDEO));
+          .setRemoveVideo(bundle.getBoolean(ConfigurationActivity.SHOULD_REMOVE_VIDEO))
+          .setEncoderFactory(
+              new DefaultEncoderFactory(
+                  EncoderSelector.DEFAULT,
+                  /* enableFallback= */ bundle.getBoolean(ConfigurationActivity.ENABLE_FALLBACK)));
     }
     return transformerBuilder
         .addListener(

demos/transformer/src/main/res/layout/configuration_activity.xml

@@ -174,6 +174,16 @@
         android:layout_weight="1"
         android:gravity="center_vertical" >
         <TextView
+          android:text="@string/enable_fallback" />
+        <CheckBox
+          android:id="@+id/enable_fallback_checkbox"
+          android:layout_gravity="right"
+          android:checked="true"/>
+      </TableRow>
+      <TableRow
+        android:layout_weight="1"
+        android:gravity="center_vertical" >
+        <TextView
           android:id="@+id/hdr_editing"
           android:text="@string/hdr_editing" />
         <CheckBox

demos/transformer/src/main/res/values/strings.xml

@@ -27,6 +27,7 @@
   <string name="translate" translatable="false">Translate video</string>
   <string name="scale" translatable="false">Scale video</string>
   <string name="rotate" translatable="false">Rotate video (degrees)</string>
+  <string name="enable_fallback" translatable="false">Enable fallback</string>
   <string name="transform" translatable="false">Transform</string>
   <string name="hdr_editing" translatable="false">[Experimental] HDR editing</string>
   <string name="debug_preview" translatable="false">Debug preview:</string>

library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/TransformerEndToEndTest.java

@@ -48,7 +48,7 @@ public class TransformerEndToEndTest {
                 new TransformationRequest.Builder().setVideoMimeType(MimeTypes.VIDEO_H264).build())
             .setMuxerFactory(muxerFactory)
             .setEncoderFactory(
-                new DefaultEncoderFactory(EncoderSelector.DEFAULT, /* disableFallback= */ true))
+                new DefaultEncoderFactory(EncoderSelector.DEFAULT, /* enableFallback= */ false))
             .build();
     // Result of the following command:
     // ffprobe -count_frames -select_streams v:0 -show_entries stream=nb_read_frames bear-vp9.webm
@@ -81,7 +81,7 @@ public class TransformerEndToEndTest {
                     .build())
             .setMuxerFactory(muxerFactory)
             .setEncoderFactory(
-                new DefaultEncoderFactory(EncoderSelector.DEFAULT, /* disableFallback= */ true))
+                new DefaultEncoderFactory(EncoderSelector.DEFAULT, /* enableFallback= */ false))
             .build();
     // Result of the following command:
     // ffprobe -count_frames -select_streams v:0 -show_entries stream=nb_read_frames sample.mp4

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/DefaultEncoderFactory.java

@@ -44,7 +44,7 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory {
   private static final int DEFAULT_I_FRAME_INTERVAL_SECS = 1;
 
   @Nullable private final EncoderSelector videoEncoderSelector;
-  private final boolean disableFallback;
+  private final boolean enableFallback;
 
   /**
    * Creates a new instance using the {@link EncoderSelector#DEFAULT default encoder selector}, and
@@ -56,14 +56,14 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory {
    * type}, resolution, {@link Format#bitrate bitrate}, {@link Format#codecs profile/level}, etc.
    */
   public DefaultEncoderFactory() {
-    this(EncoderSelector.DEFAULT, /* disableFallback= */ false);
+    this(EncoderSelector.DEFAULT, /* enableFallback= */ true);
   }
 
   /** Creates a new instance. */
   public DefaultEncoderFactory(
-      @Nullable EncoderSelector videoEncoderSelector, boolean disableFallback) {
+      @Nullable EncoderSelector videoEncoderSelector, boolean enableFallback) {
     this.videoEncoderSelector = videoEncoderSelector;
-    this.disableFallback = disableFallback;
+    this.enableFallback = enableFallback;
   }
 
   @Override
@@ -72,7 +72,7 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory {
     // TODO(b/210591626) Add encoder selection for audio.
     checkArgument(!allowedMimeTypes.isEmpty());
     if (!allowedMimeTypes.contains(format.sampleMimeType)) {
-      if (!disableFallback) {
+      if (enableFallback) {
         // TODO(b/210591626): Pick fallback MIME type using same strategy as for encoder
         // capabilities limitations.
         format = format.buildUpon().setSampleMimeType(allowedMimeTypes.get(0)).build();
@@ -115,7 +115,7 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory {
     @Nullable
     Pair<MediaCodecInfo, Format> encoderAndClosestFormatSupport =
         findEncoderWithClosestFormatSupport(
-            format, videoEncoderSelector, allowedMimeTypes, disableFallback);
+            format, videoEncoderSelector, allowedMimeTypes, enableFallback);
     if (encoderAndClosestFormatSupport == null) {
       throw TransformationException.createForCodec(
           new IllegalArgumentException("The requested output format is not supported."),
@@ -211,11 +211,11 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory {
       Format requestedFormat,
       EncoderSelector encoderSelector,
       List<String> allowedMimeTypes,
-      boolean disableFallback) {
+      boolean enableFallback) {
     String requestedMimeType = requestedFormat.sampleMimeType;
     @Nullable
     String mimeType = findFallbackMimeType(encoderSelector, requestedMimeType, allowedMimeTypes);
-    if (mimeType == null || (disableFallback && !requestedMimeType.equals(mimeType))) {
+    if (mimeType == null || (!enableFallback && !requestedMimeType.equals(mimeType))) {
       return null;
     }
 
@@ -223,7 +223,7 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory {
     if (encodersForMimeType.isEmpty()) {
       return null;
     }
-    if (disableFallback) {
+    if (!enableFallback) {
       return Pair.create(encodersForMimeType.get(0), requestedFormat);
     }
     ImmutableList<MediaCodecInfo> filteredEncoders =