Use the new L+ releaseOutputBuffer() that takes a PTS to reduce microstuttering on M and reduce latency on L

app/build.gradle

@@ -4,31 +4,23 @@ import org.apache.tools.ant.taskdefs.condition.Os
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 25
-    buildToolsVersion '26.0.1'
+    buildToolsVersion '25.0.3'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 25
 
-        versionName "5.1.2"
+        versionName "5.0.1"
-        versionCode = 130
+        versionCode = 123
     }
 
-    flavorDimensions "root"
-
     productFlavors {
         root {
-            // Android O has native mouse capture, so don't show the rooted
-            // version to devices running O on the Play Store.
-            maxSdkVersion 25
-
             applicationId "com.limelight.root"
             ndk {
                 abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mips64"
             }
-
-            dimension "root"
         }
 
         nonRoot {
@@ -36,8 +28,6 @@ android {
             ndk {
                 abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mips64"
             }
-
-            dimension "root"
         }
     }
 
@@ -60,9 +50,8 @@ android {
 }
 
 dependencies {
-    implementation 'org.bouncycastle:bcprov-jdk15on:1.52'
+    compile 'org.bouncycastle:bcprov-jdk15on:1.52'
-    implementation 'org.bouncycastle:bcpkix-jdk15on:1.52'
+    compile 'org.bouncycastle:bcpkix-jdk15on:1.52'
-    implementation files('libs/jcodec-0.1.9-patched.jar')
+    compile project(':moonlight-common')
-
+    compile files('libs/jcodec-0.1.9-patched.jar')
-    implementation project(':moonlight-common')
 }

app/src/main/AndroidManifest.xml

@@ -29,8 +29,7 @@
         android:fullBackupContent="@xml/backup_rules"
         android:isGame="true"
         android:banner="@drawable/atv_banner"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:theme="@style/AppTheme">
 
         <!-- Samsung multi-window support -->

app/src/main/java/com/limelight/Game.java

@@ -171,20 +171,6 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         streamView.setOnGenericMotionListener(this);
         streamView.setOnTouchListener(this);
 
-        inputCaptureProvider = InputCaptureManager.getInputCaptureProvider(this, this);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            // The view must be focusable for pointer capture to work.
-            streamView.setFocusable(true);
-            streamView.setDefaultFocusHighlightEnabled(false);
-            streamView.setOnCapturedPointerListener(new View.OnCapturedPointerListener() {
-                @Override
-                public boolean onCapturedPointer(View view, MotionEvent motionEvent) {
-                    return handleMotionEvent(motionEvent);
-                }
-            });
-        }
-
         // Warn the user if they're on a metered connection
         checkDataConnection();
 
@@ -214,7 +200,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         // Initialize the MediaCodec helper before creating the decoder
         MediaCodecHelper.initializeWithContext(this);
 
-        decoderRenderer = new MediaCodecDecoderRenderer(prefConfig.videoFormat, prefConfig.bitrate, prefConfig.batterySaver);
+        decoderRenderer = new MediaCodecDecoderRenderer(prefConfig.videoFormat);
 
         // Display a message to the user if H.265 was forced on but we still didn't find a decoder
         if (prefConfig.videoFormat == PreferenceConfiguration.FORCE_H265_ON && !decoderRenderer.isHevcSupported()) {
@@ -271,6 +257,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             getWindow().setSustainedPerformanceMode(true);
         }
 
+        inputCaptureProvider = InputCaptureManager.getInputCaptureProvider(this, this);
+
         if (prefConfig.onscreenController) {
             // create virtual onscreen controller
             virtualController = new VirtualController(conn,
@@ -289,20 +277,6 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         streamView.getHolder().addCallback(this);
     }
 
-    @Override
-    public void onWindowFocusChanged(boolean hasFocus) {
-        super.onWindowFocusChanged(hasFocus);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            // Capture is lost when focus is lost, so it must be requested again
-            // when focus is regained.
-            if (inputCaptureProvider.isCapturingEnabled() && hasFocus) {
-                // Recapture the pointer if focus was regained
-                streamView.requestPointerCapture();
-            }
-        }
-    }
-
     private void prepareDisplayForRendering() {
         Display display = getWindowManager().getDefaultDisplay();
         WindowManager.LayoutParams windowLayoutParams = getWindow().getAttributes();
@@ -446,17 +420,6 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             unbindService(usbDriverServiceConnection);
         }
 
-        // Destroy the capture provider
-        inputCaptureProvider.destroy();
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-
-        SpinnerDialog.closeDialogs(this);
-        Dialog.closeDialogs();
-
         if (conn != null) {
             int videoFormat = decoderRenderer.getActiveVideoFormat();
 
@@ -490,6 +453,14 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                 Toast.makeText(this, message, Toast.LENGTH_LONG).show();
             }
         }
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+        SpinnerDialog.closeDialogs(this);
+        Dialog.closeDialogs();
 
         finish();
     }
@@ -700,8 +671,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                 return true;
             }
         }
