Ensure the SilenceMediaSource position is in range

Issue: google#6229 PiperOrigin-RevId: 260500986
qiqian · Jul 29, 2019 · f5980a5 · f5980a5
1 parent d279c3d
commit f5980a5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -14,6 +14,8 @@
   ([#6153](https://github.com/google/ExoPlayer/issues/6153)).
 * Fix `DataSchemeDataSource` re-opening and range requests
   ([#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
   ([#5527](https://github.com/google/ExoPlayer/issues/5527)).
 

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SilenceMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SilenceMediaSource.java
@@ -118,6 +118,7 @@ public long selectTracks(
         @NullableType SampleStream[] streams,
         boolean[] streamResetFlags,
         long positionUs) {
+      positionUs = constrainSeekPosition(positionUs);
       for (int i = 0; i < selections.length; i++) {
         if (streams[i] != null && (selections[i] == null || !mayRetainStreamFlags[i])) {
           sampleStreams.remove(streams[i]);
@@ -144,6 +145,7 @@ public long readDiscontinuity() {
 
     @Override
     public long seekToUs(long positionUs) {
+      positionUs = constrainSeekPosition(positionUs);
       for (int i = 0; i < sampleStreams.size(); i++) {
         ((SilenceSampleStream) sampleStreams.get(i)).seekTo(positionUs);
       }
@@ -152,7 +154,7 @@ public long seekToUs(long positionUs) {
 
     @Override
     public long getAdjustedSeekPositionUs(long positionUs, SeekParameters seekParameters) {
-      return positionUs;
+      return constrainSeekPosition(positionUs);
     }
 
     @Override
@@ -172,6 +174,10 @@ public boolean continueLoading(long positionUs) {
 
     @Override
     public void reevaluateBuffer(long positionUs) {}
+
+    private long constrainSeekPosition(long positionUs) {
+      return Util.constrainValue(positionUs, 0, durationUs);
+    }
   }
 
   private static final class SilenceSampleStream implements SampleStream {
@@ -187,7 +193,7 @@ public SilenceSampleStream(long durationUs) {
     }
 
     public void seekTo(long positionUs) {
-      positionBytes = getAudioByteCount(positionUs);
+      positionBytes = Util.constrainValue(getAudioByteCount(positionUs), 0, durationBytes);
     }
 
     @Override