From fe6fa101945e3ffbe94d7c577d25e7d38bb1962d Mon Sep 17 00:00:00 2001
From: Slade Villena <slade@roguestar.games>
Date: Wed, 28 Dec 2022 15:49:49 -0600
Subject: [PATCH] adding support for DJI Mini, Mini 2, Mini SE

---
 .../app/build.gradle                          |  6 +++---
 .../app/src/main/AndroidManifest.xml          |  2 +-
 .../media/DJIVideoStreamDecoder.java          | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/android-videostreamdecodingsample/app/build.gradle b/android-videostreamdecodingsample/app/build.gradle
index 08b40c9..badd21d 100755
--- a/android-videostreamdecodingsample/app/build.gradle
+++ b/android-videostreamdecodingsample/app/build.gradle
@@ -11,7 +11,7 @@ android {
 
     defaultConfig {
         applicationId "com.dji.videostreamdecodingsample"
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 30
         multiDexEnabled true
         ndk {
@@ -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.15.1', {
+    implementation('com.dji:dji-sdk:4.16.4', {
         /**
          * 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.15.1'
+    compileOnly 'com.dji:dji-sdk-provided:4.16.4'
 
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.core:core:1.3.2'
diff --git a/android-videostreamdecodingsample/app/src/main/AndroidManifest.xml b/android-videostreamdecodingsample/app/src/main/AndroidManifest.xml
index bf6e1a8..6c5963d 100755
--- a/android-videostreamdecodingsample/app/src/main/AndroidManifest.xml
+++ b/android-videostreamdecodingsample/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
 
         <meta-data
             android:name="com.dji.sdk.API_KEY"
-            android:value="Please enter your App Key here."/>
+            android:value=""/>
 
         <activity
             android:name=".ConnectionActivity"
diff --git a/android-videostreamdecodingsample/app/src/main/java/com/dji/videostreamdecodingsample/media/DJIVideoStreamDecoder.java b/android-videostreamdecodingsample/app/src/main/java/com/dji/videostreamdecodingsample/media/DJIVideoStreamDecoder.java
index d4c5272..1b0e28c 100755
--- a/android-videostreamdecodingsample/app/src/main/java/com/dji/videostreamdecodingsample/media/DJIVideoStreamDecoder.java
+++ b/android-videostreamdecodingsample/app/src/main/java/com/dji/videostreamdecodingsample/media/DJIVideoStreamDecoder.java
@@ -485,6 +485,25 @@ public int getIframeRawId(Model pModel, int width) {
             case MAVIC_2_ENTERPRISE_ADVANCED:
                 break;
 
+            case MAVIC_MINI:
+            case DJI_MINI_SE:
+            case DJI_MINI_2:
+                switch (width) {
+                    case 1280:
+                        iframeId = dji.midware.R.raw.iframe_1280x720_wm160;
+                        DJILog.i(TAG, "Selected Iframe=iframe_1280x720_wm160");
+                        break;
+                    case 960:
+                        iframeId = dji.midware.R.raw.iframe_960x720_wm160;
+                        DJILog.i(TAG, "Selected Iframe=iframe_960x720_wm160");
+                        break;
+                }
+                if (iframeId == -1 && height == 1080) {
+                    iframeId = dji.midware.R.raw.dji1080gdriframe;
+                    DJILog.i(TAG, "Selected Iframe=iframe_1080p_wm160");
+                }
+                break;
+
             default: //for P3P, Inspire1, etc/
                 iframeId = R.raw.iframe_1280x720_ins;
                 break;