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

Ensure the SilenceMediaSource position is in range

Browse Source 
Issue: #6229
PiperOrigin-RevId: 260500986
This commit is contained in:
andrewlewis 2019-07-29 16:08:37 +01:00 committed by Oliver Woodman
parent d279c3d281
commit f5980a54a3
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASENOTES.md
View File

@ -14,6 +14,8 @@
([#6153](https://github.com/google/ExoPlayer/issues/6153)). ([#6153](https://github.com/google/ExoPlayer/issues/6153)).
* Fix `DataSchemeDataSource` re-opening and range requests * Fix `DataSchemeDataSource` re-opening and range requests
([#6192](https://github.com/google/ExoPlayer/issues/6192)). ([#6192](https://github.com/google/ExoPlayer/issues/6192)).
* Ensure the `SilenceMediaSource` position is in range
([#6229](https://github.com/google/ExoPlayer/issues/6229)).
* Flac extension: Parse `VORBIS_COMMENT` metadata * Flac extension: Parse `VORBIS_COMMENT` metadata
([#5527](https://github.com/google/ExoPlayer/issues/5527)). ([#5527](https://github.com/google/ExoPlayer/issues/5527)).

10
library/core/src/main/java/com/google/android/exoplayer2/source/SilenceMediaSource.java
View File

@ -118,6 +118,7 @@ public final class SilenceMediaSource extends BaseMediaSource {
@NullableType SampleStream[] streams, @NullableType SampleStream[] streams,
boolean[] streamResetFlags, boolean[] streamResetFlags,
long positionUs) { long positionUs) {
positionUs = constrainSeekPosition(positionUs);
for (int i = 0; i < selections.length; i++) { for (int i = 0; i < selections.length; i++) {
if (streams[i] != null && (selections[i] == null || !mayRetainStreamFlags[i])) { if (streams[i] != null && (selections[i] == null || !mayRetainStreamFlags[i])) {
sampleStreams.remove(streams[i]); sampleStreams.remove(streams[i]);
@ -144,6 +145,7 @@ public final class SilenceMediaSource extends BaseMediaSource {
@Override @Override
public long seekToUs(long positionUs) { public long seekToUs(long positionUs) {
positionUs = constrainSeekPosition(positionUs);
for (int i = 0; i < sampleStreams.size(); i++) { for (int i = 0; i < sampleStreams.size(); i++) {
((SilenceSampleStream) sampleStreams.get(i)).seekTo(positionUs); ((SilenceSampleStream) sampleStreams.get(i)).seekTo(positionUs);
} }
@ -152,7 +154,7 @@ public final class SilenceMediaSource extends BaseMediaSource {
@Override @Override
public long getAdjustedSeekPositionUs(long positionUs, SeekParameters seekParameters) { public long getAdjustedSeekPositionUs(long positionUs, SeekParameters seekParameters) {
return positionUs; return constrainSeekPosition(positionUs);
} }
@Override @Override
@ -172,6 +174,10 @@ public final class SilenceMediaSource extends BaseMediaSource {
@Override @Override
public void reevaluateBuffer(long positionUs) {} public void reevaluateBuffer(long positionUs) {}
private long constrainSeekPosition(long positionUs) {
return Util.constrainValue(positionUs, 0, durationUs);
}
} }
private static final class SilenceSampleStream implements SampleStream { private static final class SilenceSampleStream implements SampleStream {
@ -187,7 +193,7 @@ public final class SilenceMediaSource extends BaseMediaSource {
} }
public void seekTo(long positionUs) { public void seekTo(long positionUs) {
positionBytes = getAudioByteCount(positionUs); positionBytes = Util.constrainValue(getAudioByteCount(positionUs), 0, durationBytes);
} }
@Override @Override