exoplayer: small destroy improvements

Author: yuliskov

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/exoplayer/controller/ExoPlayerController.java

@@ -492,9 +492,10 @@ private void releasePlayer() {
             mPlayer.stop(true); // Cause input lags due to high cpu load?
             mPlayer.clearVideoSurface();
             mPlayer.release();
-            mPlayer = null;
         } catch (ArrayIndexOutOfBoundsException e) { // thrown on stop()
             e.printStackTrace();
+        } finally {
+            mPlayer = null;
         }
     }
 }

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/exoplayer/other/ExoPlayerInitializer.java

@@ -137,6 +137,9 @@ private DefaultLoadControl createLoadControl() {
         baseBuilder
                 .setBufferDurationsMs(minBufferMs, maxBufferMs, bufferForPlaybackMs, bufferForPlaybackAfterRebufferMs);
 
+        // Decrease buffer size?
+        //baseBuilder.setAllocator(new DefaultAllocator(true, 16 * 1024));
+
         return baseBuilder.createDefaultLoadControl();
     }
 

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

@@ -389,35 +389,33 @@ private void initializePlayer() {
     }
 
     private void destroyPlayerObjects() {
-        // Fix access calls when player isn't initialized
-        mExoPlayerController.release();
+        setAdapter(null); // PlayerGlue->LeanbackPlayerAdapter->Context memory leak fix
+        if (mRowsAdapter != null) {
+            mRowsAdapter.clear();
+            mRowsAdapter = null;
+        }
         if (mMediaSessionConnector != null) {
             mMediaSessionConnector.setPlayer(null);
+            mMediaSessionConnector = null;
         }
         if (mMediaSession != null) {
             mMediaSession.setActive(false);
             mMediaSession.release();
+            mMediaSession = null;
         }
-        if (mRowsAdapter != null) {
-            mRowsAdapter.clear();
-        }
-        setAdapter(null); // PlayerGlue->LeanbackPlayerAdapter->Context memory leak fix
-        mPlayer = null;
         mPlayerGlue = null;
-        mRowsAdapter = null;
+        // Fix access calls when player isn't initialized
+        mExoPlayerController.release();
+        mPlayer = null;
         mSubtitleManager = null;
         mDebugInfoManager = null;
-        mMediaSessionConnector = null;
-        mMediaSession = null;
         if (mYouTubeOverlay != null) {
             mYouTubeOverlay
                     .player(null)
                     .playerView(null)
                     .performListener(null);
         }
-        if (mDoubleTapPlayerAdapter != null) {
-            mDoubleTapPlayerAdapter = null;
-        }
+        mDoubleTapPlayerAdapter = null;
     }
 
     private void createPlayerObjects() {