NEW: Supports the DJI Dock2

FIX: Fixed an issue where network errors during media file retrieval
could lead to unrecoverable operation block.
ENH: Enhanced the recovery mechainism for stream transmission error.
Improved the frame rate of target detection in the liveview sample.

Author: DJI-Martin

CMakeLists.txt

@@ -1,30 +1,26 @@
 cmake_minimum_required(VERSION 3.9)
 project(dji_edge_sdk_demo CXX)
 
-set(LIB_SAMPLE edge_sample)
+set(MODULE_SAMPLE_SRC "")
+set(SAMPLE_LIB edge_sample)
 set(CMAKE_C_FLAGS "-pthread -std=gnu99")
 set(CMAKE_EXE_LINKER_FLAGS "-pthread")
 set(CMAKE_C_COMPILER "gcc")
 set(CMAKE_CXX_COMPILER "g++")
-add_definitions(-D_GNU_SOURCE)
 
 set(COMMON_CXX_FLAGS "-std=c++14 -pthread")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_CXX_FLAGS} -fprofile-arcs -ftest-coverage -Wno-deprecated-declarations")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage -lgcov")
 
-include_directories(include)
-include_directories(examples/common)
+add_definitions(-D_GNU_SOURCE)
 
 file(GLOB_RECURSE MODULE_SAMPLE_SRC
         examples/init/pre_init.cc
-        examples/init/key_store_default.cc
-        examples/liveview/sample_liveview.cc
-        examples/liveview/stream_decoder.cc
-        examples/liveview/ffmpeg_stream_decoder.cc
-        examples/liveview/image_processor_thread.cc
-        examples/liveview/stream_processor_thread.cc
-        examples/common/image_processor_dnn.cc)
+        examples/init/key_store_default.cc)
+
+include_directories(include)
+include_directories(examples/common)
 
 link_directories(${CMAKE_CURRENT_LIST_DIR}/lib/${CMAKE_HOST_SYSTEM_PROCESSOR})
 link_directories(${CMAKE_BINARY_DIR})
@@ -46,11 +42,11 @@ if (OpenCV_FOUND)
         add_definitions(-DOPEN_CV_VERSION_4)
     endif ()
 else ()
-    message(STATUS "Did not find OpenCV in the system, image data is inside RecvContainer as raw data")
+    message(STATUS "\nDID NOT FIND OPENCV IN THE SYSTEM, SOME EXECUTABLE FILES WILL NOT BE BUILT!!\n")
 endif ()
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/third_party)
-find_package(FFMPEG REQUIRED)
+find_package(FFMPEG QUIET)
 if (FFMPEG_FOUND)
     message(STATUS "Found FFMPEG installed in the system")
     message(STATUS " - Includes: ${FFMPEG_INCLUDE_DIR}")
@@ -73,38 +69,46 @@ if (FFMPEG_FOUND)
     include_directories(${FFMPEG_INCLUDE_DIR})
     add_definitions(-DFFMPEG_INSTALLED)
 else ()
-    message(STATUS "Cannot Find FFMPEG")
+    message(STATUS "\nDID NOT FIND FFMPEG IN THE SYSTEM, SOME EXECUTABLE FILES WILL NOT BE BUILT!!\n")
 endif (FFMPEG_FOUND)
 
-if (OpenCV_FOUND)
+if (OpenCV_FOUND AND FFMPEG_FOUND)
+    file(GLOB_RECURSE MODULE_SAMPLE_SRC
+            ${MODULE_SAMPLE_SRC}
+            examples/liveview/sample_liveview.cc
+            examples/liveview/stream_decoder.cc
+            examples/liveview/ffmpeg_stream_decoder.cc
+            examples/liveview/image_processor_thread.cc
+            examples/liveview/stream_processor_thread.cc
+            examples/common/util_misc.cc
+            examples/common/image_processor.cc
+            examples/common/image_processor_yolovfastest.cc)
+
     link_libraries(${OpenCV_LIBS})
-endif ()
-if (FFMPEG_FOUND)
     link_libraries(${FFMPEG_LIBRARIES})
-endif ()
+    add_executable(sample_liveview  examples/liveview/sample_liveview_main.cc)
+    target_link_libraries(sample_liveview ${SAMPLE_LIB})
 
-add_library(${LIB_SAMPLE} STATIC ${MODULE_SAMPLE_SRC})
+    add_executable(test_liveview examples/liveview/test_liveview_main.cc)
+    target_link_libraries(test_liveview ${SAMPLE_LIB})
 
-add_executable(sample_liveview  examples/liveview/sample_liveview_main.cc)
-target_link_libraries(sample_liveview edge_sample)
+    add_executable(pressure_test examples/test/pressure_test.cc)
+    target_link_libraries(pressure_test ${SAMPLE_LIB})
+endif ()
 
-add_executable(test_liveview examples/liveview/test_liveview_main.cc)
-target_link_libraries(test_liveview edge_sample)
+add_library(${SAMPLE_LIB} STATIC ${MODULE_SAMPLE_SRC})
 
 add_executable(sample_read_media_file examples/media_manager/sample_read_media_file.cc)
-target_link_libraries(sample_read_media_file edge_sample)
+target_link_libraries(sample_read_media_file ${SAMPLE_LIB})
 
 add_executable(sample_media_file_list examples/media_manager/sample_media_file_list.cc)
-target_link_libraries(sample_media_file_list edge_sample)
+target_link_libraries(sample_media_file_list ${SAMPLE_LIB})
 
 add_executable(sample_set_upload_cloud_strategy examples/media_manager/sample_set_upload_cloud_strategy.cc)
-target_link_libraries(sample_set_upload_cloud_strategy edge_sample)
+target_link_libraries(sample_set_upload_cloud_strategy ${SAMPLE_LIB})
 
 add_executable(sample_cloud_api examples/cloud_api/sample_cloud_api.cc)
-target_link_libraries(sample_cloud_api edge_sample)
-
-add_executable(pressure_test examples/test/pressure_test.cc)
-target_link_libraries(pressure_test edge_sample)
+target_link_libraries(sample_cloud_api ${SAMPLE_LIB})
 
 if (NOT EXECUTABLE_OUTPUT_PATH)
     set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)

README.md

@@ -1,6 +1,6 @@
 # DJI Edge SDK (ESDK)
 
-![](https://img.shields.io/badge/version-V1.0.0-yellow.svg)
+![](https://img.shields.io/badge/version-V1.1.0-yellow.svg)
 ![](https://img.shields.io/badge/platform-linux-green.svg)
 ![](https://img.shields.io/badge/license-MIT-blue.svg)