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

Merge branch 'master' into chore/fix_fullscreen_btn_when_already_in_fullscreen

Browse Source
This commit is contained in:
Olivier Bouillet 2022-11-16 22:00:45 +01:00 committed by GitHub
commit 908dcb147b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -10,6 +10,7 @@
- Fix iOS RCTSwiftLog naming collision [#2868](https://github.com/react-native-video/react-native-video/issues/2868) - Fix iOS RCTSwiftLog naming collision [#2868](https://github.com/react-native-video/react-native-video/issues/2868)
- Added "homepage" to package.json [#2882](https://github.com/react-native-video/react-native-video/pull/2882) - Added "homepage" to package.json [#2882](https://github.com/react-native-video/react-native-video/pull/2882)
- Fix regression when fullscreen prop is used combined with controls [#2911](https://github.com/react-native-video/react-native-video/pull/2911) - Fix regression when fullscreen prop is used combined with controls [#2911](https://github.com/react-native-video/react-native-video/pull/2911)
- Fix: memory leak issue on iOS [#2907](https://github.com/react-native-video/react-native-video/pull/2907)
### Version 6.0.0-alpha.3 ### Version 6.0.0-alpha.3

4
ios/Video/RCTVideo.swift
View File

@ -280,7 +280,7 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
self._playerItem?.preferredPeakBitRate = Double(maxBitRate) self._playerItem?.preferredPeakBitRate = Double(maxBitRate)
} }
self._player = AVPlayer() self._player = self._player ?? AVPlayer()
DispatchQueue.global(qos: .default).async { DispatchQueue.global(qos: .default).async {
self._player?.replaceCurrentItem(with: playerItem) self._player?.replaceCurrentItem(with: playerItem)
} }
@ -704,6 +704,7 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
else else
{ {
_playerViewController?.view.removeFromSuperview() _playerViewController?.view.removeFromSuperview()
_playerViewController?.removeFromParent()
_playerViewController = nil _playerViewController = nil
_playerObserver.playerViewController = nil _playerObserver.playerViewController = nil
self.usePlayerLayer() self.usePlayerLayer()
@ -836,6 +837,7 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
if let _playerViewController = _playerViewController { if let _playerViewController = _playerViewController {
_playerViewController.view.removeFromSuperview() _playerViewController.view.removeFromSuperview()
_playerViewController.removeFromParent()
_playerViewController.rctDelegate = nil _playerViewController.rctDelegate = nil
_playerViewController.player = nil _playerViewController.player = nil
self._playerViewController = nil self._playerViewController = nil