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

Compositor: Use timestamps for compositing.

Browse Source 
For now, just identical timestamps. A follow-up CL will allow for different
framerates. Prior tests already send identical timestamp frames, so no new
tests were added

PiperOrigin-RevId: 548676759
This commit is contained in:
huangdarwin 2023-07-17 14:50:14 +01:00 committed by Ian Baker
parent 81ef52763d
commit 836720ebfa
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libraries/effect/src/main/java/androidx/media3/effect/VideoCompositor.java
View File

@ -26,6 +26,7 @@ import android.opengl.GLES20;
import androidx.annotation.GuardedBy; import androidx.annotation.GuardedBy;
import androidx.annotation.IntRange; import androidx.annotation.IntRange;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.media3.common.C;
import androidx.media3.common.GlObjectsProvider; import androidx.media3.common.GlObjectsProvider;
import androidx.media3.common.GlTextureInfo; import androidx.media3.common.GlTextureInfo;
import androidx.media3.common.VideoFrameProcessingException; import androidx.media3.common.VideoFrameProcessingException;
@ -45,11 +46,13 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
/** /**
* A basic VideoCompositor that takes in frames from exactly 2 input sources and combines it to one * A basic VideoCompositor that takes in frames from exactly 2 input sources and combines it to one
* output. * output.
*
* <p>The first {@linkplain #registerInputSource registered source} will be the primary stream,
* which is used to determine the output frames' timestamps and dimensions.
*/ */
@UnstableApi @UnstableApi
public final class VideoCompositor { public final class VideoCompositor {
// TODO: b/262694346 - Flesh out this implementation by doing the following: // TODO: b/262694346 - Flesh out this implementation by doing the following:
// * Handle matched timestamps.
// * Handle mismatched timestamps // * Handle mismatched timestamps
// * Before allowing customization of this class, add an interface, and rename this class to // * Before allowing customization of this class, add an interface, and rename this class to
// DefaultCompositor. // DefaultCompositor.
@ -217,12 +220,22 @@ public final class VideoCompositor {
if (outputTexturePool.freeTextureCount() == 0) { if (outputTexturePool.freeTextureCount() == 0) {
return false; return false;
} }
// TODO: b/262694346 - Use timestamps to determine when to composite instead of number of long compositeTimestampUs = C.TIME_UNSET;
// frames.
for (int inputId = 0; inputId < inputFrameInfos.size(); inputId++) { for (int inputId = 0; inputId < inputFrameInfos.size(); inputId++) {
if (checkNotNull(inputFrameInfos.get(inputId)).isEmpty()) { Queue<InputFrameInfo> inputFrameInfoQueue = checkNotNull(inputFrameInfos.get(inputId));
if (inputFrameInfoQueue.isEmpty()) {
return false; return false;
} }
long inputTimestampUs = checkNotNull(inputFrameInfoQueue.peek()).presentationTimeUs;
if (inputId == 0) {
compositeTimestampUs = inputTimestampUs;
}
// TODO: b/262694346 - Allow for different frame-rates to be composited, by potentially
// dropping some frames in non-primary streams.
if (inputTimestampUs != compositeTimestampUs) {
throw new IllegalStateException("Non-matched timestamps not yet supported.");
}
} }
return true; return true;
} }