Skip to content

SDK / exoplayer

Go to a project
Commit 881838ba by kimvde Committed by microkatz
Options

Move slow mo logic to sample pipelines 

This is to avoid having this logic in TransformerInternal once it is
added.

PiperOrigin-RevId: 487159941
(cherry picked from commit b59fdf5e)
parent f5acc9e7
Inline Side-by-side
Showing with 115 additions and 79 deletions
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/AudioTranscodingSamplePipeline.java
......@@ -63,7 +63,12 @@ import org.checkerframework.dataflow.qual.Pure;
MuxerWrapper muxerWrapper,
FallbackListener fallbackListener)
throws TransformationException {
super(C.TRACK_TYPE_AUDIO, streamStartPositionUs, muxerWrapper);
super(
inputFormat,
streamOffsetUs,
streamStartPositionUs,
transformationRequest.flattenForSlowMotion,
muxerWrapper);
decoderInputBuffer =
new DecoderInputBuffer(DecoderInputBuffer.BUFFER_REPLACEMENT_MODE_DISABLED);
......@@ -119,17 +124,6 @@ import org.checkerframework.dataflow.qual.Pure;
}
@Override
@Nullable
public DecoderInputBuffer dequeueInputBuffer() throws TransformationException {
return decoder.maybeDequeueInputBuffer(decoderInputBuffer) ? decoderInputBuffer : null;
}
@Override
public void queueInputBuffer() throws TransformationException {
decoder.queueInputBuffer(decoderInputBuffer);
}
@Override
public void release() {
if (speedChangingAudioProcessor != null) {
speedChangingAudioProcessor.reset();
......@@ -139,6 +133,17 @@ import org.checkerframework.dataflow.qual.Pure;
}
@Override
@Nullable
protected DecoderInputBuffer dequeueInputBufferInternal() throws TransformationException {
return decoder.maybeDequeueInputBuffer(decoderInputBuffer) ? decoderInputBuffer : null;
}
@Override
protected void queueInputBufferInternal() throws TransformationException {
decoder.queueInputBuffer(decoderInputBuffer);
}
@Override
protected boolean processDataUpToMuxer() throws TransformationException {
if (speedChangingAudioProcessor != null) {
return feedEncoderFromProcessor() || feedProcessorFromDecoder();
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/BaseSamplePipeline.java
......@@ -16,25 +16,60 @@
package com.google.android.exoplayer2.transformer;
import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
import static com.google.android.exoplayer2.util.Assertions.checkStateNotNull;
import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
import com.google.android.exoplayer2.util.MimeTypes;
import java.nio.ByteBuffer;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
import org.checkerframework.checker.nullness.qual.RequiresNonNull;
/* package */ abstract class BaseSamplePipeline implements SamplePipeline {
private final int trackType;
private final long streamOffsetUs;
private final long streamStartPositionUs;
private final MuxerWrapper muxerWrapper;
private final @C.TrackType int trackType;
private final @MonotonicNonNull SefSlowMotionFlattener sefVideoSlowMotionFlattener;
@Nullable private DecoderInputBuffer inputBuffer;
private boolean muxerWrapperTrackAdded;
private boolean isEnded;
public BaseSamplePipeline(int trackType, long streamStartPositionUs, MuxerWrapper muxerWrapper) {
this.trackType = trackType;
public BaseSamplePipeline(
Format inputFormat,
long streamOffsetUs,
long streamStartPositionUs,
boolean flattenForSlowMotion,
MuxerWrapper muxerWrapper) {
this.streamOffsetUs = streamOffsetUs;
this.streamStartPositionUs = streamStartPositionUs;
this.muxerWrapper = muxerWrapper;
trackType = MimeTypes.getTrackType(inputFormat.sampleMimeType);
sefVideoSlowMotionFlattener =
flattenForSlowMotion && trackType == C.TRACK_TYPE_VIDEO
? new SefSlowMotionFlattener(inputFormat)
: null;
}
@Nullable
@Override
public DecoderInputBuffer dequeueInputBuffer() throws TransformationException {
inputBuffer = dequeueInputBufferInternal();
return inputBuffer;
}
@Override
public void queueInputBuffer() throws TransformationException {
checkNotNull(inputBuffer);
checkNotNull(inputBuffer.data);
if (!shouldDropInputBuffer()) {
queueInputBufferInternal();
}
}
@Override
......@@ -47,6 +82,11 @@ import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
return isEnded;
}
@Nullable
protected abstract DecoderInputBuffer dequeueInputBufferInternal() throws TransformationException;
protected abstract void queueInputBufferInternal() throws TransformationException;
protected abstract boolean processDataUpToMuxer() throws TransformationException;
@Nullable
......@@ -60,6 +100,31 @@ import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
protected abstract boolean isMuxerInputEnded();
/**
* Preprocesses an {@linkplain DecoderInputBuffer input buffer} queued to the pipeline and returns
* whether it should be dropped.
*/
@RequiresNonNull({"inputBuffer", "inputBuffer.data"})
private boolean shouldDropInputBuffer() {
ByteBuffer inputBytes = inputBuffer.data;
if (sefVideoSlowMotionFlattener == null || inputBuffer.isEndOfStream()) {
return false;
}
long presentationTimeUs = inputBuffer.timeUs - streamOffsetUs;
DecoderInputBuffer inputBuffer = this.inputBuffer;
boolean shouldDropInputBuffer =
sefVideoSlowMotionFlattener.dropOrTransformSample(inputBytes, presentationTimeUs);
if (shouldDropInputBuffer) {
inputBytes.clear();
} else {
inputBuffer.timeUs =
streamOffsetUs + sefVideoSlowMotionFlattener.getSamplePresentationTimeUs();
}
return shouldDropInputBuffer;
}
/**
* Attempts to pass encoded data to the muxer, and returns whether it may be possible to pass more
* data immediately by calling this method again.
*/
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/PassthroughSamplePipeline.java
......@@ -19,7 +19,6 @@ package com.google.android.exoplayer2.transformer;
import androidx.annotation.Nullable;
import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
import com.google.android.exoplayer2.util.MimeTypes;
/** Pipeline that passes through the samples without any re-encoding or transformation. */
/* package */ final class PassthroughSamplePipeline extends BaseSamplePipeline {
......@@ -31,34 +30,39 @@ import com.google.android.exoplayer2.util.MimeTypes;
public PassthroughSamplePipeline(
Format format,
long streamOffsetUs,
long streamStartPositionUs,
TransformationRequest transformationRequest,
MuxerWrapper muxerWrapper,
FallbackListener fallbackListener) {
super(MimeTypes.getTrackType(format.sampleMimeType), streamStartPositionUs, muxerWrapper);
super(
format,
streamOffsetUs,
streamStartPositionUs,
transformationRequest.flattenForSlowMotion,
muxerWrapper);
this.format = format;
buffer = new DecoderInputBuffer(DecoderInputBuffer.BUFFER_REPLACEMENT_MODE_DIRECT);
hasPendingBuffer = false;
fallbackListener.onTransformationRequestFinalized(transformationRequest);
}
@Override
public void release() {}
@Override
@Nullable
public DecoderInputBuffer dequeueInputBuffer() {
protected DecoderInputBuffer dequeueInputBufferInternal() {
return hasPendingBuffer ? null : buffer;
}
@Override
public void queueInputBuffer() {
protected void queueInputBufferInternal() {
if (buffer.data != null && buffer.data.hasRemaining()) {
hasPendingBuffer = true;
}
}
@Override
public void release() {}
@Override
protected boolean processDataUpToMuxer() {
return false;
}
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerAudioRenderer.java
......@@ -79,6 +79,7 @@ import com.google.android.exoplayer2.source.SampleStream.ReadDataResult;
samplePipeline =
new PassthroughSamplePipeline(
inputFormat,
streamOffsetUs,
streamStartPositionUs,
transformationRequest,
muxerWrapper,
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerBaseRenderer.java
......@@ -16,8 +16,6 @@
package com.google.android.exoplayer2.transformer;
import static com.google.android.exoplayer2.util.Assertions.checkStateNotNull;
import androidx.annotation.Nullable;
import com.google.android.exoplayer2.BaseRenderer;
import com.google.android.exoplayer2.C;
......@@ -137,12 +135,6 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
@EnsuresNonNullIf(expression = "samplePipeline", result = true)
protected abstract boolean ensureConfigured() throws TransformationException;
@RequiresNonNull({"samplePipeline", "#1.data"})
protected void maybeQueueSampleToPipeline(DecoderInputBuffer inputBuffer)
throws TransformationException {
samplePipeline.queueInputBuffer();
}
/**
* Attempts to read input data and pass the input data to the sample pipeline.
*
......@@ -166,8 +158,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
return false;
}
mediaClock.updateTimeForTrackType(getTrackType(), samplePipelineInputBuffer.timeUs);
checkStateNotNull(samplePipelineInputBuffer.data);
maybeQueueSampleToPipeline(samplePipelineInputBuffer);
samplePipeline.queueInputBuffer();
return true;
case C.RESULT_FORMAT_READ:
throw new IllegalStateException("Format changes are not supported.");
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerVideoRenderer.java
......@@ -29,9 +29,6 @@ import com.google.android.exoplayer2.util.DebugViewProvider;
import com.google.android.exoplayer2.util.Effect;
import com.google.android.exoplayer2.util.FrameProcessor;
import com.google.common.collect.ImmutableList;
import java.nio.ByteBuffer;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
import org.checkerframework.checker.nullness.qual.RequiresNonNull;
/* package */ final class TransformerVideoRenderer extends TransformerBaseRenderer {
......@@ -46,8 +43,6 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
private final DebugViewProvider debugViewProvider;
private final DecoderInputBuffer decoderInputBuffer;
private @MonotonicNonNull SefSlowMotionFlattener sefSlowMotionFlattener;
public TransformerVideoRenderer(
Context context,
MuxerWrapper muxerWrapper,
......@@ -117,14 +112,12 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
samplePipeline =
new PassthroughSamplePipeline(
inputFormat,
streamOffsetUs,
streamStartPositionUs,
transformationRequest,
muxerWrapper,
fallbackListener);
}
if (transformationRequest.flattenForSlowMotion) {
sefSlowMotionFlattener = new SefSlowMotionFlattener(inputFormat);
}
return true;
}
......@@ -170,32 +163,4 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
}
return false;
}
/**
* Queues the input buffer to the sample pipeline unless it should be dropped because of slow
* motion flattening.
*
* @param inputBuffer The {@link DecoderInputBuffer}.
* @throws TransformationException If a {@link SamplePipeline} problem occurs.
*/
@Override
@RequiresNonNull({"samplePipeline", "#1.data"})
protected void maybeQueueSampleToPipeline(DecoderInputBuffer inputBuffer)
throws TransformationException {
if (sefSlowMotionFlattener == null) {
samplePipeline.queueInputBuffer();
return;
}
ByteBuffer data = inputBuffer.data;
long presentationTimeUs = inputBuffer.timeUs - streamOffsetUs;
boolean shouldDropSample =
sefSlowMotionFlattener.dropOrTransformSample(data, presentationTimeUs);
inputBuffer.timeUs = streamOffsetUs + sefSlowMotionFlattener.getSamplePresentationTimeUs();
if (shouldDropSample) {
data.clear();
} else {
samplePipeline.queueInputBuffer();
}
}
}
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoTranscodingSamplePipeline.java
......@@ -78,7 +78,12 @@ import org.checkerframework.dataflow.qual.Pure;
Transformer.AsyncErrorListener asyncErrorListener,
DebugViewProvider debugViewProvider)
throws TransformationException {
super(C.TRACK_TYPE_VIDEO, streamStartPositionUs, muxerWrapper);
super(
inputFormat,
streamOffsetUs,
streamStartPositionUs,
transformationRequest.flattenForSlowMotion,
muxerWrapper);
if (ColorInfo.isTransferHdr(inputFormat.colorInfo)
&& (SDK_INT < 31 || deviceNeedsNoToneMappingWorkaround())) {
......@@ -188,13 +193,20 @@ import org.checkerframework.dataflow.qual.Pure;
}
@Override
public void release() {
frameProcessor.release();
decoder.release();
encoderWrapper.release();
}
@Override
@Nullable
public DecoderInputBuffer dequeueInputBuffer() throws TransformationException {
protected DecoderInputBuffer dequeueInputBufferInternal() throws TransformationException {
return decoder.maybeDequeueInputBuffer(decoderInputBuffer) ? decoderInputBuffer : null;
}
@Override
public void queueInputBuffer() throws TransformationException {
protected void queueInputBufferInternal() throws TransformationException {
if (decoderInputBuffer.isDecodeOnly()) {
decodeOnlyPresentationTimestamps.add(decoderInputBuffer.timeUs);
}
......@@ -202,13 +214,6 @@ import org.checkerframework.dataflow.qual.Pure;
}
@Override
public void release() {
frameProcessor.release();
decoder.release();
encoderWrapper.release();
}
@Override
protected boolean processDataUpToMuxer() throws TransformationException {
if (decoder.isEnded()) {
return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment