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

Merge branch 'master' into npm-package

parents a135dd34 584559ea

CHANGELOG.md

+3 −0
Changes for CHANGELOG.md: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 
* Support video caching for iOS [#955](https://github.com/react-native-community/react-native-video/pull/955)

* Video caching cleanups [#1172](https://github.com/react-native-community/react-native-video/pull/1172)

* Add ipod-library support [#926](https://github.com/react-native-community/react-native-video/pull/926/files)

* Fix crash on ExoPlayer when there are no audio tracks [#1233](https://github.com/react-native-community/react-native-video/pull/1233)

* Reduce package size [#1231](https://github.com/react-native-community/react-native-video/pull/1231)

* Remove unnecessary import in TextTrackType [#1229](https://github.com/react-native-community/react-native-video/pull/1229)



### Version 3.2.0

* Basic fullscreen support for Android MediaPlayer [#1138](https://github.com/react-native-community/react-native-video/pull/1138)

TextTrackType.js

+0 −2
Changes for TextTrackType.js: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line 
import keyMirror from 'keymirror';



export default {

  SRT: 'application/x-subrip',

  TTML: 'application/ttml+xml',

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

+4 −0
Changes for android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -830,6 +830,10 @@ class ReactExoplayerView extends FrameLayout implements 
    }



    private int getTrackIndexForDefaultLocale(TrackGroupArray groups) {

        if (groups.length == 0) { // Avoid a crash if we try to select a non-existant group

            return C.INDEX_UNSET;

        }



        int trackIndex = 0; // default if no match

        String locale2 = Locale.getDefault().getLanguage(); // 2 letter code

        String locale3 = Locale.getDefault().getISO3Language(); // 3 letter code

android/src/main/java/com/brentvatne/react/ReactVideoView.java

+1 −0
Changes for android/src/main/java/com/brentvatne/react/ReactVideoView.java: 1 added line, 0 removed lines.
Original line number Diff line number Diff line 
package com.brentvatne.react;



import android.annotation.SuppressLint;

import android.annotation.TargetApi;

import android.app.Activity;

import android.content.res.AssetFileDescriptor;

import android.graphics.Matrix;

package.json

+1 −1
Changes for package.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
{

    "name": "react-native-video",

    "version": "3.2.0",

    "version": "3.2.1",

    "description": "A <Video /> element for react-native",

    "main": "Video.js",

    "license": "MIT",