diff --git a/rk3568/camera/vdi_impl/v4l2/BUILD.gn b/rk3568/camera/vdi_impl/v4l2/BUILD.gn index 78e51c8d3ba1e7647a927781801704b9a90b089c..4d2d08534700b0e27b724a124a730a5c78d3951c 100755 --- a/rk3568/camera/vdi_impl/v4l2/BUILD.gn +++ b/rk3568/camera/vdi_impl/v4l2/BUILD.gn @@ -139,7 +139,6 @@ if (product_name == "rk3568_mini_system") { host_sources = [ "$camera_path/../v4l2/src/camera_device/camera_device_vdi_impl.cpp", - "$camera_path/../v4l2/src/camera_dump.cpp", "$camera_path/../v4l2/src/camera_host/camera_host_config.cpp", "$camera_path/../v4l2/src/camera_host/camera_host_vdi_impl.cpp", "$camera_path/../v4l2/src/camera_host/hcs_deal.cpp", @@ -155,6 +154,7 @@ if (product_name == "rk3568_mini_system") { "$camera_path/../v4l2/src/stream_operator/stream_still_capture.cpp", "$camera_path/../v4l2/src/stream_operator/stream_tunnel/standard/stream_tunnel.cpp", "$camera_path/../v4l2/src/stream_operator/stream_video.cpp", + "$camera_path/dump/src/camera_dump.cpp", ] host_includes = [ @@ -173,6 +173,7 @@ if (product_name == "rk3568_mini_system") { "$camera_path/buffer_manager/src/buffer_adapter/standard", "$camera_path/utils/event", "$camera_path/../../display/interfaces/include", + "$camera_path/dump/include", #producer "$camera_path/pipeline_core/utils", @@ -206,6 +207,9 @@ if (product_name == "rk3568_mini_system") { if (use_hitrace) { defines += [ "HITRACE_LOG_ENABLED" ] } + if (drivers_peripheral_camera_feature_usb) { + defines += [ "CAMERA_BUILT_ON_USB" ] + } if (is_standard_system) { external_deps = [ @@ -259,6 +263,9 @@ if (product_name == "rk3568_mini_system") { if (use_hitrace) { defines += [ "HITRACE_LOG_ENABLED" ] } + if (drivers_peripheral_camera_feature_usb) { + defines += [ "CAMERA_BUILT_ON_USB" ] + } if (is_standard_system) { external_deps = [ diff --git a/rk3568/camera/vdi_impl/v4l2/pipeline_core/BUILD.gn b/rk3568/camera/vdi_impl/v4l2/pipeline_core/BUILD.gn index b4f26d4b06dbe82ac500a1825dbcc91c37ed3a0c..8d400da4e9588ed7b08d6346fdca84e505af8ba4 100644 --- a/rk3568/camera/vdi_impl/v4l2/pipeline_core/BUILD.gn +++ b/rk3568/camera/vdi_impl/v4l2/pipeline_core/BUILD.gn @@ -45,10 +45,15 @@ config("pipe_config") { } ohos_shared_library("camera_pipeline_core") { + defines = [] + if (drivers_peripheral_camera_feature_usb) { + defines += [ "CAMERA_BUILT_ON_USB" ] + } sources = [ "$board_camera_path/pipeline_core/src/node/rk_codec_node.cpp", "$board_camera_path/pipeline_core/src/node/rk_exif_node.cpp", "$board_camera_path/pipeline_core/src/node/rk_face_node.cpp", + "$camera_path/dump/src/camera_dump.cpp", "$camera_path/pipeline_core/src/pipeline_core.cpp", "//device/soc/rockchip/rk3568/hardware/mpp/src/mpi_enc_utils.c", ] @@ -62,6 +67,7 @@ ohos_shared_library("camera_pipeline_core") { "$camera_path/include", "$camera_path/../interfaces", "$camera_path/../v4l2/include", + "$camera_path/dump/include", ] deps = [ @@ -92,6 +98,7 @@ ohos_shared_library("camera_pipeline_core") { "drivers_interface_camera:libbuffer_producer_sequenceable_1.0", "drivers_interface_camera:metadata", "graphic_chipsetsdk:surface", + "hdf_core:libhdf_host", "ipc:ipc_single", ] diff --git a/rk3568/camera/vdi_impl/v4l2/pipeline_core/src/node/rk_codec_node.cpp b/rk3568/camera/vdi_impl/v4l2/pipeline_core/src/node/rk_codec_node.cpp index 8d96ecd355a97e75d919fea4125e06a21cbff9f1..0a74d50ee7a2bd84b5e1baf094a4f7c5761a15c3 100644 --- a/rk3568/camera/vdi_impl/v4l2/pipeline_core/src/node/rk_codec_node.cpp +++ b/rk3568/camera/vdi_impl/v4l2/pipeline_core/src/node/rk_codec_node.cpp @@ -13,6 +13,7 @@ #include "rk_codec_node.h" #include +#include "camera_dump.h" extern "C" { #include @@ -470,6 +471,9 @@ void RKCodecNode::DeliverBuffer(std::shared_ptr& buffer) Yuv420ToRGBA8888(buffer); } + CameraDumper& dumper = CameraDumper::GetInstance(); + dumper.DumpBuffer("board_RKCodecNode", ENABLE_RKCODEC_NODE_CONVERTED, buffer); + std::vector> outPutPorts_; outPutPorts_ = GetOutPorts(); for (auto& it : outPutPorts_) { diff --git a/rk3568/camera/vdi_impl/v4l2/pipeline_core/src/node/rk_exif_node.cpp b/rk3568/camera/vdi_impl/v4l2/pipeline_core/src/node/rk_exif_node.cpp index c7cdf8d819af0227f8111483bfbcd04b26c901ef..fd69acf815297aa5dc164b16caa37e7d1d531d44 100644 --- a/rk3568/camera/vdi_impl/v4l2/pipeline_core/src/node/rk_exif_node.cpp +++ b/rk3568/camera/vdi_impl/v4l2/pipeline_core/src/node/rk_exif_node.cpp @@ -14,6 +14,7 @@ #include "rk_exif_node.h" #include #include +#include "camera_dump.h" namespace OHOS::Camera { RKExifNode::RKExifNode(const std::string &name, const std::string &type, const std::string &cameraId) @@ -71,6 +72,9 @@ void RKExifNode::DeliverBuffer(std::shared_ptr &buffer) } } + CameraDumper& dumper = CameraDumper::GetInstance(); + dumper.DumpBuffer("board_RKExifNode", ENABLE_RKEXIF_NODE_CONVERTED, buffer); + std::vector> outPutPorts; outPutPorts = GetOutPorts(); for (auto& it : outPutPorts) { diff --git a/rk3568/camera/vdi_impl/v4l2/pipeline_core/src/node/rk_face_node.cpp b/rk3568/camera/vdi_impl/v4l2/pipeline_core/src/node/rk_face_node.cpp index 1116911a6f5d851a084faf7dc870da2505deeac2..0173e0196a5c375f4b3334c3bf2e810d4c1a1d92 100644 --- a/rk3568/camera/vdi_impl/v4l2/pipeline_core/src/node/rk_face_node.cpp +++ b/rk3568/camera/vdi_impl/v4l2/pipeline_core/src/node/rk_face_node.cpp @@ -13,6 +13,7 @@ #include "rk_face_node.h" #include +#include "camera_dump.h" namespace OHOS::Camera { RKFaceNode::RKFaceNode(const std::string &name, const std::string &type, const std::string &cameraId) @@ -54,6 +55,9 @@ void RKFaceNode::DeliverBuffer(std::shared_ptr& buffer) return; } + CameraDumper& dumper = CameraDumper::GetInstance(); + dumper.DumpBuffer("board_RKFaceNode", ENABLE_RKFACE_NODE_CONVERTED, buffer); + int32_t id = buffer->GetStreamId(); outPutPorts_ = GetOutPorts();