sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-24 14:37:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix failing portrait export test

Browse source 
The logic in assumeFormatsSupported assumes that portrait videos are
always rotated before encoding but that's not the case when portrait
encoding is enabled.

PiperOrigin-RevId: 691042881
This commit is contained in:
kimvde 2024-10-29 09:08:35 -07:00 committed by Copybara-Service
parent 14094b5094
commit 96b923b610
2 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java
View file

@ -1217,6 +1217,20 @@ public final class AndroidTestUtil {
}
}
/**
* Assumes that the device supports decoding the input format, and encoding/muxing the output
* format if needed.
*
* <p>This is equivalent to calling {@link #assumeFormatsSupported(Context, String, Format,
* Format, boolean)} with {@code isPortraitEncodingEnabled} set to {@code false}.
*/
public static void assumeFormatsSupported(
Context context, String testId, @Nullable Format inputFormat, @Nullable Format outputFormat)
throws IOException, JSONException, MediaCodecUtil.DecoderQueryException {
assumeFormatsSupported(
context, testId, inputFormat, outputFormat, /* isPortraitEncodingEnabled= */ false);
}
/**
* Assumes that the device supports decoding the input format, and encoding/muxing the output
* format if needed.
@ -1227,16 +1241,21 @@ public final class AndroidTestUtil {
* MediaCodec, like an image.
* @param outputFormat The {@link Format format} to encode/mux or {@code null} if the output won't
* be encoded or muxed.
* @param isPortraitEncodingEnabled Whether portrait encoding is enabled.
* @throws AssumptionViolatedException If the device does not support the formats. In this case,
* the reason for skipping the test is logged.
*/
public static void assumeFormatsSupported(
Context context, String testId, @Nullable Format inputFormat, @Nullable Format outputFormat)
Context context,
String testId,
@Nullable Format inputFormat,
@Nullable Format outputFormat,
boolean isPortraitEncodingEnabled)
throws IOException, JSONException, MediaCodecUtil.DecoderQueryException {
// TODO(b/278657595): Make this capability check match the default codec factory selection code.
boolean canDecode = inputFormat == null || canDecode(inputFormat);
boolean canEncode = outputFormat == null || canEncode(outputFormat);
boolean canEncode = outputFormat == null || canEncode(outputFormat, isPortraitEncodingEnabled);
boolean canMux = outputFormat == null || canMux(outputFormat);
if (canDecode && canEncode && canMux) {
return;
@ -1314,7 +1333,7 @@ public final class AndroidTestUtil {
|| Ascii.equalsIgnoreCase(Util.MODEL, "SM-F926U1"));
}
private static boolean canEncode(Format format) {
private static boolean canEncode(Format format, boolean isPortraitEncodingEnabled) {
String mimeType = checkNotNull(format.sampleMimeType);
ImmutableList<android.media.MediaCodecInfo> supportedEncoders =
EncoderUtil.getSupportedEncoders(mimeType);
@ -1323,11 +1342,11 @@ public final class AndroidTestUtil {
}
android.media.MediaCodecInfo encoder = supportedEncoders.get(0);
// VideoSampleExporter rotates videos into landscape before encoding.
// Check if the encoder supports the video dimensions after rotating to landscape.
// VideoSampleExporter rotates videos into landscape before encoding if portrait encoding is not
// enabled.
int width = format.width;
int height = format.height;
if (width < height) {
if (!isPortraitEncodingEnabled && width < height) {
width = format.height;
height = format.width;
}

7
libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java
View file

@ -499,7 +499,12 @@ public class TransformerEndToEndTest {
public void videoEditing_withPortraitEncodingEnabled_doesNotRotateVideoBeforeEncoding()
throws Exception {
Format inputFormat = checkNotNull(MP4_PORTRAIT_ASSET.videoFormat);
assumeFormatsSupported(context, testId, inputFormat, /* outputFormat= */ inputFormat);
assumeFormatsSupported(
context,
testId,
inputFormat,
/* outputFormat= */ inputFormat,
/* isPortraitEncodingEnabled= */ true);
Transformer transformer =
new Transformer.Builder(context)
.setEncoderFactory(new AndroidTestUtil.ForceEncodeEncoderFactory(context))