player: mem leak fix (SegmentTimelineElement)

Author: yuliskov

doubletapplayerview/src/main/java/com/github/vkay94/dtpv/youtube/views/YouTubeSecondsView.kt

@@ -108,6 +108,26 @@ class SecondsView(context: Context, attrs: AttributeSet?) :
         reset()
     }
 
+    // MOD: memory leak fix (animator keep ref to activity)
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+
+        firstAnimator.removeAllUpdateListeners()
+        firstAnimator.removeAllListeners()
+
+        secondAnimator.removeAllUpdateListeners()
+        secondAnimator.removeAllListeners()
+
+        thirdAnimator.removeAllUpdateListeners()
+        thirdAnimator.removeAllListeners()
+
+        fourthAnimator.removeAllUpdateListeners()
+        fourthAnimator.removeAllListeners()
+
+        fifthAnimator.removeAllUpdateListeners()
+        fifthAnimator.removeAllListeners()
+    }
+
     private fun reset() {
         icon1.alpha = 0f
         icon2.alpha = 0f

exoplayer-amzn-2.10.6/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java

@@ -207,6 +207,10 @@ public boolean isPrepared() {
 
   @Override
   public void run() {
+    if (!hasSurface) { // MOD: mem leak fix (SegmentTimelineElement)
+      return;
+    }
+
     Callback callback = getCallback();
     callback.onCurrentPositionChanged(this);
     callback.onBufferedPositionChanged(this);

smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/playback/PlaybackActivity.java

@@ -181,21 +181,15 @@ public void finish() {
             getViewManager().blockTop(this);
             getViewManager().startParentView(this);
         } else {
-            // NOTE: don't destroy player to prevent leaking (Activities num grow with every player start)!
-            // The command to check: adb shell dumpsys meminfo org.smarttube.stable
-            getViewManager().startParentView(this);
-            // Player with TextureView keeps running in background because onStop() fired with huge delay (~5sec).
-            mPlaybackFragment.maybeReleasePlayer();
-
-            //if (getPlayerTweaksData().isKeepFinishedActivityEnabled()) {
-            //    //moveTaskToBack(true); // Don't do this or you'll have problems when player overlaps other apps (e.g. casting)
-            //    getViewManager().startParentView(this);
-            //
-            //    // Player with TextureView keeps running in background because onStop() fired with huge delay (~5sec).
-            //    mPlaybackFragment.maybeReleasePlayer();
-            //} else {
-            //    super.finish();
-            //}
+            if (getPlayerTweaksData().isKeepFinishedActivityEnabled()) {
+                //moveTaskToBack(true); // Don't do this or you'll have problems when player overlaps other apps (e.g. casting)
+                getViewManager().startParentView(this);
+
+                // Player with TextureView keeps running in background because onStop() fired with huge delay (~5sec).
+                mPlaybackFragment.maybeReleasePlayer();
+            } else {
+                super.finish();
+            }
         }
     }
 

smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/playback/PlaybackFragment.java

@@ -75,6 +75,7 @@
 import com.liskovsoft.smartyoutubetv2.tv.ui.common.LeanbackActivity;
 import com.liskovsoft.smartyoutubetv2.tv.ui.common.UriBackgroundManager;
 import com.liskovsoft.smartyoutubetv2.tv.ui.mod.leanback.misc.ProgressBarManager;
+import com.liskovsoft.smartyoutubetv2.tv.ui.mod.leanback.playerglue.tweaks.PlaybackTransportRowPresenter;
 import com.liskovsoft.smartyoutubetv2.tv.ui.playback.mod.SeekModePlaybackFragment;
 import com.liskovsoft.smartyoutubetv2.tv.ui.playback.mod.surface.SurfacePlaybackFragmentGlueHost;
 import com.liskovsoft.smartyoutubetv2.tv.ui.playback.other.BackboneQueueNavigator;
@@ -394,21 +395,46 @@ private void destroyPlayerObjects() {
             mRowsAdapter.clear();
             mRowsAdapter = null;
         }
+        // pollution exo SegmentBase.SegmentTimelineElement 3 million allocation and grown after the player reinstantiation
+        setPlaybackRow(null);
+        setOnPlaybackItemViewClickedListener(null);
+        setHostCallback(null);
+        setPlaybackSeekUiClient(null);
+        setPlaybackRowPresenter(null);
+        setOnKeyInterceptListener(null);
+        if (mRowsSupportFragment != null && mRowsSupportFragment.getVerticalGridView() != null) {
+            mRowsSupportFragment.getVerticalGridView().setAdapter(null);
+            mRowsSupportFragment.getBridgeAdapter().clear();
+            mRowsSupportFragment.getBridgeAdapter().getPresenterMapper().clear();
+            mRowsSupportFragment = null;
+        }
         if (mMediaSessionConnector != null) {
             mMediaSessionConnector.setPlayer(null);
+            mMediaSessionConnector.setControlDispatcher(null);
+            mMediaSessionConnector.setMediaMetadataProvider(null);
+            mMediaSessionConnector.setQueueNavigator(null);
             mMediaSessionConnector = null;
         }
         if (mMediaSession != null) {
             mMediaSession.setActive(false);
             mMediaSession.release();
             mMediaSession = null;
         }
-        mPlayerGlue = null;
+        if (mPlayerGlue != null) {
+            ((PlaybackTransportRowPresenter) mPlayerGlue.getPlaybackRowPresenter()).setOnActionLongClickedListener(null);
+            ((PlaybackTransportRowPresenter) mPlayerGlue.getPlaybackRowPresenter()).setOnActionClickedListener(null);
+            mPlayerGlue.getPlayerAdapter().onDetachedFromHost();
+            mPlayerGlue.setHost(null);
+            mPlayerGlue = null;
+        }
+        if (mDebugInfoManager != null) {
+            mDebugInfoManager.show(false);
+            mDebugInfoManager = null;
+        }
         // Fix access calls when player isn't initialized
         mExoPlayerController.release();
         mPlayer = null;
         mSubtitleManager = null;
-        mDebugInfoManager = null;
         if (mYouTubeOverlay != null) {
             mYouTubeOverlay
                     .player(null)
@@ -573,7 +599,7 @@ private void createMediaSession() {
 
         // NOTE: No way to disable only a notifications. We need to disable the media session instead.
         boolean disableNotifications = getPlayerTweaksData().isPlaybackNotificationsDisabled();
-        mMediaSession = new MediaSessionCompat(getContext(), getContext().getPackageName());
+        mMediaSession = new MediaSessionCompat(getContext().getApplicationContext(), getContext().getPackageName()); // NOTE: mem leak fix (SegmentTimelineElement)
         mMediaSession.setActive(!disableNotifications);
         mMediaSessionConnector = new MediaSessionConnector(mMediaSession);