Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@ set(ALGOWRAPPER_DIR ${MODULES_DIR}/algowrapper)
set(SANDBOXING_DIR ${MODULES_DIR}/sandboxing)
set(IMAGE_PROCESS_DIR ${SRC_ROOT_DIR}/image_process)

if (SUPPORT_LIVE_TUNING)
#LiveTuning directories
set(LIVE_TUNING_DIR ${MODULES_DIR}/livetune)
endif() #SUPPORT_LIVE_TUNING

# CMake module directory
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)

Expand Down Expand Up @@ -139,12 +134,7 @@ if (USE_PG_LITE_PIPE)
add_definitions(-DUSE_PG_LITE_PIPE)
endif() #USE_PG_LITE_PIPE

set(LIBCAMHAL_SRCS ${LIBCAMHAL_SRCS} ${IIO_SRCS})

if (SUPPORT_LIVE_TUNING)
include_directories(modules/livetune)
set(LIBCAMHAL_SRCS ${LIBCAMHAL_SRCS} ${LIVE_TUNING_SRCS})
endif() #SUPPORT_LIVE_TUNING
set(LIBCAMHAL_SRCS ${LIBCAMHAL_SRCS} ${IIO_SRCS})

if(FACE_DETECTION)
add_definitions(-DFACE_DETECTION)
Expand Down Expand Up @@ -235,7 +225,7 @@ if (IPU_VER MATCHES "ipu6")
set(TARGET_DEFINITIONS ${TARGET_DEFINITIONS} -DIPU_SYSVER_ipu6v6)
endif()
set(TARGET_INCLUDE ${TARGET_INCLUDE} src/core/psysprocessor)
elseif (IPU_VER MATCHES "ipu7.*")
elseif (IPU_VER MATCHES "ipu7.*" OR IPU_VER STREQUAL "ipu8")
set(TARGET_DEFINITIONS ${TARGET_DEFINITIONS} -DSTATIC_GRAPH_USE_IA_AIC_TYPES -DPAC_ENABLE)
set(TARGET_INCLUDE
${TARGET_INCLUDE}
Expand All @@ -253,6 +243,10 @@ elseif (IPU_VER MATCHES "ipu7.*")
message(STATUS "add definition -DIPU_SYSVER_ipu75 for ipu75xa")
set(TARGET_DEFINITIONS ${TARGET_DEFINITIONS} -DIPU_SYSVER_ipu75 -DGRC_IPU75XA)
set(STATIC_GRAPH_IPU_PREFIXS "Ipu75xa")
elseif (IPU_VER STREQUAL "ipu8")
message(STATUS "add definition -DIPU_SYSVER_ipu8 for ipu8")
set(TARGET_DEFINITIONS ${TARGET_DEFINITIONS} -DIPU_SYSVER_ipu8 -DGRC_IPU8)
set(STATIC_GRAPH_IPU_PREFIXS "Ipu8")
endif()
endif()

Expand Down Expand Up @@ -304,6 +298,11 @@ if (USE_STATIC_GRAPH)
${MODULES_DIR}/ipu_desc/${IPU_VER}/StaticGraphReaderAutogen.cpp
)
endif () # STATIC_GRAPH_IPU_PREFIXS
if (IPU_VER STREQUAL "ipu8")
set(TARGET_SRCS ${TARGET_SRCS}
${MODULES_DIR}/ipu_desc/${IPU_VER}/FragmentsConfigurator.cpp
)
endif ()
endif() # USE_STATIC_GRAPH

#--------------------------- Add libcamhal target ---------------------------
Expand Down Expand Up @@ -349,9 +348,6 @@ endif()
if (NOT BUILD_CAMHAL_PLUGIN)
# Install headers
install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libcamhal)
if (SUPPORT_LIVE_TUNING)
install(FILES modules/livetune/LiveTuning.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libcamhal/api)
endif() #SUPPORT_LIVE_TUNING
endif()

