sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build break + cleanup

Browse source
This commit is contained in:
Oliver Woodman 2017-01-16 00:20:51 +00:00
parent a418b132d9
commit 41c4295aee
2 changed files with 35 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
library/src/main/java/com/google/android/exoplayer2/extractor/DefaultTrackOutput.java
View file

@ -226,29 +226,37 @@ public final class DefaultTrackOutput implements TrackOutput {
} }
/** /**
* Attempts to skip to the keyframe before the specified time, if it's present in the buffer. * Attempts to skip to the keyframe before or at the specified time. Succeeds only if the buffer
* * contains a keyframe with a timestamp of {@code timeUs} or earlier, and if {@code timeUs} falls
* @param timeUs The seek time. * within the currently buffered media.
* @param skipToLastKey Skip to last key regardless the seek time is out of range . * <p>
* @return Whether the skip was successful. * This method is equivalent to {@code skipToKeyframeBefore(timeUs, false)}.
*/
public boolean skipToKeyframeBefore(long timeUs, boolean skipToLastKey) {
long nextOffset = infoQueue.skipToKeyframeBefore(timeUs, skipToLastKey);
if (nextOffset == C.POSITION_UNSET) {
return false;
}
dropDownstreamTo(nextOffset);
return true;
}
/**
* Attempts to skip to the keyframe before the specified time, if it's present in the buffer.
* *
* @param timeUs The seek time. * @param timeUs The seek time.
* @return Whether the skip was successful. * @return Whether the skip was successful.
*/ */
public boolean skipToKeyframeBefore(long timeUs) { public boolean skipToKeyframeBefore(long timeUs) {
return infoQueue.skipToKeyframeBefore(timeUs, false); return skipToKeyframeBefore(timeUs, false);
}
/**
* Attempts to skip to the keyframe before or at the specified time. Succeeds only if the buffer
* contains a keyframe with a timestamp of {@code timeUs} or earlier. If
* {@code allowTimeBeyondBuffer} is {@code false} then it is also required that {@code timeUs}
* falls within the buffer.
*
* @param timeUs The seek time.
* @param allowTimeBeyondBuffer Whether the skip can succeed if {@code timeUs} is beyond the end
* of the buffer.
* @return Whether the skip was successful.
*/
public boolean skipToKeyframeBefore(long timeUs, boolean allowTimeBeyondBuffer) {
long nextOffset = infoQueue.skipToKeyframeBefore(timeUs, allowTimeBeyondBuffer);
if (nextOffset == C.POSITION_UNSET) {
return false;
}
dropDownstreamTo(nextOffset);
return true;
} }
/** /**
@ -786,18 +794,22 @@ public final class DefaultTrackOutput implements TrackOutput {
} }
/** /**
* Attempts to locate the keyframe before the specified time, if it's present in the buffer. * Attempts to locate the keyframe before or at the specified time. If
* {@code allowTimeBeyondBuffer} is {@code false} then it is also required that {@code timeUs}
* falls within the buffer.
* *
* @param timeUs The seek time. * @param timeUs The seek time.
* @param allowTimeBeyondBuffer Whether the skip can succeed if {@code timeUs} is beyond the end
* of the buffer.
* @return The offset of the keyframe's data if the keyframe was present. * @return The offset of the keyframe's data if the keyframe was present.
* {@link C#POSITION_UNSET} otherwise. * {@link C#POSITION_UNSET} otherwise.
*/ */
public synchronized long skipToKeyframeBefore(long timeUs, boolean skipToLastKey) { public synchronized long skipToKeyframeBefore(long timeUs, boolean allowTimeBeyondBuffer) {
if (queueSize == 0 || timeUs < timesUs[relativeReadIndex]) { if (queueSize == 0 || timeUs < timesUs[relativeReadIndex]) {
return C.POSITION_UNSET; return C.POSITION_UNSET;
} }
if (timeUs > largestQueuedTimestampUs && !skipToLastKey) { if (timeUs > largestQueuedTimestampUs && !allowTimeBeyondBuffer) {
return C.POSITION_UNSET; return C.POSITION_UNSET;
} }

4
library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java
View file

@ -122,8 +122,8 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
public void seekToUs(long positionUs) { public void seekToUs(long positionUs) {
lastSeekPositionUs = positionUs; lastSeekPositionUs = positionUs;
// If we're not pending a reset, see if we can seek within the sample queue. // If we're not pending a reset, see if we can seek within the sample queue.
boolean seekInsideBuffer = !isPendingReset() && boolean seekInsideBuffer = !isPendingReset()
sampleQueue.skipToKeyframeBefore(positionUs, (positionUs < getNextLoadPositionUs())); && sampleQueue.skipToKeyframeBefore(positionUs, positionUs < getNextLoadPositionUs());
if (seekInsideBuffer) { if (seekInsideBuffer) {
// We succeeded. All we need to do is discard any chunks that we've moved past. // We succeeded. All we need to do is discard any chunks that we've moved past.
while (mediaChunks.size() > 1 while (mediaChunks.size() > 1