fix m300rtk bug

Author: Hoker1

.gitignore

@@ -1,46 +1,45 @@
-# built application files
+# Built application files
 *.apk
 *.ap_
 
-# files for the dex VM
+# Files for the ART/Dalvik VM
 *.dex
 
 # Java class files
 *.class
 
+# Generated files
+bin/
+gen/
+out/
+
 # Gradle files
-android-videostreamdecodingsample/.gradle/
-android-videostreamdecodingsample/gradle/
-android-videostreamdecodingsample/build/
-android-videostreamdecodingsample/gradlew
-android-videostreamdecodingsample/gradlew.bat
-
-# generated files
-
-/bin
-/gen
-/obj
-/build
+.gradle/
+gradle/
+build/
+
 # Local configuration file (sdk path, etc)
 local.properties
-project.properties
-
-# Eclipse project files
-.classpath
-.cproject
 
 # Proguard folder generated by Eclipse
 proguard/
 
-# Intellij project files
-*.ipr
-*.iws
-.idea/
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
 *.iml
+.idea/
+.idea/*
+.idea/libraries
 
-#ant relative files
-#build.xml
-ant.properties
+# Keystore files
+*.jks
 
-#backup files
-*.bak
+.DS_Store

android-videostreamdecodingsample/app/build.gradle

@@ -5,19 +5,19 @@ repositories {
 }
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.3'
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
         applicationId "com.dji.videostreamdecodingsample"
-        minSdkVersion 16
-        targetSdkVersion 28
+        minSdkVersion 19
+        targetSdkVersion 29
         multiDexEnabled true
         ndk {
             // On x86 devices that run Android API 23 or above, if the application is targeted with API 23 or
             // above, FFmpeg lib might lead to runtime crashes or warnings.
-            abiFilters 'armeabi-v7a', 'x86', 'arm64-v8a'
+            abiFilters 'armeabi-v7a', 'arm64-v8a'
         }
     }
 
@@ -61,7 +61,13 @@ android {
         doNotStrip "*/*/libDJICSDKCommon.so"
         doNotStrip "*/*/libDJIUpgradeCore.so"
         doNotStrip "*/*/libDJIUpgradeJNI.so"
+        doNotStrip "*/*/libDJIWaypointV2Core.so"
+        doNotStrip "*/*/libAMapSDK_MAP_v6_9_2.so"
+        doNotStrip "*/*/libDJIMOP.so"
+        doNotStrip "*/*/libDJISDKLOGJNI.so"
         exclude 'META-INF/rxjava.properties'
+        exclude 'assets/location_map_gps_locked.png'
+        exclude 'assets/location_map_gps_3d.png'
     }
 
     compileOptions {
@@ -74,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.11.1', {
+    implementation('com.dji:dji-sdk:4.14-trial1', {
         /**
          * 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
@@ -84,7 +90,7 @@ dependencies {
         exclude module: 'library-anti-distortion'
         //exclude module: 'fly-safe-database'
     })
-    compileOnly 'com.dji:dji-sdk-provided:4.11.1'
+    compileOnly 'com.dji:dji-sdk-provided:4.14-trial1'
 
     implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation 'androidx.core:core:1.0.0'
@@ -96,5 +102,5 @@ dependencies {
 
 // Please uncomment the following code if you use your own sdk version.
 // If can't get the file, Try a few times more
-apply from : "https://terra-1-g.djicdn.com/71a7d383e71a4fb8887a310eb746b47f/msdk/Android-CommonConfig/config_sample_all.gradle"
+//apply from : "https://terra-1-g.djicdn.com/71a7d383e71a4fb8887a310eb746b47f/msdk/Android-CommonConfig/config_sample_all.gradle"
 

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

@@ -32,14 +32,17 @@
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
 
+import dji.common.airlink.PhysicalSource;
 import dji.common.camera.SettingsDefinitions;
 import dji.common.error.DJIError;
 import dji.common.product.Model;
 import dji.common.util.CommonCallbacks;
+import dji.sdk.airlink.OcuSyncLink;
 import dji.sdk.base.BaseProduct;
 import dji.sdk.camera.Camera;
 import dji.sdk.camera.VideoFeeder;
 import dji.sdk.codec.DJICodecManager;
+import dji.sdk.sdkmanager.DJISDKManager;
 import dji.thirdparty.afinal.core.AsyncTask;
 
 public class MainActivity extends Activity implements DJICodecManager.YuvDataCallback {
@@ -141,6 +144,28 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setContentView(R.layout.activity_main);
         initUi();
+        if (isM300Product()) {
+            OcuSyncLink ocuSyncLink = VideoDecodingApplication.getProductInstance().getAirLink().getOcuSyncLink();
+            // If your MutltipleLensCamera is set at right or top, you need to change the PhysicalSource to RIGHT_CAM or TOP_CAM.
+            ocuSyncLink.assignSourceToPrimaryChannel(PhysicalSource.LEFT_CAM, PhysicalSource.FPV_CAM, new CommonCallbacks.CompletionCallback() {
+                @Override
+                public void onResult(DJIError error) {
+                    if (error == null) {
+                        showToast("assignSourceToPrimaryChannel success.");
+                    } else {
+                        showToast("assignSourceToPrimaryChannel fail, reason: "+ error.getDescription());
+                    }
+                }
+            });
+        }
+    }
+
+    public static boolean isM300Product() {
+        if (DJISDKManager.getInstance().getProduct() == null) {
+            return false;
+        }
+        Model model = DJISDKManager.getInstance().getProduct().getModel();
+        return model == Model.MATRICE_300_RTK;
     }
 
     private void showToast(String s) {
@@ -290,6 +315,8 @@ public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int hei
                 Log.d(TAG, "real onSurfaceTextureAvailable: width " + videoViewWidth + " height " + videoViewHeight);
                 if (mCodecManager == null) {
                     mCodecManager = new DJICodecManager(getApplicationContext(), surface, width, height);
+                    //For M300RTK, you need to actively request an I frame.
+                    mCodecManager.resetKeyFrame();
                 }
             }
 

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

@@ -754,7 +754,6 @@ private void onFrameQueueIn(Message msg) {
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     private void decodeFrame() throws Exception {
         DJIFrame inputFrame = frameQueue.poll();
-        MediaFormat format = MediaFormat.createVideoFormat(VIDEO_ENCODING_FORMAT, width, height);
         if (inputFrame == null) {
             return;
         }
@@ -789,7 +788,7 @@ private void decodeFrame() throws Exception {
                     yuvDataBuf.position(bufferInfo.offset);
                     yuvDataBuf.limit(bufferInfo.size - bufferInfo.offset);
                     if (yuvDataListener != null) {
-                        yuvDataListener.onYuvDataReceived(format, yuvDataBuf, bufferInfo.size - bufferInfo.offset,  width, height);
+                        yuvDataListener.onYuvDataReceived(codec.getOutputFormat(), yuvDataBuf, bufferInfo.size - bufferInfo.offset,  width, height);
                     }
                 }
                 // All the output buffer must be release no matter whether the yuv data is output or

android-videostreamdecodingsample/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip