[Android] Set playback params once video is loaded

[Geoffrey Métais]

vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Mon May 22 16:42:32 2017 +0200| [31c15de1427f695af49005d1c3694a728c7d7925] | committer: Geoffrey Métais

Set playback params once video is loaded

> https://code.videolan.org/videolan/vlc-android/commit/31c15de1427f695af49005d1c3694a728c7d7925
---

 .../org/videolan/vlc/gui/video/VideoPlayerActivity.java  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
index e97f68c..667583b 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -262,8 +262,8 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
     private ImageView mSize;
     private String KEY_REMAINING_TIME_DISPLAY = "remaining_time_display";
     private String KEY_BLUETOOTH_DELAY = "key_bluetooth_delay";
-    private long mSpuDelay = 0;
-    private long mAudioDelay = 0;
+    private long mSpuDelay = 0L;
+    private long mAudioDelay = 0L;
     private boolean mRateHasChanged = false;
     private int mCurrentAudioTrack = -2, mCurrentSpuTrack = -2;
 
@@ -575,7 +575,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
             }
             showTitle();
             initUI();
-            initVideoParams();
+            setPlaybackParameters();
             mForcedTime = mLastTime = -1;
             setOverlayProgress();
         }
@@ -799,8 +799,6 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
         boolean ratePref = mSettings.getBoolean(PreferencesActivity.KEY_AUDIO_PLAYBACK_SPEED_PERSIST, true);
         mService.setRate(ratePref || mRateHasChanged ? mSettings.getFloat(PreferencesActivity.VIDEO_RATE, 1.0f) : 1.0F, false);
 
-        initVideoParams();
-
         initPlaylistUi();
     }
 
@@ -878,12 +876,13 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
             mRootView.setKeepScreenOn(true);
     }
 
-    private void initVideoParams() {
-        if (mAudioDelay != 0l)
+    private void setPlaybackParameters() {
+        if (mAudioDelay != 0L && mAudioDelay != mService.getAudioDelay())
             mService.setAudioDelay(mAudioDelay);
         else if (mBtReceiver != null && (mAudioManager.isBluetoothA2dpOn() || mAudioManager.isBluetoothScoOn()))
             toggleBtDelay(true);
-        mService.setSpuDelay(mSpuDelay);
+        if (mSpuDelay != 0L && mSpuDelay != mService.getSpuDelay())
+            mService.setSpuDelay(mSpuDelay);
     }
 
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
@@ -1736,6 +1735,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
 
     private void onPlaying() {
         mIsPlaying = true;
+        setPlaybackParameters();
         stopLoading();
         updateOverlayPausePlay();
         updateNavStatus();