Commit e9008cfa authored by Nicolas Gonzalez's avatar Nicolas Gonzalez
Browse files

merge CHANGELOG

parents 5f083e4f 1207d450

CHANGELOG.md

+1 −0
Changes for CHANGELOG.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
* Re-add fullscreenAutorotate prop [#1303](https://github.com/react-native-community/react-native-video/pull/1303)

* Make seek throw a useful error for NaN values [#1283](https://github.com/react-native-community/react-native-video/pull/1283)

* Video Filters and Save Video [#1306](https://github.com/react-native-community/react-native-video/pull/1306)

* Fix: volume should not change on onAudioFocusChange event [#1327](https://github.com/react-native-community/react-native-video/pull/1327)



### Version 3.2.0

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

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

+7 −4
Changes for android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java: 7 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ class ReactExoplayerView extends FrameLayout implements 
    private boolean isPaused;

    private boolean isBuffering;

    private float rate = 1f;

    private float audioVolume = 1f;



    private int minBufferMs = DefaultLoadControl.DEFAULT_MIN_BUFFER_MS;

    private int maxBufferMs = DefaultLoadControl.DEFAULT_MAX_BUFFER_MS;
@@ -454,10 +455,10 @@ class ReactExoplayerView extends FrameLayout implements 
        if (player != null) {

            if (focusChange == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK) {

                // Lower the volume

                player.setVolume(0.8f);

                player.setVolume(audioVolume * 0.8f);

            } else if (focusChange == AudioManager.AUDIOFOCUS_GAIN) {

                // Raise it back to normal

                player.setVolume(1);

                player.setVolume(audioVolume * 1);

            }

        }

    }
@@ -875,15 +876,17 @@ class ReactExoplayerView extends FrameLayout implements 
    }



    public void setMutedModifier(boolean muted) {

        audioVolume = muted ? 0.f : 1.f;

        if (player != null) {

            player.setVolume(muted ? 0 : 1);

            player.setVolume(audioVolume);

        }

    }





    public void setVolumeModifier(float volume) {

        audioVolume = volume;

        if (player != null) {

            player.setVolume(volume);

            player.setVolume(audioVolume);

        }

    }

examples/video-caching/ios/Podfile.lock

+2 −2
Changes for examples/video-caching/ios/Podfile.lock: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ PODS: 
  - glog (0.3.4)

  - React (0.56.0):

    - React/Core (= 0.56.0)

  - react-native-video/Video (3.1.0):

  - react-native-video/Video (3.2.2):

    - React

  - react-native-video/VideoCaching (3.1.0):

  - react-native-video/VideoCaching (3.2.2):

    - DVAssetLoaderDelegate (~> 0.3.1)

    - React

    - react-native-video/Video

examples/video-caching/ios/VideoCaching/Info.plist

+15 −14
Changes for examples/video-caching/ios/VideoCaching/Info.plist: 15 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -24,6 +24,21 @@ 
	<string>1</string>

	<key>LSRequiresIPhoneOS</key>

	<true/>

	<key>NSAppTransportSecurity</key>

	<dict>

		<key>NSAllowsArbitraryLoads</key>

		<true/>

		<key>NSExceptionDomains</key>

		<dict>

			<key>localhost</key>

			<dict>

				<key>NSExceptionAllowsInsecureHTTPLoads</key>

				<true/>

			</dict>

		</dict>

	</dict>

	<key>NSLocationWhenInUseUsageDescription</key>

	<string></string>

	<key>UILaunchStoryboardName</key>

	<string>LaunchScreen</string>

	<key>UIRequiredDeviceCapabilities</key>
@@ -38,19 +53,5 @@ 
	</array>

	<key>UIViewControllerBasedStatusBarAppearance</key>

	<false/>

	<key>NSLocationWhenInUseUsageDescription</key>

	<string></string>

	<key>NSAppTransportSecurity</key>

	<!--See http://ste.vn/2015/06/10/configuring-app-transport-security-ios-9-osx-10-11/ -->

	<dict>

		<key>NSExceptionDomains</key>

		<dict>

			<key>localhost</key>

			<dict>

				<key>NSExceptionAllowsInsecureHTTPLoads</key>

				<true/>

			</dict>

		</dict>

	</dict>

</dict>

</plist>