diff --git a/components/3rd_party/sophgo-middleware/CMakeLists.txt b/components/3rd_party/sophgo-middleware/CMakeLists.txt index 59115dda..15418839 100644 --- a/components/3rd_party/sophgo-middleware/CMakeLists.txt +++ b/components/3rd_party/sophgo-middleware/CMakeLists.txt @@ -1,69 +1,69 @@ -set(middleware_src_path "${CMAKE_CURRENT_SOURCE_DIR}/sophgo-middleware") +# set(middleware_src_path "${CMAKE_CURRENT_SOURCE_DIR}/sophgo-middleware") -# middleware -set(middleware_include_dir . - ${middleware_src_path}/v2/component/panel/sg200x - ${middleware_src_path}/v2/include - ${middleware_src_path}/v2/include/isp/sg200x - ${middleware_src_path}/v2/sample/common - ${middleware_src_path}/v2/uapi - ${middleware_src_path}/v2/3rdparty/inih - ${middleware_src_path}/v2/modules/ive/include/ -) -list(APPEND ADD_INCLUDE ${middleware_include_dir}) -set_property(SOURCE ${middleware_include_dir} PROPERTY GENERATED 1) +# # middleware +# set(middleware_include_dir . +# ${middleware_src_path}/v2/component/panel/sg200x +# ${middleware_src_path}/v2/include +# ${middleware_src_path}/v2/include/isp/sg200x +# ${middleware_src_path}/v2/sample/common +# ${middleware_src_path}/v2/uapi +# ${middleware_src_path}/v2/3rdparty/inih +# ${middleware_src_path}/v2/modules/ive/include/ +# ) +# list(APPEND ADD_INCLUDE ${middleware_include_dir}) +# set_property(SOURCE ${middleware_include_dir} PROPERTY GENERATED 1) -append_srcs_dir(middleware_src_dir ${middleware_src_path}/v2/sample/common - ${middleware_src_path}/v2/component/isp/sensor/cv181x/gcore_gc4653 - ${middleware_src_path}/v2/component/isp/sensor/sg200x/sms_sc035gs - ${middleware_src_path}/v2/component/isp/sensor/sg200x/ov_ov2685 - ) -list(APPEND ADD_SRCS ${middleware_src_dir}) -set_property(SOURCE ${middleware_src_dir} PROPERTY GENERATED 1) +# append_srcs_dir(middleware_src_dir ${middleware_src_path}/v2/sample/common +# ${middleware_src_path}/v2/component/isp/sensor/cv181x/gcore_gc4653 +# ${middleware_src_path}/v2/component/isp/sensor/sg200x/sms_sc035gs +# ${middleware_src_path}/v2/component/isp/sensor/sg200x/ov_ov2685 +# ) +# list(APPEND ADD_SRCS ${middleware_src_dir}) +# set_property(SOURCE ${middleware_src_dir} PROPERTY GENERATED 1) -set(mmf_lib_dir ${middleware_src_path}/v2/lib) -set(middleware_dynamic_lib_file ${mmf_lib_dir}/libcvi_ive.so - ${mmf_lib_dir}/libcvi_bin.so - ${mmf_lib_dir}/libaaccomm2.so - ${mmf_lib_dir}/libaacdec2.so - ${mmf_lib_dir}/libaacenc2.so - ${mmf_lib_dir}/libaacsbrdec2.so - ${mmf_lib_dir}/libaacsbrenc2.so - ${mmf_lib_dir}/libae.so - ${mmf_lib_dir}/libaf.so - ${mmf_lib_dir}/libawb.so - ${mmf_lib_dir}/libcvi_audio.so - ${mmf_lib_dir}/libcvi_bin_isp.so - ${mmf_lib_dir}/libcvi_bin.so - ${mmf_lib_dir}/libcvi_ispd2.so - ${mmf_lib_dir}/libcvi_RES1.so - ${mmf_lib_dir}/libcvi_ssp.so - ${mmf_lib_dir}/libcvi_VoiceEngine.so - ${mmf_lib_dir}/libcvi_vqe.so - ${mmf_lib_dir}/libdnvqe.so - ${mmf_lib_dir}/libisp_algo.so - ${mmf_lib_dir}/libisp.so - ${mmf_lib_dir}/libmipi_tx.so - ${mmf_lib_dir}/libmisc.so - ${mmf_lib_dir}/libosdc.so - ${mmf_lib_dir}/libraw_dump.so - ${mmf_lib_dir}/libsys.so - ${mmf_lib_dir}/libvdec.so - ${mmf_lib_dir}/libvenc.so - ${mmf_lib_dir}/libvpu.so - ${mmf_lib_dir}/libjson-c.so.5 - ${mmf_lib_dir}/libtinyalsa.so - ${mmf_lib_dir}/3rd/libcli.so - ${mmf_lib_dir}/3rd/libini.so) -list(APPEND ADD_DYNAMIC_LIB ${middleware_dynamic_lib_file}) -set_property(SOURCE ${middleware_dynamic_lib_file} PROPERTY GENERATED 1) +# set(mmf_lib_dir ${middleware_src_path}/v2/lib) +# set(middleware_dynamic_lib_file ${mmf_lib_dir}/libcvi_ive.so +# ${mmf_lib_dir}/libcvi_bin.so +# ${mmf_lib_dir}/libaaccomm2.so +# ${mmf_lib_dir}/libaacdec2.so +# ${mmf_lib_dir}/libaacenc2.so +# ${mmf_lib_dir}/libaacsbrdec2.so +# ${mmf_lib_dir}/libaacsbrenc2.so +# ${mmf_lib_dir}/libae.so +# ${mmf_lib_dir}/libaf.so +# ${mmf_lib_dir}/libawb.so +# ${mmf_lib_dir}/libcvi_audio.so +# ${mmf_lib_dir}/libcvi_bin_isp.so +# ${mmf_lib_dir}/libcvi_bin.so +# ${mmf_lib_dir}/libcvi_ispd2.so +# ${mmf_lib_dir}/libcvi_RES1.so +# ${mmf_lib_dir}/libcvi_ssp.so +# ${mmf_lib_dir}/libcvi_VoiceEngine.so +# ${mmf_lib_dir}/libcvi_vqe.so +# ${mmf_lib_dir}/libdnvqe.so +# ${mmf_lib_dir}/libisp_algo.so +# ${mmf_lib_dir}/libisp.so +# ${mmf_lib_dir}/libmipi_tx.so +# ${mmf_lib_dir}/libmisc.so +# ${mmf_lib_dir}/libosdc.so +# ${mmf_lib_dir}/libraw_dump.so +# ${mmf_lib_dir}/libsys.so +# ${mmf_lib_dir}/libvdec.so +# ${mmf_lib_dir}/libvenc.so +# ${mmf_lib_dir}/libvpu.so +# ${mmf_lib_dir}/libjson-c.so.5 +# ${mmf_lib_dir}/libtinyalsa.so +# ${mmf_lib_dir}/3rd/libcli.so +# ${mmf_lib_dir}/3rd/libini.so) +# list(APPEND ADD_DYNAMIC_LIB ${middleware_dynamic_lib_file}) +# set_property(SOURCE ${middleware_dynamic_lib_file} PROPERTY GENERATED 1) -list(APPEND ADD_DEFINITIONS_PRIVATE -DSENSOR_GCORE_GC4653 - -DSENSOR0_TYPE=SONY_IMX327_MIPI_2M_30FPS_12BIT - -DSENSOR1_TYPE=SONY_IMX327_MIPI_2M_30FPS_12BIT) +# list(APPEND ADD_DEFINITIONS_PRIVATE -DSENSOR_GCORE_GC4653 +# -DSENSOR0_TYPE=SONY_IMX327_MIPI_2M_30FPS_12BIT +# -DSENSOR1_TYPE=SONY_IMX327_MIPI_2M_30FPS_12BIT) -list(APPEND ADD_DEFINITIONS_PRIVATE -DSENSOR_SMS_SC035GS - -DSENSOR2_TYPE=SMS_SC035GS_MIPI_480P_120FPS_12BIT) +# list(APPEND ADD_DEFINITIONS_PRIVATE -DSENSOR_SMS_SC035GS +# -DSENSOR2_TYPE=SMS_SC035GS_MIPI_480P_120FPS_12BIT) -list(APPEND ADD_DEFINITIONS_PRIVATE -DSENSOR_OV_OV2685) -register_component(DYNAMIC) \ No newline at end of file +# list(APPEND ADD_DEFINITIONS_PRIVATE -DSENSOR_OV_OV2685) +# register_component(DYNAMIC) \ No newline at end of file diff --git a/components/maixcam_lib/CMakeLists.txt b/components/maixcam_lib/CMakeLists.txt index 839d71db..bb62345f 100644 --- a/components/maixcam_lib/CMakeLists.txt +++ b/components/maixcam_lib/CMakeLists.txt @@ -3,10 +3,7 @@ list(APPEND ADD_REQUIREMENTS basic ini) list(APPEND ADD_INCLUDE "include") # sophgo-middleware -set(middleware_version_str "${CONFIG_SOPHGO_MIDDLEWARE_VERSION_MAJOR}.${CONFIG_SOPHGO_MIDDLEWARE_VERSION_MINOR}.${CONFIG_SOPHGO_MIDDLEWARE_VERSION_PATCH}") -set(middleware_unzip_path "${DL_EXTRACTED_PATH}/sophgo-middleware") -set(middleware_src_path "${middleware_unzip_path}/sophgo-middleware-${middleware_version_str}") - +set(middleware_src_path "${CMAKE_CURRENT_SOURCE_DIR}/../3rd_party/sophgo-middleware/sophgo-middleware") if(CONFIG_MAIXCAM_LIB_COMPILE_FROM_SOURCE) set(source_dir "maixcdk_maixcam_lib") @@ -22,14 +19,123 @@ if(CONFIG_MAIXCAM_LIB_COMPILE_FROM_SOURCE) list(APPEND ADD_REQUIREMENTS media_server) # middleware - list(APPEND ADD_SRCS "${source_dir}/middleware/sophgo_middleware.cpp") - list(APPEND ADD_REQUIREMENTS sophgo-middleware) - + set(middleware_include_dir . + ${middleware_src_path}/v2/component/panel/sg200x + ${middleware_src_path}/v2/include + ${middleware_src_path}/v2/include/isp/sg200x + ${middleware_src_path}/v2/sample/common + ${middleware_src_path}/v2/uapi + ${middleware_src_path}/v2/3rdparty/inih + ${middleware_src_path}/v2/modules/ive/include/ + ) + list(APPEND ADD_INCLUDE ${middleware_include_dir}) + set_property(SOURCE ${middleware_include_dir} PROPERTY GENERATED 1) + + append_srcs_dir(middleware_src_dir ${middleware_src_path}/v2/sample/common + ${middleware_src_path}/v2/component/isp/sensor/cv181x/gcore_gc4653 + ${middleware_src_path}/v2/component/isp/sensor/sg200x/sms_sc035gs + ) + list(APPEND ADD_SRCS ${middleware_src_dir} + "${source_dir}/middleware/sophgo_middleware.cpp") + set_property(SOURCE ${middleware_src_dir} PROPERTY GENERATED 1) + + set(mmf_lib_dir ${middleware_src_path}/v2/lib) + set(middleware_dynamic_lib_file ${mmf_lib_dir}/libcvi_ive.so + ${mmf_lib_dir}/libcvi_bin.so + ${mmf_lib_dir}/libaaccomm2.so + ${mmf_lib_dir}/libaacdec2.so + ${mmf_lib_dir}/libaacenc2.so + ${mmf_lib_dir}/libaacsbrdec2.so + ${mmf_lib_dir}/libaacsbrenc2.so + ${mmf_lib_dir}/libae.so + ${mmf_lib_dir}/libaf.so + ${mmf_lib_dir}/libawb.so + ${mmf_lib_dir}/libcvi_audio.so + ${mmf_lib_dir}/libcvi_bin_isp.so + ${mmf_lib_dir}/libcvi_bin.so + ${mmf_lib_dir}/libcvi_ispd2.so + ${mmf_lib_dir}/libcvi_RES1.so + ${mmf_lib_dir}/libcvi_ssp.so + ${mmf_lib_dir}/libcvi_VoiceEngine.so + ${mmf_lib_dir}/libcvi_vqe.so + ${mmf_lib_dir}/libdnvqe.so + ${mmf_lib_dir}/libisp_algo.so + ${mmf_lib_dir}/libisp.so + ${mmf_lib_dir}/libmipi_tx.so + ${mmf_lib_dir}/libmisc.so + ${mmf_lib_dir}/libosdc.so + ${mmf_lib_dir}/libraw_dump.so + ${mmf_lib_dir}/libsys.so + ${mmf_lib_dir}/libvdec.so + ${mmf_lib_dir}/libvenc.so + ${mmf_lib_dir}/libvpu.so + ${mmf_lib_dir}/libjson-c.so.5 + ${mmf_lib_dir}/libtinyalsa.so + ${mmf_lib_dir}/3rd/libcli.so + ${mmf_lib_dir}/3rd/libini.so) + list(APPEND ADD_DYNAMIC_LIB ${middleware_dynamic_lib_file}) + set_property(SOURCE ${middleware_dynamic_lib_file} PROPERTY GENERATED 1) + + list(APPEND ADD_DEFINITIONS_PRIVATE -DSENSOR_GCORE_GC4653 + -DSENSOR0_TYPE=SONY_IMX327_MIPI_2M_30FPS_12BIT + -DSENSOR1_TYPE=SONY_IMX327_MIPI_2M_30FPS_12BIT) + + list(APPEND ADD_DEFINITIONS_PRIVATE -DSENSOR_SMS_SC035GS + -DSENSOR2_TYPE=SMS_SC035GS_MIPI_480P_120FPS_12BIT) register_component(DYNAMIC) else() list(APPEND ADD_DYNAMIC_LIB "lib/libmaixcam_lib.so") list(APPEND ADD_DIST_LIB_IGNORE "lib/libmaixcam_lib.so") - list(APPEND ADD_REQUIREMENTS sophgo-middleware) + set(middleware_include_dir . + ${middleware_src_path}/v2/component/panel/sg200x + ${middleware_src_path}/v2/include + ${middleware_src_path}/v2/include/isp/sg200x + ${middleware_src_path}/v2/sample/common + ${middleware_src_path}/v2/uapi + ${middleware_src_path}/v2/3rdparty/inih + ${middleware_src_path}/v2/modules/ive/include/ + ) + list(APPEND ADD_INCLUDE ${middleware_include_dir}) + set_property(SOURCE ${middleware_include_dir} PROPERTY GENERATED 1) + + set(mmf_lib_dir ${middleware_src_path}/v2/lib) + set(middleware_dynamic_lib_file ${mmf_lib_dir}/libcvi_ive.so + ${mmf_lib_dir}/libcvi_bin.so + ${mmf_lib_dir}/libaaccomm2.so + ${mmf_lib_dir}/libaacdec2.so + ${mmf_lib_dir}/libaacenc2.so + ${mmf_lib_dir}/libaacsbrdec2.so + ${mmf_lib_dir}/libaacsbrenc2.so + ${mmf_lib_dir}/libae.so + ${mmf_lib_dir}/libaf.so + ${mmf_lib_dir}/libawb.so + ${mmf_lib_dir}/libcvi_audio.so + ${mmf_lib_dir}/libcvi_bin_isp.so + ${mmf_lib_dir}/libcvi_bin.so + ${mmf_lib_dir}/libcvi_ispd2.so + ${mmf_lib_dir}/libcvi_RES1.so + ${mmf_lib_dir}/libcvi_ssp.so + ${mmf_lib_dir}/libcvi_VoiceEngine.so + ${mmf_lib_dir}/libcvi_vqe.so + ${mmf_lib_dir}/libdnvqe.so + ${mmf_lib_dir}/libisp_algo.so + ${mmf_lib_dir}/libisp.so + ${mmf_lib_dir}/libmipi_tx.so + ${mmf_lib_dir}/libmisc.so + ${mmf_lib_dir}/libosdc.so + ${mmf_lib_dir}/libraw_dump.so + ${mmf_lib_dir}/libsys.so + ${mmf_lib_dir}/libvdec.so + ${mmf_lib_dir}/libvenc.so + ${mmf_lib_dir}/libvpu.so + ${mmf_lib_dir}/libjson-c.so.5 + ${mmf_lib_dir}/libtinyalsa.so + ${mmf_lib_dir}/3rd/libcli.so + ${mmf_lib_dir}/3rd/libini.so + ) + list(APPEND ADD_DYNAMIC_LIB ${middleware_dynamic_lib_file}) + set_property(SOURCE ${ADD_DYNAMIC_LIB} PROPERTY GENERATED 1) + register_component() endif() @@ -79,8 +185,8 @@ endif() ############################################### #### Add compile option for this component #### -#### Just for this component, won't affect other -#### modules, including component that depend +#### Just for this component, won't affect other +#### modules, including component that depend #### on this component # list(APPEND ADD_DEFINITIONS_PRIVATE -DAAAAA=1) diff --git a/components/maixcam_lib/lib/libmaixcam_lib.so b/components/maixcam_lib/lib/libmaixcam_lib.so index d536f614..3506ed1b 100755 Binary files a/components/maixcam_lib/lib/libmaixcam_lib.so and b/components/maixcam_lib/lib/libmaixcam_lib.so differ