Skip to content

Commit

Permalink
adl-p MR6 release
Browse files Browse the repository at this point in the history
Signed-off-by: zouxiaoh <[email protected]>
  • Loading branch information
zouxiaoh committed Nov 22, 2023
1 parent a3008b7 commit 94c72c8
Show file tree
Hide file tree
Showing 124 changed files with 671 additions and 573 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,8 @@ if (${CMAKE_VERSION} VERSION_LESS 3.11)
else()
add_library(camhal SHARED $<TARGET_OBJECTS:camhal_static>)
endif()
set_target_properties(camhal PROPERTIES SOVERSION 0)
set_target_properties(camhal PROPERTIES VERSION "0.0.0")

add_library(camhal_static STATIC ${LIBCAMHAL_SRCS})

Expand Down
4 changes: 2 additions & 2 deletions config/linux/ipu6epmtl/libcamhal_profile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<platform value="IPU6"/>
<!-- The value format of availableSensors is "sensor name"-wf/uf-"CSI port ID". -->
<availableSensors value="ov13b10-uf-0,ov13b10-wf-4,ov5675-uf-4,ov01a1s-uf-0,ov01a10-uf-0,ov01a10-uf-4,
ov02c10-uf-0,ov02c10-uf-4,ov02e10-uf-0,
hm2170-uf-0,hm2170-uf-4,hm2172-uf-0,hi556-uf-0,
ov02c10-uf-0,ov02c10-uf-4,ov02e10-uf-1,ov02e10-uf-4,
hm2170-uf-0,hm2170-uf-4,hm2172-uf-1,hm2172-uf-4,hi556-uf-1,
imx390,ar0234,external_source,ar0234_usb,lt6911uxc,lt6911uxe"/>
</Common>
</CameraSettings>
8 changes: 4 additions & 4 deletions config/linux/ipu6epmtl/sensors/hm2172-uf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
<MediaCtlConfig id="0" ConfigMode="AUTO" outputWidth="1928" outputHeight="1088" format="V4L2_PIX_FMT_SGRBG10"> <!-- RAW10 BE capture -->
<format name="hm2172 $I2CBUS" pad="0" width="1928" height="1088" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
<format name="Intel IPU6 CSI-2 $CSI_PORT" pad="0" width="1928" height="1088" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
<format name="Intel IPU6 CSI2 BE SOC $CSI_PORT" pad="0" width="1928" height="1088" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
<format name="Intel IPU6 CSI2 BE SOC 0" pad="0" width="1928" height="1088" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>

<link srcName="hm2172 $I2CBUS" srcPad="0" sinkName="Intel IPU6 CSI-2 $CSI_PORT" sinkPad="0" enable="true"/>
<link srcName="Intel IPU6 CSI-2 $CSI_PORT" srcPad="1" sinkName="Intel IPU6 CSI2 BE SOC $CSI_PORT" sinkPad="0" enable="true"/>
<link srcName="Intel IPU6 CSI2 BE SOC $CSI_PORT" srcPad="1" sinkName="Intel IPU6 BE SOC capture $CSI_PORT" sinkPad="0" enable="true"/>
<link srcName="Intel IPU6 CSI-2 $CSI_PORT" srcPad="1" sinkName="Intel IPU6 CSI2 BE SOC 0" sinkPad="0" enable="true"/>
<link srcName="Intel IPU6 CSI2 BE SOC 0" srcPad="1" sinkName="Intel IPU6 BE SOC capture 0" sinkPad="0" enable="true"/>

<videonode name="hm2172 $I2CBUS" videoNodeType="VIDEO_PIXEL_ARRAY"/>
<videonode name="Intel IPU6 CSI-2 $CSI_PORT" videoNodeType="VIDEO_ISYS_RECEIVER"/>
<videonode name="Intel IPU6 BE SOC capture $CSI_PORT" videoNodeType="VIDEO_GENERIC"/>
<videonode name="Intel IPU6 BE SOC capture 0" videoNodeType="VIDEO_GENERIC"/>
</MediaCtlConfig>

