Unverified Commit b3291ca1 authored by Hampton Maxwell's avatar Hampton Maxwell Committed by GitHub
Browse files

Merge pull request #1074 from react-native-community/bugfix/no-text-title 

Text track cleanups
parents 20aae509 b850b31f

android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java

+2 −2
Changes for android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -520,9 +520,9 @@ class ReactExoplayerView extends FrameLayout implements 
             Format format = groups.get(i).getFormat(0);

             WritableMap textTrack = Arguments.createMap();

             textTrack.putInt("index", i);

             textTrack.putString("title", format.id);

             textTrack.putString("title", format.id != null ? format.id : "");

             textTrack.putString("type", format.sampleMimeType);

             textTrack.putString("language", format.language);

             textTrack.putString("language", format.language != null ? format.language : "");

             textTracks.pushMap(textTrack);

        }

        return textTracks;

android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java

+6 −2
Changes for android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java: 6 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -126,10 +126,14 @@ public class ReactExoplayerViewManager extends ViewGroupManager<ReactExoplayerVi 
    @ReactProp(name = PROP_SELECTED_TEXT_TRACK)

    public void setSelectedTextTrack(final ReactExoplayerView videoView,

                                     @Nullable ReadableMap selectedTextTrack) {

        String typeString = selectedTextTrack.hasKey(PROP_SELECTED_TEXT_TRACK_TYPE)

        String typeString = null;

        Dynamic value = null;

        if (selectedTextTrack != null) {

            typeString = selectedTextTrack.hasKey(PROP_SELECTED_TEXT_TRACK_TYPE)

                    ? selectedTextTrack.getString(PROP_SELECTED_TEXT_TRACK_TYPE) : null;

        Dynamic value = selectedTextTrack.hasKey(PROP_SELECTED_TEXT_TRACK_VALUE)

            value = selectedTextTrack.hasKey(PROP_SELECTED_TEXT_TRACK_VALUE)

                    ? selectedTextTrack.getDynamic(PROP_SELECTED_TEXT_TRACK_VALUE) : null;

        }

        videoView.setSelectedTextTrack(typeString, value);

    }

ios/RCTVideo.m

+7 −4
Changes for ios/RCTVideo.m: 7 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -702,13 +702,16 @@ static NSString *const timedMetadata = @"timedMetadata"; 
                                  mediaSelectionGroupForMediaCharacteristic:AVMediaCharacteristicLegible];

  for (int i = 0; i < group.options.count; ++i) {

    AVMediaSelectionOption *currentOption = [group.options objectAtIndex:i];

    NSString *title = [[[currentOption commonMetadata]

                        valueForKey:@"value"]

                       objectAtIndex:0];

    NSString *title = @"";

    NSArray *values = [[currentOption commonMetadata] valueForKey:@"value"];

    if (values.count > 0) {

      title = [values objectAtIndex:0];

    }

    NSString *language = [currentOption extendedLanguageTag] ? [currentOption extendedLanguageTag] : @"";

    NSDictionary *textTrack = @{

                                @"index": [NSNumber numberWithInt:i],

                                @"title": title,

                                @"language": [currentOption extendedLanguageTag]

                                @"language": language

                                };

    [textTracks addObject:textTrack];

  }