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

Cleanups to video track handling.

Browse Source 
This also fixes a bug that compared track type & renderer index
This commit is contained in:
Hampton Maxwell 2018-12-31 21:33:02 -08:00 committed by GitHub
parent 756bbc96f0
commit d5168af211
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,7 +249,7 @@ class ReactExoplayerView extends FrameLayout implements
//BandwidthMeter.EventListener implementation //BandwidthMeter.EventListener implementation
@Override @Override
public void onBandwidthSample(int elapsedMs, long bytes, long bitrate) { public void onBandwidthSample(int elapsedMs, long bytes, long bitrate) {
if (mReportBandwidth == true) { if (mReportBandwidth) {
eventEmitter.bandwidthReport(bitrate); eventEmitter.bandwidthReport(bitrate);
} }
} }
@ -566,7 +566,6 @@ class ReactExoplayerView extends FrameLayout implements
} }
return audioTracks; return audioTracks;
} }
private WritableArray getVideoTrackInfo() { private WritableArray getVideoTrackInfo() {
WritableArray videoTracks = Arguments.createArray(); WritableArray videoTracks = Arguments.createArray();
@ -582,18 +581,13 @@ class ReactExoplayerView extends FrameLayout implements
for (int trackIndex = 0; trackIndex < group.length; trackIndex++) { for (int trackIndex = 0; trackIndex < group.length; trackIndex++) {
Format format = group.getFormat(trackIndex); Format format = group.getFormat(trackIndex);
WritableMap videoTrack = Arguments.createMap(); WritableMap videoTrack = Arguments.createMap();
videoTrack.putInt("width", format.width == Format.NO_VALUE ? 0 : format.width);
videoTrack.putString("width", videoTrack.putInt("height",format.height == Format.NO_VALUE ? 0 : format.height);
format.width == Format.NO_VALUE ? "" : format.width + ""); videoTrack.putInt("bitrate", format.bitrate == Format.NO_VALUE ? 0 : format.bitrate);
videoTrack.putString("height", videoTrack.putString("codecs", format.codecs != null ? format.codecs : "");
format.height == Format.NO_VALUE ? "" : format.height + ""); videoTrack.putString("trackId",
videoTrack.putString("bitrate", format.id == null ? String.valueOf(trackIndex) : format.id);
format.bitrate == Format.NO_VALUE ? ""
: String.format(Locale.US, "%.2fMbps", format.bitrate / 1000000f));
videoTrack.putString("trackid", format.id == null ? "" : "" + format.id + "");
videoTracks.pushMap(videoTrack); videoTracks.pushMap(videoTrack);
} }
} }
@ -819,7 +813,6 @@ class ReactExoplayerView extends FrameLayout implements
} }
public void setSelectedTrack(int trackType, String type, Dynamic value) { public void setSelectedTrack(int trackType, String type, Dynamic value) {
int rendererIndex = getTrackRendererIndex(trackType); int rendererIndex = getTrackRendererIndex(trackType);
if (rendererIndex == C.INDEX_UNSET) { if (rendererIndex == C.INDEX_UNSET) {
return; return;
@ -865,65 +858,38 @@ class ReactExoplayerView extends FrameLayout implements
if (value.asInt() < groups.length) { if (value.asInt() < groups.length) {
groupIndex = value.asInt(); groupIndex = value.asInt();
} }
} else if (type.equals("videoHeight")) { } else if (type.equals("resolution")) {
groupIndex = C.INDEX_UNSET; int height = value.asInt();
for (int i = 0; i < groups.length; ++i) { // Search for the exact height
/*0 is auto mode. Add all tracks of group 0*/ TrackGroup group = groups.get(i);
if (0 == value.asInt()) { for (int j = 0; j < group.length; j++) {
if (groups.length > 0) { Format format = group.getFormat(j);
TrackGroup group = groups.get(0); if (format.height == value.asInt()) {
groupIndex = i;
tracks = new int[group.length]; tracks[0] = j;
break;
groupIndex = 0;
for (int j = 0; j < group.length; j++) {
tracks[j] = j;
}
}
} else {
/*Search for the exact video Height*/
for (int i = 0; i < groups.length; ++i) {
TrackGroup group = groups.get(i);
for (int j = 0; j < group.length; j++) {
Format format = group.getFormat(j);
if (format.height == value.asInt()) {
groupIndex = i;
tracks[0] = j;
break;
}
}
}
/*If exact height not found then make it auto. Add all tracks of group 0*/
if (groupIndex == C.INDEX_UNSET) {
TrackGroup group = groups.get(0);
tracks = new int[group.length];
groupIndex = 0;
for (int j = 0; j < group.length; j++) {
tracks[j] = j;
} }
} }
} }
} else { // default } else if (rendererIndex == C.TRACK_TYPE_TEXT && Util.SDK_INT > 18) { // Text default
if (rendererIndex == C.TRACK_TYPE_TEXT && Util.SDK_INT > 18 && groups.length > 0) { // Use system settings if possible
// Use system settings if possible CaptioningManager captioningManager
CaptioningManager captioningManager = (CaptioningManager)themedReactContext.getSystemService(Context.CAPTIONING_SERVICE);
= (CaptioningManager)themedReactContext.getSystemService(Context.CAPTIONING_SERVICE); if (captioningManager != null && captioningManager.isEnabled()) {
if (captioningManager != null && captioningManager.isEnabled()) {
groupIndex = getGroupIndexForDefaultLocale(groups);
}
} else if (rendererIndex == C.TRACK_TYPE_AUDIO) {
groupIndex = getGroupIndexForDefaultLocale(groups); groupIndex = getGroupIndexForDefaultLocale(groups);
} }
} else if (rendererIndex == C.TRACK_TYPE_AUDIO) { // Audio default
groupIndex = getGroupIndexForDefaultLocale(groups);
} }
if (groupIndex == C.INDEX_UNSET) { if (groupIndex == C.INDEX_UNSET && trackType == C.TRACK_TYPE_VIDEO) { // Video auto
TrackGroup group = groups.get(0);
tracks = new int[group.length];
groupIndex = 0;
for (int j = 0; j < group.length; j++) {
tracks[j] = j;
}
} else if (groupIndex == C.INDEX_UNSET) {
trackSelector.setParameters(disableParameters); trackSelector.setParameters(disableParameters);
return; return;
} }
@ -938,6 +904,10 @@ class ReactExoplayerView extends FrameLayout implements
} }
private int getGroupIndexForDefaultLocale(TrackGroupArray groups) { private int getGroupIndexForDefaultLocale(TrackGroupArray groups) {
if (groups.length == 0){
return C.INDEX_UNSET;
}
int groupIndex = 0; // default if no match int groupIndex = 0; // default if no match
String locale2 = Locale.getDefault().getLanguage(); // 2 letter code String locale2 = Locale.getDefault().getLanguage(); // 2 letter code
String locale3 = Locale.getDefault().getISO3Language(); // 3 letter code String locale3 = Locale.getDefault().getISO3Language(); // 3 letter code