update sample to Android SDK 4.10.

Author: oliverou

README.md

@@ -8,7 +8,7 @@ This sample code demonstrates how to use [FFmpeg](https://ffmpeg.org) for video
 
  - Android Studio 2.0+
  - Android System 4.2+
- - DJI Android SDK 4.9
+ - DJI Android SDK 4.10
 
 ## IMPORTANT: Install `git lfs`
 

android-videostreamdecodingsample/app/build.gradle

@@ -45,20 +45,25 @@ android {
         doNotStrip "*/*/libFRCorkscrew.so"
         doNotStrip "*/*/libUpgradeVerify.so"
         doNotStrip "*/*/libFR.so"
+        doNotStrip "*/*/libDJIFlySafeCore.so"
+        doNotStrip "*/*/libdjifs_jni.so"
+        doNotStrip "*/*/libsfjni.so"
         exclude 'META-INF/rxjava.properties'
     }
 }
 dependencies {
     implementation 'com.android.support:multidex:1.0.2'
-    implementation('com.dji:dji-sdk:4.9', {
+    implementation('com.dji:dji-sdk:4.10', {
         //if your app needn't support Mavic 2 Pro and Mavic 2 Zoom, pls exclude the library-anti-distortion module
         //like following
         //exclude module: 'library-anti-distortion'
+
+        //Uncomment the following line if your APP does not need network RTK.
+        //For Phantom 4 RTK and Matrice 210 RTK V2. Network RTK can be used as a virtual reference station to provide
+        //cm level accurate position.
+        //exclude module: 'library-anti-distortion'
     })
-    compileOnly 'com.dji:dji-sdk-provided:4.9'
-}
+    compileOnly 'com.dji:dji-sdk-provided:4.10'
 
+}
 
-repositories {
-    google()
-}

android-videostreamdecodingsample/app/dji-sdk/dji-sdk.aar

@@ -19,6 +19,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import dji.sdk.sdkmanager.DJISDKInitEvent;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -153,6 +154,11 @@ public void onConnectivityChange(boolean b) {
                             }
                             notifyStatusChange();
                         }
+
+                        @Override
+                        public void onInitProcess(DJISDKInitEvent djisdkInitEvent, int i) {
+                            //notify the init progress
+                        }
                     });
                 }
             });
@@ -245,6 +251,7 @@ private void initUI() {
         mBtnOpen.setOnClickListener(this);
         mBtnOpen.setEnabled(false);
         ((TextView)findViewById(R.id.textView2)).setText(getResources().getString(R.string.sdk_version, DJISDKManager.getInstance().getSDKVersion()));
+
     }
 
     private void updateTitleBar() {

android-videostreamdecodingsample/app/src/main/java/com/dji/videostreamdecodingsample/ConnectionActivity.java

@@ -5,6 +5,7 @@
 import android.graphics.Rect;
 import android.graphics.SurfaceTexture;
 import android.graphics.YuvImage;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
@@ -20,25 +21,24 @@
 import android.widget.Toast;
 
 import com.dji.videostreamdecodingsample.media.DJIVideoStreamDecoder;
-
 import com.dji.videostreamdecodingsample.media.NativeHelper;
-import dji.common.camera.SettingsDefinitions;
-import dji.common.error.DJIError;
-import dji.common.util.CommonCallbacks;
-import dji.log.DJILog;
-import dji.thirdparty.afinal.core.AsyncTask;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.ByteBuffer;
 
+import dji.common.camera.SettingsDefinitions;
+import dji.common.error.DJIError;
 import dji.common.product.Model;
+import dji.common.util.CommonCallbacks;
 import dji.sdk.base.BaseProduct;
 import dji.sdk.camera.Camera;
 import dji.sdk.camera.VideoFeeder;
 import dji.sdk.codec.DJICodecManager;
-import java.nio.ByteBuffer;
+import dji.thirdparty.afinal.core.AsyncTask;
 
 public class MainActivity extends Activity implements DJICodecManager.YuvDataCallback {
     private static final String TAG = MainActivity.class.getSimpleName();
@@ -391,13 +391,18 @@ public void onYuvDataReceived(final ByteBuffer yuvFrame, int dataSize, final int
             AsyncTask.execute(new Runnable() {
                 @Override
                 public void run() {
-                    saveYuvDataToJPEG(bytes, width, height);
+                    if (Build.VERSION.SDK_INT <= 23){
+                        oldSaveYuvDataToJPEG(bytes, width, height);
+                    }else {
+                        newSaveYuvDataToJPEG(bytes, width, height);
+                    }
                 }
             });
         }
     }
 
-    private void saveYuvDataToJPEG(byte[] yuvFrame, int width, int height){
+    // For android API <= 23
+    private void oldSaveYuvDataToJPEG(byte[] yuvFrame, int width, int height){
         if (yuvFrame.length < width * height) {
             //DJILog.d(TAG, "yuvFrame size is too small " + yuvFrame.length);
             return;
@@ -447,6 +452,26 @@ private void saveYuvDataToJPEG(byte[] yuvFrame, int width, int height){
         screenShot(bytes,Environment.getExternalStorageDirectory() + "/DJI_ScreenShot", width, height);
     }
 
+    private void newSaveYuvDataToJPEG(byte[] yuvFrame, int width, int height){
+        if (yuvFrame.length < width * height) {
+            //DJILog.d(TAG, "yuvFrame size is too small " + yuvFrame.length);
+            return;
+        }
+        int length = width * height;
+
+        byte[] u = new byte[width * height / 4];
+        byte[] v = new byte[width * height / 4];
+        for (int i = 0; i < u.length; i++) {
+            v[i] = yuvFrame[length + 2 * i];
+            u[i] = yuvFrame[length + 2 * i + 1];
+        }
+        for (int i = 0; i < u.length; i++) {
+            yuvFrame[length + 2 * i] = u[i];
+            yuvFrame[length + 2 * i + 1] = v[i];
+        }
+        screenShot(yuvFrame,Environment.getExternalStorageDirectory() + "/DJI_ScreenShot", width, height);
+    }
+
     /**
      * Save the buffered data into a JPG image file
      */