diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt index bea448c5..89fea9fb 100644 --- a/app/src/main/cpp/CMakeLists.txt +++ b/app/src/main/cpp/CMakeLists.txt @@ -21,7 +21,7 @@ if(ANDROID_ABI STREQUAL "armeabi-v7a") add_definitions(-DUSING_N938) elseif(ANDROID_ABI STREQUAL "arm64-v8a") # add_definitions(-DUSING_N938) - add_definitions(-DUSING_PTZ) + # add_definitions(-DUSING_PTZ) endif() # OUTPUT_DBG_INFO: 输出调试相关信息 @@ -63,8 +63,8 @@ add_definitions(-DENABLE_3V3_ALWAYS) add_definitions(-DCURL_STATICLIB) add_definitions(-DUSING_HDRPLUS) -add_definitions(-DUSING_EXEC_HDRP=1) -set(USING_EXEC_HDRP 1) +add_definitions(-DUSING_EXEC_HDRP=0) +#set(USING_EXEC_HDRP 1) # include_directories(${OpenCV_DIR}/include) # add_library( lib_opencv SHARED IMPORTED ) @@ -160,9 +160,9 @@ add_definitions(-DDISABLE_RTTI) SET(STREAMING_SRCS media/RTSPToMP4.cpp media/RTSPRecorder.cpp media/Streaming.cpp ) -SET(HDRPLUS_LIBS raw exiv2 exiv2-xmp expat lcms2 OpenMP::OpenMP_CXX) +#SET(HDRPLUS_LIBS raw exiv2 exiv2-xmp expat lcms2 OpenMP::OpenMP_CXX) -SET(HDRPLUS2_LIBS raw raw_r lcms2 tiff tiffxx jpeg hdrplus_pipeline) +#SET(HDRPLUS2_LIBS raw raw_r lcms2 tiff tiffxx jpeg hdrplus_pipeline) SET(HDRPLUS_SOURCES hdrplus/src/align.cpp @@ -180,6 +180,7 @@ SET(HDRPLUS2_SOURCES hdrplus2/src/InputSource.cpp hdrplus2/src/LibRaw2DngConverter.cpp hdrplus2/${ANDROID_ABI}/hdrplus_pipeline.registration.cpp) +SET(HDRPLUS2_SOURCES ) SET(YAMC_INC_DIR ${CMAKE_SOURCE_DIR}) diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index 92a627a8..c3752cdf 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -47,15 +47,8 @@ #include namespace fs = std::filesystem; -#if 0 -#define CMD_SET_485_EN_STATE 131 -#define CMD_SET_CAM_3V3_EN_STATE 132 -#define CMD_SET_12V_EN_STATE 133 -#endif - extern bool GetJniEnv(JavaVM *vm, JNIEnv **env, bool& didAttachThread); - bool makeHdr(vector& times, std::vector& paths, cv::Mat& rgb) { // Read images and exposure times @@ -2812,6 +2805,7 @@ bool CPhoneDevice::onBurstCapture(std::shared_ptr characteristi std::vector >& results, uint32_t ldr, uint32_t duration, std::vector >& frames) { +#if 0 time_t takingTime = time(NULL); if (mPhotoInfo.remedy != 0) { @@ -3177,6 +3171,7 @@ bool CPhoneDevice::onBurstCapture(std::shared_ptr characteristi }); th.detach(); +#endif return true; }