-        else if ((event.getSource() & InputDevice.SOURCE_CLASS_POINTER) != 0 ||
+        else if ((event.getSource() & InputDevice.SOURCE_CLASS_POINTER) != 0)
-                  event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE)
         {
             // This case is for mice
             if (event.getSource() == InputDevice.SOURCE_MOUSE ||
@@ -710,11 +680,6 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             {
                 int changedButtons = event.getButtonState() ^ lastButtonState;
 
-                // Ignore mouse input if we're not capturing from our input source
-                if (!inputCaptureProvider.isCapturingActive()) {
-                    return false;
-                }
-
                 if (event.getActionMasked() == MotionEvent.ACTION_SCROLL) {
                     // Send the vertical scroll packet
                     byte vScrollClicks = (byte) event.getAxisValue(MotionEvent.AXIS_VSCROLL);
@@ -928,6 +893,12 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             connecting = connected = false;
             conn.stop();
         }
+
+        // Enable cursor visibility again
+        inputCaptureProvider.disableCapture();
+
+        // Destroy the capture provider
+        inputCaptureProvider.destroy();
     }
 
     @Override
@@ -937,23 +908,11 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             spinner = null;
         }
 
-        // Enable cursor visibility again
-        inputCaptureProvider.disableCapture();
-
         if (!displayedFailureDialog) {
             displayedFailureDialog = true;
             LimeLog.severe(stage+" failed: "+errorCode);
 
-            // If video initialization failed and the surface is still valid, display extra information for the user
+            stopConnection();
-            if (stage.contains("video") && streamView.getHolder().getSurface().isValid()) {
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        Toast.makeText(Game.this, "Video decoder failed to initialize. Your device may not support the selected resolution.", Toast.LENGTH_LONG).show();
-                    }
-                });
-            }
-
             Dialog.displayDialog(this, getResources().getString(R.string.conn_error_title),
                     getResources().getString(R.string.conn_error_msg)+" "+stage, true);
         }
