Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

iOS Side loading for captions and offline support #1109

Merged
merged 10 commits into from
Jul 11, 2018
Merged

iOS Side loading for captions and offline support #1109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3e2e16e
iOS Sidecar loading for captions and offline support (isAsset). Android
ashnfb Jun 21, 2018
05d4be2
Merge remote-tracking branch 'upstream/master'
ashnfb Jul 6, 2018
fa63a9e
Fix for textTracks not being set before selectedTextTrack (bug found …
ashnfb Jul 6, 2018
c9b7524
PR fixes for iOS sideloaded captions
ashnfb Jul 9, 2018
572c11a
Android device locale support for captions
ashnfb Jul 9, 2018
6339b9a
isPaused reverted
ashnfb Jul 9, 2018
93ce4d6
Support loading multiple sideloaded text tracks
cobarx Jul 9, 2018
ea7bc15
Merge branch 'nfb-onf-master'
ashnfb Jul 9, 2018
0d32a31
Merged, but text sideloading is not working
ashnfb Jul 10, 2018
fe26f54
Fix default sideload text track for system caption setting
cobarx Jul 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import android.util.Log;
import android.view.View;
import android.view.Window;
import android.view.accessibility.CaptioningManager;
import android.widget.FrameLayout;

import com.brentvatne.react.R;
Expand Down Expand Up @@ -68,6 +69,7 @@
import java.util.Map;
import java.lang.Object;
import java.util.ArrayList;
import java.util.Locale;

@SuppressLint("ViewConstructor")
class ReactExoplayerView extends FrameLayout implements
Expand Down Expand Up @@ -737,10 +739,11 @@ public void setSelectedTextTrack(String type, Dynamic value) {

TrackGroupArray groups = info.getTrackGroups(index);
int trackIndex = C.INDEX_UNSET;
trackSelector.setSelectionOverride(index, groups, null);

if (TextUtils.isEmpty(type)) {
// Do nothing
} else if (type.equals("disabled")) {
trackSelector.setSelectionOverride(index, groups, null);
return;
} else if (type.equals("language")) {
for (int i = 0; i < groups.length; ++i) {
Expand All @@ -760,9 +763,25 @@ public void setSelectedTextTrack(String type, Dynamic value) {
}
} else if (type.equals("index")) {
trackIndex = value.asInt();
} else { // default. invalid type or "system"
trackSelector.clearSelectionOverrides(index);
return;
} else { // default. Use system settings if possible
int sdk = android.os.Build.VERSION.SDK_INT;
if (sdk>18 && groups.length>0) {
CaptioningManager captioningManager = (CaptioningManager) themedReactContext.getSystemService(Context.CAPTIONING_SERVICE);
if (captioningManager.isEnabled()) {
// default is to take the first object
trackIndex = 0;

String locale = Locale.getDefault().getDisplayLanguage();
for (int i = 0; i < groups.length; ++i) {
Format format = groups.get(i).getFormat(0);
if (format.language != null && format.language.equals(locale)) {
trackIndex = i;
break;
}
}
}
} else return;

}

if (trackIndex == C.INDEX_UNSET) {
Expand Down
Loading