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

Merge pull request #2318 from WeiChungChang/far_seek_improvement

Browse source 
Improve far seek performance of chunkSampleStream
This commit is contained in:
ojw28 2017-01-16 00:02:44 +00:00 committed by GitHub
commit a418b132d9
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -229,10 +229,11 @@ 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 the specified time, if it's present in the buffer.
* *
* @param timeUs The seek time. * @param timeUs The seek time.
* @param skipToLastKey Skip to last key regardless the seek time is out of range .
* @return Whether the skip was successful. * @return Whether the skip was successful.
*/ */
public boolean skipToKeyframeBefore(long timeUs) { public boolean skipToKeyframeBefore(long timeUs, boolean skipToLastKey) {
long nextOffset = infoQueue.skipToKeyframeBefore(timeUs); long nextOffset = infoQueue.skipToKeyframeBefore(timeUs, skipToLastKey);
if (nextOffset == C.POSITION_UNSET) { if (nextOffset == C.POSITION_UNSET) {
return false; return false;
} }
@ -240,6 +241,16 @@ public final class DefaultTrackOutput implements TrackOutput {
return true; return true;
} }
/**
* Attempts to skip to the keyframe before the specified time, if it's present in the buffer.
*
* @param timeUs The seek time.
* @return Whether the skip was successful.
*/
public boolean skipToKeyframeBefore(long timeUs) {
return infoQueue.skipToKeyframeBefore(timeUs, false);
}
/** /**
* Attempts to read from the queue. * Attempts to read from the queue.
* *
@ -781,12 +792,12 @@ public final class DefaultTrackOutput implements TrackOutput {
* @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) { public synchronized long skipToKeyframeBefore(long timeUs, boolean skipToLastKey) {
if (queueSize == 0 || timeUs < timesUs[relativeReadIndex]) { if (queueSize == 0 || timeUs < timesUs[relativeReadIndex]) {
return C.POSITION_UNSET; return C.POSITION_UNSET;
} }
if (timeUs > largestQueuedTimestampUs) { if (timeUs > largestQueuedTimestampUs && !skipToLastKey) {
return C.POSITION_UNSET; return C.POSITION_UNSET;
} }

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

@ -122,7 +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() && sampleQueue.skipToKeyframeBefore(positionUs); boolean seekInsideBuffer = !isPendingReset() &&
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