update 4.15.1

Author: daniel.chen

android-videostreamdecodingsample/app/build.gradle

@@ -80,7 +80,7 @@ android {
 dependencies {
     implementation 'androidx.multidex:multidex:2.0.0'
     implementation 'com.squareup:otto:1.3.8'
-    implementation('com.dji:dji-sdk:4.14-trial1', {
+    implementation('com.dji:dji-sdk:4.15.1', {
         /**
          * Uncomment the "library-anti-distortion" if your app does not need Anti Distortion for Mavic 2 Pro and Mavic 2 Zoom.
          * Uncomment the "fly-safe-database" if you need database for release, or we will download it when DJISDKManager.getInstance().registerApp
@@ -90,7 +90,7 @@ dependencies {
         exclude module: 'library-anti-distortion'
         //exclude module: 'fly-safe-database'
     })
-    compileOnly 'com.dji:dji-sdk-provided:4.14-trial1'
+    compileOnly 'com.dji:dji-sdk-provided:4.15.1'
 
     implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation 'androidx.core:core:1.0.0'

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

@@ -277,14 +277,27 @@ public void onReceive(byte[] videoBuffer, int size) {
         } else {
             if (!product.getModel().equals(Model.UNKNOWN_AIRCRAFT)) {
                 mCamera = product.getCamera();
-                mCamera.setMode(SettingsDefinitions.CameraMode.SHOOT_PHOTO, new CommonCallbacks.CompletionCallback() {
-                    @Override
-                    public void onResult(DJIError djiError) {
-                        if (djiError != null) {
-                            showToast("can't change mode of camera, error:"+djiError.getDescription());
-                        }
+                if (mCamera != null) {
+                    if (mCamera.isFlatCameraModeSupported()) {
+                        mCamera.setFlatMode(SettingsDefinitions.FlatCameraMode.PHOTO_SINGLE, new CommonCallbacks.CompletionCallback() {
+                            @Override
+                            public void onResult(DJIError djiError) {
+                                if(djiError!=null){
+                                    showToast("can't change flat mode of camera, error:" + djiError.getDescription());
+                                }
+                            }
+                        });
+                    } else {
+                        mCamera.setMode(SettingsDefinitions.CameraMode.SHOOT_PHOTO, new CommonCallbacks.CompletionCallback() {
+                            @Override
+                            public void onResult(DJIError djiError) {
+                                if (djiError != null) {
+                                    showToast("can't change mode of camera, error:" + djiError.getDescription());
+                                }
+                            }
+                        });
                     }
-                });
+                }
 
                 //When calibration is needed or the fetch key frame is required by SDK, should use the provideTranscodedVideoFeed
                 //to receive the transcoded video feed from main camera.
@@ -493,7 +506,11 @@ private void oldSaveYuvDataToJPEG(byte[] yuvFrame, int width, int height){
                   + DJIVideoStreamDecoder.getInstance().frameIndex
                   + ",array length: "
                   + bytes.length);
-        screenShot(bytes, Environment.getExternalStorageDirectory() + "/DJI_ScreenShot", width, height);
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
+            screenShot(bytes, getApplicationContext().getExternalFilesDir("DJI").getPath() + "/DJI_ScreenShot", width, height);
+        } else {
+            screenShot(bytes, Environment.getExternalStorageDirectory() + "/DJI_ScreenShot", width, height);
+        }
     }
 
     private void newSaveYuvDataToJPEG(byte[] yuvFrame, int width, int height){
@@ -513,7 +530,12 @@ private void newSaveYuvDataToJPEG(byte[] yuvFrame, int width, int height){
             yuvFrame[length + 2 * i] = u[i];
             yuvFrame[length + 2 * i + 1] = v[i];
         }
-        screenShot(yuvFrame,Environment.getExternalStorageDirectory() + "/DJI_ScreenShot", width, height);
+
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
+            screenShot(yuvFrame, getApplicationContext().getExternalFilesDir("DJI").getPath() + "/DJI_ScreenShot", width, height);
+        } else {
+            screenShot(yuvFrame, Environment.getExternalStorageDirectory() + "/DJI_ScreenShot", width, height);
+        }
     }
 
     private void newSaveYuvDataToJPEG420P(byte[] yuvFrame, int width, int height) {
@@ -533,7 +555,12 @@ private void newSaveYuvDataToJPEG420P(byte[] yuvFrame, int width, int height) {
             yuvFrame[length + 2 * i] = v[i];
             yuvFrame[length + 2 * i + 1] = u[i];
         }
-        screenShot(yuvFrame, Environment.getExternalStorageDirectory() + "/DJI_ScreenShot", width, height);
+
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
+            screenShot(yuvFrame, getApplicationContext().getExternalFilesDir("DJI").getPath() + "/DJI_ScreenShot", width, height);
+        } else {
+            screenShot(yuvFrame, Environment.getExternalStorageDirectory() + "/DJI_ScreenShot", width, height);
+        }
     }
 
     /**

android-videostreamdecodingsample/app/src/main/java/com/dji/videostreamdecodingsample/media/DJIVideoStreamDecoder.java

@@ -13,20 +13,21 @@
 import android.view.Surface;
 
 import com.dji.videostreamdecodingsample.R;
-import dji.common.product.Model;
-import dji.log.DJILog;
-import dji.midware.data.model.P3.DataCameraGetPushStateInfo;
-import dji.sdk.codec.DJICodecManager;
-import dji.sdk.products.Aircraft;
-import dji.sdk.sdkmanager.DJISDKManager;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.util.LinkedList;
 import java.util.Queue;
 import java.util.concurrent.ArrayBlockingQueue;
 
+import dji.common.product.Model;
+import dji.log.DJILog;
+import dji.midware.data.model.P3.DataCameraGetPushStateInfo;
 import dji.sdk.base.BaseProduct;
+import dji.sdk.codec.DJICodecManager;
+import dji.sdk.products.Aircraft;
+import dji.sdk.sdkmanager.DJISDKManager;
 
 /**
  * This class is a helper class for hardware decoding. Please follow the following steps to use it:
@@ -474,6 +475,16 @@ public int getIframeRawId(Model pModel, int width) {
                 iframeId = -1;
             }
                 break;
+
+            case MAVIC_AIR_2:
+                break;
+            case MAVIC_2_ENTERPRISE:
+            case MAVIC_2_ENTERPRISE_DUAL:
+                iframeId = dji.midware.R.raw.iframe_1280x720_wm220;
+                break;
+            case MAVIC_2_ENTERPRISE_ADVANCED:
+                break;
+
             default: //for P3P, Inspire1, etc/
                 iframeId = R.raw.iframe_1280x720_ins;
                 break;