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

Rename shouldPassthrough to shouldTranscode

Browse Source 
shouldPassthrough's internal checks seem to be check whether we should *not*
pass through, which seemed a bit like a confusing double-negative to me.

shouldTranscode is slightly more clear, by instead returning true when we do
want to transcode.

No functional changes intended.

PiperOrigin-RevId: 471753771
This commit is contained in:
huangdarwin 2022-09-02 09:49:26 +00:00 committed by Marc Baechinger
parent bc88f8be54
commit 7085c2fa6e
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libraries/transformer/src/main/java/androidx/media3/transformer/TransformerVideoRenderer.java
View File

@ -108,10 +108,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
/* mediaCodecName= */ null,
TransformationException.ERROR_CODE_HDR_EDITING_UNSUPPORTED);
}
if (shouldPassthrough(inputFormat)) {
samplePipeline =
new PassthroughSamplePipeline(inputFormat, transformationRequest, fallbackListener);
} else {
if (shouldTranscode(inputFormat)) {
samplePipeline =
new VideoTranscodingSamplePipeline(
context,
@ -126,6 +123,9 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
fallbackListener,
asyncErrorListener,
debugViewProvider);
} else {
samplePipeline =
new PassthroughSamplePipeline(inputFormat, transformationRequest, fallbackListener);
}
if (transformationRequest.flattenForSlowMotion) {
sefSlowMotionFlattener = new SefSlowMotionFlattener(inputFormat);
@ -133,48 +133,48 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
return true;
}
private boolean shouldPassthrough(Format inputFormat) {
private boolean shouldTranscode(Format inputFormat) {
if ((streamStartPositionUs - streamOffsetUs) != 0 && !clippingStartsAtKeyFrame) {
return false;
return true;
}
if (encoderFactory.videoNeedsEncoding()) {
return false;
return true;
}
if (transformationRequest.enableRequestSdrToneMapping) {
return false;
return true;
}
if (transformationRequest.videoMimeType != null
&& !transformationRequest.videoMimeType.equals(inputFormat.sampleMimeType)) {
return false;
return true;
}
if (transformationRequest.videoMimeType == null
&& !muxerWrapper.supportsSampleMimeType(inputFormat.sampleMimeType)) {
return false;
return true;
}
if (inputFormat.pixelWidthHeightRatio != 1f) {
return false;
return true;
}
if (transformationRequest.rotationDegrees != 0f) {
return false;
return true;
}
if (transformationRequest.scaleX != 1f) {
return false;
return true;
}
if (transformationRequest.scaleY != 1f) {
return false;
return true;
}
// The decoder rotates encoded frames for display by inputFormat.rotationDegrees.
int decodedHeight =
(inputFormat.rotationDegrees % 180 == 0) ? inputFormat.height : inputFormat.width;
if (transformationRequest.outputHeight != C.LENGTH_UNSET
&& transformationRequest.outputHeight != decodedHeight) {
return false;
return true;
}
if (!effects.isEmpty()) {
return false;
}
return true;
}
return false;
}
/**
* Queues the input buffer to the sample pipeline unless it should be dropped because of slow