Additional optimizations

Author: iakov

as/app/app.iml

@@ -64,14 +64,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -80,6 +72,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />

as/app/src/main/AndroidManifest.xml

@@ -10,7 +10,9 @@
         android:allowBackup="false"
         android:icon="@drawable/trik_icon"
         android:label="TRIK Gamepad"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme"
+        android:largeHeap="false"
+        android:hardwareAccelerated="true">
        <!--  <service android:name=".SenderService" />  -->
 
         <activity

as/app/src/main/java/com/demo/mjpeg/MjpegInputStream.java

@@ -66,7 +66,7 @@ private int getStartOfSequence(@NonNull byte[] sequence) throws IOException {
         return end < 0 ? -1 : end - sequence.length;
     }
 
-    public InputStream readMjpegFrame() throws IOException {
+    public BoundedInputStream readMjpegFrame() throws IOException {
         int contentLength = -1;
         int contentAttrPos = getStartOfSequence(CONTENT_LENGTH_MARKER);
         if (contentAttrPos < 0 || skipBytes(contentAttrPos) < contentAttrPos)
@@ -97,17 +97,15 @@ public InputStream readMjpegFrame() throws IOException {
         try {
             if (contentLength < 0) {
                 Log.e(TAG, "Skipping to recover");
-                int count = getStartOfSequence(CONTENT_LENGTH_MARKER);
-                Log.e(TAG, count + " bytes to skip until next frame header.");
-                int skipped = skipBytes(count);
-                if (skipped != count)
-                    Log.e(TAG, "But " + skipped + " bytes skipped instead.");
-
+                contentLength = getStartOfSequence(CONTENT_LENGTH_MARKER);
             }
             else {
                 Log.i(TAG, "Frame dropped.");
-                skipBytes(contentLength);
             }
+            Log.v(TAG, contentLength + " bytes to skip until next frame header.");
+            int skipped = skipBytes(contentLength);
+            if (skipped != contentLength)
+                Log.w(TAG, "Skipped only" + skipped + " bytes instead of " + contentLength);
         } catch (IOException e) {
             e.getStackTrace();
             Log.e(TAG, "Failed to skip bad data:" + e);