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

Pass initial timestamp offset to VideoFrameProcessor

Browse Source 
For pause and resume feature we will remux the previously processed
video in the first export and then in the second export we will resume
processing remaining video. For the second export we will have to
set initial timestamp offset so that video samples from the second
export are in continuation to the previously muxed samples.

PiperOrigin-RevId: 561689651
This commit is contained in:
sheenachhabra 2023-08-31 10:15:01 -07:00 committed by Copybara-Service
parent 4c3ad641c0
commit 219b253731
6 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/transformer/src/main/java/androidx/media3/transformer/SingleInputVideoGraph.java
View File

@ -53,7 +53,8 @@ import java.util.concurrent.Executor;
DebugViewProvider debugViewProvider,
Listener listener,
Executor listenerExecutor,
List<Effect> compositionEffects) {
List<Effect> compositionEffects,
long initialTimestampOffsetUs) {
@Nullable Presentation presentation = null;
for (int i = 0; i < compositionEffects.size(); i++) {
Effect effect = compositionEffects.get(i);
@ -71,7 +72,8 @@ import java.util.concurrent.Executor;
debugViewProvider,
listenerExecutor,
/* renderFramesAutomatically= */ true,
presentation);
presentation,
initialTimestampOffsetUs);
}
}
@ -84,6 +86,7 @@ import java.util.concurrent.Executor;
private final DebugViewProvider debugViewProvider;
private final Executor listenerExecutor;
private final boolean renderFramesAutomatically;
private final long initialTimestampOffsetUs;
@Nullable private final Presentation presentation;
@Nullable private VideoFrameProcessingWrapper videoFrameProcessingWrapper;
@ -101,7 +104,8 @@ import java.util.concurrent.Executor;
DebugViewProvider debugViewProvider,
Executor listenerExecutor,
boolean renderFramesAutomatically,
@Nullable Presentation presentation) {
@Nullable Presentation presentation,
long initialTimestampOffsetUs) {
this.context = context;
this.videoFrameProcessorFactory = videoFrameProcessorFactory;
this.inputColorInfo = inputColorInfo;
@ -112,6 +116,7 @@ import java.util.concurrent.Executor;
this.listenerExecutor = listenerExecutor;
this.renderFramesAutomatically = renderFramesAutomatically;
this.presentation = presentation;
this.initialTimestampOffsetUs = initialTimestampOffsetUs;
}
/**
@ -168,7 +173,8 @@ import java.util.concurrent.Executor;
}
},
renderFramesAutomatically,
presentation);
presentation,
initialTimestampOffsetUs);
}
/** Returns the {@link GraphInput}. */

3
libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
View File

@ -1008,7 +1008,8 @@ public final class Transformer {
fallbackListener,
applicationHandler,
debugViewProvider,
clock);
clock,
/* videoSampleTimestampOffsetUs= */ 0);
transformerInternal.start();
}

14
libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java
View File

@ -105,6 +105,13 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
private final Listener listener;
private final HandlerWrapper applicationHandler;
private final Clock clock;
/**
* The presentation timestamp offset for all the video samples. It will be set when resuming video
* processing after remuxing previously processed samples.
*/
private final long videoSampleTimestampOffsetUs;
private final HandlerThread internalHandlerThread;
private final HandlerWrapper internalHandler;
private final List<SequenceAssetLoader> sequenceAssetLoaders;
@ -142,13 +149,15 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
FallbackListener fallbackListener,
HandlerWrapper applicationHandler,
DebugViewProvider debugViewProvider,
Clock clock) {
Clock clock,
long videoSampleTimestampOffsetUs) {
this.context = context;
this.composition = composition;
this.encoderFactory = new CapturingEncoderFactory(encoderFactory);
this.listener = listener;
this.applicationHandler = applicationHandler;
this.clock = clock;
this.videoSampleTimestampOffsetUs = videoSampleTimestampOffsetUs;
this.muxerWrapper = muxerWrapper;
// It's safe to use "this" because we don't mux any data before exiting the constructor.
this.muxerWrapper.setListener(this);
@ -601,7 +610,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
muxerWrapper,
/* errorConsumer= */ this::onError,
fallbackListener,
debugViewProvider));
debugViewProvider,
videoSampleTimestampOffsetUs));
}
}

