Add getNormalizedTrackType, mapping image to video track type.

PiperOrigin-RevId: 513514142

Add getNormalizedTrackType, mapping image to video track type.
PiperOrigin-RevId: 513514142
86425943 · samrobinson · tonihei · 3b16231e · 86425943 · 86425943
Commit 86425943 authored Mar 02, 2023 by samrobinson Committed by tonihei Mar 02, 2023
Showing with 50 additions and 14 deletions
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/CompositeAssetLoader.java
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SamplePipeline.java
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerInternal.java
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerUtil.java
--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/CompositeAssetLoader.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/CompositeAssetLoader.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.transformer;
 import static com.google.android.exoplayer2.transformer.Transformer.PROGRESS_STATE_AVAILABLE;
 import static com.google.android.exoplayer2.transformer.Transformer.PROGRESS_STATE_NOT_STARTED;
+import static com.google.android.exoplayer2.transformer.TransformerUtil.getProcessedTrackType;
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.android.exoplayer2.util.Assertions.checkState;
@@ -191,9 +192,7 @@ import java.util.concurrent.atomic.AtomicInteger;
      long streamStartPositionUs,
      long streamOffsetUs)
      throws ExportException {
-    // Consider image as video because image inputs are fed to the VideoSamplePipeline.
+    @C.TrackType int trackType = getProcessedTrackType(format.sampleMimeType);
-    int trackType =
-        MimeTypes.isAudio(format.sampleMimeType) ? C.TRACK_TYPE_AUDIO : C.TRACK_TYPE_VIDEO;
    SampleConsumer sampleConsumer;
    if (currentMediaItemIndex.get() == 0) {
      boolean addForcedAudioTrack =

--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SamplePipeline.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SamplePipeline.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.transformer;
 import static com.google.android.exoplayer2.transformer.EncoderUtil.getSupportedEncoders;
 import static com.google.android.exoplayer2.transformer.EncoderUtil.getSupportedEncodersForHdrEditing;
+import static com.google.android.exoplayer2.transformer.TransformerUtil.getProcessedTrackType;
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.android.exoplayer2.util.Assertions.checkStateNotNull;
 import static com.google.android.exoplayer2.video.ColorInfo.isTransferHdr;
@@ -55,10 +56,7 @@ import java.util.List;
      Format firstInputFormat, long streamStartPositionUs, MuxerWrapper muxerWrapper) {
    this.streamStartPositionUs = streamStartPositionUs;
    this.muxerWrapper = muxerWrapper;
-    outputTrackType =
+    this.outputTrackType = getProcessedTrackType(firstInputFormat.sampleMimeType);
-        MimeTypes.isImage(firstInputFormat.sampleMimeType)
-            ? C.TRACK_TYPE_VIDEO
-            : MimeTypes.getTrackType(firstInputFormat.sampleMimeType);
  }
  @Override

--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerInternal.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerInternal.java
@@ -22,6 +22,7 @@ import static com.google.android.exoplayer2.transformer.ExportException.ERROR_CO
 import static com.google.android.exoplayer2.transformer.ExportException.ERROR_CODE_MUXING_FAILED;
 import static com.google.android.exoplayer2.transformer.Transformer.PROGRESS_STATE_AVAILABLE;
 import static com.google.android.exoplayer2.transformer.Transformer.PROGRESS_STATE_NOT_STARTED;
+import static com.google.android.exoplayer2.transformer.TransformerUtil.getProcessedTrackType;
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 import static com.google.android.exoplayer2.util.Assertions.checkState;
 import static java.lang.annotation.ElementType.TYPE_USE;
@@ -452,11 +453,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
                  firstInputFormat, supportedOutputTypes, streamStartPositionUs, streamOffsetUs),
              streamStartPositionUs,
              streamOffsetUs);
-      // Consider image as video because image inputs are fed to the VideoSamplePipeline.
+      @C.TrackType int trackType = getProcessedTrackType(firstInputFormat.sampleMimeType);
-      int trackType =
-          MimeTypes.isAudio(firstInputFormat.sampleMimeType)
-              ? C.TRACK_TYPE_AUDIO
-              : C.TRACK_TYPE_VIDEO;
      compositeAssetLoaders
          .get(sequenceIndex)
          .addOnMediaItemChangedListener(samplePipeline, trackType);
@@ -531,12 +528,14 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
          (supportedOutputTypes & SUPPORTED_OUTPUT_TYPE_ENCODED) != 0;
      checkArgument(assetLoaderCanOutputDecoded || assetLoaderCanOutputEncoded);
+      @C.TrackType int trackType = getProcessedTrackType(inputFormat.sampleMimeType);
      boolean shouldTranscode = false;
      if (!assetLoaderCanOutputEncoded) {
        shouldTranscode = true;
-      } else if (MimeTypes.isAudio(inputFormat.sampleMimeType)) {
+      } else if (trackType == C.TRACK_TYPE_AUDIO) {
        shouldTranscode = shouldTranscodeAudio(inputFormat);
-      } else if (MimeTypes.isVideo(inputFormat.sampleMimeType)) {
+      } else if (trackType == C.TRACK_TYPE_VIDEO) {
        shouldTranscode = shouldTranscodeVideo(inputFormat, streamStartPositionUs, streamOffsetUs);
      }

--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerUtil.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerUtil.java
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.transformer;
+import androidx.annotation.Nullable;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.util.MimeTypes;
+/** Utility methods for Transformer. */
+/* package */ final class TransformerUtil {
+  private TransformerUtil() {}
+  /**
+   * Returns the {@link C.TrackType track type} constant corresponding to how a specified MIME type
+   * should be processed, which may be {@link C#TRACK_TYPE_UNKNOWN} if it could not be determined.
+   *
+   * <p>{@linkplain MimeTypes#isImage image} mime types are processed as {@link C#TRACK_TYPE_VIDEO}.
+   *
+   * <p>See {@link MimeTypes#getTrackType} for more details.
+   */
+  public static @C.TrackType int getProcessedTrackType(@Nullable String mimeType) {
+    @C.TrackType int trackType = MimeTypes.getTrackType(mimeType);
+    return trackType == C.TRACK_TYPE_IMAGE ? C.TRACK_TYPE_VIDEO : trackType;
+  }
+}