railbird/react-native-video
10
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into fix/gradle3

Browse Source
This commit is contained in:
Hampton Maxwell
2018-10-13 19:18:13 -07:00
committed by GitHub
parent 00174b63b8 604250b4a6
commit 051a2c39f4
28 changed files with 1063 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android-exoplayer/build.gradle
View File

@@ -19,7 +19,7 @@ android {
dependencies {
//noinspection GradleDynamicVersion
compileOnly "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
implementation('com.google.android.exoplayer:exoplayer:2.8.2') {
implementation('com.google.android.exoplayer:exoplayer:2.8.4') {
exclude group: 'com.android.support'
}
@@ -28,7 +28,7 @@ dependencies {
implementation "com.android.support:support-compat:${safeExtGet('supportLibVersion', '+')}"
implementation "com.android.support:support-media-compat:${safeExtGet('supportLibVersion', '+')}"
implementation('com.google.android.exoplayer:extension-okhttp:2.8.2') {
implementation('com.google.android.exoplayer:extension-okhttp:2.8.4') {
exclude group: 'com.squareup.okhttp3', module: 'okhttp'
}
implementation 'com.squareup.okhttp3:okhttp:3.11.0'

4
android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
View File

@@ -830,6 +830,10 @@ class ReactExoplayerView extends FrameLayout implements
}
private int getTrackIndexForDefaultLocale(TrackGroupArray groups) {
if (groups.length == 0) { // Avoid a crash if we try to select a non-existant group
return C.INDEX_UNSET;
}
int trackIndex = 0; // default if no match
String locale2 = Locale.getDefault().getLanguage(); // 2 letter code
String locale3 = Locale.getDefault().getISO3Language(); // 3 letter code