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

Take encoder resolution fallback into account in video sample pipeline.

Browse Source 
If the encoder picks a fallback resolution the video pipeline needs
to take this into account when configuring the frameEditor and when
setting up the fallback TransformationRequest that's passed to the
fallbackListener.

PiperOrigin-RevId: 424611290
This commit is contained in:
hschlueter 2022-01-27 15:55:06 +00:00 committed by Andrew Lewis
parent 47f71cfe4d
commit 75c0896f7e
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/transformer/src/main/java/androidx/media3/transformer/AudioTranscodingSamplePipeline.java
View File

@ -113,7 +113,7 @@ import org.checkerframework.dataflow.qual.Pure;
encoder = encoderFactory.createForAudioEncoding(requestedOutputFormat, allowedOutputMimeTypes);
fallbackListener.onTransformationRequestFinalized(
createFallbackRequest(
createFallbackTransformationRequest(
transformationRequest, requestedOutputFormat, encoder.getConfigurationFormat()));
}
@ -329,7 +329,7 @@ import org.checkerframework.dataflow.qual.Pure;
}
@Pure
private static TransformationRequest createFallbackRequest(
private static TransformationRequest createFallbackTransformationRequest(
TransformationRequest transformationRequest, Format requestedFormat, Format actualFormat) {
// TODO(b/210591626): Also update bitrate and other params once encoder configuration and
// fallback are implemented.

44
libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java
View File

@ -76,9 +76,10 @@ import org.checkerframework.dataflow.qual.Pure;
outputHeight = transformationRequest.outputHeight;
}
if (inputFormat.height > inputFormat.width) {
// The encoder may not support encoding in portrait orientation, so the decoded video is
// rotated to landscape orientation and a rotation is added back later to the output format.
// The encoder may not support encoding in portrait orientation, so the decoded video is
// rotated to landscape orientation and a rotation is added back later to the output format.
boolean swapEncodingDimensions = inputFormat.height > inputFormat.width;
if (swapEncodingDimensions) {
outputRotationDegrees = (inputFormat.rotationDegrees + 90) % 360;
int temp = outputWidth;
outputWidth = outputHeight;
@ -116,18 +117,22 @@ import org.checkerframework.dataflow.qual.Pure;
: inputFormat.sampleMimeType)
.build();
encoder = encoderFactory.createForVideoEncoding(requestedOutputFormat, allowedOutputMimeTypes);
Format actualOutputFormat = encoder.getConfigurationFormat();
fallbackListener.onTransformationRequestFinalized(
createFallbackRequest(
transformationRequest, requestedOutputFormat, encoder.getConfigurationFormat()));
createFallbackTransformationRequest(
transformationRequest,
!swapEncodingDimensions,
requestedOutputFormat,
actualOutputFormat));
if (inputFormat.height != outputHeight
|| inputFormat.width != outputWidth
if (inputFormat.height != actualOutputFormat.height
|| inputFormat.width != actualOutputFormat.width
|| !transformationMatrix.isIdentity()) {
frameEditor =
FrameEditor.create(
context,
outputWidth,
outputHeight,
actualOutputFormat.width,
actualOutputFormat.height,
inputFormat.pixelWidthHeightRatio,
transformationMatrix,
/* outputSurface= */ checkNotNull(encoder.getInputSurface()),
@ -270,13 +275,22 @@ import org.checkerframework.dataflow.qual.Pure;
}
@Pure
private static TransformationRequest createFallbackRequest(
TransformationRequest transformationRequest, Format requestedFormat, Format actualFormat) {
// TODO(b/210591626): Also update resolution, bitrate etc. once encoder configuration and
// fallback are implemented.
if (Util.areEqual(requestedFormat.sampleMimeType, actualFormat.sampleMimeType)) {
private static TransformationRequest createFallbackTransformationRequest(
TransformationRequest transformationRequest,
boolean resolutionIsHeight,
Format requestedFormat,
Format actualFormat) {
// TODO(b/210591626): Also update bitrate etc. once encoder configuration and fallback are
// implemented.
if (Util.areEqual(requestedFormat.sampleMimeType, actualFormat.sampleMimeType)
&& ((!resolutionIsHeight && requestedFormat.width == actualFormat.width)
|| (resolutionIsHeight && requestedFormat.height == actualFormat.height))) {
return transformationRequest;
}
return transformationRequest.buildUpon().setVideoMimeType(actualFormat.sampleMimeType).build();
return transformationRequest
.buildUpon()
.setVideoMimeType(actualFormat.sampleMimeType)
.setResolution(resolutionIsHeight ? requestedFormat.height : requestedFormat.width)
.build();
}
}