@@ -961,14 +920,11 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 
     @Override
     public void connectionTerminated(long errorCode) {
-        // Enable cursor visibility again
-        inputCaptureProvider.disableCapture();
-
         if (!displayedFailureDialog) {
             displayedFailureDialog = true;
             LimeLog.severe("Connection terminated: "+errorCode);
-            stopConnection();
 
+            stopConnection();
             Dialog.displayDialog(this, getResources().getString(R.string.conn_terminated_title),
                     getResources().getString(R.string.conn_terminated_msg), true);
         }
@@ -1035,10 +991,15 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 
     @Override
     public void surfaceDestroyed(SurfaceHolder holder) {
-        // Let the decoder know immediately that the surface is gone
-        decoderRenderer.prepareForStop();
-
         if (connected) {
+            // HACK: Android is supposed to let you return from this function
+            // before throwing a fit if you access the surface again. Unfortunately,
+            // MediaCodec often tries to access the destroyed surface and triggers
+            // an IllegalStateException. To workaround this, we will invoke
+            // the DecoderRenderer's stop function ourselves, so it will hopefully
+            // happen early enough to not trigger the bug
+            decoderRenderer.stop();
+
             stopConnection();
         }
     }

app/src/main/java/com/limelight/binding/audio/AndroidAudioRenderer.java

@@ -1,10 +1,8 @@
 package com.limelight.binding.audio;
 
-import android.media.AudioAttributes;
 import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.AudioTrack;
-import android.os.Build;
 
 import com.limelight.LimeLog;
 import com.limelight.nvstream.av.audio.AudioRenderer;
@@ -14,58 +12,10 @@ public class AndroidAudioRenderer implements AudioRenderer {
 
     private AudioTrack track;
 
-    private AudioTrack createAudioTrack(int channelConfig, int bufferSize, boolean lowLatency) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            return new AudioTrack(AudioManager.STREAM_MUSIC,
-                    48000,
-                    channelConfig,
-                    AudioFormat.ENCODING_PCM_16BIT,
-                    bufferSize,
-                    AudioTrack.MODE_STREAM);
-        }
-        else {
-            AudioAttributes.Builder attributesBuilder = new AudioAttributes.Builder()
-                    .setUsage(AudioAttributes.USAGE_GAME);
-            AudioFormat format = new AudioFormat.Builder()
-                    .setEncoding(AudioFormat.ENCODING_PCM_16BIT)
-                    .setSampleRate(48000)
-                    .setChannelMask(channelConfig)
-                    .build();
-
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-                // Use FLAG_LOW_LATENCY on L through N
-                if (lowLatency) {
-                    attributesBuilder.setFlags(AudioAttributes.FLAG_LOW_LATENCY);
-                }
-            }
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                AudioTrack.Builder trackBuilder = new AudioTrack.Builder()
-                        .setAudioFormat(format)
-                        .setAudioAttributes(attributesBuilder.build())
-                        .setTransferMode(AudioTrack.MODE_STREAM)
-                        .setBufferSizeInBytes(bufferSize);
-
-                // Use PERFORMANCE_MODE_LOW_LATENCY on O and later
-                if (lowLatency) {
-                    trackBuilder.setPerformanceMode(AudioTrack.PERFORMANCE_MODE_LOW_LATENCY);
-                }
-
-                return trackBuilder.build();
-            }
-            else {
-                return new AudioTrack(attributesBuilder.build(),
-                        format,
-                        bufferSize,
-                        AudioTrack.MODE_STREAM,
-                        AudioManager.AUDIO_SESSION_ID_GENERATE);
-            }
-        }
-    }
-
     @Override
     public int setup(int audioConfiguration) {
         int channelConfig;
+        int bufferSize;
         int bytesPerFrame;
 
         switch (audioConfiguration)
@@ -88,76 +38,44 @@ public class AndroidAudioRenderer implements AudioRenderer {
         // do this on many devices and it lowers audio latency.
         // We'll try the small buffer size first and if it fails,
         // use the recommended larger buffer size.
+        try {
+            // Buffer two frames of audio if possible
+            bufferSize = bytesPerFrame * 2;
 
-        for (int i = 0; i < 4; i++) {
+            track = new AudioTrack(AudioManager.STREAM_MUSIC,
-            boolean lowLatency;
+                    48000,
-            int bufferSize;
+                    channelConfig,
+                    AudioFormat.ENCODING_PCM_16BIT,
+                    bufferSize,
+                    AudioTrack.MODE_STREAM);
+            track.play();
+        } catch (Exception e) {
+            // Try to release the AudioTrack if we got far enough
+            try {
+                if (track != null) {
+                    track.release();
+                }
+            } catch (Exception ignored) {}
 
-            // We will try:
+            // Now try the larger buffer size
-            // 1) Small buffer, low latency mode
+            bufferSize = Math.max(AudioTrack.getMinBufferSize(48000,
-            // 2) Large buffer, low latency mode
-            // 3) Small buffer, standard mode
-            // 4) Large buffer, standard mode
-
-            switch (i) {
-                case 0:
-                case 1:
-                    lowLatency = true;
-                    break;
-                case 2:
-                case 3:
-                    lowLatency = false;
-                    break;
-                default:
-                    // Unreachable
-                    throw new IllegalStateException();
-            }
-
-            switch (i) {
-                case 0:
-                case 2:
-                    bufferSize = bytesPerFrame * 2;
-                    break;
-
-                case 1:
-                case 3:
-                    // Try the larger buffer size
-                    bufferSize = Math.max(AudioTrack.getMinBufferSize(48000,
                             channelConfig,
                             AudioFormat.ENCODING_PCM_16BIT),
-                            bytesPerFrame * 2);
+                    bytesPerFrame * 2);
 
-                    // Round to next frame
+            // Round to next frame
-                    bufferSize = (((bufferSize + (bytesPerFrame - 1)) / bytesPerFrame) * bytesPerFrame);
+            bufferSize = (((bufferSize + (bytesPerFrame - 1)) / bytesPerFrame) * bytesPerFrame);
-                    break;
-                default:
-                    // Unreachable
-                    throw new IllegalStateException();
-            }
 
-            // Skip low latency options if hardware sample rate isn't 48000Hz
+            track = new AudioTrack(AudioManager.STREAM_MUSIC,
-            if (AudioTrack.getNativeOutputSampleRate(AudioManager.STREAM_MUSIC) != 48000 && lowLatency) {
+                    48000,
-                continue;
+                    channelConfig,
-            }
+                    AudioFormat.ENCODING_PCM_16BIT,
-
+                    bufferSize,
-            try {
+                    AudioTrack.MODE_STREAM);
-                track = createAudioTrack(channelConfig, bufferSize, lowLatency);
+            track.play();
-                track.play();
-
-                // Successfully created working AudioTrack. We're done here.
-                LimeLog.info("Audio track configuration: "+bufferSize+" "+lowLatency);
-                break;
-            } catch (Exception e) {
-                // Try to release the AudioTrack if we got far enough
-                try {
-                    if (track != null) {
-                        track.release();
-                        track = null;
-                    }
-                } catch (Exception ignored) {}
-            }
         }
 
+        LimeLog.info("Audio track buffer size: "+bufferSize);
         return 0;
     }
 

app/src/main/java/com/limelight/binding/input/ControllerHandler.java

@@ -63,10 +63,6 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         int[] ids = InputDevice.getDeviceIds();
         for (int id : ids) {
             InputDevice dev = InputDevice.getDevice(id);
-            if (dev == null) {
-                // This device was removed during enumeration
-                continue;
-            }
             if ((dev.getSources() & InputDevice.SOURCE_JOYSTICK) != 0 ||
                     (dev.getSources() & InputDevice.SOURCE_GAMEPAD) != 0) {
                 // This looks like a gamepad, but we'll check X and Y to be sure

app/src/main/java/com/limelight/binding/input/capture/AndroidCaptureProvider.java

@@ -10,11 +10,11 @@ import android.view.View;
 import android.view.ViewGroup;
 
 @TargetApi(Build.VERSION_CODES.N)
-public class AndroidPointerIconCaptureProvider extends InputCaptureProvider {
+public class AndroidCaptureProvider extends InputCaptureProvider {
     private ViewGroup rootViewGroup;
     private Context context;
 
-    public AndroidPointerIconCaptureProvider(Activity activity) {
+    public AndroidCaptureProvider(Activity activity) {
         this.context = activity;
         this.rootViewGroup = (ViewGroup) activity.getWindow().getDecorView();
     }
@@ -33,13 +33,11 @@ public class AndroidPointerIconCaptureProvider extends InputCaptureProvider {
 
     @Override
     public void enableCapture() {
-        super.enableCapture();
         setPointerIconOnAllViews(PointerIcon.getSystemIcon(context, PointerIcon.TYPE_NULL));
     }
 
     @Override
     public void disableCapture() {
-        super.disableCapture();
         setPointerIconOnAllViews(null);
     }
 

app/src/main/java/com/limelight/binding/input/capture/AndroidNativePointerCaptureProvider.java

@@ -1,53 +0,0 @@
-package com.limelight.binding.input.capture;
-
-import android.annotation.TargetApi;
-import android.os.Build;
-import android.view.InputDevice;
-import android.view.MotionEvent;
-import android.view.View;
-
-@TargetApi(Build.VERSION_CODES.O)
-public class AndroidNativePointerCaptureProvider extends InputCaptureProvider {
-
-    private View targetView;
-
-    public AndroidNativePointerCaptureProvider(View targetView) {
-        this.targetView = targetView;
-    }
-
-    public static boolean isCaptureProviderSupported() {
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
-    }
-
-    @Override
-    public void enableCapture() {
-        super.enableCapture();
-        targetView.requestPointerCapture();
-    }
-
-    @Override
-    public void disableCapture() {
-        super.disableCapture();
-        targetView.releasePointerCapture();
-    }
-
-    @Override
-    public boolean isCapturingActive() {
-        return targetView.hasPointerCapture();
-    }
-
-    @Override
-    public boolean eventHasRelativeMouseAxes(MotionEvent event) {
-        return event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE;
-    }
-
-    @Override
-    public float getRelativeAxisX(MotionEvent event) {
-        return event.getX();
-    }
-
-    @Override
-    public float getRelativeAxisY(MotionEvent event) {
-        return event.getY();
-    }
-}

app/src/main/java/com/limelight/binding/input/capture/InputCaptureManager.java

@@ -3,17 +3,15 @@ package com.limelight.binding.input.capture;
 import android.app.Activity;
 
 import com.limelight.LimeLog;
-import com.limelight.R;
 import com.limelight.binding.input.evdev.EvdevCaptureProvider;
 import com.limelight.binding.input.evdev.EvdevListener;
 
 public class InputCaptureManager {
     public static InputCaptureProvider getInputCaptureProvider(Activity activity, EvdevListener rootListener) {
-        if (AndroidNativePointerCaptureProvider.isCaptureProviderSupported()) {
+        // Shield capture is preferred because it can capture when the cursor is over
-            LimeLog.info("Using Android O+ native mouse capture");
+        // the system UI. Android N native capture can only capture over views owned
-            return new AndroidNativePointerCaptureProvider(activity.findViewById(R.id.surfaceView));
+        // by the application.
-        }
+        if (ShieldCaptureProvider.isCaptureProviderSupported()) {
-        else if (ShieldCaptureProvider.isCaptureProviderSupported()) {
             LimeLog.info("Using NVIDIA mouse capture extension");
             return new ShieldCaptureProvider(activity);
         }
@@ -21,11 +19,9 @@ public class InputCaptureManager {
             LimeLog.info("Using Evdev mouse capture");
             return new EvdevCaptureProvider(activity, rootListener);
         }
-        else if (AndroidPointerIconCaptureProvider.isCaptureProviderSupported()) {
+        else if (AndroidCaptureProvider.isCaptureProviderSupported()) {
-            // Android N's native capture can't capture over system UI elements
+            LimeLog.info("Using Android N+ native mouse capture");
-            // so we want to only use it if there's no other option.
+            return new AndroidCaptureProvider(activity);
-            LimeLog.info("Using Android N+ pointer hiding");
-            return new AndroidPointerIconCaptureProvider(activity);
         }
         else {
             LimeLog.info("Mouse capture not available");

app/src/main/java/com/limelight/binding/input/capture/InputCaptureProvider.java

@@ -3,25 +3,10 @@ package com.limelight.binding.input.capture;
 import android.view.MotionEvent;
 
 public abstract class InputCaptureProvider {
-    protected boolean isCapturing;
+    public abstract void enableCapture();
-
+    public abstract void disableCapture();
-    public void enableCapture() {
-        isCapturing = true;
-    }
-    public void disableCapture() {
-        isCapturing = false;
-    }
-
     public void destroy() {}
 
-    public boolean isCapturingEnabled() {
-        return isCapturing;
-    }
-
-    public boolean isCapturingActive() {
-        return isCapturing;
-    }
-
     public boolean eventHasRelativeMouseAxes(MotionEvent event) {
         return false;
     }

app/src/main/java/com/limelight/binding/input/capture/NullCaptureProvider.java

@@ -1,4 +1,10 @@
 package com.limelight.binding.input.capture;
 
 
-public class NullCaptureProvider extends InputCaptureProvider {}
+public class NullCaptureProvider extends InputCaptureProvider {
+    @Override
+    public void enableCapture() {}
+
+    @Override
+    public void disableCapture() {}
+}

app/src/main/java/com/limelight/binding/input/capture/ShieldCaptureProvider.java

@@ -63,13 +63,11 @@ public class ShieldCaptureProvider extends InputCaptureProvider {
 
     @Override
     public void enableCapture() {
-        super.enableCapture();
         setCursorVisibility(false);
     }
 
     @Override
     public void disableCapture() {
-        super.disableCapture();
         setCursorVisibility(true);
     }
 

app/src/main/java/com/limelight/binding/input/evdev/EvdevCaptureProvider.java

@@ -221,7 +221,6 @@ public class EvdevCaptureProvider extends InputCaptureProvider {
 
     @Override
     public void enableCapture() {
-        super.enableCapture();
         if (!started) {
             // Start the handler thread if it's our first time
             // capturing
@@ -248,7 +247,6 @@ public class EvdevCaptureProvider extends InputCaptureProvider {
 
     @Override
     public void disableCapture() {
-        super.disableCapture();
         // This may be called on the main thread
         runInNetworkSafeContextSynchronously(new Runnable() {
             @Override

app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java

@@ -23,7 +23,17 @@ import android.view.SurfaceHolder;
 public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
 
     private static final boolean USE_FRAME_RENDER_TIME = false;
-    private static final boolean FRAME_RENDER_TIME_ONLY = USE_FRAME_RENDER_TIME && false;
+
+    // This value is added to the PTS for each frame to force frames delivered right at
+    // V-sync time to be delayed until the next V-sync rather than dropping the existing frame.
+    // To make matters worse, these frames often end up being displayed for 2 V-syncs because
+    // the next frame isn't ready at the next V-sync. So without this, we end up with a pattern of:
+    // F0 - Displayed | F1 - Dropped | F2 - Displayed | F2 - Displayed again | F3 - Displayed ...
+    // which can be very noticeable for some video content and users.
+    //
+    // This value is currently 6 ms, which means that a frame ready for display less than 6 ms from
+    // the next V-sync will be delayed until the following V-sync to ensure smooth frame pacing.
+    private static final int PTS_OFFSET_NS = 6 * 1000000;
 
     // Used on versions < 5.0
     private ByteBuffer[] legacyInputBuffers;
@@ -31,10 +41,6 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
     private MediaCodecInfo avcDecoder;
     private MediaCodecInfo hevcDecoder;
 
-    // Used for HEVC only
-    private byte[] vpsBuffer;
-    private byte[] spsBuffer;
-
     private MediaCodec videoDecoder;
     private Thread rendererThread;
     private Thread[] spinnerThreads;
@@ -45,25 +51,16 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
     private boolean refFrameInvalidationActive;
     private int initialWidth, initialHeight;
     private int videoFormat;
-    private SurfaceHolder renderTarget;
+    private Object renderTarget;
-    private volatile boolean stopping;
+    private boolean stopping;
 
     private boolean needsBaselineSpsHack;
     private SeqParameterSet savedSps;
 
-    private RendererException initialException;
-    private long initialExceptionTimestamp;
-    private static final int EXCEPTION_REPORT_DELAY_MS = 3000;
-
     private long lastTimestampUs;
     private long decoderTimeMs;
     private long totalTimeMs;
     private int totalFrames;
-    private int frameLossEvents;
-    private int framesLost;
-    private int lastFrameNumber;
-    private int refreshRate;
-    private int bitrate;
 
     private int numSpsIn;
     private int numPpsIn;
@@ -105,22 +102,14 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         return decoderInfo;
     }
 
-    public void setRenderTarget(SurfaceHolder renderTarget) {
+    public void setRenderTarget(Object renderTarget) {
         this.renderTarget = renderTarget;
     }
 
-    public MediaCodecDecoderRenderer(int videoFormat, int bitrate, boolean batterySaver) {
+    public MediaCodecDecoderRenderer(int videoFormat) {
         //dumpDecoders();
 
-        this.bitrate = bitrate;
+        spinnerThreads = new Thread[Runtime.getRuntime().availableProcessors()];
-
-        // Disable spinner threads in battery saver mode
-        if (batterySaver) {
-            spinnerThreads = new Thread[0];
-        }
-        else {
-            spinnerThreads = new Thread[Runtime.getRuntime().availableProcessors()];
-        }
 
         avcDecoder = findAvcDecoder();
         if (avcDecoder != null) {
@@ -178,7 +167,6 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         this.initialWidth = width;
         this.initialHeight = height;
         this.videoFormat = format;
-        this.refreshRate = redrawRate;
 
         String mimeType;
         String selectedDecoderName;
@@ -256,7 +244,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         }
 
         try {
-            videoDecoder.configure(videoFormat, renderTarget.getSurface(), null, 0);
+            videoDecoder.configure(videoFormat, ((SurfaceHolder)renderTarget).getSurface(), null, 0);
             videoDecoder.setVideoScalingMode(MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT);
 
             if (USE_FRAME_RENDER_TIME && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
@@ -289,12 +277,12 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         return 0;
     }
 
-    private void handleDecoderException(Exception e, ByteBuffer buf, int codecFlags, boolean throwOnTransient) {
+    private void handleDecoderException(Exception e, ByteBuffer buf, int codecFlags) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             if (e instanceof CodecException) {
                 CodecException codecExc = (CodecException) e;
 
-                if (codecExc.isTransient() && !throwOnTransient) {
+                if (codecExc.isTransient()) {
                     // We'll let transient exceptions go
                     LimeLog.warning(codecExc.getDiagnosticInfo());
                     return;
@@ -304,31 +292,14 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
             }
         }
 
-        // Only throw if we're not stopping
+        // Only throw if this happens at the beginning of a stream
-        if (!stopping) {
+        // but not if we're stopping
-            //
+        if (totalFrames > 0 && totalFrames < 20 && !stopping) {
-            // There seems to be a race condition with decoder/surface teardown causing some
+            if (buf != null || codecFlags != 0) {
-            // decoders to to throw IllegalStateExceptions even before 'stopping' is set.
+                throw new RendererException(this, e, buf, codecFlags);
-            // To workaround this while allowing real exceptions to propagate, we will eat the
-            // first exception. If we are still receiving exceptions 3 seconds later, we will
-            // throw the original exception again.
-            //
-            if (initialException != null) {
-                // This isn't the first time we've had an exception processing video
-                if (System.currentTimeMillis() - initialExceptionTimestamp >= EXCEPTION_REPORT_DELAY_MS) {
-                    // It's been over 3 seconds and we're still getting exceptions. Throw the original now.
-                    throw initialException;
-                }
             }
             else {
-                // This is the first exception we've hit
+                throw new RendererException(this, e);
-                if (buf != null || codecFlags != 0) {
-                    initialException = new RendererException(this, e, buf, codecFlags);
-                }
-                else {
-                    initialException = new RendererException(this, e);
-                }
-                initialExceptionTimestamp = System.currentTimeMillis();
             }
         }
     }
@@ -339,7 +310,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
             @Override
             public void run() {
                 BufferInfo info = new BufferInfo();
-                while (!stopping) {
+                while (!isInterrupted()) {
                     try {
                         // Try to output a frame
                         int outIndex = videoDecoder.dequeueOutputBuffer(info, 50000);
@@ -356,7 +327,17 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
                             }
 
                             // Render the last buffer
-                            videoDecoder.releaseOutputBuffer(lastIndex, true);
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                                // On L and later, we can fine tune our PTS right before rendering, so
+                                // we take advantage of that for frame pacing using the PTS offset. Using
+                                // this version of releaseOutputBuffer() also lets SurfaceFlinger drop extra
+                                // frames in the SurfaceView<->SurfaceFlinger BufferQueue that reduces
+                                // latency if an stray extra frame ends up in the output queue.
+                                videoDecoder.releaseOutputBuffer(lastIndex, System.nanoTime() + PTS_OFFSET_NS);
+                            }
+                            else {
+                                videoDecoder.releaseOutputBuffer(lastIndex, true);
+                            }
 
                             // Add delta time to the totals (excluding probable outliers)
                             long delta = MediaCodecHelper.getMonotonicMillis() - (presentationTimeUs / 1000);
@@ -379,7 +360,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
                             }
                         }
                     } catch (Exception e) {
-                        handleDecoderException(e, null, 0, false);
+                        handleDecoderException(e, null, 0);
                     }
                 }
             }
@@ -397,7 +378,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
                 public void run() {
                     // This thread exists to keep the CPU at a higher DVFS state on devices
                     // where the governor scales clock speed sporadically, causing dropped frames.
-                    while (!stopping) {
+                    while (!isInterrupted()) {
                         try {
                             Thread.sleep(0, 1);
                         } catch (InterruptedException e) {
@@ -419,11 +400,11 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         startTime = MediaCodecHelper.getMonotonicMillis();
 
         try {
-            while (index < 0 && !stopping) {
+            while (rendererThread.isAlive() && index < 0 && !stopping) {
                 index = videoDecoder.dequeueInputBuffer(10000);
             }
         } catch (Exception e) {
-            handleDecoderException(e, null, 0, true);
+            handleDecoderException(e, null, 0);
             return MediaCodec.INFO_TRY_AGAIN_LATER;
         }
 
@@ -446,41 +427,16 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         startSpinnerThreads();
     }
 
-    // !!! May be called even if setup()/start() fails !!!
+    @Override
-    public void prepareForStop() {
+    public void stop() {
-        // Let the decoding code know to ignore codec exceptions now
         stopping = true;
 
         // Halt the rendering thread
-        if (rendererThread != null) {
+        rendererThread.interrupt();
-            rendererThread.interrupt();
-        }
-    }
-
-    @Override
-    public void stop() {
-        // May be called already, but we'll call it now to be safe
-        prepareForStop();
-
-        try {
-            // Invalidate pending decode buffers
-            videoDecoder.flush();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        // Wait for the renderer thread to shut down
         try {
             rendererThread.join();
         } catch (InterruptedException ignored) { }
 
-        try {
-            // Stop the video decoder
-            videoDecoder.stop();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
         // Halt the spinner threads
         for (Thread t : spinnerThreads) {
             t.interrupt();
@@ -498,13 +454,31 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
     }
 
     private boolean queueInputBuffer(int inputBufferIndex, int offset, int length, long timestampUs, int codecFlags) {
-        try {
+        // Try 25 times to submit the input buffer before throwing a real exception
-            videoDecoder.queueInputBuffer(inputBufferIndex,
+        int i;
-                    offset, length,
+        Exception lastException = null;
-                    timestampUs, codecFlags);
+
+        for (i = 0; i < 25; i++) {
+            try {
+                videoDecoder.queueInputBuffer(inputBufferIndex,
+                        offset, length,
+                        timestampUs, codecFlags);
+                break;
+            } catch (Exception e) {
+                handleDecoderException(e, null, codecFlags);
+                lastException = e;
+            }
+        }
+
+        if (i == 25 && totalFrames > 0 && totalFrames < 20 && !stopping) {
+            throw new RendererException(this, lastException, null, codecFlags);
+        }
+        else if (i != 25) {
+            // Queued input buffer
             return true;
-        } catch (Exception e) {
+        }
-            handleDecoderException(e, null, codecFlags, true);
+        else {
+            // Failed to queue
             return false;
         }
     }
@@ -515,12 +489,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         ByteBuffer buf;
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            try {
+            buf = videoDecoder.getInputBuffer(inputBufferIndex);
-                buf = videoDecoder.getInputBuffer(inputBufferIndex);
-            } catch (Exception e) {
-                handleDecoderException(e, null, 0, true);
-                return null;
-            }
         }
         else {
             buf = legacyInputBuffers[inputBufferIndex];
@@ -551,36 +520,25 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
 
     @SuppressWarnings("deprecation")
     @Override
-    public int submitDecodeUnit(byte[] frameData, int frameLength, int frameNumber, long receiveTimeMs) {
+    public int submitDecodeUnit(byte[] frameData, int frameLength) {
         totalFrames++;
 
-        // We can receive the same "frame" multiple times if it's an IDR frame.
-        // In that case, each frame start NALU is submitted independently.
-        if (frameNumber != lastFrameNumber && frameNumber != lastFrameNumber + 1) {
-            framesLost += frameNumber - lastFrameNumber - 1;
-            frameLossEvents++;
-        }
-
-        lastFrameNumber = frameNumber;
-
-        int inputBufferIndex;
-        ByteBuffer buf;
-
         long timestampUs = System.nanoTime() / 1000;
-
-        if (!FRAME_RENDER_TIME_ONLY) {
-            // Count time from first packet received to decode start
-            totalTimeMs += (timestampUs / 1000) - receiveTimeMs;
-        }
-
         if (timestampUs <= lastTimestampUs) {
             // We can't submit multiple buffers with the same timestamp
             // so bump it up by one before queuing
             timestampUs = lastTimestampUs + 1;
         }
-
         lastTimestampUs = timestampUs;
 
+        int inputBufferIndex = dequeueInputBuffer();
+        if (inputBufferIndex < 0) {
+            // We're being torn down now
+            return MoonBridge.DR_OK;
+        }
+
+        ByteBuffer buf = getEmptyInputBuffer(inputBufferIndex);
+
         int codecFlags = 0;
         boolean needsSpsReplay = false;
 
@@ -682,18 +640,6 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
             // Patch the SPS constraint flags
             doProfileSpecificSpsPatching(sps);
 
-            inputBufferIndex = dequeueInputBuffer();
-            if (inputBufferIndex < 0) {
-                // We're being torn down now
-                return MoonBridge.DR_NEED_IDR;
-            }
-
-            buf = getEmptyInputBuffer(inputBufferIndex);
-            if (buf == null) {
-                // We're being torn down now
-                return MoonBridge.DR_NEED_IDR;
-            }
-
             // Write the annex B header
             buf.put(frameData, 0, 5);
 
@@ -716,17 +662,6 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
             numPpsIn++;
             codecFlags |= MediaCodec.BUFFER_FLAG_CODEC_CONFIG;
 
-            inputBufferIndex = dequeueInputBuffer();
-            if (inputBufferIndex < 0) {
-                // We're being torn down now
-                return MoonBridge.DR_NEED_IDR;
-            }
-
-            buf = getEmptyInputBuffer(inputBufferIndex);
-            if (buf == null) {
-                // We're being torn down now
-                return MoonBridge.DR_NEED_IDR;
-            }
 
             if (needsBaselineSpsHack) {
                 LimeLog.info("Saw PPS; disabling SPS hack");
@@ -738,66 +673,22 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         }
         else if (frameData[4] == 0x40) {
             numVpsIn++;
-
+            codecFlags |= MediaCodec.BUFFER_FLAG_CODEC_CONFIG;
-            // Batch this to submit together with SPS and PPS per AOSP docs
-            vpsBuffer = new byte[frameLength];
-            System.arraycopy(frameData, 0, vpsBuffer, 0, frameLength);
-            return MoonBridge.DR_OK;
         }
         else if (frameData[4] == 0x42) {
             numSpsIn++;
-
+            codecFlags |= MediaCodec.BUFFER_FLAG_CODEC_CONFIG;
-            // Batch this to submit together with VPS and PPS per AOSP docs
-            spsBuffer = new byte[frameLength];
-            System.arraycopy(frameData, 0, spsBuffer, 0, frameLength);
-            return MoonBridge.DR_OK;
         }
         else if (frameData[4] == 0x44) {
             numPpsIn++;
-
-            inputBufferIndex = dequeueInputBuffer();
-            if (inputBufferIndex < 0) {
-                // We're being torn down now
-                return MoonBridge.DR_NEED_IDR;
-            }
-
-            buf = getEmptyInputBuffer(inputBufferIndex);
-            if (buf == null) {
-                // We're being torn down now
-                return MoonBridge.DR_NEED_IDR;
-            }
-
-            // When we get the PPS, submit the VPS and SPS together with
-            // the PPS, as required by AOSP docs on use of HEVC and MediaCodec.
-            if (vpsBuffer != null) {
-                buf.put(vpsBuffer);
-            }
-            if (spsBuffer != null) {
-                buf.put(spsBuffer);
-            }
-
-            // This is the HEVC CSD blob
             codecFlags |= MediaCodec.BUFFER_FLAG_CODEC_CONFIG;
         }
-        else {
-            inputBufferIndex = dequeueInputBuffer();
-            if (inputBufferIndex < 0) {
-                // We're being torn down now
-                return MoonBridge.DR_NEED_IDR;
-            }
-
-            buf = getEmptyInputBuffer(inputBufferIndex);
-            if (buf == null) {
-                // We're being torn down now
-                return MoonBridge.DR_NEED_IDR;
-            }
-        }
 
         // Copy data from our buffer list into the input buffer
         buf.put(frameData, 0, frameLength);
 
         if (!queueInputBuffer(inputBufferIndex,
-                0, buf.position(),
+                0, frameLength,
                 timestampUs, codecFlags)) {
             return MoonBridge.DR_NEED_IDR;
         }
@@ -820,9 +711,6 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         }
 
         ByteBuffer inputBuffer = getEmptyInputBuffer(inputIndex);
-        if (inputBuffer == null) {
-            return false;
-        }
 
         // Write the Annex B header
         inputBuffer.put(new byte[]{0x00, 0x00, 0x00, 0x01, 0x67});
@@ -912,11 +800,8 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
             str += "AVC Decoder: "+((renderer.avcDecoder != null) ? renderer.avcDecoder.getName():"(none)")+"\n";
             str += "HEVC Decoder: "+((renderer.hevcDecoder != null) ? renderer.hevcDecoder.getName():"(none)")+"\n";
             str += "Initial video dimensions: "+renderer.initialWidth+"x"+renderer.initialHeight+"\n";
-            str += "FPS target: "+renderer.refreshRate+"\n";
-            str += "Bitrate: "+renderer.bitrate+" Mbps \n";
             str += "In stats: "+renderer.numVpsIn+", "+renderer.numSpsIn+", "+renderer.numPpsIn+"\n";
             str += "Total frames: "+renderer.totalFrames+"\n";
-            str += "Frame losses: "+renderer.framesLost+" in "+frameLossEvents+" loss events\n";
             str += "Average end-to-end client latency: "+getAverageEndToEndLatency()+"ms\n";
             str += "Average hardware decoder latency: "+getAverageDecoderLatency()+"ms\n";
 

app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java

@@ -63,24 +63,15 @@ public class MediaCodecHelper {
 	
 	static {
 		blacklistedDecoderPrefixes = new LinkedList<>();
-
+		
-		// Blacklist software decoders that don't support H264 high profile,
+		// Software decoders that don't support H264 high profile
-		// but exclude the official AOSP emulator from this restriction.
+		blacklistedDecoderPrefixes.add("omx.google");
-		if (!Build.HARDWARE.equals("ranchu") || !Build.BRAND.equals("google")) {
+		blacklistedDecoderPrefixes.add("AVCDecoder");
-			blacklistedDecoderPrefixes.add("omx.google");
-			blacklistedDecoderPrefixes.add("AVCDecoder");
-		}
 
 		// Without bitstream fixups, we perform horribly on NVIDIA's HEVC
 		// decoder. While not strictly necessary, I'm going to fully blacklist this
 		// one to avoid users getting inaccurate impressions of Tegra X1/Moonlight performance.
 		blacklistedDecoderPrefixes.add("OMX.Nvidia.h265.decode");
-
-		// Force these decoders disabled because:
-		// 1) They are software decoders, so the performance is terrible
-		// 2) They crash with our HEVC stream anyway (at least prior to CSD batching)
-		blacklistedDecoderPrefixes.add("OMX.qcom.video.decoder.hevcswvdec");
-		blacklistedDecoderPrefixes.add("OMX.SEC.hevc.sw.dec");
 	}
 	
 	static {
@@ -107,11 +98,6 @@ public class MediaCodecHelper {
 	static {
 		whitelistedHevcDecoders = new LinkedList<>();
 
-		// Allow software HEVC decoding in the official AOSP emulator
-		if (Build.HARDWARE.equals("ranchu") && Build.BRAND.equals("google")) {
-			whitelistedHevcDecoders.add("omx.google");
-		}
-
 		// Exynos seems to be the only HEVC decoder that works reliably
 		whitelistedHevcDecoders.add("omx.exynos");
 

app/src/main/java/com/limelight/preferences/PreferenceConfiguration.java

@@ -23,7 +23,6 @@ public class PreferenceConfiguration {
     private static final String USB_DRIVER_PREF_SRING = "checkbox_usb_driver";
     private static final String VIDEO_FORMAT_PREF_STRING = "video_format";
     private static final String ONSCREEN_CONTROLLER_PREF_STRING = "checkbox_show_onscreen_controls";
-    private static final String BATTERY_SAVER_PREF_STRING = "checkbox_battery_saver";
 
     private static final int BITRATE_DEFAULT_720_30 = 5;
     private static final int BITRATE_DEFAULT_720_60 = 10;
@@ -46,7 +45,6 @@ public class PreferenceConfiguration {
     private static final boolean DEFAULT_USB_DRIVER = true;
     private static final String DEFAULT_VIDEO_FORMAT = "auto";
     private static final boolean ONSCREEN_CONTROLLER_DEFAULT = false;
-    private static final boolean DEFAULT_BATTERY_SAVER = false;
 
     public static final int FORCE_H265_ON = -1;
     public static final int AUTOSELECT_H265 = 0;
@@ -60,7 +58,6 @@ public class PreferenceConfiguration {
     public String language;
     public boolean listMode, smallIconMode, multiController, enable51Surround, usbDriver;
     public boolean onscreenController;
-    public boolean batterySaver;
 
     public static int getDefaultBitrate(String resFpsString) {
         if (resFpsString.equals("720p30")) {
@@ -191,7 +188,6 @@ public class PreferenceConfiguration {
         config.enable51Surround = prefs.getBoolean(ENABLE_51_SURROUND_PREF_STRING, DEFAULT_ENABLE_51_SURROUND);
         config.usbDriver = prefs.getBoolean(USB_DRIVER_PREF_SRING, DEFAULT_USB_DRIVER);
         config.onscreenController = prefs.getBoolean(ONSCREEN_CONTROLLER_PREF_STRING, ONSCREEN_CONTROLLER_DEFAULT);
-        config.batterySaver = prefs.getBoolean(BATTERY_SAVER_PREF_STRING, DEFAULT_BATTERY_SAVER);
 
         return config;
     }

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_pc_scut.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_pc_scut_background"/>
-    <foreground android:drawable="@mipmap/ic_pc_scut_foreground"/>
-</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_pc_scut_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_pc_scut_background"/>
-    <foreground android:drawable="@mipmap/ic_pc_scut_foreground"/>
-</adaptive-icon>

app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <color name="ic_launcher_background">#565C64</color>
-</resources>

app/src/main/res/values/ic_pc_scut_background.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <color name="ic_pc_scut_background">#FFFFFF</color>
-</resources>

app/src/main/res/values/strings.xml

@@ -104,8 +104,6 @@
     <string name="title_checkbox_stretch_video">Stretch video to full-screen</string>
     <string name="title_checkbox_disable_warnings">Disable warning messages</string>
     <string name="summary_checkbox_disable_warnings">Disable on-screen connection warning messages while streaming</string>
-    <string name="title_checkbox_battery_saver">Battery saver</string>
-    <string name="summary_checkbox_battery_saver">Uses less battery, but may increase stuttering</string>
 
     <string name="category_audio_settings">Audio Settings</string>
     <string name="title_checkbox_51_surround">Enable 5.1 surround sound</string>

app/src/main/res/xml/preferences.xml

@@ -21,9 +21,9 @@
             android:title="@string/title_checkbox_stretch_video"
             android:defaultValue="false" />
         <CheckBoxPreference
-            android:key="checkbox_battery_saver"
+            android:key="checkbox_disable_warnings"
-            android:title="@string/title_checkbox_battery_saver"
+            android:title="@string/title_checkbox_disable_warnings"
-            android:summary="@string/summary_checkbox_battery_saver"
+            android:summary="@string/summary_checkbox_disable_warnings"
             android:defaultValue="false" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_audio_settings">

build.gradle

@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta2'
+        classpath 'com.android.tools.build:gradle:2.3.2'
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Aug 12 15:52:56 PDT 2017
+#Thu Mar 02 18:32:01 PST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip