From a05b8f36940530309091558022e03ce95acbff16 Mon Sep 17 00:00:00 2001 From: yanghongliang Date: Tue, 2 Nov 2021 16:14:17 +0800 Subject: [PATCH] add camera Signed-off-by: yanghongliang --- .../mpp/hispark_taurus/driver/mpp_config.hcs | 250 ----------- .../hdi_impl/stream_supported_config.hcs | 58 --- .../hispark_taurus/pipeline_core/config.hcs | 402 ------------------ .../hispark_taurus/pipeline_core/params.hcs | 27 -- .../rpi4b/hdi_impl/camera_host_config.hcs | 179 -------- .../hdi_impl/stream_supported_config.hcs | 58 --- .../rpi4b/pipeline_core/ipp_algo_config.hcs | 11 - .../hdi_impl/camera_host_config.hcs | 0 .../v4l2/rpi4b => }/pipeline_core/config.hcs | 0 .../pipeline_core/ipp_algo_config.hcs | 0 .../v4l2/rpi4b => }/pipeline_core/params.hcs | 0 11 files changed, 985 deletions(-) delete mode 100755 rk3568/hdf_config/uhdf/camera/hal/mpp/hispark_taurus/driver/mpp_config.hcs delete mode 100755 rk3568/hdf_config/uhdf/camera/hal/mpp/hispark_taurus/hdi_impl/stream_supported_config.hcs delete mode 100755 rk3568/hdf_config/uhdf/camera/hal/mpp/hispark_taurus/pipeline_core/config.hcs delete mode 100755 rk3568/hdf_config/uhdf/camera/hal/mpp/hispark_taurus/pipeline_core/params.hcs delete mode 100755 rk3568/hdf_config/uhdf/camera/hal/v4l2/rpi4b/hdi_impl/camera_host_config.hcs delete mode 100755 rk3568/hdf_config/uhdf/camera/hal/v4l2/rpi4b/hdi_impl/stream_supported_config.hcs delete mode 100755 rk3568/hdf_config/uhdf/camera/hal/v4l2/rpi4b/pipeline_core/ipp_algo_config.hcs rename rk3568/hdf_config/uhdf/camera/{hal/mpp/hispark_taurus => }/hdi_impl/camera_host_config.hcs (100%) mode change 100755 => 100644 rename rk3568/hdf_config/uhdf/camera/{hal/v4l2/rpi4b => }/pipeline_core/config.hcs (100%) mode change 100755 => 100644 rename rk3568/hdf_config/uhdf/camera/{hal/mpp/hispark_taurus => }/pipeline_core/ipp_algo_config.hcs (100%) mode change 100755 => 100644 rename rk3568/hdf_config/uhdf/camera/{hal/v4l2/rpi4b => }/pipeline_core/params.hcs (100%) mode change 100755 => 100644 diff --git a/rk3568/hdf_config/uhdf/camera/hal/mpp/hispark_taurus/driver/mpp_config.hcs b/rk3568/hdf_config/uhdf/camera/hal/mpp/hispark_taurus/driver/mpp_config.hcs deleted file mode 100755 index 67262348..00000000 --- a/rk3568/hdf_config/uhdf/camera/hal/mpp/hispark_taurus/driver/mpp_config.hcs +++ /dev/null @@ -1,250 +0,0 @@ -root { - module="sample"; - mpp_config { - vbConfig { - maxPoolCnt = 5; - pool0 { - image_width = 2592; - image_height = 1944; - pix_format = 19; - data_bitwidth = 0; - compress_mode = 0; - default_align = 8; - blk_count = 7; - } - pool1 { - image_width = 2592; - image_height = 1944; - pix_format = 26; - data_bitwidth = 0; - compress_mode = 0; - default_align = 8; - blk_count = 7; - } - pool2 { - image_width = 1280; - image_height = 720; - pix_format = 26; - data_bitwidth = 0; - compress_mode = 0; - default_align = 8; - blk_count = 12; - } - } - vcapDev { - sensocnt = 1; - sensor_type0 = 12; - sensor_mode = 0; - sensor_width = 2592; - sensor_height = 1944; - bas_width = 2592; - bas_height = 1944; - wdr_mode = 0; - data_type = 2; - componentmask0 = 4293918720; - componentmask1 = 0; - } - vcapMipi { - enable = 1; - combo_dev_t = 0; - input_mode_t = 0; - mipi_data_rate_t = 0; - img_rect_x = 0; - img_rect_y = 0; - img_rect_w = 2592; - img_rect_h = 1944; - data_type_t = 1; - mipi_wdr_mode_t = 0; - lane_id_num = 4; - lane_id_0 = 0; - lane_id_1 = 1; - lane_id_2 = 2; - lane_id_3 = 3; - } - vcapIspPub { - enable = 1; - stWndRect_x = 0; - stWndRect_y = 0; - stWndRect_w = 2592; - stWndRect_h = 1944; - outImageSize_x = 2592; - outImageSize_y = 1944; - frameRate = 30; - enBayer = 0; - wdrMode = 0; - snsMode = 0; - } - vcapPipe { - pipecnt = 2; - pipe0 { - chncnt = 1; - vivpssmode = 0; - enPipeBypassMode = 0; - bYuvSkip = 0; - bIspBypass = 0; - u32MaxW = 2592; - u32MaxH = 1944; - enPixFmt = 19; - enCompressMode = 0; - enBitWidth = 2; - bNrEn = 1; - enNrRefSource = 0; - bSharpenEn = 1; - src_framerate = 30; - dst_framerate = 30; - bDiscardProPic = 0; - chl0 { - out_width = 2592; - out_height = 1944; - enPixelFormat = 26; - enDynamicRange = 0; - enVideoFormat = 0; - enCompressMode = 0; - bMirror = 0; - bFlip = 0; - u32Depth = 0; - src_framerate = 30; - dst_framerate = 30; - } - } - pipe1 { - chncnt = 1; - vivpssmode = 0; - enPipeBypassMode = 0; - bYuvSkip = 0; - bIspBypass = 0; - u32MaxW = 2592; - u32MaxH = 1944; - enPixFmt = 19; - enCompressMode = 0; - enBitWidth = 2; - bNrEn = 1; - enNrRefSource = 0; - bSharpenEn = 1; - src_framerate = 30; - dst_framerate = 30; - bDiscardProPic = 0; - chl0 { - out_width = 2592; - out_height = 1944; - enPixelFormat = 26; - enDynamicRange = 0; - enVideoFormat = 0; - enCompressMode = 0; - bMirror = 0; - bFlip = 0; - u32Depth = 0; - src_framerate = 30; - dst_framerate = 30; - } - } - } - vpss0 { - vportcnt = 3; - max_width = 2592; - max_height = 1944; - src_framerate = 30; - dst_framerate = 30; - pix_format = 26; - vport0 { - enable = 1; - res_width = 2592; - res_height = 1944; - src_framerate = 30; - dst_framerate = 30; - video_format = 0; - pix_format = 26; - compressMode = 0; - depth = 0; - mirror = 0; - flip = 0; - } - vport1 { - enable = 1; - res_width = 1280; - res_height = 720; - src_framerate = 30; - dst_framerate = 30; - video_format = 0; - pix_format = 26; - compressMode = 0; - depth = 0; - mirror = 0; - flip = 0; - } - vport2 { - enable = 1; - res_width = 640; - res_height = 480; - src_framerate = 30; - dst_framerate = 30; - video_format = 0; - pix_format = 26; - compressMode = 0; - depth = 0; - mirror = 0; - flip = 0; - } - extvport0 { - enable = 0; - res_width = 160; - res_height = 120; - src_framerate = 30; - dst_framerate = 30; - video_format = 0; - pix_format = 26; - compressMode = 0; - depth = 0; - mirror = 0; - flip = 0; - } - } - venc { - venccnt = 4; - venc0 { - res_width = 1920; - res_height = 1080; - bufsize = 1258290; - gop = 30; - src_framerate = 30; - dst_framerate = 30; - h265bitrate = 10240; - h264bitrate = 12288; - stat_time = 2; - } - venc1 { - res_width = 640; - res_height = 360; - bufsize = 230400; - gop = 30; - src_framerate = 30; - dst_framerate = 30; - h265bitrate = 2048; - h264bitrate = 2048; - stat_time = 2; - } - venc2 { - res_width = 1920; - res_height = 1080; - bufsize = 1258290; - gop = 0; - src_framerate = 30; - dst_framerate = 30; - h265bitrate = 0; - h264bitrate = 0; - stat_time = 2; - } - venc3 { - res_width = 320; - res_height = 180; - bufsize = 57600; - gop = 0; - src_framerate = 30; - dst_framerate = 30; - h265bitrate = 0; - h264bitrate = 0; - stat_time = 2; - } - } - } -} diff --git a/rk3568/hdf_config/uhdf/camera/hal/mpp/hispark_taurus/hdi_impl/stream_supported_config.hcs b/rk3568/hdf_config/uhdf/camera/hal/mpp/hispark_taurus/hdi_impl/stream_supported_config.hcs deleted file mode 100755 index 4e84fddd..00000000 --- a/rk3568/hdf_config/uhdf/camera/hal/mpp/hispark_taurus/hdi_impl/stream_supported_config.hcs +++ /dev/null @@ -1,58 +0,0 @@ -root { - module="huawei,camera"; - stream_supported_config { - match_attr = "stream_supported"; - template supported { - operationMode = "NORMAL"; - template streamInfo { - width = 1280; - height = 720; - format = 24; - dataspace = 1; - intent = 0; - tunneledMode = 1; - minFrameDuration = 1; - } - streamSupportType = "DYNAMIC_SUPPORTED"; - } - supported_01 :: supported { - operationMode = "NORMAL"; - streamInfo01 :: streamInfo { - width = 640; - height = 480; - format = 24; - dataspace = 1; - intent = 0; - tunneledMode = 1; - minFrameDuration = 33333; - } - streamSupportType = "NOT_SUPPORTED"; - } - supported_02 :: supported { - operationMode = "NORMAL"; - streamInfo01 :: streamInfo { - width = 1280; - height = 720; - format = 24; - dataspace = 1; - intent = 1; - tunneledMode = 1; - minFrameDuration = 33333; - } - streamSupportType = "NOT_SUPPORTED"; - } - supported_03 :: supported { - operationMode = "NORMAL"; - streamInfo01 :: streamInfo { - width = 1280; - height = 720; - format = 24; - dataspace = 1; - intent = 2; - tunneledMode = 1; - minFrameDuration = 33333; - } - streamSupportType = "NOT_SUPPORTED"; - } - } -} diff --git a/rk3568/hdf_config/uhdf/camera/hal/mpp/hispark_taurus/pipeline_core/config.hcs b/rk3568/hdf_config/uhdf/camera/hal/mpp/hispark_taurus/pipeline_core/config.hcs deleted file mode 100755 index 8d6d5d54..00000000 --- a/rk3568/hdf_config/uhdf/camera/hal/mpp/hispark_taurus/pipeline_core/config.hcs +++ /dev/null @@ -1,402 +0,0 @@ - root { - module = "pipeline_specs"; - template pipeline_spec { - name = ""; - template node_spec { - name = ""; - status = ""; - stream_type = ""; - template port_spec { - name = ""; - peer_port_name = ""; - peer_port_node_name = ""; - direction = 0; - width = 0; - height = 0; - format = 0; - usage = 0x10000000000000; - need_allocation = 0; - buffer_count = 0; - } - } - } - normal_privew :: pipeline_spec { - name = "normal_preview"; - sensor :: node_spec { - name = "sensor#0"; - status = "new"; - out_port_0 :: port_spec { - name = "out0"; - peer_port_name = "in0"; - peer_port_node_name = "vi#0"; - direction = 1; - width = 0; - height = 0; - format = 0; - } - } - vi :: node_spec { - name = "vi#0"; - status = "new"; - in_port_0 :: port_spec { - name = "in0"; - peer_port_name = "out0"; - peer_port_node_name = "sensor#0"; - direction = 0; - } - out_port_0 :: port_spec { - name = "out0"; - peer_port_name = "in0"; - peer_port_node_name = "vpss#0"; - direction = 1; - } - } - vpss :: node_spec { - name = "vpss#0"; - status = "new"; - in_port_0 :: port_spec { - name = "in0"; - peer_port_name = "out0"; - peer_port_node_name = "vi#0"; - direction = 0; - } - out_port_0 :: port_spec { - name = "out0"; - peer_port_name = "in0"; - peer_port_node_name = "vo#0"; - direction = 1; - } - } - vo :: node_spec { - name = "vo#0"; - status = "new"; - stream_type = "preview"; - in_port_0 :: port_spec { - name = "in0"; - peer_port_name = "out0"; - peer_port_node_name = "vpss#0"; - direction = 0; - } - } - } - normal_snapshot :: pipeline_spec { - name = "normal_snapshot"; - sensor :: node_spec { - name = "sensor#0"; - status = "new"; - out_port_0 :: port_spec { - name = "out0"; - peer_port_name = "in0"; - peer_port_node_name = "vi#0"; - direction = 1; - width = 0; - height = 0; - format = 0; - } - } - vi :: node_spec { - name = "vi#0"; - status = "new"; - in_port_0 :: port_spec { - name = "in0"; - peer_port_name = "out0"; - peer_port_node_name = "sensor#0"; - direction = 0; - } - out_port_0 :: port_spec { - name = "out0"; - peer_port_name = "in0"; - peer_port_node_name = "vpss#0"; - direction = 1; - } - } - vpss :: node_spec { - name = "vpss#0"; - status = "new"; - in_port_0 :: port_spec { - name = "in0"; - peer_port_name = "out0"; - peer_port_node_name = "vi#0"; - direction = 0; - } - out_port_0 :: port_spec { - name = "out0"; - peer_port_name = "in0"; - peer_port_node_name = "ipp#0"; - direction = 1; - } - } - ipp :: node_spec { - name = "ipp#0"; - status = "new"; - in_port_0 :: port_spec { - name = "in0"; - peer_port_name = "out0"; - peer_port_node_name = "vpss#0"; - direction = 0; - } - out_port_0 :: port_spec { - name = "out0"; - peer_port_name = "in0"; - peer_port_node_name = "sink#0"; - direction = 1; - } - } - sink :: node_spec { - name = "sink#0"; - status = "new"; - stream_type = "snapshot"; - in_port_0 :: port_spec { - name = "in0"; - peer_port_name = "out0"; - peer_port_node_name = "ipp#0"; - direction = 0; - } - } - } - normal_preview_snapshot :: pipeline_spec { - name = "normal_preview_snapshot"; - sensor :: node_spec { - name = "sensor#0"; - status = "new"; - out_port_0 :: port_spec { - name = "out0"; - peer_port_name = "in0"; - peer_port_node_name = "vi#0"; - direction = 1; - width = 0; - height = 0; - format = 0; - } - } - vi :: node_spec { - name = "vi#0"; - status = "new"; - in_port_0 :: port_spec { - name = "in0"; - peer_port_name = "out0"; - peer_port_node_name = "sensor#0"; - direction = 0; - } - out_port_0 :: port_spec { - name = "out0"; - peer_port_name = "in0"; - peer_port_node_name = "vpss#0"; - direction = 1; - } - } - vpss :: node_spec { - name = "vpss#0"; - status = "new"; - in_port_0 :: port_spec { - name = "in0"; - peer_port_name = "out0"; - peer_port_node_name = "vi#0"; - direction = 0; - } - out_port_0 :: port_spec { - name = "out0"; - peer_port_name = "in0"; - peer_port_node_name = "vo#0"; - direction = 1; - } - out_port_1 :: port_spec { - name = "out1"; - peer_port_name = "in0"; - peer_port_node_name = "ipp#0"; - direction = 1; - } - } - ipp :: node_spec { - name = "ipp#0"; - status = "new"; - in_port_0 :: port_spec { - name = "in0"; - peer_port_name = "out1"; - peer_port_node_name = "vpss#0"; - direction = 0; - } - out_port_0 :: port_spec { - name = "out0"; - peer_port_name = "in0"; - peer_port_node_name = "sink#0"; - direction = 1; - } - } - vo :: node_spec { - name = "vo#0"; - status = "new"; - stream_type = "preview"; - in_port_0 :: port_spec { - name = "in0"; - peer_port_name = "out0"; - peer_port_node_name = "vpss#0"; - direction = 0; - } - } - sink :: node_spec { - name = "sink#0"; - status = "new"; - stream_type = "snapshot"; - in_port_0 :: port_spec { - name = "in0"; - peer_port_name = "out0"; - peer_port_node_name = "ipp#0"; - direction = 0; - } - } - } - normal_preview_video :: pipeline_spec { - name = "normal_preview_video"; - sensor :: node_spec { - name = "sensor#0"; - status = "new"; - out_port_0 :: port_spec { - name = "out0"; - peer_port_name = "in0"; - peer_port_node_name = "vi#0"; - direction = 1; - width = 0; - height = 0; - format = 0; - } - } - vi :: node_spec { - name = "vi#0"; - status = "new"; - in_port_0 :: port_spec { - name = "in0"; - peer_port_name = "out0"; - peer_port_node_name = "sensor#0"; - direction = 0; - } - out_port_0 :: port_spec { - name = "out0"; - peer_port_name = "in0"; - peer_port_node_name = "vpss#0"; - direction = 1; - } - } - vpss :: node_spec { - name = "vpss#0"; - status = "new"; - in_port_0 :: port_spec { - name = "in0"; - peer_port_name = "out0"; - peer_port_node_name = "vi#0"; - direction = 0; - } - out_port_0 :: port_spec { - name = "out0"; - peer_port_name = "in0"; - peer_port_node_name = "vo#0"; - direction = 1; - } - out_port_1 :: port_spec { - name = "out1"; - peer_port_name = "in0"; - peer_port_node_name = "venc#0"; - direction = 1; - } - } - vo :: node_spec { - name = "vo#0"; - status = "new"; - stream_type = "preview"; - in_port_0 :: port_spec { - name = "in0"; - peer_port_name = "out0"; - peer_port_node_name = "vpss#0"; - direction = 0; - } - } - venc :: node_spec { - name = "venc#0"; - status = "new"; - stream_type = "video"; - in_port_0 :: port_spec { - name = "in0"; - peer_port_name = "out1"; - peer_port_node_name = "vpss#0"; - direction = 0; - } - } - } - normal_preview_preview :: pipeline_spec { - name = "normal_preview_preview"; - sensor :: node_spec { - name = "sensor#0"; - status = "new"; - out_port_0 :: port_spec { - name = "out0"; - peer_port_name = "in0"; - peer_port_node_name = "vi#0"; - direction = 1; - width = 0; - height = 0; - format = 0; - } - } - vi :: node_spec { - name = "vi#0"; - status = "new"; - in_port_0 :: port_spec { - name = "in0"; - peer_port_name = "out0"; - peer_port_node_name = "sensor#0"; - direction = 0; - } - out_port_0 :: port_spec { - name = "out0"; - peer_port_name = "in0"; - peer_port_node_name = "vpss#0"; - direction = 1; - } - } - vpss :: node_spec { - name = "vpss#0"; - status = "new"; - in_port_0 :: port_spec { - name = "in0"; - peer_port_name = "out0"; - peer_port_node_name = "vi#0"; - direction = 0; - } - out_port_0 :: port_spec { - name = "out0"; - peer_port_name = "in0"; - peer_port_node_name = "vo#0"; - direction = 1; - } - out_port_1 :: port_spec { - name = "out1"; - peer_port_name = "in0"; - peer_port_node_name = "vo#1"; - direction = 1; - } - } - vo :: node_spec { - name = "vo#0"; - status = "new"; - stream_type = "preview"; - in_port_0 :: port_spec { - name = "in0"; - peer_port_name = "out0"; - peer_port_node_name = "vpss#0"; - direction = 0; - } - } - vo_preview :: node_spec { - name = "vo#1"; - status = "new"; - stream_type = "preview"; - in_port_0 :: port_spec { - name = "in0"; - peer_port_name = "out1"; - peer_port_node_name = "vpss#0"; - direction = 0; - } - } - } - -} diff --git a/rk3568/hdf_config/uhdf/camera/hal/mpp/hispark_taurus/pipeline_core/params.hcs b/rk3568/hdf_config/uhdf/camera/hal/mpp/hispark_taurus/pipeline_core/params.hcs deleted file mode 100755 index 29124c33..00000000 --- a/rk3568/hdf_config/uhdf/camera/hal/mpp/hispark_taurus/pipeline_core/params.hcs +++ /dev/null @@ -1,27 +0,0 @@ - root { - module = ""; - template stream_info { - id = 0; - name = ""; - } - template scene_info { - id = 0; - name = ""; - } - privew :: stream_info { - id = 0; - name = "preview"; - } - video :: stream_info { - id = 1; - name = "video"; - } - snapshot :: stream_info { - id = 2; - name = "snapshot"; - } - normal :: scene_info { - id = 0; - name = "normal"; - } -} diff --git a/rk3568/hdf_config/uhdf/camera/hal/v4l2/rpi4b/hdi_impl/camera_host_config.hcs b/rk3568/hdf_config/uhdf/camera/hal/v4l2/rpi4b/hdi_impl/camera_host_config.hcs deleted file mode 100755 index 4328b1c8..00000000 --- a/rk3568/hdf_config/uhdf/camera/hal/v4l2/rpi4b/hdi_impl/camera_host_config.hcs +++ /dev/null @@ -1,179 +0,0 @@ -root { - module="sample"; - camera_host_config { - match_attr = "camera_host_interface"; - template ability { - logicCameraId = "lcam001"; - physicsCameraIds = [ - "CAMERA_FIRST", - "CAMERA_SECOND" - ]; - metadata { - aeAvailableAntiBandingModes = [ - "OHOS_CONTROL_AE_ANTIBANDING_MODE_OFF", - "OHOS_CONTROL_AE_ANTIBANDING_MODE_50HZ", - "OHOS_CONTROL_AE_ANTIBANDING_MODE_60HZ", - "OHOS_CONTROL_AE_ANTIBANDING_MODE_AUTO" - ]; - aeAvailableModes = ["OHOS_CONTROL_AE_MODE_ON"]; - availableAeFpsTargets = [15, 30]; - aeCompensationRange = [0, 0]; - aeCompensationSteps = [0, 1]; - availableAwbModes = [ - "OHOS_CONTROL_AWB_MODE_OFF" - ]; - sceneModesOverrides = [ - "OHOS_CONTROL_AE_MODE_ON", - "OHOS_CONTROL_AWB_MODE_AUTO" - ]; - aeLockAvailable = "OHOS_CONTROL_AE_LOCK_AVAILABLE_FALSE"; - awbLockAvailable = "OHOS_CONTROL_AWB_LOCK_AVAILABLE_FALSE"; - sensitivityRange = [32, 2400]; - exposureTimeRange = [100000, 200000000]; - faceDetectMode = "OHOS_STATISTICS_FACE_DETECT_MODE_OFF"; - maxFaceCount = 0; - flashAvailable = "OHOS_FLASH_INFO_AVAILABLE_FALSE"; - lensFacing = "OHOS_LENS_FACING_FRONT"; - opticalStabilizations = ["OHOS_LENS_OPTICAL_STABILIZATION_MODE_OFF"]; - maxDigitalZoom = "1"; - availableCharacteristicsKeys = [ - "OHOS_COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES", - "OHOS_CONTROL_AE_AVAILABLE_ANTIBANDING_MODES", - "OHOS_CONTROL_AE_AVAILABLE_MODES", - "OHOS_CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES", - "OHOS_CONTROL_AE_COMPENSATION_RANGE", - "OHOS_CONTROL_AE_COMPENSATION_STEP", - "OHOS_CONTROL_AVAILABLE_EFFECTS", - "OHOS_CONTROL_AVAILABLE_SCENE_MODES", - "OHOS_CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES", - "OHOS_CONTROL_AWB_AVAILABLE_MODES", - "OHOS_CONTROL_MAX_REGIONS", - "OHOS_CONTROL_SCENE_MODE_OVERRIDES", - "OHOS_CONTROL_AE_LOCK_AVAILABLE", - "OHOS_CONTROL_AWB_LOCK_AVAILABLE", - "OHOS_CONTROL_AVAILABLE_MODES", - "OHOS_JPEG_AVAILABLE_THUMBNAIL_SIZES", - "OHOS_JPEG_MAX_SIZE", - "OHOS_SENSOR_INFO_PIXEL_ARRAY_SIZE", - "OHOS_SENSOR_INFO_ACTIVE_ARRAY_SIZE", - "OHOS_SENSOR_INFO_SENSITIVITY_RANGE", - "OHOS_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT", - "OHOS_SENSOR_INFO_EXPOSURE_TIME_RANGE", - "OHOS_SENSOR_ORIENTATION", - "OHOS_SENSOR_AVAILABLE_TEST_PATTERN_MODES", - "OHOS_SENSOR_INFO_PHYSICAL_SIZE", - "OHOS_SENSOR_INFO_TIMESTAMP_SOURCE", - "OHOS_STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES", - "OHOS_STATISTICS_INFO_MAX_FACE_COUNT", - "OHOS_SYNC_MAX_LATENCY", - "OHOS_FLASH_INFO_AVAILABLE", - "OHOS_LENS_INFO_AVAILABLE_APERTURES", - "OHOS_LENS_FACING", - "OHOS_LENS_INFO_AVAILABLE_FOCAL_LENGTHS", - "OHOS_LENS_INFO_AVAILABLE_OPTICAL_STABILIZATION", - "OHOS_LENS_INFO_HYPERFOCAL_DISTANCE", - "OHOS_LENS_INFO_MINIMUM_FOCUS_DISTANCE", - "OHOS_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES", - "OHOS_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM", - "OHOS_SCALER_AVAILABLE_STREAM_CONFIGURATIONS", - "OHOS_SCALER_AVAILABLE_STALL_DURATIONS", - "OHOS_SCALER_AVAILABLE_MIN_FRAME_DURATIONS", - "OHOS_SCALER_CROPPING_TYPE", - "OHOS_INFO_SUPPORTED_HARDWARE_LEVEL", - "OHOS_REQUEST_PARTIAL_RESULT_COUNT", - "OHOS_REQUEST_PIPELINE_MAX_DEPTH", - "OHOS_REQUEST_MAX_NUM_OUTPUT_STREAMS", - "OHOS_REQUEST_MAX_NUM_INPUT_STREAMS", - "OHOS_REQUEST_AVAILABLE_CAPABILITIES" - ]; - availableRequestKeys = [ - "OHOS_CONTROL_AE_MODE", - "OHOS_CONTROL_AE_EXPOSURE_COMPENSATION", - "OHOS_CONTROL_AE_PRECAPTURE_TRIGGER", - "OHOS_CONTROL_AE_TARGET_FPS_RANGE", - "OHOS_CONTROL_AE_ANTIBANDING_MODE", - "OHOS_CONTROL_AWB_MODE", - "OHOS_CONTROL_AWB_LOCK", - "OHOS_FLASH_MODE", - "OHOS_STATISTICS_FACE_DETECT_MODE", - "OHOS_NOISE_REDUCTION_MODE", - "OHOS_COLOR_CORRECTION_ABERRATION_MODE", - "OHOS_LENS_APERTURE", - "OHOS_LENS_OPTICAL_STABILIZATION_MODE", - "OHOS_CONTROL_MODE", - "OHOS_CONTROL_CAPTURE_INTENT" - ]; - availableResultKeys = [ - "OHOS_CONTROL_AE_STATE", - "OHOS_CONTROL_AE_LOCK", - "OHOS_CONTROL_AWB_STATE", - "OHOS_CONTROL_AWB_LOCK", - "OHOS_LENS_STATE", - "OHOS_REQUEST_PIPELINE_DEPTH", - "OHOS_SCALER_CROP_REGION", - "OHOS_SENSOR_TIMESTAMP", - "OHOS_SENSOR_ROLLING_SHUTTER_SKEW", - "OHOS_SENSOR_EXPOSURE_TIME", - "OHOS_STATISTICS_LENS_SHADING_MAP_MODE", - "OHOS_STATISTICS_SCENE_FLICKER", - "OHOS_JPEG_SIZE", - "OHOS_JPEG_QUALITY", - "OHOS_JPEG_ORIENTATION" - ]; - } - } - ability_01 :: ability { - logicCameraId = "lcam001"; - physicsCameraIds = [ - "CAMERA_FIRST", - "CAMERA_SECOND" - ]; - metadata { - aeAvailableAntiBandingModes = [ - "OHOS_CAMERA_AE_ANTIBANDING_MODE_OFF" - ]; - aeAvailableModes = ["OHOS_CAMERA_AE_MODE_OFF"]; - availableAeFpsTargets = [30, 30]; - aeCompensationRange = [0, 0]; - aeCompensationSteps = [0, 0]; - availableAwbModes = [ - "OHOS_CAMERA_AWB_MODE_OFF" - ]; - sensitivityRange = [32, 2400]; - faceDetectMode = "OHOS_CAMERA_FACE_DETECT_MODE_OFF"; - availableCharacteristicsKeys = [ - "OHOS_CONTROL_AE_AVAILABLE_ANTIBANDING_MODES", - "OHOS_CONTROL_AE_AVAILABLE_MODES", - "OHOS_CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES", - "OHOS_CONTROL_AE_COMPENSATION_RANGE", - "OHOS_CONTROL_AE_COMPENSATION_STEP", - "OHOS_CONTROL_AWB_AVAILABLE_MODES", - "OHOS_JPEG_AVAILABLE_THUMBNAIL_SIZES", - "OHOS_JPEG_MAX_SIZE", - "OHOS_SENSOR_INFO_PIXEL_ARRAY_SIZE", - "OHOS_SENSOR_INFO_ACTIVE_ARRAY_SIZE", - "OHOS_SENSOR_INFO_SENSITIVITY_RANGE", - "OHOS_SENSOR_INFO_PHYSICAL_SIZE", - ]; - availableRequestKeys = [ - "OHOS_CONTROL_AE_MODE", - "OHOS_CONTROL_AE_EXPOSURE_COMPENSATION", - "OHOS_CONTROL_AE_TARGET_FPS_RANGE", - "OHOS_CONTROL_AE_ANTIBANDING_MODE", - "OHOS_CONTROL_AWB_MODE", - "OHOS_CONTROL_AWB_LOCK", - "OHOS_STATISTICS_FACE_DETECT_MODE" - ]; - availableResultKeys = [ - "OHOS_CONTROL_AE_LOCK", - "OHOS_CONTROL_AWB_LOCK", - "OHOS_SENSOR_EXPOSURE_TIME", - "OHOS_JPEG_SIZE", - "OHOS_JPEG_QUALITY", - "OHOS_JPEG_ORIENTATION" - ]; - } - } - } -} - diff --git a/rk3568/hdf_config/uhdf/camera/hal/v4l2/rpi4b/hdi_impl/stream_supported_config.hcs b/rk3568/hdf_config/uhdf/camera/hal/v4l2/rpi4b/hdi_impl/stream_supported_config.hcs deleted file mode 100755 index 4e84fddd..00000000 --- a/rk3568/hdf_config/uhdf/camera/hal/v4l2/rpi4b/hdi_impl/stream_supported_config.hcs +++ /dev/null @@ -1,58 +0,0 @@ -root { - module="huawei,camera"; - stream_supported_config { - match_attr = "stream_supported"; - template supported { - operationMode = "NORMAL"; - template streamInfo { - width = 1280; - height = 720; - format = 24; - dataspace = 1; - intent = 0; - tunneledMode = 1; - minFrameDuration = 1; - } - streamSupportType = "DYNAMIC_SUPPORTED"; - } - supported_01 :: supported { - operationMode = "NORMAL"; - streamInfo01 :: streamInfo { - width = 640; - height = 480; - format = 24; - dataspace = 1; - intent = 0; - tunneledMode = 1; - minFrameDuration = 33333; - } - streamSupportType = "NOT_SUPPORTED"; - } - supported_02 :: supported { - operationMode = "NORMAL"; - streamInfo01 :: streamInfo { - width = 1280; - height = 720; - format = 24; - dataspace = 1; - intent = 1; - tunneledMode = 1; - minFrameDuration = 33333; - } - streamSupportType = "NOT_SUPPORTED"; - } - supported_03 :: supported { - operationMode = "NORMAL"; - streamInfo01 :: streamInfo { - width = 1280; - height = 720; - format = 24; - dataspace = 1; - intent = 2; - tunneledMode = 1; - minFrameDuration = 33333; - } - streamSupportType = "NOT_SUPPORTED"; - } - } -} diff --git a/rk3568/hdf_config/uhdf/camera/hal/v4l2/rpi4b/pipeline_core/ipp_algo_config.hcs b/rk3568/hdf_config/uhdf/camera/hal/v4l2/rpi4b/pipeline_core/ipp_algo_config.hcs deleted file mode 100755 index c5953616..00000000 --- a/rk3568/hdf_config/uhdf/camera/hal/v4l2/rpi4b/pipeline_core/ipp_algo_config.hcs +++ /dev/null @@ -1,11 +0,0 @@ -root { - module="sample"; - ipp_algo_config { - algo1 { - name = "example"; - description = "example algorithm"; - path = "/system/lib/libcamera_ipp_algo_example.z.so"; - mode = "IPP_ALGO_MODE_NORMAL"; - } - } -} diff --git a/rk3568/hdf_config/uhdf/camera/hal/mpp/hispark_taurus/hdi_impl/camera_host_config.hcs b/rk3568/hdf_config/uhdf/camera/hdi_impl/camera_host_config.hcs old mode 100755 new mode 100644 similarity index 100% rename from rk3568/hdf_config/uhdf/camera/hal/mpp/hispark_taurus/hdi_impl/camera_host_config.hcs rename to rk3568/hdf_config/uhdf/camera/hdi_impl/camera_host_config.hcs diff --git a/rk3568/hdf_config/uhdf/camera/hal/v4l2/rpi4b/pipeline_core/config.hcs b/rk3568/hdf_config/uhdf/camera/pipeline_core/config.hcs old mode 100755 new mode 100644 similarity index 100% rename from rk3568/hdf_config/uhdf/camera/hal/v4l2/rpi4b/pipeline_core/config.hcs rename to rk3568/hdf_config/uhdf/camera/pipeline_core/config.hcs diff --git a/rk3568/hdf_config/uhdf/camera/hal/mpp/hispark_taurus/pipeline_core/ipp_algo_config.hcs b/rk3568/hdf_config/uhdf/camera/pipeline_core/ipp_algo_config.hcs old mode 100755 new mode 100644 similarity index 100% rename from rk3568/hdf_config/uhdf/camera/hal/mpp/hispark_taurus/pipeline_core/ipp_algo_config.hcs rename to rk3568/hdf_config/uhdf/camera/pipeline_core/ipp_algo_config.hcs diff --git a/rk3568/hdf_config/uhdf/camera/hal/v4l2/rpi4b/pipeline_core/params.hcs b/rk3568/hdf_config/uhdf/camera/pipeline_core/params.hcs old mode 100755 new mode 100644 similarity index 100% rename from rk3568/hdf_config/uhdf/camera/hal/v4l2/rpi4b/pipeline_core/params.hcs rename to rk3568/hdf_config/uhdf/camera/pipeline_core/params.hcs -- Gitee