loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-14 19:19:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove weird nextOffset state from SampleMetadataQueue

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=159681714
This commit is contained in:
olly 2017-05-07 05:19:29 +01:00 committed by Oliver Woodman
parent 9154d54df9
commit 59ccd63544
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
library/core/src/main/java/com/google/android/exoplayer2/source/SampleMetadataQueue.java
View File

@ -55,7 +55,6 @@ import com.google.android.exoplayer2.util.Util;
private int relativeStartIndex; private int relativeStartIndex;
private int readPosition; private int readPosition;
private long nextOffset;
private long largestDequeuedTimestampUs; private long largestDequeuedTimestampUs;
private long largestQueuedTimestampUs; private long largestQueuedTimestampUs;
private boolean upstreamKeyframeRequired; private boolean upstreamKeyframeRequired;
@ -249,8 +248,6 @@ import com.google.android.exoplayer2.util.Util;
largestDequeuedTimestampUs = Math.max(largestDequeuedTimestampUs, buffer.timeUs); largestDequeuedTimestampUs = Math.max(largestDequeuedTimestampUs, buffer.timeUs);
readPosition++; readPosition++;
nextOffset = extrasHolder.offset + extrasHolder.size;
return C.RESULT_BUFFER_READ; return C.RESULT_BUFFER_READ;
} }
@ -298,7 +295,6 @@ import com.google.android.exoplayer2.util.Util;
} }
readPosition += sampleCountToKeyframe; readPosition += sampleCountToKeyframe;
nextOffset = offsets[(relativeStartIndex + readPosition) % capacity];
return true; return true;
} }
@ -310,8 +306,6 @@ import com.google.android.exoplayer2.util.Util;
return; return;
} }
readPosition = length; readPosition = length;
int relativeLastSampleIndex = (relativeStartIndex + readPosition - 1) % capacity;
nextOffset = offsets[relativeLastSampleIndex] + sizes[relativeLastSampleIndex];
} }
/** /**
@ -331,7 +325,12 @@ import com.google.android.exoplayer2.util.Util;
relativeStartIndex -= capacity; relativeStartIndex -= capacity;
} }
readPosition = 0; readPosition = 0;
return length == 0 ? nextOffset : offsets[relativeStartIndex]; if (length == 0) {
int relativeLastDiscardedIndex = (relativeStartIndex - 1 + capacity) % capacity;
return offsets[relativeLastDiscardedIndex] + sizes[relativeLastDiscardedIndex];
} else {
return offsets[relativeStartIndex];
}
} }
// Called by the loading thread. // Called by the loading thread.