From 114285a2352ff31082e40db43763ec622a183da6 Mon Sep 17 00:00:00 2001 From: Vinayak Y B Date: Fri, 28 Jun 2024 16:16:21 +0530 Subject: [PATCH 1/3] added pkg config path as env in the cmakelist --- base/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index 34b0d7fab..5ff214cab 100755 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -60,9 +60,10 @@ IF(ENABLE_LINUX) pkg_check_modules(GLFW REQUIRED glfw3) ENDIF() -IF(ENABLE_LINUX AND NOT ENABLE_ARM64) - pkg_check_modules(GTK3 REQUIRED gtk+-3.0) +IF(ENABLE_LINUX) + set(ENV{PKG_CONFIG_PATH} "/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig") pkg_check_modules(GDK3 REQUIRED gdk-3.0) + pkg_check_modules(GTK3 REQUIRED gtk+-3.0) ENDIF() IF(ENABLE_CUDA) From 5eebdf4e7893136551f802c16240302e92dac89a Mon Sep 17 00:00:00 2001 From: Vinayak Y B Date: Fri, 28 Jun 2024 16:20:27 +0530 Subject: [PATCH 2/3] Added pkg config path as env only for arm64 --- base/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index 5ff214cab..a0891c043 100755 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -60,8 +60,11 @@ IF(ENABLE_LINUX) pkg_check_modules(GLFW REQUIRED glfw3) ENDIF() -IF(ENABLE_LINUX) +IF(ENABLE_ARM64) set(ENV{PKG_CONFIG_PATH} "/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig") +ENDIF(ENABLE_ARM64) + +IF(ENABLE_LINUX) pkg_check_modules(GDK3 REQUIRED gdk-3.0) pkg_check_modules(GTK3 REQUIRED gtk+-3.0) ENDIF() From a2d9cb73f5b3a6cd2e5cba6e7721282381f4a707 Mon Sep 17 00:00:00 2001 From: zaki Date: Fri, 28 Jun 2024 19:25:40 +0530 Subject: [PATCH 3/3] Added missing return statements --- base/src/H264EncoderV4L2Helper.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/base/src/H264EncoderV4L2Helper.cpp b/base/src/H264EncoderV4L2Helper.cpp index 9bb7eca1d..fd1f84f03 100644 --- a/base/src/H264EncoderV4L2Helper.cpp +++ b/base/src/H264EncoderV4L2Helper.cpp @@ -154,6 +154,7 @@ H264EncoderV4L2Helper::enableMotionVectorReporting() control.value = 1; setExtControlsMV(ctrls); + return 1; } void H264EncoderV4L2Helper::initEncoderParams(uint32_t bitrate, uint32_t fps) @@ -265,6 +266,8 @@ H264EncoderV4L2Helper::getMotionVectors(uint32_t buffer_index, control.string = (char *)&metadata; getExtControls(ctrls); + + return 1; } void H264EncoderV4L2Helper::serializeMotionVectors(v4l2_ctrl_videoenc_outputbuf_metadata_MV enc_mv_metadata, frame_container &frames) @@ -347,6 +350,8 @@ bool H264EncoderV4L2Helper::process(frame_sp& frame) mConverter->process(frame, buffer); mOutputPlane->qBuffer(buffer->getIndex()); + + return true; } bool H264EncoderV4L2Helper::processEOS() @@ -361,4 +366,6 @@ bool H264EncoderV4L2Helper::processEOS() mOutputPlane->qBuffer(buffer->getIndex()); mCapturePlane->waitForDQThread(2000); // blocking call - waits for 2 secs for thread to exit + + return true; } \ No newline at end of file