From 86a89eaed2fe5f7f81ebbb43419936b417781324 Mon Sep 17 00:00:00 2001
From: wood1986 <5212215+wood1986@users.noreply.github.com>
Date: Fri, 4 Nov 2022 00:53:02 -0700
Subject: [PATCH] fix: fix memory leak for iOS

---
 CHANGELOG.md             | 3 ++-
 ios/Video/RCTVideo.swift | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a956d2a..d9026c6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - Android: fix linter warning [#2891] (https://github.com/react-native-video/react-native-video/pull/2891)
 - 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)
+- Fix: memory leak issue on iOS [#2907](https://github.com/react-native-video/react-native-video/pull/2907)
 
 ### Version 6.0.0-alpha.3
 
@@ -100,7 +101,7 @@
 
 - Basic support for DRM on iOS and Android [#1445](https://github.com/react-native-community/react-native-video/pull/1445)
 
-### Version 5.1.0-alpha6 
+### Version 5.1.0-alpha6
 
 - Fix iOS bug which would break size of views when video is displayed with controls on a non full-screen React view. [#1931](https://github.com/react-native-community/react-native-video/pull/1931)
 - Fix video dimensions being undefined when playing HLS in ios. [#1992](https://github.com/react-native-community/react-native-video/pull/1992)
diff --git a/ios/Video/RCTVideo.swift b/ios/Video/RCTVideo.swift
index bc36d17d..2b4a20de 100644
--- a/ios/Video/RCTVideo.swift
+++ b/ios/Video/RCTVideo.swift
@@ -280,7 +280,7 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
                     self._playerItem?.preferredPeakBitRate = Double(maxBitRate)
                 }
                 
-                self._player = AVPlayer()
+                self._player = self._player ?? AVPlayer()
                 DispatchQueue.global(qos: .default).async {
                     self._player?.replaceCurrentItem(with: playerItem)
                 }
@@ -704,6 +704,7 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
             else
             {
                 _playerViewController?.view.removeFromSuperview()
+                _playerViewController?.removeFromParent()
                 _playerViewController = nil
                 _playerObserver.playerViewController = nil
                 self.usePlayerLayer()
@@ -836,6 +837,7 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
         
         if let _playerViewController = _playerViewController {
             _playerViewController.view.removeFromSuperview()
+            _playerViewController.removeFromParent()
             _playerViewController.rctDelegate = nil
             _playerViewController.player = nil
             self._playerViewController = nil