7
libraries/transformer/src/main/java/androidx/media3/transformer/VideoFrameProcessingWrapper.java
View File

@ -48,6 +48,7 @@ import java.util.concurrent.atomic.AtomicLong;
private final VideoFrameProcessor videoFrameProcessor;
private final AtomicLong mediaItemOffsetUs;
private final ColorInfo inputColorInfo;
private final long initialTimestampOffsetUs;
@Nullable final Presentation presentation;
public VideoFrameProcessingWrapper(
@ -59,10 +60,12 @@ import java.util.concurrent.atomic.AtomicLong;
Executor listenerExecutor,
VideoFrameProcessor.Listener listener,
boolean renderFramesAutomatically,
@Nullable Presentation presentation)
@Nullable Presentation presentation,
long initialTimestampOffsetUs)
throws VideoFrameProcessingException {
this.mediaItemOffsetUs = new AtomicLong();
this.inputColorInfo = inputColorInfo;
this.initialTimestampOffsetUs = initialTimestampOffsetUs;
this.presentation = presentation;
videoFrameProcessor =
@ -89,7 +92,7 @@ import java.util.concurrent.atomic.AtomicLong;
createEffectListWithPresentation(editedMediaItem.effects.videoEffects, presentation),
new FrameInfo.Builder(decodedSize.getWidth(), decodedSize.getHeight())
.setPixelWidthHeightRatio(trackFormat.pixelWidthHeightRatio)
.setOffsetToAddUs(mediaItemOffsetUs.get())
.setOffsetToAddUs(initialTimestampOffsetUs + mediaItemOffsetUs.get())
.build());
}
mediaItemOffsetUs.addAndGet(durationUs);

3
libraries/transformer/src/main/java/androidx/media3/transformer/VideoGraph.java
View File

@ -56,7 +56,8 @@ import java.util.concurrent.Executor;
DebugViewProvider debugViewProvider,
Listener listener,
Executor listenerExecutor,
List<Effect> compositionEffects)
List<Effect> compositionEffects,
long initialTimestampOffsetUs)
throws VideoFrameProcessingException;
}

8
libraries/transformer/src/main/java/androidx/media3/transformer/VideoSampleExporter.java
View File

@ -63,6 +63,7 @@ import org.checkerframework.dataflow.qual.Pure;
private final VideoGraph videoGraph;
private final EncoderWrapper encoderWrapper;
private final DecoderInputBuffer encoderOutputBuffer;
private final long initialTimestampOffsetUs;
/**
* The timestamp of the last buffer processed before {@linkplain
@ -82,11 +83,13 @@ import org.checkerframework.dataflow.qual.Pure;
MuxerWrapper muxerWrapper,
Consumer<ExportException> errorConsumer,
FallbackListener fallbackListener,
DebugViewProvider debugViewProvider)
DebugViewProvider debugViewProvider,
long initialTimestampOffsetUs)
throws ExportException {
// TODO(b/278259383) Consider delaying configuration of VideoSampleExporter to use the decoder
// output format instead of the extractor output format, to match AudioSampleExporter behavior.
super(firstInputFormat, muxerWrapper);
this.initialTimestampOffsetUs = initialTimestampOffsetUs;
finalFramePresentationTimeUs = C.TIME_UNSET;
ColorInfo decoderInputColor;
@ -488,7 +491,8 @@ import org.checkerframework.dataflow.qual.Pure;
debugViewProvider,
/* listener= */ thisRef,
/* listenerExecutor= */ MoreExecutors.directExecutor(),
compositionEffects);
compositionEffects,
initialTimestampOffsetUs);
}
@Nullable