loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move Output Mime Type And Hdr Mode Fallback logic to TransformerUtil

Browse Source 
allows apps to use the logic statically before running transformer.

Also ensure the mime type reported is the mime type outputted

PiperOrigin-RevId: 631811763
This commit is contained in:
tofunmi 2024-05-08 08:37:13 -07:00 committed by Copybara-Service
parent 1a5f57e9eb
commit ad2fc4fbb1
2 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libraries/transformer/src/main/java/androidx/media3/transformer/TransformerUtil.java
View File

@ -17,10 +17,15 @@
package androidx.media3.transformer; package androidx.media3.transformer;
import static androidx.media3.common.ColorInfo.SDR_BT709_LIMITED; import static androidx.media3.common.ColorInfo.SDR_BT709_LIMITED;
import static androidx.media3.common.ColorInfo.isTransferHdr;
import static androidx.media3.transformer.Composition.HDR_MODE_KEEP_HDR; import static androidx.media3.transformer.Composition.HDR_MODE_KEEP_HDR;
import static androidx.media3.transformer.Composition.HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_OPEN_GL;
import static androidx.media3.transformer.EncoderUtil.getSupportedEncodersForHdrEditing;
import static java.lang.Math.round; import static java.lang.Math.round;
import android.media.MediaCodec; import android.media.MediaCodec;
import android.media.MediaCodecInfo;
import android.util.Pair;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.media3.common.C; import androidx.media3.common.C;
import androidx.media3.common.ColorInfo; import androidx.media3.common.ColorInfo;
@ -31,6 +36,7 @@ import androidx.media3.common.MimeTypes;
import androidx.media3.effect.GlEffect; import androidx.media3.effect.GlEffect;
import androidx.media3.effect.ScaleAndRotateTransformation; import androidx.media3.effect.ScaleAndRotateTransformation;
import androidx.media3.extractor.metadata.mp4.SlowMotionData; import androidx.media3.extractor.metadata.mp4.SlowMotionData;
import androidx.media3.transformer.Composition.HdrMode;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
/** Utility methods for Transformer. */ /** Utility methods for Transformer. */
@ -233,4 +239,33 @@ import com.google.common.collect.ImmutableList;
} }
return decoderInputColor; return decoderInputColor;
} }
/**
* Calculate what the MIME type and {@link HdrMode} to use, applying fallback measure if
* necessary.
*
* @param hdrMode The {@link HdrMode}.
* @param requestedOutputMimeType The desired output MIME type.
* @param colorInfo The {@link ColorInfo}.
* @return a {@link Pair} of the output MIME type and {@link HdrMode}.
*/
public static Pair<String, Integer> getOutputMimeTypeAndHdrModeAfterFallback(
@HdrMode int hdrMode, String requestedOutputMimeType, @Nullable ColorInfo colorInfo) {
// HdrMode fallback is only supported from HDR_MODE_KEEP_HDR to
// HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_OPEN_GL.
if (hdrMode == HDR_MODE_KEEP_HDR && isTransferHdr(colorInfo)) {
ImmutableList<MediaCodecInfo> hdrEncoders =
getSupportedEncodersForHdrEditing(requestedOutputMimeType, colorInfo);
if (hdrEncoders.isEmpty()) {
// Fallback H.265/HEVC codecs for HDR content to avoid tonemapping.
hdrEncoders = getSupportedEncodersForHdrEditing(MimeTypes.VIDEO_H265, colorInfo);
if (!hdrEncoders.isEmpty()) {
requestedOutputMimeType = MimeTypes.VIDEO_H265;
} else {
hdrMode = HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_OPEN_GL;
}
}
}
return Pair.create(requestedOutputMimeType, hdrMode);
}
} }

25
libraries/transformer/src/main/java/androidx/media3/transformer/VideoSampleExporter.java
View File

@ -26,11 +26,10 @@ import static androidx.media3.common.util.Assertions.checkArgument;
import static androidx.media3.common.util.Assertions.checkNotNull; import static androidx.media3.common.util.Assertions.checkNotNull;
import static androidx.media3.transformer.Composition.HDR_MODE_KEEP_HDR; import static androidx.media3.transformer.Composition.HDR_MODE_KEEP_HDR;
import static androidx.media3.transformer.Composition.HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_OPEN_GL; import static androidx.media3.transformer.Composition.HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_OPEN_GL;
import static androidx.media3.transformer.EncoderUtil.getSupportedEncodersForHdrEditing; import static androidx.media3.transformer.TransformerUtil.getOutputMimeTypeAndHdrModeAfterFallback;
import android.content.Context; import android.content.Context;
import android.media.MediaCodec; import android.media.MediaCodec;
import android.media.MediaCodecInfo;
import android.util.Pair; import android.util.Pair;
import android.view.Surface; import android.view.Surface;
import androidx.annotation.IntRange; import androidx.annotation.IntRange;
@ -51,7 +50,6 @@ import androidx.media3.common.util.Util;
import androidx.media3.decoder.DecoderInputBuffer; import androidx.media3.decoder.DecoderInputBuffer;
import androidx.media3.effect.DebugTraceUtil; import androidx.media3.effect.DebugTraceUtil;
import androidx.media3.effect.VideoCompositorSettings; import androidx.media3.effect.VideoCompositorSettings;
import com.google.common.collect.ImmutableList;
import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.MoreExecutors;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.List; import java.util.List;
@ -268,25 +266,8 @@ import org.checkerframework.dataflow.qual.Pure;
requestedOutputMimeType = inputSampleMimeType; requestedOutputMimeType = inputSampleMimeType;
} }
// HdrMode fallback is only supported from HDR_MODE_KEEP_HDR to return getOutputMimeTypeAndHdrModeAfterFallback(
// HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_OPEN_GL. transformationRequest.hdrMode, requestedOutputMimeType, inputFormat.colorInfo);
@Composition.HdrMode int hdrMode = transformationRequest.hdrMode;
if (hdrMode == HDR_MODE_KEEP_HDR && isTransferHdr(inputFormat.colorInfo)) {
ImmutableList<MediaCodecInfo> hdrEncoders =
getSupportedEncodersForHdrEditing(requestedOutputMimeType, inputFormat.colorInfo);
if (hdrEncoders.isEmpty()) {
// Fallback H.265/HEVC codecs for HDR content to avoid tonemapping.
hdrEncoders =
getSupportedEncodersForHdrEditing(MimeTypes.VIDEO_H265, inputFormat.colorInfo);
}
if (hdrEncoders.isEmpty()) {
hdrMode = HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_OPEN_GL;
} else {
requestedOutputMimeType = MimeTypes.VIDEO_H265;
}
}
return Pair.create(requestedOutputMimeType, hdrMode);
} }
public @Composition.HdrMode int getHdrModeAfterFallback() { public @Composition.HdrMode int getHdrModeAfterFallback() {