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

Compositor: Use lists for inputs instead of instances.

Browse Source 
This makes the code a bit more flexible for when we allow for an arbitrary
number of inputs.

PiperOrigin-RevId: 558740536
This commit is contained in:
huangdarwin 2023-08-21 11:53:22 +01:00 committed by Julia Bibik
parent 521c210fd1
commit 153740386a
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoCompositor.java
View File

@ -271,18 +271,22 @@ public final class DefaultVideoCompositor implements VideoCompositor {
// TODO: b/262694346 -
// * Support an arbitrary number of inputs.
// * Allow different frame dimensions.
InputFrameInfo inputFrame1 = framesToComposite.get(0);
InputFrameInfo inputFrame2 = framesToComposite.get(1);
checkState(inputFrame1.texture.width == inputFrame2.texture.width);
checkState(inputFrame1.texture.height == inputFrame2.texture.height);
// * Allow different input frame dimensions.
InputFrameInfo primaryInputFrame = framesToComposite.get(PRIMARY_INPUT_ID);
GlTextureInfo primaryInputTexture = primaryInputFrame.texture;
outputTexturePool.ensureConfigured(
glObjectsProvider, inputFrame1.texture.width, inputFrame1.texture.height);
glObjectsProvider, primaryInputTexture.width, primaryInputTexture.height);
for (int i = 1; i < framesToComposite.size(); i++) {
GlTextureInfo textureToComposite = framesToComposite.get(i).texture;
checkState(primaryInputTexture.width == textureToComposite.width);
checkState(primaryInputTexture.height == textureToComposite.height);
}
GlTextureInfo outputTexture = outputTexturePool.useTexture();
long outputPresentationTimestampUs = framesToComposite.get(PRIMARY_INPUT_ID).presentationTimeUs;
long outputPresentationTimestampUs = primaryInputFrame.presentationTimeUs;
outputTextureTimestamps.add(outputPresentationTimestampUs);
drawFrame(inputFrame1.texture, inputFrame2.texture, outputTexture);
drawFrame(framesToComposite, outputTexture);
long syncObject = GlUtil.createGlSyncFence();
syncObjects.add(syncObject);
textureOutputListener.onTextureRendered(
@ -295,7 +299,7 @@ public final class DefaultVideoCompositor implements VideoCompositor {
releaseFrames(primaryInputSource, /* numberOfFramesToRelease= */ 1);
releaseExcessFramesInAllSecondaryStreams();
if (allInputsEnded && inputSources.get(PRIMARY_INPUT_ID).frameInfos.isEmpty()) {
if (allInputsEnded && primaryInputSource.frameInfos.isEmpty()) {
listener.onEnded();
}
}
@ -397,8 +401,7 @@ public final class DefaultVideoCompositor implements VideoCompositor {
}
}
private void drawFrame(
GlTextureInfo inputTexture1, GlTextureInfo inputTexture2, GlTextureInfo outputTexture)
private void drawFrame(List<InputFrameInfo> framesToComposite, GlTextureInfo outputTexture)
throws GlUtil.GlException {
GlUtil.focusFramebufferUsingCurrentContext(
outputTexture.fboId, outputTexture.width, outputTexture.height);
@ -420,8 +423,9 @@ public final class DefaultVideoCompositor implements VideoCompositor {
GlUtil.checkGlError();
// Draw textures from back to front.
blendOntoFocusedTexture(inputTexture2.texId);
blendOntoFocusedTexture(inputTexture1.texId);
for (int i = framesToComposite.size() - 1; i >= 0; i--) {
blendOntoFocusedTexture(framesToComposite.get(i).texture.texId);
}
GLES20.glDisable(GLES20.GL_BLEND);
@ -459,8 +463,10 @@ public final class DefaultVideoCompositor implements VideoCompositor {
/** Holds information on an input source. */
private static final class InputSource {
// A queue of {link InputFrameInfo}s, inserted in order from lower to higher {@code
// presentationTimeUs} values.
/**
* A queue of {link InputFrameInfo}s, monotonically increasing in order of {@code
* presentationTimeUs} values.
*/
public final Queue<InputFrameInfo> frameInfos;
public boolean isInputEnded;