Merge pull request #1 from BrightcoveOS/updateDurationFix

Modified updateDurationUs() to also filter out TrackRenderers with a
brightcove · Oct 23, 2015 · 5904b22 · 5904b22
2 parents 54fed33 + 8f2103d
commit 5904b22
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 114 deletions.
diff --git a/build.gradle~ b/build.gradle~
diff --git a/library/build.gradle~ b/library/build.gradle~
diff --git a/library/src/main/java/com/google/android/exoplayer/ExoPlayerImplInternal.java b/library/src/main/java/com/google/android/exoplayer/ExoPlayerImplInternal.java
@@ -337,7 +337,10 @@ private void updateDurationUs() {
       long durationUs = 0;
       for (int i = 0; i < renderers.length; i++) {
           TrackRenderer renderer = renderers[i];
-          if (rendererEnabledFlags[i] && renderer.getState() != TrackRenderer.STATE_UNPREPARED && renderer.getState() != TrackRenderer.STATE_RELEASED ) {
+          if (rendererEnabledFlags[i]
+              && renderer.getState() != TrackRenderer.STATE_IGNORE
+              && renderer.getState() != TrackRenderer.STATE_UNPREPARED
+              && renderer.getState() != TrackRenderer.STATE_RELEASED ) {
               if (durationUs == TrackRenderer.UNKNOWN_TIME_US) {
                   // We've already encountered a track for which the duration is unknown, so the media
                   // duration is unknown regardless of the duration of this track.