Made changes for AM62A_QNX for single cam and tidl demo #91
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ravi-rahul
requested changes
Oct 29, 2024
cmake/common.cmake
Outdated
| @@ -84,6 +84,7 @@ link_directories(${TARGET_FS}/usr/lib/aarch64-linux | |||
| ${CMAKE_LIBRARY_PATH}/lib | |||
| ${VISION_APPS_LIBS_PATH} | |||
| ${EDGEAI_LIBS_PATH} | |||
| ${PROJECT_SOURCE_DIR}/../../psdkqa/qnxfs/tilib | |||
There was a problem hiding this comment.
Use absolute path here
This might fail if repository is kept in a different directory
cmake/common.cmake
Outdated
| avcodec | ||
| # avformat | ||
| # avutil | ||
| # avcodec |
There was a problem hiding this comment.
Why are this commented?
modules/CMakeLists.txt
Outdated
| @@ -26,7 +26,7 @@ set(SRC_FILES | |||
| src/tiovx_pixelwise_multiply_module.c | |||
| src/tiovx_pixelwise_add_module.c | |||
| src/tiovx_lut_module.c | |||
| src/codec_input_demuxer.c | |||
| #src/codec_input_demuxer.c | |||
modules/CMakeLists.txt
Outdated
| @@ -45,7 +45,10 @@ if ("${TARGET_OS}" STREQUAL "QNX") | |||
| if ("${TARGET_CPU}" STREQUAL "A72" OR "${TARGET_CPU}" STREQUAL "A53") | |||
| list(APPEND | |||
| SRC_FILES | |||
| src/omx_decode_module.c) | |||
| # src/omx_decode_module.c | |||
| #include "tiovx_display_module.h" | ||
| #endif |
There was a problem hiding this comment.
This is bit confusing
Just add capture headers separately
modules/src/tiovx_capture_module.c
Outdated
| #define TIOVX_MODULES_DEFAULT_CAPTURE_SENSOR "SENSOR_SONY_IMX390_UB953_D3" | ||
|
|
||
modules/src/tiovx_capture_module.c
Outdated
| @@ -268,6 +269,7 @@ void tiovx_capture_init_cfg(TIOVXCaptureNodeCfg *node_cfg) | |||
| node_cfg->usecase_option = TIOVX_SENSOR_MODULE_FEATURE_CFG_UC0; | |||
| node_cfg->enable_error_detection = 0; | |||
| sprintf(node_cfg->target_string, TIVX_TARGET_CAPTURE1); | |||
| //sprintf(node_cfg->target_string, TIVX_TARGET_CAPTURE2); | |||
modules/src/tiovx_capture_module.c
Outdated
| @@ -347,7 +349,6 @@ vx_status tiovx_capture_init_node(NodeObj *node) | |||
| sensor_params->sensorInfo.raw_params.height, | |||
| VX_DF_IMAGE_UYVY); | |||
| } | |||
|
|
|||
modules/src/tiovx_sensor_module.c
Outdated
| { | ||
| if(sensorObj->usecase_option == TIOVX_SENSOR_MODULE_FEATURE_CFG_UC1) | ||
| { | ||
| if(sensorObj->usecase_option == TIOVX_SENSOR_MODULE_FEATURE_CFG_UC1) |
modules/src/tiovx_sensor_module.c
Outdated
| @@ -288,7 +289,7 @@ vx_status tiovx_sensor_init(SensorObj *sensorObj) | |||
| if(0 != sensor_init_status) | |||
| { | |||
| TIOVX_MODULE_ERROR("Error initializing sensor %s \n", sensorObj->sensor_name); | |||
| status = VX_FAILURE; | |||
| //status = VX_FAILURE; // commented forcefully | |||
Akshay-Abdar
force-pushed
the
am62a_qnx
branch
3 times, most recently
from
bfc15bb to
5eda3d3
Compare
shiva-ti
reviewed
Nov 25, 2024
cmake/common.cmake
Outdated
| link_directories(${TARGET_FS}/usr/lib/aarch64-linux | ||
| ${TARGET_FS}/usr/lib | ||
| ${CMAKE_LIBRARY_PATH}/usr/lib | ||
| ${CMAKE_LIBRARY_PATH}/lib | ||
| ${VISION_APPS_LIBS_PATH} | ||
| ${EDGEAI_LIBS_PATH} | ||
| ) | ||
| ${QNX_LIB_PATH} |
There was a problem hiding this comment.
can this break linux builds ? psdkqa exists only for QNX SDK
shiva-ti
reviewed
Nov 25, 2024
modules/core/src/tiovx_modules_cbs.c
Outdated
| { | ||
| .init_node = tiovx_sde_init_node, | ||
| .create_node = tiovx_sde_create_node, | ||
| .post_verify_graph = NULL, | ||
| .delete_node = tiovx_sde_delete_node, | ||
| .get_cfg_size = tiovx_sde_get_cfg_size, | ||
| .get_priv_size = tiovx_sde_get_priv_size | ||
| }, | ||
| }, |
There was a problem hiding this comment.
Please remove all trailing spaces, new line differences
shiva-ti
reviewed
Nov 25, 2024
modules/include/qnx_display_module.h
Outdated
| * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| * | ||
| */ | ||
| #ifndef _qnx_DISPLAY_MODULE |
There was a problem hiding this comment.
is this newly added macro ? try to use CAPS for macro
shiva-ti
reviewed
Nov 25, 2024
| #define MSC_OUTPUT_WIDTH MSC_INPUT_WIDTH/2 | ||
| #define MSC_OUTPUT_HEIGHT MSC_INPUT_HEIGHT/2 | ||
| #endif | ||
|
|
shiva-ti
reviewed
Nov 25, 2024
| @@ -109,11 +120,18 @@ | |||
| #define DCC_VISS TIOVX_MODULES_IMAGING_PATH"/imx390/linear/dcc_viss.bin" | |||
| #define DCC_LDC TIOVX_MODULES_IMAGING_PATH"/imx390/linear/dcc_ldc.bin" | |||
|
|
|||
| #define POST_PROC_OUT_WIDTH (1280) | |||
| #define POST_PROC_OUT_HEIGHT (720) | |||
| #define POST_PROC_OUT_WIDTH (1920) | |||
There was a problem hiding this comment.
do we need QNX -AM62A flag here, to avoid breaking previous code ?
shiva-ti
reviewed
Nov 25, 2024
| #define TIDL_IO_CONFIG_FILE_PATH "/opt/model_zoo/ONR-OD-8200-yolox-nano-lite-mmdet-coco-416x416/artifacts/detslabels_tidl_io_1.bin" | ||
| #define TIDL_NETWORK_FILE_PATH "/opt/model_zoo/ONR-OD-8200-yolox-nano-lite-mmdet-coco-416x416/artifacts/detslabels_tidl_net.bin" | ||
| #endif | ||
|
|
||
| #if defined(SOC_AM62A) |
There was a problem hiding this comment.
Please add QNX check also, /tifs path is relvant only for QNX. This would break AM62A-Linux build
shiva-ti
reviewed
Nov 25, 2024
| @@ -128,6 +146,7 @@ vx_status app_modules_capture_dl_display_test(int argc, char* argv[]) | |||
| GraphObj graph; | |||
| Pad *input_pad = NULL, *output_pad[4] = {NULL, NULL, NULL, NULL}, *post_proc_in_img_pad = NULL; | |||
| Buf *inbuf = NULL; | |||
| Buf *outbuf = NULL; | |||
There was a problem hiding this comment.
if outbuf varible is used only for AM62A-QNX usecase, add flags here as well. It may throw unused varible error for other QNX platforms otherwise
shiva-ti
reviewed
Nov 25, 2024
|
|
||
| status = tiovx_modules_verify_graph(&graph); | ||
|
|
||
| #if !defined(SOC_AM62A) |
shiva-ti
reviewed
Nov 25, 2024
| viss_node = tiovx_modules_add_node(&graph, TIOVX_VISS, (void *)&viss_cfg); | ||
|
|
||
| output_pad[0] = &viss_node->srcs[0]; |
There was a problem hiding this comment.
can this change break Linux/J7 build ?
Akshay-Abdar
force-pushed
the
am62a_qnx
branch
11 times, most recently
from
509b8e2 to
a64bc2b
Compare
shiva-ti
reviewed
Nov 29, 2024
cmake/common.cmake
Outdated
| @@ -184,16 +187,23 @@ if ("${TARGET_OS}" STREQUAL "QNX") | |||
| tiipc-usr | |||
| ti-udmalld | |||
| ti-pdk | |||
| ti-csirxlld | |||
There was a problem hiding this comment.
csirx, fvid2 libraries are QNX specific for AM62A only, for Jacinto these are on R5. Please add AM62A check here
shiva-ti
reviewed
Nov 29, 2024
| #include "tiovx_capture_module.h" | ||
| #include "tiovx_aewb_module.h" | ||
| #if !defined(SOC_AM62A) |
There was a problem hiding this comment.
are these exluded header files needed for AM62A-Linux ? if yes, please add QNX flag as well
shiva-ti
reviewed
Nov 29, 2024
modules/src/qnx_display_module.c
Outdated
| int32_t qnx_display_render_buf(Buf *tiovx_buffer) | ||
| { | ||
|
|
||
| static uint32_t j=0; |
There was a problem hiding this comment.
can you rename i,j varibales to something more relevant ? so that the variable names reflect their usage here
shiva-ti
reviewed
Nov 29, 2024
tests/CMakeLists.txt
Outdated
| @@ -50,6 +50,16 @@ endif() | |||
| endif() | |||
| endif() | |||
|
|
|||
| if ("${TARGET_OS}" STREQUAL "QNX") | |||
| if ("${TARGET_CPU}" STREQUAL "A72" OR "${TARGET_CPU}" STREQUAL "A53") | |||
There was a problem hiding this comment.
will this affect Jacinto ? why are we adding A72 core here ?
Akshay-Abdar
force-pushed
the
am62a_qnx
branch
2 times, most recently
from
6cb82ea to
159113d
Compare
Akshay-Abdar
force-pushed
the
am62a_qnx
branch
from
159113d to
70ca80b
Compare
ravi-rahul
requested changes
Dec 3, 2024
apps/src/input_block.c
Outdated
| @@ -201,7 +201,9 @@ int32_t create_input_block(GraphObj *graph, InputBlock *input_block) | |||
| sprintf(sensor_name, "SENSOR_OV2312_UB953_LI"); | |||
| format_pixel_container = TIVX_RAW_IMAGE_16_BIT; | |||
| format_msb = 9; | |||
| v4l2_pix_format = v4l2_fourcc('B','G','I','0'); | |||
| #if defined(TARGET_OS_LINUX) | |||
| v4l2_pix_format = v4l2_fourcc('B','G','I','0'); | |||
modules/CMakeLists.txt
Outdated
| @@ -46,7 +46,10 @@ if ("${TARGET_CPU}" STREQUAL "A72" OR "${TARGET_CPU}" STREQUAL "A53") | |||
| list(APPEND | |||
| SRC_FILES | |||
| src/omx_encode_module.c | |||
| src/omx_decode_module.c) | |||
| src/omx_decode_module.c | |||
There was a problem hiding this comment.
This should be protected for AM62A
modules/include/qnx_display_module.h
Outdated
| #endif | ||
|
|
||
| #endif | ||
|
|
There was a problem hiding this comment.
Remove this empty lines
Akshay-Abdar
force-pushed
the
am62a_qnx
branch
3 times, most recently
from
c07634a to
6bed5e7
Compare
Akshay-Abdar
force-pushed
the
am62a_qnx
branch
from
6bed5e7 to
0cf9a30
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Made necessary changes to support single camera application and TIDL based classification demo on AM62A_QNX.