Commit 454b1069 by olly Committed by Oliver Woodman

Fix freezing playing multi-period DASH with EventStreams

EventSampleStream.readData required eventStreamUpdatable to be
false for END_OF_STREAM to be returned, but it was only being
set to false when the manifest became static. This change also
sets it to false if the period is not the last one in a dynamic
manifest. It also renames it the parameter to appendable, since
that's what it really represents. Events may still be removed
from the start of the EventStream as the period starts moving
out of the live window.

Issue: #4492

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=207517265
parent 27aa39e8
...@@ -99,8 +99,11 @@ ...@@ -99,8 +99,11 @@
([#4491](https://github.com/google/ExoPlayer/issues/4491)). ([#4491](https://github.com/google/ExoPlayer/issues/4491)).
* CEA-608: Improve handling of embedded styles * CEA-608: Improve handling of embedded styles
([#4321](https://github.com/google/ExoPlayer/issues/4321)). ([#4321](https://github.com/google/ExoPlayer/issues/4321)).
* DASH: Exclude text streams from duration calculations * DASH:
* Exclude text streams from duration calculations
([#4029](https://github.com/google/ExoPlayer/issues/4029)). ([#4029](https://github.com/google/ExoPlayer/issues/4029)).
* Fix freezing when playing multi-period manifests with `EventStream`s
([#4492](https://github.com/google/ExoPlayer/issues/4492)).
* DRM: Allow DrmInitData to carry a license server URL * DRM: Allow DrmInitData to carry a license server URL
([#3393](https://github.com/google/ExoPlayer/issues/3393)). ([#3393](https://github.com/google/ExoPlayer/issues/3393)).
* MPEG-TS: Fix bug preventing SCTE-35 cues from being output * MPEG-TS: Fix bug preventing SCTE-35 cues from being output
......
...@@ -149,7 +149,10 @@ import java.util.List; ...@@ -149,7 +149,10 @@ import java.util.List;
for (EventSampleStream eventSampleStream : eventSampleStreams) { for (EventSampleStream eventSampleStream : eventSampleStreams) {
for (EventStream eventStream : eventStreams) { for (EventStream eventStream : eventStreams) {
if (eventStream.id().equals(eventSampleStream.eventStreamId())) { if (eventStream.id().equals(eventSampleStream.eventStreamId())) {
eventSampleStream.updateEventStream(eventStream, manifest.dynamic); int lastPeriodIndex = manifest.getPeriodCount() - 1;
eventSampleStream.updateEventStream(
eventStream,
/* eventStreamAppendable= */ manifest.dynamic && periodIndex == lastPeriodIndex);
break; break;
} }
} }
......
...@@ -36,37 +36,53 @@ import java.io.IOException; ...@@ -36,37 +36,53 @@ import java.io.IOException;
private final EventMessageEncoder eventMessageEncoder; private final EventMessageEncoder eventMessageEncoder;
private long[] eventTimesUs; private long[] eventTimesUs;
private boolean eventStreamUpdatable; private boolean eventStreamAppendable;
private EventStream eventStream; private EventStream eventStream;
private boolean isFormatSentDownstream; private boolean isFormatSentDownstream;
private int currentIndex; private int currentIndex;
private long pendingSeekPositionUs; private long pendingSeekPositionUs;
EventSampleStream(EventStream eventStream, Format upstreamFormat, boolean eventStreamUpdatable) { public EventSampleStream(
EventStream eventStream, Format upstreamFormat, boolean eventStreamAppendable) {
this.upstreamFormat = upstreamFormat; this.upstreamFormat = upstreamFormat;
this.eventStream = eventStream; this.eventStream = eventStream;
eventMessageEncoder = new EventMessageEncoder(); eventMessageEncoder = new EventMessageEncoder();
pendingSeekPositionUs = C.TIME_UNSET; pendingSeekPositionUs = C.TIME_UNSET;
eventTimesUs = eventStream.presentationTimesUs; eventTimesUs = eventStream.presentationTimesUs;
updateEventStream(eventStream, eventStreamUpdatable); updateEventStream(eventStream, eventStreamAppendable);
} }
void updateEventStream(EventStream eventStream, boolean eventStreamUpdatable) { public String eventStreamId() {
return eventStream.id();
}
public void updateEventStream(EventStream eventStream, boolean eventStreamAppendable) {
long lastReadPositionUs = currentIndex == 0 ? C.TIME_UNSET : eventTimesUs[currentIndex - 1]; long lastReadPositionUs = currentIndex == 0 ? C.TIME_UNSET : eventTimesUs[currentIndex - 1];
this.eventStreamUpdatable = eventStreamUpdatable; this.eventStreamAppendable = eventStreamAppendable;
this.eventStream = eventStream; this.eventStream = eventStream;
this.eventTimesUs = eventStream.presentationTimesUs; this.eventTimesUs = eventStream.presentationTimesUs;
if (pendingSeekPositionUs != C.TIME_UNSET) { if (pendingSeekPositionUs != C.TIME_UNSET) {
seekToUs(pendingSeekPositionUs); seekToUs(pendingSeekPositionUs);
} else if (lastReadPositionUs != C.TIME_UNSET) { } else if (lastReadPositionUs != C.TIME_UNSET) {
currentIndex = Util.binarySearchCeil(eventTimesUs, lastReadPositionUs, false, false); currentIndex =
Util.binarySearchCeil(
eventTimesUs, lastReadPositionUs, /* inclusive= */ false, /* stayInBounds= */ false);
} }
} }
String eventStreamId() { /**
return eventStream.id(); * Seeks to the specified position in microseconds.
*
* @param positionUs The seek position in microseconds.
*/
public void seekToUs(long positionUs) {
currentIndex =
Util.binarySearchCeil(
eventTimesUs, positionUs, /* inclusive= */ true, /* stayInBounds= */ false);
boolean isPendingSeek = eventStreamAppendable && currentIndex == eventTimesUs.length;
pendingSeekPositionUs = isPendingSeek ? positionUs : C.TIME_UNSET;
} }
@Override @Override
...@@ -88,7 +104,7 @@ import java.io.IOException; ...@@ -88,7 +104,7 @@ import java.io.IOException;
return C.RESULT_FORMAT_READ; return C.RESULT_FORMAT_READ;
} }
if (currentIndex == eventTimesUs.length) { if (currentIndex == eventTimesUs.length) {
if (!eventStreamUpdatable) { if (!eventStreamAppendable) {
buffer.setFlags(C.BUFFER_FLAG_END_OF_STREAM); buffer.setFlags(C.BUFFER_FLAG_END_OF_STREAM);
return C.RESULT_BUFFER_READ; return C.RESULT_BUFFER_READ;
} else { } else {
...@@ -118,15 +134,4 @@ import java.io.IOException; ...@@ -118,15 +134,4 @@ import java.io.IOException;
return skipped; return skipped;
} }
/**
* Seeks to the specified position in microseconds.
*
* @param positionUs The seek position in microseconds.
*/
public void seekToUs(long positionUs) {
currentIndex = Util.binarySearchCeil(eventTimesUs, positionUs, true, false);
boolean isPendingSeek = eventStreamUpdatable && currentIndex == eventTimesUs.length;
pendingSeekPositionUs = isPendingSeek ? positionUs : C.TIME_UNSET;
}
} }
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