移除HDRPlus相关的代码

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)
+add_definitions(-DUSING_EXEC_HDRP=0)
-set(USING_EXEC_HDRP 1)
+#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})
 

app/src/main/cpp/PhoneDevice.cpp

@@ -47,15 +47,8 @@
 #include <unistd.h>
 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<float>& times, std::vector<std::string>& paths, cv::Mat& rgb)
 {
     // Read images and exposure times
@@ -2812,6 +2805,7 @@ bool CPhoneDevice::onBurstCapture(std::shared_ptr<ACameraMetadata> characteristi
                                   std::vector<std::shared_ptr<ACameraMetadata> >& results,
                                   uint32_t ldr, uint32_t duration, std::vector<std::vector<uint8_t> >& frames)
 {
+#if 0
     time_t takingTime = time(NULL);
     if (mPhotoInfo.remedy != 0)
     {
@@ -3177,6 +3171,7 @@ bool CPhoneDevice::onBurstCapture(std::shared_ptr<ACameraMetadata> characteristi
                    });
 
     th.detach();
+#endif
 
     return true;
 }