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

fix(android): video tracks crash and clean (#3767)

Browse Source 
* perf: ensure we do not provide callback to native if no callback provided from app

* chore: rework bufferConfig to make it more generic and reduce ReactExoplayerView code size

* chore: improve issue template

* fix(android): avoid video view flickering at playback startup

* fix: fix crash when invalid index type is provided and minor clean up
This commit is contained in:
Olivier Bouillet
2024-05-14 16:39:41 +02:00
committed by GitHub
parent 98b4a75a90
commit 219496ff3a
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1358,7 +1358,7 @@ public class ReactExoplayerView extends FrameLayout implements
videoTrack.setHeight(format.height == Format.NO_VALUE ? 0 : format.height); videoTrack.setHeight(format.height == Format.NO_VALUE ? 0 : format.height);
videoTrack.setBitrate(format.bitrate == Format.NO_VALUE ? 0 : format.bitrate); videoTrack.setBitrate(format.bitrate == Format.NO_VALUE ? 0 : format.bitrate);
if (format.codecs != null) videoTrack.setCodecs(format.codecs); if (format.codecs != null) videoTrack.setCodecs(format.codecs);
videoTrack.setTrackId(format.id == null ? String.valueOf(trackIndex) : format.id);; videoTrack.setTrackId(format.id == null ? String.valueOf(trackIndex) : format.id);
return videoTrack; return videoTrack;
} }
@@ -1798,9 +1798,14 @@ public class ReactExoplayerView extends FrameLayout implements
} }
} }
} else if ("index".equals(type)) { } else if ("index".equals(type)) {
int iValue = Integer.parseInt(value); try {
if (iValue < groups.length) { int iValue = Integer.parseInt(value);
groupIndex = iValue; if (iValue < groups.length) {
groupIndex = iValue;
}
} catch (Exception e) {
DebugLog.e(TAG, "cannot parse index:" + value);
groupIndex = 0;
} }
} else if ("resolution".equals(type)) { } else if ("resolution".equals(type)) {
int height = Integer.parseInt(value); int height = Integer.parseInt(value);
@@ -1866,7 +1871,6 @@ public class ReactExoplayerView extends FrameLayout implements
if (groupIndex == C.INDEX_UNSET && trackType == C.TRACK_TYPE_VIDEO && groups.length != 0) { // Video auto if (groupIndex == C.INDEX_UNSET && trackType == C.TRACK_TYPE_VIDEO && groups.length != 0) { // Video auto
// Add all tracks as valid options for ABR to choose from // Add all tracks as valid options for ABR to choose from
TrackGroup group = groups.get(0); TrackGroup group = groups.get(0);
tracks = new ArrayList<>(group.length);
ArrayList<Integer> allTracks = new ArrayList<>(group.length); ArrayList<Integer> allTracks = new ArrayList<>(group.length);
groupIndex = 0; groupIndex = 0;
for (int j = 0; j < group.length; j++) { for (int j = 0; j < group.length; j++) {