<StaticMetadata>
Expand Down
8 changes: 4 additions & 4 deletions config/linux/ipu6epmtl/sensors/ov02e10-uf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
<MediaCtlConfig id="0" ConfigMode="AUTO" outputWidth="1928" outputHeight="1088" format="V4L2_PIX_FMT_SGRBG10"> <!-- RAW10 BE capture -->
<format name="ov02e10 $I2CBUS" pad="0" width="1928" height="1088" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
<format name="Intel IPU6 CSI-2 $CSI_PORT" pad="0" width="1928" height="1088" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
<format name="Intel IPU6 CSI2 BE SOC $CSI_PORT" pad="0" width="1928" height="1088" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
<format name="Intel IPU6 CSI2 BE SOC 0" pad="0" width="1928" height="1088" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>

<link srcName="ov02e10 $I2CBUS" srcPad="0" sinkName="Intel IPU6 CSI-2 $CSI_PORT" sinkPad="0" enable="true"/>
<link srcName="Intel IPU6 CSI-2 $CSI_PORT" srcPad="1" sinkName="Intel IPU6 CSI2 BE SOC $CSI_PORT" sinkPad="0" enable="true"/>
<link srcName="Intel IPU6 CSI2 BE SOC $CSI_PORT" srcPad="1" sinkName="Intel IPU6 BE SOC capture $CSI_PORT" sinkPad="0" enable="true"/>
<link srcName="Intel IPU6 CSI-2 $CSI_PORT" srcPad="1" sinkName="Intel IPU6 CSI2 BE SOC 0" sinkPad="0" enable="true"/>
<link srcName="Intel IPU6 CSI2 BE SOC 0" srcPad="1" sinkName="Intel IPU6 BE SOC capture 0" sinkPad="0" enable="true"/>

<videonode name="ov02e10 $I2CBUS" videoNodeType="VIDEO_PIXEL_ARRAY"/>
<videonode name="Intel IPU6 CSI-2 $CSI_PORT" videoNodeType="VIDEO_ISYS_RECEIVER"/>
<videonode name="Intel IPU6 BE SOC capture $CSI_PORT" videoNodeType="VIDEO_GENERIC"/>
<videonode name="Intel IPU6 BE SOC capture 0" videoNodeType="VIDEO_GENERIC"/>
</MediaCtlConfig>

<StaticMetadata>
Expand Down
1 change: 1 addition & 0 deletions include/api/Parameters.h
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ typedef enum {
BUFFER_FLAG_INTERNAL = 1 << 1,
BUFFER_FLAG_SW_READ = 1 << 2,
BUFFER_FLAG_SW_WRITE = 1 << 3,
BUFFER_FLAG_NO_FLUSH = 1 << 4,
} camera_buffer_flags_t;

