Merge pull request #4801 from nicklasl/trackselector-filter-on-framerate

Trackselector filter on framerate

Merge pull request #4801 from nicklasl/trackselector-filter-on-framerate
Trackselector filter on framerate
1e3c2a6b · ojw28 · Oliver Woodman · 6323c190 · 1e3c2a6b · 1e3c2a6b
Commit 1e3c2a6b authored Sep 20, 2018 by ojw28 Committed by Oliver Woodman Sep 20, 2018
Showing with 45 additions and 14 deletions
library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
@@ -136,7 +136,8 @@ public final class DefaultTrackSelectorTest {
            /* viewportWidth= */ 4,
            /* viewportHeight= */ 5,
            /* viewportOrientationMayChange= */ false,
-            /* tunnelingAudioSessionId= */ C.AUDIO_SESSION_ID_UNSET);
+            /* tunnelingAudioSessionId= */ C.AUDIO_SESSION_ID_UNSET,
+            /* maxFrameRate= */ 6);

    Parcel parcel = Parcel.obtain();
    parametersToParcel.writeToParcel(parcel, 0);