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

Fix image seeking

Browse Source 
Queue image again after position reset, and reset timestamp iterator.

PiperOrigin-RevId: 635049953
This commit is contained in:
claincly 2024-05-18 07:38:38 -07:00 committed by Copybara-Service
parent b645004902
commit dc4f20ed84
7 changed files with 108 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libraries/common/src/main/java/androidx/media3/common/util/ConstantRateTimestampIterator.java
View File

@ -30,10 +30,11 @@ import androidx.media3.common.C;
@UnstableApi
public final class ConstantRateTimestampIterator implements TimestampIterator {
private final long durationUs;
private final float frameRate;
private final double framesDurationUs;
private final int totalNumberOfFramesToAdd;
private final long startPositionUs;
private final long endPositionUs;
private int framesAdded;
@ -46,11 +47,30 @@ public final class ConstantRateTimestampIterator implements TimestampIterator {
public ConstantRateTimestampIterator(
@IntRange(from = 1) long durationUs,
@FloatRange(from = 0, fromInclusive = false) float frameRate) {
checkArgument(durationUs > 0);
this(/* startPositionUs= */ 0, /* endPositionUs= */ durationUs, frameRate);
}
/**
* Creates an instance that outputs timestamps from {@code startTimeUs}.
*
* @param startPositionUs The start position in microseconds. The first timestamp generated will
* be equal to {@code startPositionUs}.
* @param endPositionUs The end position at which the timestamps finish, in microseconds. The
* generated timestamps are less or equal to the end position.
* @param frameRate The frame rate in frames per second.
*/
public ConstantRateTimestampIterator(
@IntRange(from = 0) long startPositionUs,
@IntRange(from = 1) long endPositionUs,
@FloatRange(from = 0, fromInclusive = false) float frameRate) {
checkArgument(endPositionUs > 0);
checkArgument(frameRate > 0);
this.durationUs = durationUs;
checkArgument(0 <= startPositionUs && startPositionUs < endPositionUs);
this.startPositionUs = startPositionUs;
this.endPositionUs = endPositionUs;
this.frameRate = frameRate;
this.totalNumberOfFramesToAdd = round(frameRate * (durationUs / (float) C.MICROS_PER_SECOND));
float durationSecs = (endPositionUs - startPositionUs) / (float) C.MICROS_PER_SECOND;
this.totalNumberOfFramesToAdd = round(frameRate * durationSecs);
framesDurationUs = C.MICROS_PER_SECOND / frameRate;
}
@ -67,7 +87,7 @@ public final class ConstantRateTimestampIterator implements TimestampIterator {
@Override
public ConstantRateTimestampIterator copyOf() {
return new ConstantRateTimestampIterator(durationUs, frameRate);
return new ConstantRateTimestampIterator(startPositionUs, endPositionUs, frameRate);
}
@Override
@ -80,7 +100,7 @@ public final class ConstantRateTimestampIterator implements TimestampIterator {
/** Returns the timestamp after {@code numberOfFrames}, in microseconds. */
private long getTimestampUsAfter(int numberOfFrames) {
long timestampUs = round(framesDurationUs * numberOfFrames);
long timestampUs = startPositionUs + round(framesDurationUs * numberOfFrames);
// Check for possible overflow.
checkState(timestampUs >= 0);
return timestampUs;

58
libraries/common/src/test/java/androidx/media3/common/util/ConstantRateTimestampIteratorTest.java
View File

@ -30,7 +30,7 @@ import org.junit.runner.RunWith;
public class ConstantRateTimestampIteratorTest {
@Test
public void timestampIterator_validArguments_generatesCorrectTimestamps() throws Exception {
public void timestampIterator_validArguments_generatesCorrectTimestamps() {
ConstantRateTimestampIterator constantRateTimestampIterator =
new ConstantRateTimestampIterator(C.MICROS_PER_SECOND, /* frameRate= */ 2);
@ -41,8 +41,7 @@ public class ConstantRateTimestampIteratorTest {
}
@Test
public void timestampIterator_realisticArguments_generatesCorrectNumberOfTimestamps()
throws Exception {
public void timestampIterator_realisticArguments_generatesCorrectNumberOfTimestamps() {
ConstantRateTimestampIterator constantRateTimestampIterator =
new ConstantRateTimestampIterator((long) (2.5 * C.MICROS_PER_SECOND), /* frameRate= */ 30);
@ -52,8 +51,7 @@ public class ConstantRateTimestampIteratorTest {
}
@Test
public void timestampIterator_realisticArguments_generatesTimestampsInStrictOrder()
throws Exception {
public void timestampIterator_realisticArguments_generatesTimestampsInStrictOrder() {
ConstantRateTimestampIterator constantRateTimestampIterator =
new ConstantRateTimestampIterator((long) (2.5 * C.MICROS_PER_SECOND), /* frameRate= */ 30);
@ -61,7 +59,7 @@ public class ConstantRateTimestampIteratorTest {
}
@Test
public void timestampIterator_realisticArguments_doesNotGenerateDuplicates() throws Exception {
public void timestampIterator_realisticArguments_doesNotGenerateDuplicates() {
ConstantRateTimestampIterator constantRateTimestampIterator =
new ConstantRateTimestampIterator((long) (2.5 * C.MICROS_PER_SECOND), /* frameRate= */ 30);
@ -69,7 +67,7 @@ public class ConstantRateTimestampIteratorTest {
}
@Test
public void timestampIterator_smallDuration_generatesEmptyIterator() throws Exception {
public void timestampIterator_smallDuration_generatesEmptyIterator() {
ConstantRateTimestampIterator constantRateTimestampIterator =
new ConstantRateTimestampIterator(/* durationUs= */ 1, /* frameRate= */ 2);
@ -77,6 +75,52 @@ public class ConstantRateTimestampIteratorTest {
assertThat(constantRateTimestampIterator.getLastTimestampUs()).isEqualTo(C.TIME_UNSET);
}
@Test
public void timestampIterator_withStartTimeAndEvenFrameRate_generatesCorrectTimestamps() {
ConstantRateTimestampIterator constantRateTimestampIterator =
new ConstantRateTimestampIterator(
/* startPositionUs= */ 500_000L, C.MICROS_PER_SECOND, /* frameRate= */ 2);
assertThat(generateList(constantRateTimestampIterator)).containsExactly(500_000L);
assertThat(constantRateTimestampIterator.getLastTimestampUs()).isEqualTo(500_000L);
}
@Test
public void timestampIterator_withStartTimeAndOddFrameRate_generatesCorrectTimestamps() {
ConstantRateTimestampIterator constantRateTimestampIterator =
new ConstantRateTimestampIterator(
/* startPositionUs= */ 500_000L, C.MICROS_PER_SECOND, /* frameRate= */ 3);
assertThat(generateList(constantRateTimestampIterator))
.containsExactly(500_000L, 833_333L)
.inOrder();
assertThat(constantRateTimestampIterator.getLastTimestampUs()).isEqualTo(833_333L);
}
@Test
public void timestampIterator_withZeroStartTime_generatesCorrectTimestamps() {
ConstantRateTimestampIterator constantRateTimestampIterator =
new ConstantRateTimestampIterator(
/* startPositionUs= */ 0L,
/* endPositionUs= */ C.MICROS_PER_SECOND,
/* frameRate= */ 3);
assertThat(generateList(constantRateTimestampIterator)).containsExactly(0L, 333_333L, 666_667L);
assertThat(constantRateTimestampIterator.getLastTimestampUs()).isEqualTo(666_667L);
}
@Test
public void timestampIterator_withNoTimestampsWithinParameters_generatesNoTimestamp() {
ConstantRateTimestampIterator constantRateTimestampIterator =
new ConstantRateTimestampIterator(
/* startPositionUs= */ 900_000L,
/* endPositionUs= */ C.MICROS_PER_SECOND,
/* frameRate= */ 3);
assertThat(generateList(constantRateTimestampIterator)).isEmpty();
assertThat(constantRateTimestampIterator.getLastTimestampUs()).isEqualTo(C.TIME_UNSET);
}
private static List<Long> generateList(TimestampIterator iterator) {
ArrayList<Long> list = new ArrayList<>();

16
libraries/effect/src/main/java/androidx/media3/effect/BitmapTextureManager.java
View File

@ -35,6 +35,7 @@ import androidx.media3.common.util.Util;
import java.util.Queue;
import java.util.concurrent.LinkedBlockingQueue;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
/**
* Forwards a video frame produced from a {@link Bitmap} to a {@link GlShaderProgram} for
@ -47,7 +48,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
private final GlObjectsProvider glObjectsProvider;
private @MonotonicNonNull GainmapShaderProgram gainmapShaderProgram;
private @MonotonicNonNull GlTextureInfo currentSdrGlTextureInfo;
@Nullable private GlTextureInfo currentSdrGlTextureInfo;
private int downstreamShaderProgramCapacity;
private boolean currentInputStreamEnded;
private boolean isNextFrameInTexture;
@ -180,8 +181,19 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
}
@Override
protected void flush() {
protected void flush() throws VideoFrameProcessingException {
pendingBitmaps.clear();
isNextFrameInTexture = false;
currentInputStreamEnded = false;
downstreamShaderProgramCapacity = 0;
if (currentSdrGlTextureInfo != null) {
try {
currentSdrGlTextureInfo.release();
} catch (GlUtil.GlException e) {
throw VideoFrameProcessingException.from(e);
}
currentSdrGlTextureInfo = null;
}
super.flush();
}

2
libraries/effect/src/main/java/androidx/media3/effect/ExternalTextureManager.java
View File

@ -267,7 +267,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
}
@Override
protected void flush() {
protected void flush() throws VideoFrameProcessingException {
externalShaderProgramInputCapacity.set(0);
currentFrame = null;
pendingFrames.clear();

3
libraries/effect/src/main/java/androidx/media3/effect/TexIdTextureManager.java
View File

@ -27,6 +27,7 @@ import androidx.media3.common.FrameInfo;
import androidx.media3.common.GlObjectsProvider;
import androidx.media3.common.GlTextureInfo;
import androidx.media3.common.OnInputFrameProcessedListener;
import androidx.media3.common.VideoFrameProcessingException;
import androidx.media3.common.util.GlUtil;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
@ -132,7 +133,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
// Methods that must be called on the GL thread.
@Override
protected synchronized void flush() {
protected synchronized void flush() throws VideoFrameProcessingException {
checkNotNull(frameConsumptionManager).onFlush();
super.flush();
}

2
libraries/effect/src/main/java/androidx/media3/effect/TextureManager.java
View File

@ -157,7 +157,7 @@ import androidx.media3.common.util.TimestampIterator;
public abstract void release() throws VideoFrameProcessingException;
/** Clears any pending data. Must be called on the GL thread. */
protected void flush() {
protected void flush() throws VideoFrameProcessingException {
synchronized (lock) {
if (onFlushCompleteTask != null) {
videoFrameProcessingTaskExecutor.submitWithHighPriority(onFlushCompleteTask);

17
libraries/transformer/src/main/java/androidx/media3/transformer/SequencePlayerRenderersWrapper.java
View File

@ -15,6 +15,7 @@
*/
package androidx.media3.transformer;
import static androidx.media3.common.util.Assertions.checkNotNull;
import static androidx.media3.common.util.Assertions.checkState;
import static androidx.media3.common.util.Assertions.checkStateNotNull;
import static androidx.media3.exoplayer.DefaultRenderersFactory.DEFAULT_ALLOWED_VIDEO_JOINING_TIME_MS;
@ -292,8 +293,9 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
private ImmutableList<Effect> videoEffects;
private @MonotonicNonNull ConstantRateTimestampIterator timestampIterator;
private boolean inputStreamPendingRegistration;
private @MonotonicNonNull EditedMediaItem editedMediaItem;
@Nullable private ExoPlaybackException pendingExoPlaybackException;
private boolean inputStreamPendingRegistration;
private long streamOffsetUs;
private boolean mayRenderStartOfStream;
@ -360,6 +362,11 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
protected void onPositionReset(long positionUs, boolean joining) throws ExoPlaybackException {
videoSink.flush();
super.onPositionReset(positionUs, joining);
timestampIterator =
new ConstantRateTimestampIterator(
/* startPositionUs= */ positionUs - streamOffsetUs,
/* endPositionUs= */ checkNotNull(editedMediaItem).getPresentationDurationUs(),
DEFAULT_FRAME_RATE);
videoFrameReleaseControl.reset();
if (joining) {
videoFrameReleaseControl.join(/* renderNextFrameImmediately= */ false);
@ -388,13 +395,15 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
checkState(getTimeline().getWindowCount() == 1);
super.onStreamChanged(formats, startPositionUs, offsetUs, mediaPeriodId);
streamOffsetUs = offsetUs;
EditedMediaItem editedMediaItem =
editedMediaItem =
sequencePlayerRenderersWrapper.sequence.editedMediaItems.get(
getTimeline().getIndexOfPeriod(mediaPeriodId.periodUid));
videoEffects = editedMediaItem.effects.videoEffects;
timestampIterator =
new ConstantRateTimestampIterator(
editedMediaItem.getPresentationDurationUs(), /* frameRate= */ DEFAULT_FRAME_RATE);
/* startPositionUs= */ startPositionUs - streamOffsetUs,
/* endPositionUs= */ editedMediaItem.getPresentationDurationUs(),
DEFAULT_FRAME_RATE);
videoEffects = editedMediaItem.effects.videoEffects;
inputStreamPendingRegistration = true;
}