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

Upgrade exoplayer to 2.11.4 (#2034)

Browse Source
This commit is contained in:
limaAniceto 2020-06-11 14:17:33 +01:00 committed by GitHub
parent 2dd5025190
commit 7c8c613a65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android-exoplayer/build.gradle
View File

@ -23,7 +23,7 @@ android {
dependencies { dependencies {
implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}" implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
implementation('com.google.android.exoplayer:exoplayer:2.10.5') { implementation('com.google.android.exoplayer:exoplayer:2.11.4') {
exclude group: 'com.android.support' exclude group: 'com.android.support'
} }
@ -32,7 +32,7 @@ dependencies {
implementation "androidx.core:core:1.1.0" implementation "androidx.core:core:1.1.0"
implementation "androidx.media:media:1.1.0" implementation "androidx.media:media:1.1.0"
implementation('com.google.android.exoplayer:extension-okhttp:2.10.5') { implementation('com.google.android.exoplayer:extension-okhttp:2.11.4') {
exclude group: 'com.squareup.okhttp3', module: 'okhttp' exclude group: 'com.squareup.okhttp3', module: 'okhttp'
} }
implementation 'com.squareup.okhttp3:okhttp:3.14.3' implementation 'com.squareup.okhttp3:okhttp:3.14.3'

3
android-exoplayer/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java
View File

@ -21,6 +21,7 @@ import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.source.TrackGroupArray;
import com.google.android.exoplayer2.text.Cue; import com.google.android.exoplayer2.text.Cue;
import com.google.android.exoplayer2.text.TextRenderer; import com.google.android.exoplayer2.text.TextRenderer;
import com.google.android.exoplayer2.text.TextOutput;
import com.google.android.exoplayer2.trackselection.TrackSelectionArray; import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
import com.google.android.exoplayer2.ui.SubtitleView; import com.google.android.exoplayer2.ui.SubtitleView;
@ -200,7 +201,7 @@ public final class ExoPlayerView extends FrameLayout {
} }
private final class ComponentListener implements SimpleExoPlayer.VideoListener, private final class ComponentListener implements SimpleExoPlayer.VideoListener,
TextRenderer.Output, ExoPlayer.EventListener { TextOutput, ExoPlayer.EventListener {
// TextRenderer.Output implementation // TextRenderer.Output implementation

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

@ -915,7 +915,7 @@ class ReactExoplayerView extends FrameLayout implements
// Special case for decoder initialization failures. // Special case for decoder initialization failures.
MediaCodecRenderer.DecoderInitializationException decoderInitializationException = MediaCodecRenderer.DecoderInitializationException decoderInitializationException =
(MediaCodecRenderer.DecoderInitializationException) cause; (MediaCodecRenderer.DecoderInitializationException) cause;
if (decoderInitializationException.decoderName == null) { if (decoderInitializationException.codecInfo.name == null) {
if (decoderInitializationException.getCause() instanceof MediaCodecUtil.DecoderQueryException) { if (decoderInitializationException.getCause() instanceof MediaCodecUtil.DecoderQueryException) {
errorString = getResources().getString(R.string.error_querying_decoders); errorString = getResources().getString(R.string.error_querying_decoders);
} else if (decoderInitializationException.secureDecoderRequired) { } else if (decoderInitializationException.secureDecoderRequired) {
@ -927,7 +927,7 @@ class ReactExoplayerView extends FrameLayout implements
} }
} else { } else {
errorString = getResources().getString(R.string.error_instantiating_decoder, errorString = getResources().getString(R.string.error_instantiating_decoder,
decoderInitializationException.decoderName); decoderInitializationException.codecInfo.name);
} }
} }
} }