loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

A few nits

Browse Source 
PiperOrigin-RevId: 723859603
This commit is contained in:
kimvde 2025-02-06 02:53:53 -08:00 committed by Copybara-Service
parent a56a0bd928
commit e229f957e6
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/transformer/src/androidTest/java/androidx/media3/transformer/DefaultVideoCompositorPixelTest.java
View File

@ -816,13 +816,14 @@ public final class DefaultVideoCompositorPixelTest {
String testId, String testId,
TextureBitmapReader textureBitmapReader, TextureBitmapReader textureBitmapReader,
VideoCompositor videoCompositor, VideoCompositor videoCompositor,
@Nullable ExecutorService executorService, ExecutorService executorService,
GlObjectsProvider glObjectsProvider, GlObjectsProvider glObjectsProvider,
int inputIndex) { int inputIndex) {
videoCompositor.registerInputSource(inputIndex); videoCompositor.registerInputSource(inputIndex);
DefaultVideoFrameProcessor.Factory.Builder defaultVideoFrameProcessorFactoryBuilder = DefaultVideoFrameProcessor.Factory.Builder defaultVideoFrameProcessorFactoryBuilder =
new DefaultVideoFrameProcessor.Factory.Builder() new DefaultVideoFrameProcessor.Factory.Builder()
.setGlObjectsProvider(glObjectsProvider) .setGlObjectsProvider(glObjectsProvider)
.setExecutorService(executorService)
.setSdrWorkingColorSpace(DefaultVideoFrameProcessor.WORKING_COLOR_SPACE_LINEAR) .setSdrWorkingColorSpace(DefaultVideoFrameProcessor.WORKING_COLOR_SPACE_LINEAR)
.setTextureOutput( .setTextureOutput(
/* textureOutputListener= */ (outputTextureProducer, /* textureOutputListener= */ (outputTextureProducer,
@ -840,9 +841,6 @@ public final class DefaultVideoCompositorPixelTest {
presentationTimeUs); presentationTimeUs);
}, },
/* textureOutputCapacity= */ 2); /* textureOutputCapacity= */ 2);
if (executorService != null) {
defaultVideoFrameProcessorFactoryBuilder.setExecutorService(executorService);
}
return new VideoFrameProcessorTestRunner.Builder() return new VideoFrameProcessorTestRunner.Builder()
.setTestId(testId) .setTestId(testId)
.setVideoFrameProcessorFactory(defaultVideoFrameProcessorFactoryBuilder.build()) .setVideoFrameProcessorFactory(defaultVideoFrameProcessorFactoryBuilder.build())

1
libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraph.java
View File

@ -277,7 +277,6 @@ import java.util.Objects;
} }
private boolean isMixerEnded() { private boolean isMixerEnded() {
// return !mixerOutput.hasRemaining() && activeInputCount == 0 && mixer.isEnded();
return !mixerOutput.hasRemaining() && finishedInputs >= inputInfos.size() && mixer.isEnded(); return !mixerOutput.hasRemaining() && finishedInputs >= inputInfos.size() && mixer.isEnded();
} }