Skip to content

SDK / exoplayer

Go to a project
Commit bf11a8a8 by rohks Committed by Ian Baker
Options

Add timestamp to `CueGroup` 

`TextRenderer` is updated to output `CueGroup`, which contains the presentation time of the cues, in microseconds.

PiperOrigin-RevId: 456531399
parent e25bf811
Inline Side-by-side
Showing with 858 additions and 31 deletions
extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
...@@ -111,6 +111,8 @@ public final class CastPlayer extends BasePlayer { ...@@ -111,6 +111,8 @@ public final class CastPlayer extends BasePlayer {
private static final long PROGRESS_REPORT_PERIOD_MS = 1000; private static final long PROGRESS_REPORT_PERIOD_MS = 1000;
private static final long[] EMPTY_TRACK_ID_ARRAY = new long[0]; private static final long[] EMPTY_TRACK_ID_ARRAY = new long[0];
private static final CueGroup EMPTY_CUE_GROUP =
new CueGroup(ImmutableList.of(), /* presentationTimeUs= */ 0);
private final CastContext castContext; private final CastContext castContext;
private final MediaItemConverter mediaItemConverter; private final MediaItemConverter mediaItemConverter;
...@@ -712,7 +714,7 @@ public final class CastPlayer extends BasePlayer { ...@@ -712,7 +714,7 @@ public final class CastPlayer extends BasePlayer {
/** This method is not supported and returns an empty {@link CueGroup}. */ /** This method is not supported and returns an empty {@link CueGroup}. */
@Override @Override
public CueGroup getCurrentCues() { public CueGroup getCurrentCues() {
return CueGroup.EMPTY; return EMPTY_CUE_GROUP;
} }
/** This method is not supported and always returns {@link DeviceInfo#UNKNOWN}. */ /** This method is not supported and always returns {@link DeviceInfo#UNKNOWN}. */
......
library/common/src/main/java/com/google/android/exoplayer2/text/CueGroup.java
...@@ -22,6 +22,7 @@ import android.os.Bundle; ...@@ -22,6 +22,7 @@ import android.os.Bundle;
import androidx.annotation.IntDef; import androidx.annotation.IntDef;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.Bundleable; import com.google.android.exoplayer2.Bundleable;
import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.util.BundleableUtil; import com.google.android.exoplayer2.util.BundleableUtil;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
...@@ -33,10 +34,6 @@ import java.util.List; ...@@ -33,10 +34,6 @@ import java.util.List;
/** Class to represent the state of active {@link Cue Cues} at a particular time. */ /** Class to represent the state of active {@link Cue Cues} at a particular time. */
public final class CueGroup implements Bundleable { public final class CueGroup implements Bundleable {
/** Empty {@link CueGroup}. */
public static final CueGroup EMPTY = new CueGroup(ImmutableList.of());
/** /**
* The cues in this group. * The cues in this group.
* *
...@@ -46,10 +43,17 @@ public final class CueGroup implements Bundleable { ...@@ -46,10 +43,17 @@ public final class CueGroup implements Bundleable {
* <p>This list may be empty if the group represents a state with no cues. * <p>This list may be empty if the group represents a state with no cues.
*/ */
public final ImmutableList<Cue> cues; public final ImmutableList<Cue> cues;
/**
* The presentation time of the {@link #cues}, in microseconds.
*
* <p>This time is an offset from the start of the current {@link Timeline.Period}
*/
public final long presentationTimeUs;
/** Creates a CueGroup. */ /** Creates a CueGroup. */
public CueGroup(List<Cue> cues) { public CueGroup(List<Cue> cues, long presentationTimeUs) {
this.cues = ImmutableList.copyOf(cues); this.cues = ImmutableList.copyOf(cues);
this.presentationTimeUs = presentationTimeUs;
} }
// Bundleable implementation. // Bundleable implementation.
...@@ -57,16 +61,18 @@ public final class CueGroup implements Bundleable { ...@@ -57,16 +61,18 @@ public final class CueGroup implements Bundleable {
@Documented @Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@Target(TYPE_USE) @Target(TYPE_USE)
@IntDef({FIELD_CUES}) @IntDef({FIELD_CUES, FIELD_PRESENTATION_TIME_US})
private @interface FieldNumber {} private @interface FieldNumber {}
private static final int FIELD_CUES = 0; private static final int FIELD_CUES = 0;
private static final int FIELD_PRESENTATION_TIME_US = 1;
@Override @Override
public Bundle toBundle() { public Bundle toBundle() {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putParcelableArrayList( bundle.putParcelableArrayList(
keyForField(FIELD_CUES), BundleableUtil.toBundleArrayList(filterOutBitmapCues(cues))); keyForField(FIELD_CUES), BundleableUtil.toBundleArrayList(filterOutBitmapCues(cues)));
bundle.putLong(keyForField(FIELD_PRESENTATION_TIME_US), presentationTimeUs);
return bundle; return bundle;
} }
...@@ -78,7 +84,8 @@ public final class CueGroup implements Bundleable { ...@@ -78,7 +84,8 @@ public final class CueGroup implements Bundleable {
cueBundles == null cueBundles == null
? ImmutableList.of() ? ImmutableList.of()
: BundleableUtil.fromBundleList(Cue.CREATOR, cueBundles); : BundleableUtil.fromBundleList(Cue.CREATOR, cueBundles);
return new CueGroup(cues); long presentationTimeUs = bundle.getLong(keyForField(FIELD_PRESENTATION_TIME_US));
return new CueGroup(cues, presentationTimeUs);
} }
private static String keyForField(@FieldNumber int field) { private static String keyForField(@FieldNumber int field) {
......
library/common/src/test/java/com/google/android/exoplayer2/text/CueGroupTest.java
...@@ -37,7 +37,7 @@ public class CueGroupTest { ...@@ -37,7 +37,7 @@ public class CueGroupTest {
Cue bitmapCue = Cue bitmapCue =
new Cue.Builder().setBitmap(Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888)).build(); new Cue.Builder().setBitmap(Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888)).build();
ImmutableList<Cue> cues = ImmutableList.of(textCue, bitmapCue); ImmutableList<Cue> cues = ImmutableList.of(textCue, bitmapCue);
CueGroup cueGroup = new CueGroup(cues); CueGroup cueGroup = new CueGroup(cues, /* presentationTimeUs= */ 1_230_000);
Parcel parcel = Parcel.obtain(); Parcel parcel = Parcel.obtain();
try { try {
......
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
...@@ -344,7 +344,7 @@ import java.util.concurrent.TimeoutException; ...@@ -344,7 +344,7 @@ import java.util.concurrent.TimeoutException;
} else { } else {
audioSessionId = Util.generateAudioSessionIdV21(applicationContext); audioSessionId = Util.generateAudioSessionIdV21(applicationContext);
} }
currentCueGroup = CueGroup.EMPTY; currentCueGroup = new CueGroup(ImmutableList.of(), /* presentationTimeUs= */ 0);
throwsWhenUsingWrongThread = true; throwsWhenUsingWrongThread = true;
addListener(analyticsCollector); addListener(analyticsCollector);
...@@ -928,7 +928,7 @@ import java.util.concurrent.TimeoutException; ...@@ -928,7 +928,7 @@ import java.util.concurrent.TimeoutException;
verifyApplicationThread(); verifyApplicationThread();
audioFocusManager.updateAudioFocus(getPlayWhenReady(), Player.STATE_IDLE); audioFocusManager.updateAudioFocus(getPlayWhenReady(), Player.STATE_IDLE);
stopInternal(reset, /* error= */ null); stopInternal(reset, /* error= */ null);
currentCueGroup = CueGroup.EMPTY; currentCueGroup = new CueGroup(ImmutableList.of(), playbackInfo.positionUs);
} }
@Override @Override
...@@ -982,7 +982,7 @@ import java.util.concurrent.TimeoutException; ...@@ -982,7 +982,7 @@ import java.util.concurrent.TimeoutException;
checkNotNull(priorityTaskManager).remove(C.PRIORITY_PLAYBACK); checkNotNull(priorityTaskManager).remove(C.PRIORITY_PLAYBACK);
isPriorityTaskManagerRegistered = false; isPriorityTaskManagerRegistered = false;
} }
currentCueGroup = CueGroup.EMPTY; currentCueGroup = new CueGroup(ImmutableList.of(), /* presentationTimeUs= */ 0);
playerReleased = true; playerReleased = true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java
...@@ -34,12 +34,13 @@ import com.google.android.exoplayer2.source.SampleStream.ReadDataResult; ...@@ -34,12 +34,13 @@ import com.google.android.exoplayer2.source.SampleStream.ReadDataResult;
import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.common.collect.ImmutableList;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import java.util.Collections; import org.checkerframework.checker.nullness.qual.RequiresNonNull;
import java.util.List; import org.checkerframework.dataflow.qual.SideEffectFree;
/** /**
* A renderer for text. * A renderer for text.
...@@ -94,6 +95,8 @@ public final class TextRenderer extends BaseRenderer implements Callback { ...@@ -94,6 +95,8 @@ public final class TextRenderer extends BaseRenderer implements Callback {
@Nullable private SubtitleOutputBuffer nextSubtitle; @Nullable private SubtitleOutputBuffer nextSubtitle;
private int nextSubtitleEventIndex; private int nextSubtitleEventIndex;
private long finalStreamEndPositionUs; private long finalStreamEndPositionUs;
private long outputStreamOffsetUs;
private long lastRendererPositionUs;
/** /**
* @param output The output. * @param output The output.
...@@ -125,6 +128,8 @@ public final class TextRenderer extends BaseRenderer implements Callback { ...@@ -125,6 +128,8 @@ public final class TextRenderer extends BaseRenderer implements Callback {
this.decoderFactory = decoderFactory; this.decoderFactory = decoderFactory;
formatHolder = new FormatHolder(); formatHolder = new FormatHolder();
finalStreamEndPositionUs = C.TIME_UNSET; finalStreamEndPositionUs = C.TIME_UNSET;
outputStreamOffsetUs = C.TIME_UNSET;
lastRendererPositionUs = C.TIME_UNSET;
} }
@Override @Override
...@@ -161,6 +166,7 @@ public final class TextRenderer extends BaseRenderer implements Callback { ...@@ -161,6 +166,7 @@ public final class TextRenderer extends BaseRenderer implements Callback {
@Override @Override
protected void onStreamChanged(Format[] formats, long startPositionUs, long offsetUs) { protected void onStreamChanged(Format[] formats, long startPositionUs, long offsetUs) {
outputStreamOffsetUs = offsetUs;
streamFormat = formats[0]; streamFormat = formats[0];
if (decoder != null) { if (decoder != null) {
decoderReplacementState = REPLACEMENT_STATE_SIGNAL_END_OF_STREAM; decoderReplacementState = REPLACEMENT_STATE_SIGNAL_END_OF_STREAM;
...@@ -171,6 +177,7 @@ public final class TextRenderer extends BaseRenderer implements Callback { ...@@ -171,6 +177,7 @@ public final class TextRenderer extends BaseRenderer implements Callback {
@Override @Override
protected void onPositionReset(long positionUs, boolean joining) { protected void onPositionReset(long positionUs, boolean joining) {
lastRendererPositionUs = positionUs;
clearOutput(); clearOutput();
inputStreamEnded = false; inputStreamEnded = false;
outputStreamEnded = false; outputStreamEnded = false;
...@@ -185,6 +192,7 @@ public final class TextRenderer extends BaseRenderer implements Callback { ...@@ -185,6 +192,7 @@ public final class TextRenderer extends BaseRenderer implements Callback {
@Override @Override
public void render(long positionUs, long elapsedRealtimeUs) { public void render(long positionUs, long elapsedRealtimeUs) {
lastRendererPositionUs = positionUs;
if (isCurrentStreamFinal() if (isCurrentStreamFinal()
&& finalStreamEndPositionUs != C.TIME_UNSET && finalStreamEndPositionUs != C.TIME_UNSET
&& positionUs >= finalStreamEndPositionUs) { && positionUs >= finalStreamEndPositionUs) {
...@@ -248,7 +256,9 @@ public final class TextRenderer extends BaseRenderer implements Callback { ...@@ -248,7 +256,9 @@ public final class TextRenderer extends BaseRenderer implements Callback {
// If textRendererNeedsUpdate then subtitle must be non-null. // If textRendererNeedsUpdate then subtitle must be non-null.
checkNotNull(subtitle); checkNotNull(subtitle);
// textRendererNeedsUpdate is set and we're playing. Update the renderer. // textRendererNeedsUpdate is set and we're playing. Update the renderer.
updateOutput(subtitle.getCues(positionUs)); long presentationTimeUs = getPresentationTimeUs(getCurrentEventTimeUs(positionUs));
CueGroup cueGroup = new CueGroup(subtitle.getCues(positionUs), presentationTimeUs);
updateOutput(cueGroup);
} }
if (decoderReplacementState == REPLACEMENT_STATE_WAIT_END_OF_STREAM) { if (decoderReplacementState == REPLACEMENT_STATE_WAIT_END_OF_STREAM) {
...@@ -306,6 +316,8 @@ public final class TextRenderer extends BaseRenderer implements Callback { ...@@ -306,6 +316,8 @@ public final class TextRenderer extends BaseRenderer implements Callback {
streamFormat = null; streamFormat = null;
finalStreamEndPositionUs = C.TIME_UNSET; finalStreamEndPositionUs = C.TIME_UNSET;
clearOutput(); clearOutput();
outputStreamOffsetUs = C.TIME_UNSET;
lastRendererPositionUs = C.TIME_UNSET;
releaseDecoder(); releaseDecoder();
} }
...@@ -361,33 +373,33 @@ public final class TextRenderer extends BaseRenderer implements Callback { ...@@ -361,33 +373,33 @@ public final class TextRenderer extends BaseRenderer implements Callback {
: subtitle.getEventTime(nextSubtitleEventIndex); : subtitle.getEventTime(nextSubtitleEventIndex);
} }
private void updateOutput(List<Cue> cues) { private void updateOutput(CueGroup cueGroup) {
if (outputHandler != null) { if (outputHandler != null) {
outputHandler.obtainMessage(MSG_UPDATE_OUTPUT, cues).sendToTarget(); outputHandler.obtainMessage(MSG_UPDATE_OUTPUT, cueGroup).sendToTarget();
} else { } else {
invokeUpdateOutputInternal(cues); invokeUpdateOutputInternal(cueGroup);
} }
} }
private void clearOutput() { private void clearOutput() {
updateOutput(Collections.emptyList()); updateOutput(new CueGroup(ImmutableList.of(), getPresentationTimeUs(lastRendererPositionUs)));
} }
@SuppressWarnings("unchecked")
@Override @Override
public boolean handleMessage(Message msg) { public boolean handleMessage(Message msg) {
switch (msg.what) { switch (msg.what) {
case MSG_UPDATE_OUTPUT: case MSG_UPDATE_OUTPUT:
invokeUpdateOutputInternal((List<Cue>) msg.obj); invokeUpdateOutputInternal((CueGroup) msg.obj);
return true; return true;
default: default:
throw new IllegalStateException(); throw new IllegalStateException();
} }
} }
private void invokeUpdateOutputInternal(List<Cue> cues) { @SuppressWarnings("deprecation") // We need to call both onCues method for backward compatibility.
output.onCues(cues); private void invokeUpdateOutputInternal(CueGroup cueGroup) {
output.onCues(new CueGroup(cues)); output.onCues(cueGroup.cues);
output.onCues(cueGroup);
} }
/** /**
...@@ -401,4 +413,25 @@ public final class TextRenderer extends BaseRenderer implements Callback { ...@@ -401,4 +413,25 @@ public final class TextRenderer extends BaseRenderer implements Callback {
clearOutput(); clearOutput();
replaceDecoder(); replaceDecoder();
} }
@RequiresNonNull("subtitle")
@SideEffectFree
private long getCurrentEventTimeUs(long positionUs) {
int nextEventTimeIndex = subtitle.getNextEventTimeIndex(positionUs);
if (nextEventTimeIndex == 0) {
return subtitle.timeUs;
}
return nextEventTimeIndex == C.INDEX_UNSET
? subtitle.getEventTime(subtitle.getEventTimeCount() - 1)
: subtitle.getEventTime(nextEventTimeIndex - 1);
}
@SideEffectFree
private long getPresentationTimeUs(long positionUs) {
checkState(positionUs != C.TIME_UNSET);
checkState(outputStreamOffsetUs != C.TIME_UNSET);
return positionUs - outputStreamOffsetUs;
}
} }
library/core/src/test/java/com/google/android/exoplayer2/e2etest/PlaylistPlaybackTest.java
...@@ -16,17 +16,25 @@ ...@@ -16,17 +16,25 @@
package com.google.android.exoplayer2.e2etest; package com.google.android.exoplayer2.e2etest;
import android.content.Context; import android.content.Context;
import android.graphics.SurfaceTexture;
import android.net.Uri;
import android.view.Surface;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.robolectric.PlaybackOutput; import com.google.android.exoplayer2.robolectric.PlaybackOutput;
import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig; import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig;
import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper; import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper;
import com.google.android.exoplayer2.source.DefaultMediaSourceFactory;
import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.testutil.CapturingRenderersFactory; import com.google.android.exoplayer2.testutil.CapturingRenderersFactory;
import com.google.android.exoplayer2.testutil.DumpFileAsserts; import com.google.android.exoplayer2.testutil.DumpFileAsserts;
import com.google.android.exoplayer2.testutil.FakeClock; import com.google.android.exoplayer2.testutil.FakeClock;
import com.google.android.exoplayer2.util.MimeTypes;
import com.google.common.collect.ImmutableList;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
...@@ -82,4 +90,43 @@ public final class PlaylistPlaybackTest { ...@@ -82,4 +90,43 @@ public final class PlaylistPlaybackTest {
DumpFileAsserts.assertOutput( DumpFileAsserts.assertOutput(
applicationContext, playbackOutput, "playbackdumps/playlists/bypass-off-then-on.dump"); applicationContext, playbackOutput, "playbackdumps/playlists/bypass-off-then-on.dump");
} }
@Test
public void test_subtitle() throws Exception {
Context applicationContext = ApplicationProvider.getApplicationContext();
CapturingRenderersFactory capturingRenderersFactory =
new CapturingRenderersFactory(applicationContext);
MediaSource.Factory mediaSourceFactory =
new DefaultMediaSourceFactory(applicationContext)
.experimentalUseProgressiveMediaSourceForSubtitles(true);
ExoPlayer player =
new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
.setClock(new FakeClock(/* isAutoAdvancing= */ true))
.setMediaSourceFactory(mediaSourceFactory)
.build();
player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
player.addMediaItem(MediaItem.fromUri("asset:///media/mp4/preroll-5s.mp4"));
MediaItem mediaItemWithSubtitle =
new MediaItem.Builder()
.setUri("asset:///media/mp4/preroll-5s.mp4")
.setSubtitleConfigurations(
ImmutableList.of(
new MediaItem.SubtitleConfiguration.Builder(
Uri.parse("asset:///media/webvtt/typical"))
.setMimeType(MimeTypes.TEXT_VTT)
.setLanguage("en")
.setSelectionFlags(C.SELECTION_FLAG_DEFAULT)
.build()))
.build();
player.addMediaItem(mediaItemWithSubtitle);
player.prepare();
player.play();
TestPlayerRunHelper.runUntilPlaybackState(player, Player.STATE_ENDED);
player.release();
DumpFileAsserts.assertOutput(
applicationContext, playbackOutput, "playbackdumps/playlists/playlist_with_subtitles.dump");
}
} }
robolectricutils/src/main/java/com/google/android/exoplayer2/robolectric/PlaybackOutput.java
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
*/ */
package com.google.android.exoplayer2.robolectric; package com.google.android.exoplayer2.robolectric;
import static java.lang.Math.max;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
...@@ -54,7 +56,7 @@ public final class PlaybackOutput implements Dumper.Dumpable { ...@@ -54,7 +56,7 @@ public final class PlaybackOutput implements Dumper.Dumpable {
private final CapturingRenderersFactory capturingRenderersFactory; private final CapturingRenderersFactory capturingRenderersFactory;
private final List<Metadata> metadatas; private final List<Metadata> metadatas;
private final List<List<Cue>> subtitles; private final List<CueGroup> subtitles;
private final List<List<Cue>> subtitlesFromDeprecatedTextOutput; private final List<List<Cue>> subtitlesFromDeprecatedTextOutput;
private PlaybackOutput(ExoPlayer player, CapturingRenderersFactory capturingRenderersFactory) { private PlaybackOutput(ExoPlayer player, CapturingRenderersFactory capturingRenderersFactory) {
...@@ -63,8 +65,8 @@ public final class PlaybackOutput implements Dumper.Dumpable { ...@@ -63,8 +65,8 @@ public final class PlaybackOutput implements Dumper.Dumpable {
metadatas = Collections.synchronizedList(new ArrayList<>()); metadatas = Collections.synchronizedList(new ArrayList<>());
subtitles = Collections.synchronizedList(new ArrayList<>()); subtitles = Collections.synchronizedList(new ArrayList<>());
subtitlesFromDeprecatedTextOutput = Collections.synchronizedList(new ArrayList<>()); subtitlesFromDeprecatedTextOutput = Collections.synchronizedList(new ArrayList<>());
// TODO: Consider passing playback position into MetadataOutput and TextOutput. Calling // TODO: Consider passing playback position into MetadataOutput. Calling
// player.getCurrentPosition() inside onMetadata/Cues will likely be non-deterministic // player.getCurrentPosition() inside onMetadata will likely be non-deterministic
// because renderer-thread != playback-thread. // because renderer-thread != playback-thread.
player.addListener( player.addListener(
new Player.Listener() { new Player.Listener() {
...@@ -80,7 +82,7 @@ public final class PlaybackOutput implements Dumper.Dumpable { ...@@ -80,7 +82,7 @@ public final class PlaybackOutput implements Dumper.Dumpable {
@Override @Override
public void onCues(CueGroup cueGroup) { public void onCues(CueGroup cueGroup) {
subtitles.add(cueGroup.cues); subtitles.add(cueGroup);
} }
}); });
} }
...@@ -152,9 +154,9 @@ public final class PlaybackOutput implements Dumper.Dumpable { ...@@ -152,9 +154,9 @@ public final class PlaybackOutput implements Dumper.Dumpable {
} }
private void dumpSubtitles(Dumper dumper) { private void dumpSubtitles(Dumper dumper) {
if (!subtitles.equals(subtitlesFromDeprecatedTextOutput)) { if (subtitles.size() != subtitlesFromDeprecatedTextOutput.size()) {
throw new IllegalStateException( throw new IllegalStateException(
"Expected subtitles to be equal from both implementations of onCues method."); "Expected subtitles to be of equal length from both implementations of onCues method.");
} }
if (subtitles.isEmpty()) { if (subtitles.isEmpty()) {
...@@ -163,7 +165,15 @@ public final class PlaybackOutput implements Dumper.Dumpable { ...@@ -163,7 +165,15 @@ public final class PlaybackOutput implements Dumper.Dumpable {
dumper.startBlock("TextOutput"); dumper.startBlock("TextOutput");
for (int i = 0; i < subtitles.size(); i++) { for (int i = 0; i < subtitles.size(); i++) {
dumper.startBlock("Subtitle[" + i + "]"); dumper.startBlock("Subtitle[" + i + "]");
List<Cue> subtitle = subtitles.get(i); // TODO: Solving https://github.com/google/ExoPlayer/issues/9672 will allow us to remove this
// hack of forcing presentationTimeUs to be >= 0.
dumper.add("presentationTimeUs", max(0, subtitles.get(i).presentationTimeUs));
ImmutableList<Cue> subtitle = subtitles.get(i).cues;
if (!subtitle.equals(subtitlesFromDeprecatedTextOutput.get(i))) {
throw new IllegalStateException(
"Expected subtitle to be equal from both implementations of onCues method for index "
+ i);
}
if (subtitle.isEmpty()) { if (subtitle.isEmpty()) {
dumper.add("Cues", ImmutableList.of()); dumper.add("Cues", ImmutableList.of());
} }
......
testdata/src/test/assets/playbackdumps/playlists/playlist_with_subtitles.dump 0 → 100644
MediaCodecAdapter (exotest.audio.aac):
buffers.length = 436
buffers[0] = length 21, hash D57A2CCC
buffers[1] = length 4, hash EE9DF
buffers[2] = length 4, hash EE9DF
buffers[3] = length 4, hash EE9DF
buffers[4] = length 4, hash EE9DF
buffers[5] = length 4, hash EE9DF
buffers[6] = length 4, hash EE9DF
buffers[7] = length 4, hash EE9DF
buffers[8] = length 4, hash EE9DF
buffers[9] = length 4, hash EE9DF
buffers[10] = length 4, hash EE9DF
buffers[11] = length 4, hash EE9DF
buffers[12] = length 4, hash EE9DF
buffers[13] = length 4, hash EE9DF
buffers[14] = length 4, hash EE9DF
buffers[15] = length 4, hash EE9DF
buffers[16] = length 4, hash EE9DF
buffers[17] = length 4, hash EE9DF
buffers[18] = length 4, hash EE9DF
buffers[19] = length 4, hash EE9DF
buffers[20] = length 4, hash EE9DF
buffers[21] = length 4, hash EE9DF
buffers[22] = length 4, hash EE9DF
buffers[23] = length 4, hash EE9DF
buffers[24] = length 4, hash EE9DF
buffers[25] = length 4, hash EE9DF
buffers[26] = length 4, hash EE9DF
buffers[27] = length 4, hash EE9DF
buffers[28] = length 4, hash EE9DF
buffers[29] = length 4, hash EE9DF
buffers[30] = length 4, hash EE9DF
buffers[31] = length 4, hash EE9DF
buffers[32] = length 4, hash EE9DF
buffers[33] = length 4, hash EE9DF
buffers[34] = length 4, hash EE9DF
buffers[35] = length 4, hash EE9DF
buffers[36] = length 4, hash EE9DF
buffers[37] = length 4, hash EE9DF
buffers[38] = length 4, hash EE9DF
buffers[39] = length 4, hash EE9DF
buffers[40] = length 4, hash EE9DF
buffers[41] = length 4, hash EE9DF
buffers[42] = length 4, hash EE9DF
buffers[43] = length 4, hash EE9DF
buffers[44] = length 4, hash EE9DF
buffers[45] = length 4, hash EE9DF
buffers[46] = length 4, hash EE9DF
buffers[47] = length 4, hash EE9DF
buffers[48] = length 4, hash EE9DF
buffers[49] = length 4, hash EE9DF
buffers[50] = length 4, hash EE9DF
buffers[51] = length 4, hash EE9DF
buffers[52] = length 4, hash EE9DF
buffers[53] = length 4, hash EE9DF
buffers[54] = length 4, hash EE9DF
buffers[55] = length 4, hash EE9DF
buffers[56] = length 4, hash EE9DF
buffers[57] = length 4, hash EE9DF
buffers[58] = length 4, hash EE9DF
buffers[59] = length 4, hash EE9DF
buffers[60] = length 4, hash EE9DF
buffers[61] = length 4, hash EE9DF
buffers[62] = length 4, hash EE9DF
buffers[63] = length 4, hash EE9DF
buffers[64] = length 4, hash EE9DF
buffers[65] = length 4, hash EE9DF
buffers[66] = length 4, hash EE9DF
buffers[67] = length 4, hash EE9DF
buffers[68] = length 4, hash EE9DF
buffers[69] = length 4, hash EE9DF
buffers[70] = length 4, hash EE9DF
buffers[71] = length 4, hash EE9DF
buffers[72] = length 4, hash EE9DF
buffers[73] = length 4, hash EE9DF
buffers[74] = length 4, hash EE9DF
buffers[75] = length 4, hash EE9DF
buffers[76] = length 4, hash EE9DF
buffers[77] = length 4, hash EE9DF
buffers[78] = length 4, hash EE9DF
buffers[79] = length 4, hash EE9DF
buffers[80] = length 4, hash EE9DF
buffers[81] = length 4, hash EE9DF
buffers[82] = length 4, hash EE9DF
buffers[83] = length 4, hash EE9DF
buffers[84] = length 4, hash EE9DF
buffers[85] = length 4, hash EE9DF
buffers[86] = length 4, hash EE9DF
buffers[87] = length 4, hash EE9DF
buffers[88] = length 4, hash EE9DF
buffers[89] = length 4, hash EE9DF
buffers[90] = length 4, hash EE9DF
buffers[91] = length 4, hash EE9DF
buffers[92] = length 4, hash EE9DF
buffers[93] = length 4, hash EE9DF
buffers[94] = length 4, hash EE9DF
buffers[95] = length 4, hash EE9DF
buffers[96] = length 4, hash EE9DF
buffers[97] = length 4, hash EE9DF
buffers[98] = length 4, hash EE9DF
buffers[99] = length 4, hash EE9DF
buffers[100] = length 4, hash EE9DF
buffers[101] = length 4, hash EE9DF
buffers[102] = length 4, hash EE9DF
buffers[103] = length 4, hash EE9DF
buffers[104] = length 4, hash EE9DF
buffers[105] = length 4, hash EE9DF
buffers[106] = length 4, hash EE9DF
buffers[107] = length 4, hash EE9DF
buffers[108] = length 4, hash EE9DF
buffers[109] = length 4, hash EE9DF
buffers[110] = length 4, hash EE9DF
buffers[111] = length 4, hash EE9DF
buffers[112] = length 4, hash EE9DF
buffers[113] = length 4, hash EE9DF
buffers[114] = length 4, hash EE9DF
buffers[115] = length 4, hash EE9DF
buffers[116] = length 4, hash EE9DF
buffers[117] = length 4, hash EE9DF
buffers[118] = length 4, hash EE9DF
buffers[119] = length 4, hash EE9DF
buffers[120] = length 4, hash EE9DF
buffers[121] = length 4, hash EE9DF
buffers[122] = length 4, hash EE9DF
buffers[123] = length 4, hash EE9DF
buffers[124] = length 4, hash EE9DF
buffers[125] = length 4, hash EE9DF
buffers[126] = length 4, hash EE9DF
buffers[127] = length 4, hash EE9DF
buffers[128] = length 4, hash EE9DF
buffers[129] = length 4, hash EE9DF
buffers[130] = length 4, hash EE9DF
buffers[131] = length 4, hash EE9DF
buffers[132] = length 4, hash EE9DF
buffers[133] = length 4, hash EE9DF
buffers[134] = length 4, hash EE9DF
buffers[135] = length 4, hash EE9DF
buffers[136] = length 4, hash EE9DF
buffers[137] = length 4, hash EE9DF
buffers[138] = length 4, hash EE9DF
buffers[139] = length 4, hash EE9DF
buffers[140] = length 4, hash EE9DF
buffers[141] = length 4, hash EE9DF
buffers[142] = length 4, hash EE9DF
buffers[143] = length 4, hash EE9DF
buffers[144] = length 4, hash EE9DF
buffers[145] = length 4, hash EE9DF
buffers[146] = length 4, hash EE9DF
buffers[147] = length 4, hash EE9DF
buffers[148] = length 4, hash EE9DF
buffers[149] = length 4, hash EE9DF
buffers[150] = length 4, hash EE9DF
buffers[151] = length 4, hash EE9DF
buffers[152] = length 4, hash EE9DF
buffers[153] = length 4, hash EE9DF
buffers[154] = length 4, hash EE9DF
buffers[155] = length 4, hash EE9DF
buffers[156] = length 4, hash EE9DF
buffers[157] = length 4, hash EE9DF
buffers[158] = length 4, hash EE9DF
buffers[159] = length 4, hash EE9DF
buffers[160] = length 4, hash EE9DF
buffers[161] = length 4, hash EE9DF
buffers[162] = length 4, hash EE9DF
buffers[163] = length 4, hash EE9DF
buffers[164] = length 4, hash EE9DF
buffers[165] = length 4, hash EE9DF
buffers[166] = length 4, hash EE9DF
buffers[167] = length 4, hash EE9DF
buffers[168] = length 4, hash EE9DF
buffers[169] = length 4, hash EE9DF
buffers[170] = length 4, hash EE9DF
buffers[171] = length 4, hash EE9DF
buffers[172] = length 4, hash EE9DF
buffers[173] = length 4, hash EE9DF
buffers[174] = length 4, hash EE9DF
buffers[175] = length 4, hash EE9DF
buffers[176] = length 4, hash EE9DF
buffers[177] = length 4, hash EE9DF
buffers[178] = length 4, hash EE9DF
buffers[179] = length 4, hash EE9DF
buffers[180] = length 4, hash EE9DF
buffers[181] = length 4, hash EE9DF
buffers[182] = length 4, hash EE9DF
buffers[183] = length 4, hash EE9DF
buffers[184] = length 4, hash EE9DF
buffers[185] = length 4, hash EE9DF
buffers[186] = length 4, hash EE9DF
buffers[187] = length 4, hash EE9DF
buffers[188] = length 4, hash EE9DF
buffers[189] = length 4, hash EE9DF
buffers[190] = length 4, hash EE9DF
buffers[191] = length 4, hash EE9DF
buffers[192] = length 4, hash EE9DF
buffers[193] = length 4, hash EE9DF
buffers[194] = length 4, hash EE9DF
buffers[195] = length 4, hash EE9DF
buffers[196] = length 4, hash EE9DF
buffers[197] = length 4, hash EE9DF
buffers[198] = length 4, hash EE9DF
buffers[199] = length 4, hash EE9DF
buffers[200] = length 4, hash EE9DF
buffers[201] = length 4, hash EE9DF
buffers[202] = length 4, hash EE9DF
buffers[203] = length 4, hash EE9DF
buffers[204] = length 4, hash EE9DF
buffers[205] = length 4, hash EE9DF
buffers[206] = length 4, hash EE9DF
buffers[207] = length 4, hash EE9DF
buffers[208] = length 4, hash EE9DF
buffers[209] = length 4, hash EE9DF
buffers[210] = length 4, hash EE9DF
buffers[211] = length 4, hash EE9DF
buffers[212] = length 4, hash EE9DF
buffers[213] = length 4, hash EE9DF
buffers[214] = length 4, hash EE9DF
buffers[215] = length 4, hash EE9DF
buffers[216] = length 4, hash EE9DF
buffers[217] = length 0, hash 1
buffers[218] = length 21, hash D57A2CCC
buffers[219] = length 4, hash EE9DF
buffers[220] = length 4, hash EE9DF
buffers[221] = length 4, hash EE9DF
buffers[222] = length 4, hash EE9DF
buffers[223] = length 4, hash EE9DF
buffers[224] = length 4, hash EE9DF
buffers[225] = length 4, hash EE9DF
buffers[226] = length 4, hash EE9DF
buffers[227] = length 4, hash EE9DF
buffers[228] = length 4, hash EE9DF
buffers[229] = length 4, hash EE9DF
buffers[230] = length 4, hash EE9DF
buffers[231] = length 4, hash EE9DF
buffers[232] = length 4, hash EE9DF
buffers[233] = length 4, hash EE9DF
buffers[234] = length 4, hash EE9DF
buffers[235] = length 4, hash EE9DF
buffers[236] = length 4, hash EE9DF
buffers[237] = length 4, hash EE9DF
buffers[238] = length 4, hash EE9DF
buffers[239] = length 4, hash EE9DF
buffers[240] = length 4, hash EE9DF
buffers[241] = length 4, hash EE9DF
buffers[242] = length 4, hash EE9DF
buffers[243] = length 4, hash EE9DF
buffers[244] = length 4, hash EE9DF
buffers[245] = length 4, hash EE9DF
buffers[246] = length 4, hash EE9DF
buffers[247] = length 4, hash EE9DF
buffers[248] = length 4, hash EE9DF
buffers[249] = length 4, hash EE9DF
buffers[250] = length 4, hash EE9DF
buffers[251] = length 4, hash EE9DF
buffers[252] = length 4, hash EE9DF
buffers[253] = length 4, hash EE9DF
buffers[254] = length 4, hash EE9DF
buffers[255] = length 4, hash EE9DF
buffers[256] = length 4, hash EE9DF
buffers[257] = length 4, hash EE9DF
buffers[258] = length 4, hash EE9DF
buffers[259] = length 4, hash EE9DF
buffers[260] = length 4, hash EE9DF
buffers[261] = length 4, hash EE9DF
buffers[262] = length 4, hash EE9DF
buffers[263] = length 4, hash EE9DF
buffers[264] = length 4, hash EE9DF
buffers[265] = length 4, hash EE9DF
buffers[266] = length 4, hash EE9DF
buffers[267] = length 4, hash EE9DF
buffers[268] = length 4, hash EE9DF
buffers[269] = length 4, hash EE9DF
buffers[270] = length 4, hash EE9DF
buffers[271] = length 4, hash EE9DF
buffers[272] = length 4, hash EE9DF
buffers[273] = length 4, hash EE9DF
buffers[274] = length 4, hash EE9DF
buffers[275] = length 4, hash EE9DF
buffers[276] = length 4, hash EE9DF
buffers[277] = length 4, hash EE9DF
buffers[278] = length 4, hash EE9DF
buffers[279] = length 4, hash EE9DF
buffers[280] = length 4, hash EE9DF
buffers[281] = length 4, hash EE9DF
buffers[282] = length 4, hash EE9DF
buffers[283] = length 4, hash EE9DF
buffers[284] = length 4, hash EE9DF
buffers[285] = length 4, hash EE9DF
buffers[286] = length 4, hash EE9DF
buffers[287] = length 4, hash EE9DF
buffers[288] = length 4, hash EE9DF
buffers[289] = length 4, hash EE9DF
buffers[290] = length 4, hash EE9DF
buffers[291] = length 4, hash EE9DF
buffers[292] = length 4, hash EE9DF
buffers[293] = length 4, hash EE9DF
buffers[294] = length 4, hash EE9DF
buffers[295] = length 4, hash EE9DF
buffers[296] = length 4, hash EE9DF
buffers[297] = length 4, hash EE9DF
buffers[298] = length 4, hash EE9DF
buffers[299] = length 4, hash EE9DF
buffers[300] = length 4, hash EE9DF
buffers[301] = length 4, hash EE9DF
buffers[302] = length 4, hash EE9DF
buffers[303] = length 4, hash EE9DF
buffers[304] = length 4, hash EE9DF
buffers[305] = length 4, hash EE9DF
buffers[306] = length 4, hash EE9DF
buffers[307] = length 4, hash EE9DF
buffers[308] = length 4, hash EE9DF
buffers[309] = length 4, hash EE9DF
buffers[310] = length 4, hash EE9DF
buffers[311] = length 4, hash EE9DF
buffers[312] = length 4, hash EE9DF
buffers[313] = length 4, hash EE9DF
buffers[314] = length 4, hash EE9DF
buffers[315] = length 4, hash EE9DF
buffers[316] = length 4, hash EE9DF
buffers[317] = length 4, hash EE9DF
buffers[318] = length 4, hash EE9DF
buffers[319] = length 4, hash EE9DF
buffers[320] = length 4, hash EE9DF
buffers[321] = length 4, hash EE9DF
buffers[322] = length 4, hash EE9DF
buffers[323] = length 4, hash EE9DF
buffers[324] = length 4, hash EE9DF
buffers[325] = length 4, hash EE9DF
buffers[326] = length 4, hash EE9DF
buffers[327] = length 4, hash EE9DF
buffers[328] = length 4, hash EE9DF
buffers[329] = length 4, hash EE9DF
buffers[330] = length 4, hash EE9DF
buffers[331] = length 4, hash EE9DF
buffers[332] = length 4, hash EE9DF
buffers[333] = length 4, hash EE9DF
buffers[334] = length 4, hash EE9DF
buffers[335] = length 4, hash EE9DF
buffers[336] = length 4, hash EE9DF
buffers[337] = length 4, hash EE9DF
buffers[338] = length 4, hash EE9DF
buffers[339] = length 4, hash EE9DF
buffers[340] = length 4, hash EE9DF
buffers[341] = length 4, hash EE9DF
buffers[342] = length 4, hash EE9DF
buffers[343] = length 4, hash EE9DF
buffers[344] = length 4, hash EE9DF
buffers[345] = length 4, hash EE9DF
buffers[346] = length 4, hash EE9DF
buffers[347] = length 4, hash EE9DF
buffers[348] = length 4, hash EE9DF
buffers[349] = length 4, hash EE9DF
buffers[350] = length 4, hash EE9DF
buffers[351] = length 4, hash EE9DF
buffers[352] = length 4, hash EE9DF
buffers[353] = length 4, hash EE9DF
buffers[354] = length 4, hash EE9DF
buffers[355] = length 4, hash EE9DF
buffers[356] = length 4, hash EE9DF
buffers[357] = length 4, hash EE9DF
buffers[358] = length 4, hash EE9DF
buffers[359] = length 4, hash EE9DF
buffers[360] = length 4, hash EE9DF
buffers[361] = length 4, hash EE9DF
buffers[362] = length 4, hash EE9DF
buffers[363] = length 4, hash EE9DF
buffers[364] = length 4, hash EE9DF
buffers[365] = length 4, hash EE9DF
buffers[366] = length 4, hash EE9DF
buffers[367] = length 4, hash EE9DF
buffers[368] = length 4, hash EE9DF
buffers[369] = length 4, hash EE9DF
buffers[370] = length 4, hash EE9DF
buffers[371] = length 4, hash EE9DF
buffers[372] = length 4, hash EE9DF
buffers[373] = length 4, hash EE9DF
buffers[374] = length 4, hash EE9DF
buffers[375] = length 4, hash EE9DF
buffers[376] = length 4, hash EE9DF
buffers[377] = length 4, hash EE9DF
buffers[378] = length 4, hash EE9DF
buffers[379] = length 4, hash EE9DF
buffers[380] = length 4, hash EE9DF
buffers[381] = length 4, hash EE9DF
buffers[382] = length 4, hash EE9DF
buffers[383] = length 4, hash EE9DF
buffers[384] = length 4, hash EE9DF
buffers[385] = length 4, hash EE9DF
buffers[386] = length 4, hash EE9DF
buffers[387] = length 4, hash EE9DF
buffers[388] = length 4, hash EE9DF
buffers[389] = length 4, hash EE9DF
buffers[390] = length 4, hash EE9DF
buffers[391] = length 4, hash EE9DF
buffers[392] = length 4, hash EE9DF
buffers[393] = length 4, hash EE9DF
buffers[394] = length 4, hash EE9DF
buffers[395] = length 4, hash EE9DF
buffers[396] = length 4, hash EE9DF
buffers[397] = length 4, hash EE9DF
buffers[398] = length 4, hash EE9DF
buffers[399] = length 4, hash EE9DF
buffers[400] = length 4, hash EE9DF
buffers[401] = length 4, hash EE9DF
buffers[402] = length 4, hash EE9DF
buffers[403] = length 4, hash EE9DF
buffers[404] = length 4, hash EE9DF
buffers[405] = length 4, hash EE9DF
buffers[406] = length 4, hash EE9DF
buffers[407] = length 4, hash EE9DF
buffers[408] = length 4, hash EE9DF
buffers[409] = length 4, hash EE9DF
buffers[410] = length 4, hash EE9DF
buffers[411] = length 4, hash EE9DF
buffers[412] = length 4, hash EE9DF
buffers[413] = length 4, hash EE9DF
buffers[414] = length 4, hash EE9DF
buffers[415] = length 4, hash EE9DF
buffers[416] = length 4, hash EE9DF
buffers[417] = length 4, hash EE9DF
buffers[418] = length 4, hash EE9DF
buffers[419] = length 4, hash EE9DF
buffers[420] = length 4, hash EE9DF
buffers[421] = length 4, hash EE9DF
buffers[422] = length 4, hash EE9DF
buffers[423] = length 4, hash EE9DF
buffers[424] = length 4, hash EE9DF
buffers[425] = length 4, hash EE9DF
buffers[426] = length 4, hash EE9DF
buffers[427] = length 4, hash EE9DF
buffers[428] = length 4, hash EE9DF
buffers[429] = length 4, hash EE9DF
buffers[430] = length 4, hash EE9DF
buffers[431] = length 4, hash EE9DF
buffers[432] = length 4, hash EE9DF
buffers[433] = length 4, hash EE9DF
buffers[434] = length 4, hash EE9DF
buffers[435] = length 0, hash 1
MediaCodecAdapter (exotest.video.avc):
buffers.length = 251
buffers[0] = length 5245, hash C090A41E
buffers[1] = length 63, hash 5141C80D
buffers[2] = length 22, hash A32E59A1
buffers[3] = length 20, hash A09DEAB8
buffers[4] = length 18, hash B64DA059
buffers[5] = length 28, hash FC8EF2BB
buffers[6] = length 22, hash BF8A4A9F
buffers[7] = length 18, hash D163DF61
buffers[8] = length 18, hash FD82E95
buffers[9] = length 28, hash 44A16E72
buffers[10] = length 22, hash 31C06057
buffers[11] = length 18, hash DC93CC9D
buffers[12] = length 18, hash 1B081BD1
buffers[13] = length 28, hash 2700AF
buffers[14] = length 22, hash 6D292D94
buffers[15] = length 18, hash D646C05A
buffers[16] = length 18, hash 14BB0F8E
buffers[17] = length 28, hash 5DE2C2B
buffers[18] = length 22, hash 57E81CD0
buffers[19] = length 18, hash E176AD96
buffers[20] = length 18, hash 1FEAFCCA
buffers[21] = length 28, hash C163BE68
buffers[22] = length 22, hash B0C92D0B
buffers[23] = length 18, hash 3B013BD2
buffers[24] = length 18, hash 79758B06
buffers[25] = length 28, hash F72EB1A3
buffers[26] = length 22, hash 9B881C48
buffers[27] = length 18, hash 4631290E
buffers[28] = length 18, hash 84A57842
buffers[29] = length 28, hash E1FCF000
buffers[30] = length 22, hash 359D2D82
buffers[31] = length 18, hash 62DE0FC9
buffers[32] = length 18, hash A1525EFD
buffers[33] = length 28, hash 5350E8FA
buffers[34] = length 22, hash EE2060DF
buffers[35] = length 18, hash 77D95125
buffers[36] = length 18, hash B64DA059
buffers[37] = length 28, hash ED67B37
buffers[38] = length 22, hash 4701711B
buffers[39] = length 18, hash D163DF61
buffers[40] = length 18, hash FD82E95
buffers[41] = length 28, hash 44A16E72
buffers[42] = length 22, hash 31C06057
buffers[43] = length 18, hash DC93CC9D
buffers[44] = length 18, hash 1B081BD1
buffers[45] = length 28, hash 2700AF
buffers[46] = length 22, hash 6D292D94
buffers[47] = length 18, hash D646C05A
buffers[48] = length 18, hash 14BB0F8E
buffers[49] = length 28, hash 5DE2C2B
buffers[50] = length 22, hash 57E81CD0
buffers[51] = length 18, hash E176AD96
buffers[52] = length 18, hash 1FEAFCCA
buffers[53] = length 28, hash C163BE68
buffers[54] = length 22, hash B0C92D0B
buffers[55] = length 18, hash 3B013BD2
buffers[56] = length 18, hash 79758B06
buffers[57] = length 28, hash F72EB1A3
buffers[58] = length 22, hash 9B881C48
buffers[59] = length 18, hash 4631290E
buffers[60] = length 18, hash 84A57842
buffers[61] = length 28, hash E1FCF000
buffers[62] = length 22, hash 359D2D82
buffers[63] = length 18, hash 62DE0FC9
buffers[64] = length 18, hash A1525EFD
buffers[65] = length 28, hash 5350E8FA
buffers[66] = length 22, hash EE2060DF
buffers[67] = length 18, hash 77D95125
buffers[68] = length 18, hash B64DA059
buffers[69] = length 28, hash ED67B37
buffers[70] = length 22, hash 4701711B
buffers[71] = length 18, hash D163DF61
buffers[72] = length 18, hash FD82E95
buffers[73] = length 28, hash 44A16E72
buffers[74] = length 22, hash 31C06057
buffers[75] = length 18, hash DC93CC9D
buffers[76] = length 18, hash 1B081BD1
buffers[77] = length 28, hash 2700AF
buffers[78] = length 22, hash 6D292D94
buffers[79] = length 18, hash D646C05A
buffers[80] = length 18, hash 14BB0F8E
buffers[81] = length 28, hash 5DE2C2B
buffers[82] = length 22, hash 57E81CD0
buffers[83] = length 18, hash E176AD96
buffers[84] = length 18, hash 1FEAFCCA
buffers[85] = length 28, hash C163BE68
buffers[86] = length 22, hash B0C92D0B
buffers[87] = length 18, hash 3B013BD2
buffers[88] = length 18, hash 79758B06
buffers[89] = length 28, hash F72EB1A3
buffers[90] = length 22, hash 9B881C48
buffers[91] = length 18, hash 4631290E
buffers[92] = length 18, hash 84A57842
buffers[93] = length 33, hash AF5CF49E
buffers[94] = length 22, hash 359D2D82
buffers[95] = length 18, hash 62DE0FC9
buffers[96] = length 18, hash A1525EFD
buffers[97] = length 33, hash F4C6DE46
buffers[98] = length 22, hash EE2060DF
buffers[99] = length 18, hash 77D95125
buffers[100] = length 18, hash B64DA059
buffers[101] = length 28, hash ED67B37
buffers[102] = length 22, hash 4701711B
buffers[103] = length 18, hash D163DF61
buffers[104] = length 18, hash FD82E95
buffers[105] = length 28, hash 44A16E72
buffers[106] = length 22, hash 31C06057
buffers[107] = length 18, hash DC93CC9D
buffers[108] = length 18, hash 1B081BD1
buffers[109] = length 28, hash 2700AF
buffers[110] = length 22, hash 6D292D94
buffers[111] = length 18, hash D646C05A
buffers[112] = length 18, hash 14BB0F8E
buffers[113] = length 27, hash 5292D9E
buffers[114] = length 22, hash 57E81CD0
buffers[115] = length 18, hash E176AD96
buffers[116] = length 18, hash 1FEAFCCA
buffers[117] = length 26, hash B0CAA4C9
buffers[118] = length 22, hash B0C92D0B
buffers[119] = length 18, hash 3B013BD2
buffers[120] = length 18, hash 79758B06
buffers[121] = length 26, hash C63A1445
buffers[122] = length 22, hash 9B881C48
buffers[123] = length 18, hash 4631290E
buffers[124] = length 18, hash 84A57842
buffers[125] = length 5245, hash C090A41E
buffers[126] = length 63, hash 5141C80D
buffers[127] = length 22, hash A32E59A1
buffers[128] = length 20, hash A09DEAB8
buffers[129] = length 18, hash B64DA059
buffers[130] = length 28, hash FC8EF2BB
buffers[131] = length 22, hash BF8A4A9F
buffers[132] = length 18, hash D163DF61
buffers[133] = length 18, hash FD82E95
buffers[134] = length 28, hash 44A16E72
buffers[135] = length 22, hash 31C06057
buffers[136] = length 18, hash DC93CC9D
buffers[137] = length 18, hash 1B081BD1
buffers[138] = length 28, hash 2700AF
buffers[139] = length 22, hash 6D292D94
buffers[140] = length 18, hash D646C05A
buffers[141] = length 18, hash 14BB0F8E
buffers[142] = length 28, hash 5DE2C2B
buffers[143] = length 22, hash 57E81CD0
buffers[144] = length 18, hash E176AD96
buffers[145] = length 18, hash 1FEAFCCA
buffers[146] = length 28, hash C163BE68
buffers[147] = length 22, hash B0C92D0B
buffers[148] = length 18, hash 3B013BD2
buffers[149] = length 18, hash 79758B06
buffers[150] = length 28, hash F72EB1A3
buffers[151] = length 22, hash 9B881C48
buffers[152] = length 18, hash 4631290E
buffers[153] = length 18, hash 84A57842
buffers[154] = length 28, hash E1FCF000
buffers[155] = length 22, hash 359D2D82
buffers[156] = length 18, hash 62DE0FC9
buffers[157] = length 18, hash A1525EFD
buffers[158] = length 28, hash 5350E8FA
buffers[159] = length 22, hash EE2060DF
buffers[160] = length 18, hash 77D95125
buffers[161] = length 18, hash B64DA059
buffers[162] = length 28, hash ED67B37
buffers[163] = length 22, hash 4701711B
buffers[164] = length 18, hash D163DF61
buffers[165] = length 18, hash FD82E95
buffers[166] = length 28, hash 44A16E72
buffers[167] = length 22, hash 31C06057
buffers[168] = length 18, hash DC93CC9D
buffers[169] = length 18, hash 1B081BD1
buffers[170] = length 28, hash 2700AF
buffers[171] = length 22, hash 6D292D94
buffers[172] = length 18, hash D646C05A
buffers[173] = length 18, hash 14BB0F8E
buffers[174] = length 28, hash 5DE2C2B
buffers[175] = length 22, hash 57E81CD0
buffers[176] = length 18, hash E176AD96
buffers[177] = length 18, hash 1FEAFCCA
buffers[178] = length 28, hash C163BE68
buffers[179] = length 22, hash B0C92D0B
buffers[180] = length 18, hash 3B013BD2
buffers[181] = length 18, hash 79758B06
buffers[182] = length 28, hash F72EB1A3
buffers[183] = length 22, hash 9B881C48
buffers[184] = length 18, hash 4631290E
buffers[185] = length 18, hash 84A57842
buffers[186] = length 28, hash E1FCF000
buffers[187] = length 22, hash 359D2D82
buffers[188] = length 18, hash 62DE0FC9
buffers[189] = length 18, hash A1525EFD
buffers[190] = length 28, hash 5350E8FA
buffers[191] = length 22, hash EE2060DF
buffers[192] = length 18, hash 77D95125
buffers[193] = length 18, hash B64DA059
buffers[194] = length 28, hash ED67B37
buffers[195] = length 22, hash 4701711B
buffers[196] = length 18, hash D163DF61
buffers[197] = length 18, hash FD82E95
buffers[198] = length 28, hash 44A16E72
buffers[199] = length 22, hash 31C06057
buffers[200] = length 18, hash DC93CC9D
buffers[201] = length 18, hash 1B081BD1
buffers[202] = length 28, hash 2700AF
buffers[203] = length 22, hash 6D292D94
buffers[204] = length 18, hash D646C05A
buffers[205] = length 18, hash 14BB0F8E
buffers[206] = length 28, hash 5DE2C2B
buffers[207] = length 22, hash 57E81CD0
buffers[208] = length 18, hash E176AD96
buffers[209] = length 18, hash 1FEAFCCA
buffers[210] = length 28, hash C163BE68
buffers[211] = length 22, hash B0C92D0B
buffers[212] = length 18, hash 3B013BD2
buffers[213] = length 18, hash 79758B06
buffers[214] = length 28, hash F72EB1A3
buffers[215] = length 22, hash 9B881C48
buffers[216] = length 18, hash 4631290E
buffers[217] = length 18, hash 84A57842
buffers[218] = length 33, hash AF5CF49E
buffers[219] = length 22, hash 359D2D82
buffers[220] = length 18, hash 62DE0FC9
buffers[221] = length 18, hash A1525EFD
buffers[222] = length 33, hash F4C6DE46
buffers[223] = length 22, hash EE2060DF
buffers[224] = length 18, hash 77D95125
buffers[225] = length 18, hash B64DA059
buffers[226] = length 28, hash ED67B37
buffers[227] = length 22, hash 4701711B
buffers[228] = length 18, hash D163DF61
buffers[229] = length 18, hash FD82E95
buffers[230] = length 28, hash 44A16E72
buffers[231] = length 22, hash 31C06057
buffers[232] = length 18, hash DC93CC9D
buffers[233] = length 18, hash 1B081BD1
buffers[234] = length 28, hash 2700AF
buffers[235] = length 22, hash 6D292D94
buffers[236] = length 18, hash D646C05A
buffers[237] = length 18, hash 14BB0F8E
buffers[238] = length 27, hash 5292D9E
buffers[239] = length 22, hash 57E81CD0
buffers[240] = length 18, hash E176AD96
buffers[241] = length 18, hash 1FEAFCCA
buffers[242] = length 26, hash B0CAA4C9
buffers[243] = length 22, hash B0C92D0B
buffers[244] = length 18, hash 3B013BD2
buffers[245] = length 18, hash 79758B06
buffers[246] = length 26, hash C63A1445
buffers[247] = length 22, hash 9B881C48
buffers[248] = length 18, hash 4631290E
buffers[249] = length 18, hash 84A57842
buffers[250] = length 0, hash 1
TextOutput:
Subtitle[0]:
presentationTimeUs = 0
Cues = []
Subtitle[1]:
presentationTimeUs = 0
Cue[0]:
text = This is the first subtitle.
textAlignment = ALIGN_CENTER
line = -1.0
lineType = 1
lineAnchor = 0
position = 0.5
positionAnchor = 1
size = 1.0
Subtitle[2]:
presentationTimeUs = 1234000
Cues = []
Subtitle[3]:
presentationTimeUs = 2345000
Cue[0]:
text = This is the second subtitle.
textAlignment = ALIGN_CENTER
line = -1.0
lineType = 1
lineAnchor = 0
position = 0.5
positionAnchor = 1
size = 1.0
Subtitle[4]:
presentationTimeUs = 3456000
Cues = []
testdata/src/test/assets/playbackdumps/webvtt/typical.dump
...@@ -348,8 +348,10 @@ MediaCodecAdapter (exotest.video.avc): ...@@ -348,8 +348,10 @@ MediaCodecAdapter (exotest.video.avc):
buffers[125] = length 0, hash 1 buffers[125] = length 0, hash 1
TextOutput: TextOutput:
Subtitle[0]: Subtitle[0]:
presentationTimeUs = 0
Cues = [] Cues = []
Subtitle[1]: Subtitle[1]:
presentationTimeUs = 0
Cue[0]: Cue[0]:
text = This is the first subtitle. text = This is the first subtitle.
textAlignment = ALIGN_CENTER textAlignment = ALIGN_CENTER
...@@ -360,8 +362,10 @@ TextOutput: ...@@ -360,8 +362,10 @@ TextOutput:
positionAnchor = 1 positionAnchor = 1
size = 1.0 size = 1.0
Subtitle[2]: Subtitle[2]:
presentationTimeUs = 1234000
Cues = [] Cues = []
Subtitle[3]: Subtitle[3]:
presentationTimeUs = 2345000
Cue[0]: Cue[0]:
text = This is the second subtitle. text = This is the second subtitle.
textAlignment = ALIGN_CENTER textAlignment = ALIGN_CENTER
...@@ -372,4 +376,5 @@ TextOutput: ...@@ -372,4 +376,5 @@ TextOutput:
positionAnchor = 1 positionAnchor = 1
size = 1.0 size = 1.0
Subtitle[4]: Subtitle[4]:
presentationTimeUs = 3456000
Cues = [] Cues = []
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