/**
Expand Down
9 changes: 9 additions & 0 deletions include/api/intel_vendor_metadata_tags.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ typedef enum vendor_metadata_tag {
INTEL_VENDOR_CAMERA_TOTAL_EXPOSURE_TARGET_RANGE, // int64[] | public
INTEL_VENDOR_CAMERA_RAW_DATA_OUTPUT, // enum | public
INTEL_VENDOR_CAMERA_HDR_RATIO, // float | public
INTEL_VENDOR_CAMERA_MODULE_ID, // byte[] | public
INTEL_VENDOR_CAMERA_SENSOR_ID, // byte[] | public
INTEL_VENDOR_CAMERA_SENSOR_MODE, // enum | public
INTEL_VENDOR_CAMERA_END,
} vendor_metadata_tag_t;

Expand Down Expand Up @@ -139,3 +142,9 @@ typedef enum vendor_metadata_enum_intel_vendor_camera_raw_data_output {
INTEL_VENDOR_CAMERA_RAW_DATA_OUTPUT_ON,
} vendor_metadata_enum_intel_vendor_camera_raw_data_output_t;

// INTEL_VENDOR_CAMERA_SENSOR_MODE
typedef enum vendor_metadata_enum_intel_vendor_camera_sensor_mode {
INTEL_VENDOR_CAMERA_SENSOR_MODE_FULL,
INTEL_VENDOR_CAMERA_SENSOR_MODE_BINNING,
} vendor_metadata_enum_intel_vendor_camera_sensor_mode_t;

2 changes: 2 additions & 0 deletions modules/algowrapper/IntelICBM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,11 @@ int IntelICBM::shutdown(const ICBMReqInfo& request) {
int IntelICBM::processFrame(const ICBMReqInfo& reqInfo) {
CheckAndLogError(mIntelOPIC2 == nullptr, UNKNOWN_ERROR, "@%s, no active ICBM session",
__func__);
// LEVEL0_ICBM_S
if (reqInfo.reqType &
(icamera::ICBMFeatureType::USER_FRAMING | icamera::ICBMFeatureType::BC_MODE_BB))
return mIntelOPIC2->processFrame(reqInfo);
// LEVEL0_ICBM_E
if (reqInfo.reqType & icamera::ICBMFeatureType::LEVEL0_TNR)
return mIntelOPIC2->runTnrFrame(reqInfo);
return 0;
Expand Down
7 changes: 4 additions & 3 deletions modules/ia_cipr/src/Context.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2020-2021 Intel Corporation.
* Copyright (C) 2020-2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -229,8 +229,9 @@ Result Context::registerBuffer(MemoryDesc* mem) {
mem->sysBuff = ioc_buffer;
mem->flags |= MemoryFlag::Migrated;

LOG2("registered buffer:%p -> fd:%d len:%lu offset:%u bytes_used:%u", mem->cpuPtr,
ioc_buffer->base.fd, ioc_buffer->len, ioc_buffer->data_offset, ioc_buffer->bytes_used);
LOG2("registered buffer:%p -> fd:%d len:%lu offset:%u bytes_used:%u, flags:%x", mem->cpuPtr,
ioc_buffer->base.fd, ioc_buffer->len, ioc_buffer->data_offset, ioc_buffer->bytes_used,
ioc_buffer->flags);

return res;
}
Expand Down
2 changes: 1 addition & 1 deletion modules/ia_css/ipu6/include/assert_support.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion modules/ia_css/ipu6/include/cpu_mem_support.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion modules/ia_css/ipu6/include/error_support.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion modules/ia_css/ipu6/include/frame_support.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion modules/ia_css/ipu6/include/ia_css_base_types.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion modules/ia_css/ipu6/include/ia_css_isa_parameter_defs.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion modules/ia_css/ipu6/include/ia_css_kernel_bitmap.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion modules/ia_css/ipu6/include/ia_css_kernel_bitmap_impl.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion modules/ia_css/ipu6/include/ia_css_program_group_data.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion modules/ia_css/ipu6/include/ia_css_program_group_param.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion modules/ia_css/ipu6/include/ia_css_psys_buffer_set.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion modules/ia_css/ipu6/include/ia_css_psys_data_trace.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion modules/ia_css/ipu6/include/ia_css_psys_dynamic_trace.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion modules/ia_css/ipu6/include/ia_css_psys_kernel_trace.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion modules/ia_css/ipu6/include/ia_css_psys_manifest_types.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion modules/ia_css/ipu6/include/ia_css_psys_param_trace.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion modules/ia_css/ipu6/include/ia_css_psys_private_pg_data.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion modules/ia_css/ipu6/include/ia_css_psys_process.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion modules/ia_css/ipu6/include/ia_css_psys_process.psys.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion modules/ia_css/ipu6/include/ia_css_psys_process_group.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation.
* Copyright (C) 2023 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Loading

0 comments on commit 94c72c8

Please sign in to comment.