# Install configure files, by default ipu4 is used
Expand Down Expand Up @@ -379,7 +375,7 @@ elseif (IPU_VER STREQUAL "ipu6sepla")
message("Install JSL penguin peak configure files")
install(DIRECTORY config/ubuntu/jsl/ DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/camera/${IPU_VER})
endif()
elseif (IPU_VER MATCHES "ipu7.*")
elseif (IPU_VER MATCHES "ipu7.*" OR IPU_VER STREQUAL "ipu8")
message("Install ${IPU_VER} configure files")
install(DIRECTORY config/linux/${IPU_VER}/ DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/camera/${IPU_VER} PATTERN "config/linux/*/gcss/*.xml" EXCLUDE)
else()
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ cmake -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_CAMHAL_ADAPTOR=ON \
-DBUILD_CAMHAL_PLUGIN=ON \
-DIPU_VERSIONS="ipu7x;ipu75xa" \
-DIPU_VERSIONS="ipu7x;ipu75xa;ipu8" \
-DUSE_STATIC_GRAPH=ON \
-DUSE_STATIC_GRAPH_AUTOGEN=ON \
..
make && sudo make install
```
```
Binary file modified config/linux/ipu75xa/gcss/IMX471_BBG803N3.IPU75XA.bin
Binary file not shown.
12 changes: 1 addition & 11 deletions config/linux/ipu75xa/libcamhal_configs.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,7 @@
"ov13b10-uf-2",
"ov08x40-uf-0",
"ov08x40-uf-2",
"lt6911gxd-1-0",
"lt6911gxd-2-2",
"imx471-uf-0",
"isx031-1-0",
"isx031-2-0",
"isx031-3-0",
"isx031-4-0",
"isx031-5-2",
"isx031-6-2",
"isx031-7-2",
"isx031-8-2"
"imx471-uf-0",
],
"videoStreamNum" : 2
}
Expand Down
Binary file added config/linux/ipu8/gcss/OV13B10_09B13.IPU8.bin
Binary file not shown.
Binary file added config/linux/ipu8/gcss/OV13B10_09B13_2M.IPU8.bin
Binary file not shown.
29 changes: 29 additions & 0 deletions config/linux/ipu8/libcamhal_configs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
//
// Copyright (C) 2025 Intel Corporation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

{
"Common" : {
"version": 1.0,
"platform": "IPU7",
// The value format of availableSensors is "sensor name"-wf/uf-"CSI port ID".
// wf is word facing, and uf is user facing.
"availableSensors": [
"ov13b10-wf-2",
"ov13b10-uf-0"
],
"videoStreamNum" : 2
}
}
Binary file added config/linux/ipu8/ov13b10.aiqb
Binary file not shown.
48 changes: 48 additions & 0 deletions config/linux/ipu8/pipe_scheduler_profiles.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
//
// Copyright (C) 2025 Intel Corporation.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

{
"PipeSchedulerPolicy": {
// Configuration is chosen according to: graphId, usecase, cameraId
"schedulers": [
{
"id": 1, "graphId": 100002,
"pipe_executors": [
{
"name": "video_lb",
"nodes": [
"lbff",
],
},
{
"name": "video_po",
"nodes": [
"post_1",
"post_2",
],
},
{
"name": "still_full",
"nodes": [
"lbff1",
"post_0",
],
},
],
},
],
}
}
37 changes: 37 additions & 0 deletions config/linux/ipu8/pnp_profiles.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
//
// Copyright (C) 2025 Intel Corporation.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

{
"PnpDebugConfig": {
"Power": {
"useMockAAL": false,
"useMockHal": false,
"pnpMockFps": 30,
// algos
"bypass3A": false,
"bypassPAL": false,
// disable all face features
"disableFace": false,
"disableFaceAe": false,
"bypassFDAlgo": false,
// IPU PSYS
"bypassCB": false,
"useMockPipes": false,
// IPU ISYS
"bypassISys": false,
}
}
}
Loading