scottk/meta-tegra
1
0
Fork 0
mirror of https://github.com/lingble/meta-tegra.git synced 2025-11-01 21:07:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

tegra-mmapi: update to R35.2.1

Browse Source 
Signed-off-by: Matt Madison <matt@madison.systems>
This commit is contained in:
Matt Madison
2023-01-25 10:41:22 -08:00
committed by Matt Madison
parent 304c113204
commit 1fa12da6f2
11 changed files with 204 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
recipes-multimedia/argus/files/0005-Remove-DO-NOT-USE-declarations-from-v4l2_nv_extensio.patch → recipes-multimedia/argus/files/0001-Remove-DO-NOT-USE-declarations-from-v4l2_nv_extensio.patch
View File

@@ -1,18 +1,18 @@
From ffbfc4d696bbf87a20905418fbb94d4fcc8d9d7f Mon Sep 17 00:00:00 2001 From 194ecaad5dcc62fe8b4f80bba47b97b14993556d Mon Sep 17 00:00:00 2001
From: Ilies CHERGUI <ilies.chergui@gmail.com> From: Ilies CHERGUI <ilies.chergui@gmail.com>
Date: Wed, 30 Mar 2022 22:22:00 +0100 Date: Wed, 30 Mar 2022 22:22:00 +0100
Subject: [PATCH 5/9] Remove DO NOT USE declarations from v4l2_nv_extensions.h Subject: [PATCH 1/8] Remove DO NOT USE declarations from v4l2_nv_extensions.h
as they are now present in v4l2-controls.h and conflict as they are now present in v4l2-controls.h and conflict
with the definitions there. with the definitions there.
Signed-off-by: Matt Madison <matt@madison.systems> Signed-off-by: Matt Madison <matt@madison.systems>
--- ---
include/v4l2_nv_extensions.h | 264 ------------------ include/v4l2_nv_extensions.h | 264 -----------------------------------
1 file changed, 264 deletions(-) 1 file changed, 264 deletions(-)
diff --git a/include/v4l2_nv_extensions.h b/include/v4l2_nv_extensions.h diff --git a/include/v4l2_nv_extensions.h b/include/v4l2_nv_extensions.h
index 49fcfba..3ea4f7f 100644 index 4d346b1..d3d6dea 100644
--- a/include/v4l2_nv_extensions.h --- a/include/v4l2_nv_extensions.h
+++ b/include/v4l2_nv_extensions.h +++ b/include/v4l2_nv_extensions.h
@@ -120,21 +120,6 @@ @@ -120,21 +120,6 @@
@@ -294,5 +294,5 @@ index 49fcfba..3ea4f7f 100644
/** /**
-- --
2.32.0 2.34.1

4
recipes-multimedia/argus/tegra-mmapi-35.2.1.inc
View File

@@ -4,11 +4,11 @@ LICENSE = "Proprietary & BSD-3-Clause"
SRC_COMMON_DEBS = "${@l4t_deb_pkgname(d, 'jetson-multimedia-api')};subdir=tegra-mmapi" SRC_COMMON_DEBS = "${@l4t_deb_pkgname(d, 'jetson-multimedia-api')};subdir=tegra-mmapi"
PV .= "${@l4t_bsp_debian_version_suffix(d, pkgname='nvidia-l4t-jetson-multimedia-api')}" PV .= "${@l4t_bsp_debian_version_suffix(d, pkgname='nvidia-l4t-jetson-multimedia-api')}"
SRC_URI[sha256sum] = "7cf134ea26da03c12421ff91c2f9a0051d655704bfbb6917ff1d5ed678bd6600" SRC_URI[sha256sum] = "a436cbfdbbef87b9be8e0defb4c6af5ffa4c4ba8bd957446577a9fb30334595f"
inherit l4t_deb_pkgfeed features_check inherit l4t_deb_pkgfeed features_check
SRC_URI += "file://0005-Remove-DO-NOT-USE-declarations-from-v4l2_nv_extensio.patch" SRC_URI += "file://0001-Remove-DO-NOT-USE-declarations-from-v4l2_nv_extensio.patch"
REQUIRED_DISTRO_FEATURES = "opengl" REQUIRED_DISTRO_FEATURES = "opengl"

6
recipes-multimedia/argus/tegra-mmapi-samples/0001-include-fix-jpeglib-header-inclusion.patch → recipes-multimedia/argus/tegra-mmapi-samples/0002-include-fix-jpeglib-header-inclusion.patch
View File

@@ -1,7 +1,7 @@
From 2b123a62056ce766bf4d10d5710160697bd1c686 Mon Sep 17 00:00:00 2001 From 00e976a8c74528baab75c25b86960962259d8e86 Mon Sep 17 00:00:00 2001
From: Ilies CHERGUI <ilies.chergui@gmail.com> From: Ilies CHERGUI <ilies.chergui@gmail.com>
Date: Wed, 30 Mar 2022 21:54:22 +0100 Date: Wed, 30 Mar 2022 21:54:22 +0100
Subject: [PATCH 1/9] include: fix jpeglib header inclusion Subject: [PATCH 2/8] include: fix jpeglib header inclusion
To ensure that it's using the NVIDIA-specific header. To ensure that it's using the NVIDIA-specific header.
@@ -38,5 +38,5 @@ index be40589..5b341b9 100644
#include "NvBuffer.h" #include "NvBuffer.h"
-- --
2.32.0 2.34.1

4
recipes-multimedia/argus/tegra-mmapi-samples/0002-tools-update-GetPixel.py-to-Python-3.patch → recipes-multimedia/argus/tegra-mmapi-samples/0003-tools-update-GetPixel.py-to-Python-3.patch
View File

@@ -1,7 +1,7 @@
From 61519d1939dc9f9028a0b148eea08cf6449f29ba Mon Sep 17 00:00:00 2001 From 526726c3c8d89250337ef17eddc4f012274629b4 Mon Sep 17 00:00:00 2001
From: Dan Walkes <danwalkes@trellis-logic.com> From: Dan Walkes <danwalkes@trellis-logic.com>
Date: Fri, 19 Aug 2022 10:05:15 -0500 Date: Fri, 19 Aug 2022 10:05:15 -0500
Subject: [PATCH] tools: update GetPixel.py to Python 3 Subject: [PATCH 3/8] tools: update GetPixel.py to Python 3
Reworked from the original at [1] for Jetpack 5, as 3 Reworked from the original at [1] for Jetpack 5, as 3
of the 4 hunks were included in the tegra-mmpai-samples 35.1 of the 4 hunks were included in the tegra-mmpai-samples 35.1

12
recipes-multimedia/argus/tegra-mmapi-samples/0003-samples-classes-fix-a-data-race-in-shutting-down.patch → recipes-multimedia/argus/tegra-mmapi-samples/0004-samples-classes-fix-a-data-race-in-shutting-down-deq.patch
View File

@@ -1,7 +1,7 @@
From c4f70f1cc329154128e3f0f325484f9916caa391 Mon Sep 17 00:00:00 2001 From 27de2fa4ef71a952a1c0fcbb8dd8b73b8d619f21 Mon Sep 17 00:00:00 2001
From: Ilies CHERGUI <ilies.chergui@gmail.com> From: Ilies CHERGUI <ilies.chergui@gmail.com>
Date: Wed, 30 Mar 2022 22:04:38 +0100 Date: Wed, 30 Mar 2022 22:04:38 +0100
Subject: [PATCH 3/9] samples: classes: fix a data race in shutting down Subject: [PATCH 4/8] samples: classes: fix a data race in shutting down
dequeue thread dequeue thread
as well as a couple of other uses of pthread_join with as well as a couple of other uses of pthread_join with
@@ -9,9 +9,9 @@ a possibly null (and thus invalid) thread id.
Signed-off-by: Matt Madison <matt@madison.systems> Signed-off-by: Matt Madison <matt@madison.systems>
--- ---
.../common/classes/NvApplicationProfiler.cpp | 5 +++- .../common/classes/NvApplicationProfiler.cpp | 5 +++-
samples/common/classes/NvEglRenderer.cpp | 6 ++++- samples/common/classes/NvEglRenderer.cpp | 6 ++++-
samples/common/classes/NvV4l2ElementPlane.cpp | 23 +++++++++++++++---- samples/common/classes/NvV4l2ElementPlane.cpp | 23 +++++++++++++++----
3 files changed, 28 insertions(+), 6 deletions(-) 3 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/samples/common/classes/NvApplicationProfiler.cpp b/samples/common/classes/NvApplicationProfiler.cpp diff --git a/samples/common/classes/NvApplicationProfiler.cpp b/samples/common/classes/NvApplicationProfiler.cpp
@@ -96,5 +96,5 @@ index bb67a5d..c755923 100644
{ {
ret = pthread_cond_timedwait(&plane_cond, &plane_lock, &timeToWait); ret = pthread_cond_timedwait(&plane_cond, &plane_lock, &timeToWait);
-- --
2.32.0 2.34.1

316
recipes-multimedia/argus/tegra-mmapi-samples/0006-samples-Rework-makefiles-and-rules.patch → recipes-multimedia/argus/tegra-mmapi-samples/0005-samples-Rework-makefiles-and-rules.patch
View File

@@ -1,7 +1,7 @@
From 7c9891dbcb5f4dcddc6d41b73d99e10579cfc300 Mon Sep 17 00:00:00 2001 From 916d83cb06bb164e3681130f01daf6095561c3e2 Mon Sep 17 00:00:00 2001
From: Ilies CHERGUI <ilies.chergui@gmail.com> From: Ilies CHERGUI <ilies.chergui@gmail.com>
Date: Wed, 30 Mar 2022 22:42:28 +0100 Date: Wed, 30 Mar 2022 22:42:28 +0100
Subject: [PATCH 6/9] samples: Rework makefiles and rules Subject: [PATCH 5/8] samples: Rework makefiles and rules
* Make them more OE-friendly * Make them more OE-friendly
* Add install targets * Add install targets
@@ -10,41 +10,41 @@ Subject: [PATCH 6/9] samples: Rework makefiles and rules
Signed-off-by: Matt Madison <matt@madison.systems> Signed-off-by: Matt Madison <matt@madison.systems>
--- ---
Makefile | 9 +- Makefile | 9 +-
samples/00_video_decode/Makefile | 10 +- samples/00_video_decode/Makefile | 10 +-
samples/01_video_encode/Makefile | 10 +- samples/01_video_encode/Makefile | 10 +-
samples/02_video_dec_cuda/Makefile | 20 +--- samples/02_video_dec_cuda/Makefile | 20 +---
samples/03_video_cuda_enc/Makefile | 21 +--- samples/03_video_cuda_enc/Makefile | 21 +---
samples/04_video_dec_trt/Makefile | 34 +++---- samples/04_video_dec_trt/Makefile | 34 +++----
samples/05_jpeg_encode/Makefile | 11 +-- samples/05_jpeg_encode/Makefile | 11 +--
samples/06_jpeg_decode/Makefile | 10 +- samples/06_jpeg_decode/Makefile | 10 +-
samples/07_video_convert/Makefile | 10 +- samples/07_video_convert/Makefile | 10 +-
samples/08_video_dec_drm/Makefile | 16 ++-- samples/08_video_dec_drm/Makefile | 16 ++--
samples/09_camera_jpeg_capture/Makefile | 14 +-- samples/09_argus_camera_jpeg/Makefile | 14 +--
samples/10_camera_recording/Makefile | 18 ++-- samples/10_argus_camera_recording/Makefile | 18 ++--
samples/12_camera_v4l2_cuda/Makefile | 20 +--- samples/12_v4l2_camera_cuda/Makefile | 20 +---
samples/13_multi_camera/Makefile | 14 +-- samples/13_argus_multi_camera/Makefile | 14 +--
samples/14_multivideo_decode/Makefile | 10 +- samples/14_multivideo_decode/Makefile | 10 +-
samples/15_multivideo_encode/Makefile | 10 +- samples/15_multivideo_encode/Makefile | 10 +-
samples/16_multivideo_transcode/Makefile | 10 +- samples/16_multivideo_transcode/Makefile | 10 +-
samples/Rules.mk | 96 +++++++++---------- samples/17_frontend/Makefile | 42 ++++----
samples/backend/Makefile | 41 ++++---- samples/18_v4l2_camera_cuda_rgb/Makefile | 11 +--
samples/common/algorithm/cuda/Makefile | 17 ++-- samples/Rules.mk | 96 +++++++++----------
samples/common/algorithm/trt/Makefile | 11 ++- samples/backend/Makefile | 41 ++++----
samples/common/classes/Makefile | 10 +- samples/common/algorithm/cuda/Makefile | 17 ++--
samples/frontend/Makefile | 42 ++++---- samples/common/algorithm/trt/Makefile | 11 ++-
.../camera_unit_sample/Makefile | 10 +- samples/common/classes/Makefile | 10 +-
.../decoder_unit_sample/Makefile | 10 +- .../camera_unit_sample/Makefile | 10 +-
.../encoder_unit_sample/Makefile | 10 +- .../decoder_unit_sample/Makefile | 10 +-
.../transform_unit_sample/Makefile | 10 +- .../encoder_unit_sample/Makefile | 10 +-
samples/v4l2cuda/Makefile | 11 +-- .../transform_unit_sample/Makefile | 10 +-
28 files changed, 208 insertions(+), 307 deletions(-) 28 files changed, 208 insertions(+), 307 deletions(-)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 3729d4d..d1fcd9f 100644 index 26b05cf..18e37d3 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -57,7 +57,7 @@ SUBDIRS = \ @@ -58,7 +58,7 @@ SUBDIRS = \
all: all:
@list='$(SUBDIRS)'; for subdir in $$list; do \ @list='$(SUBDIRS)'; for subdir in $$list; do \
echo "Make in $$subdir";\ echo "Make in $$subdir";\
@@ -53,7 +53,7 @@ index 3729d4d..d1fcd9f 100644
if [ $$? -ne 0 ]; then exit 1; fi;\ if [ $$? -ne 0 ]; then exit 1; fi;\
done done
@@ -67,3 +67,10 @@ clean: @@ -68,3 +68,10 @@ clean:
echo "Clean in $$subdir";\ echo "Clean in $$subdir";\
$(MAKE) -C $$subdir clean;\ $(MAKE) -C $$subdir clean;\
done done
@@ -408,10 +408,10 @@ index 5cb1be9..f59d7f7 100644
clean: clean:
$(AT)rm -rf $(APP) $(OBJS) image_rgba.* $(AT)rm -rf $(APP) $(OBJS) image_rgba.*
diff --git a/samples/09_camera_jpeg_capture/Makefile b/samples/09_camera_jpeg_capture/Makefile diff --git a/samples/09_argus_camera_jpeg/Makefile b/samples/09_argus_camera_jpeg/Makefile
index 52ee562..0fd68f8 100644 index 2fc7720..4372f8d 100644
--- a/samples/09_camera_jpeg_capture/Makefile --- a/samples/09_argus_camera_jpeg/Makefile
+++ b/samples/09_camera_jpeg_capture/Makefile +++ b/samples/09_argus_camera_jpeg/Makefile
@@ -36,10 +36,9 @@ ARGUS_UTILS_DIR := $(TOP_DIR)/argus/samples/utils @@ -36,10 +36,9 @@ ARGUS_UTILS_DIR := $(TOP_DIR)/argus/samples/utils
SRCS := \ SRCS := \
@@ -447,10 +447,10 @@ index 52ee562..0fd68f8 100644
clean: clean:
$(AT)rm -rf $(APP) $(OBJS) $(AT)rm -rf $(APP) $(OBJS)
diff --git a/samples/10_camera_recording/Makefile b/samples/10_camera_recording/Makefile diff --git a/samples/10_argus_camera_recording/Makefile b/samples/10_argus_camera_recording/Makefile
index c3fdce9..fb4551d 100644 index 8a8eb57..21e2beb 100644
--- a/samples/10_camera_recording/Makefile --- a/samples/10_argus_camera_recording/Makefile
+++ b/samples/10_camera_recording/Makefile +++ b/samples/10_argus_camera_recording/Makefile
@@ -36,12 +36,11 @@ ARGUS_UTILS_DIR := $(TOP_DIR)/argus/samples/utils @@ -36,12 +36,11 @@ ARGUS_UTILS_DIR := $(TOP_DIR)/argus/samples/utils
SRCS := \ SRCS := \
@@ -492,12 +492,12 @@ index c3fdce9..fb4551d 100644
clean: clean:
$(AT)rm -rf $(APP) $(OBJS) $(AT)rm -rf $(APP) $(OBJS)
diff --git a/samples/12_camera_v4l2_cuda/Makefile b/samples/12_camera_v4l2_cuda/Makefile diff --git a/samples/12_v4l2_camera_cuda/Makefile b/samples/12_v4l2_camera_cuda/Makefile
index 0cc2e97..9a644db 100644 index c6d086a..63f4338 100644
--- a/samples/12_camera_v4l2_cuda/Makefile --- a/samples/12_v4l2_camera_cuda/Makefile
+++ b/samples/12_camera_v4l2_cuda/Makefile +++ b/samples/12_v4l2_camera_cuda/Makefile
@@ -33,33 +33,19 @@ include ../Rules.mk @@ -33,33 +33,19 @@ include ../Rules.mk
APP := camera_v4l2_cuda APP := v4l2_camera_cuda
SRCS := \ SRCS := \
- camera_v4l2_cuda.cpp \ - camera_v4l2_cuda.cpp \
@@ -533,10 +533,10 @@ index 0cc2e97..9a644db 100644
clean: clean:
$(AT)rm -rf $(APP) $(OBJS) $(AT)rm -rf $(APP) $(OBJS)
diff --git a/samples/13_multi_camera/Makefile b/samples/13_multi_camera/Makefile diff --git a/samples/13_argus_multi_camera/Makefile b/samples/13_argus_multi_camera/Makefile
index b600351..73cb468 100644 index 6a28095..f556b2a 100644
--- a/samples/13_multi_camera/Makefile --- a/samples/13_argus_multi_camera/Makefile
+++ b/samples/13_multi_camera/Makefile +++ b/samples/13_argus_multi_camera/Makefile
@@ -36,10 +36,9 @@ ARGUS_UTILS_DIR := $(TOP_DIR)/argus/samples/utils @@ -36,10 +36,9 @@ ARGUS_UTILS_DIR := $(TOP_DIR)/argus/samples/utils
SRCS := \ SRCS := \
@@ -665,6 +665,113 @@ index df65641..9b7394e 100644
clean: clean:
$(AT)rm -rf $(APP) $(OBJS) $(AT)rm -rf $(APP) $(OBJS)
diff --git a/samples/17_frontend/Makefile b/samples/17_frontend/Makefile
index 35f3f56..8bfafb3 100644
--- a/samples/17_frontend/Makefile
+++ b/samples/17_frontend/Makefile
@@ -30,6 +30,15 @@
include ../Rules.mk
+ifneq ($(HAVE_OPENCV), 1)
+all:
+ :
+install:
+ :
+clean:
+ :
+else
+
APP := frontend
ARGUS_UTILS_DIR := $(TOP_DIR)/argus/samples/utils
@@ -41,7 +50,6 @@ SRCS := \
StreamConsumer.cpp \
VideoEncodeStreamConsumer.cpp \
VideoEncoder.cpp \
- $(wildcard $(CLASS_DIR)/*.cpp) \
$(ARGUS_UTILS_DIR)/Thread.cpp
ifeq ($(ENABLE_TRT), 1)
@@ -49,18 +57,17 @@ SRCS += \
TRTStreamConsumer.cpp
endif
-OBJS := $(SRCS:.cpp=.o)
+OBJS := $(notdir $(SRCS:.cpp=.o))
ifeq ($(ENABLE_TRT), 1)
CPPFLAGS += -DENABLE_TRT
-OBJS += \
- $(ALGO_CUDA_DIR)/NvAnalysis.o \
- $(ALGO_CUDA_DIR)/NvCudaProc.o \
- $(ALGO_TRT_DIR)/trt_inference.o
+LINKDEPS = algo_cuda algo_trt
+EXTRAOBJS = $(ALGO_CUDA_OBJS) $(ALGO_TRT_OBJS)
endif
CPPFLAGS += \
- -I"$(ARGUS_UTILS_DIR)"
+ -I"$(ARGUS_UTILS_DIR)" \
+ $(shell pkg-config --cflags opencv4)
LDFLAGS += -lnvargus_socketclient -lopencv_objdetect
ifeq ($(ENABLE_TRT), 1)
@@ -69,25 +76,18 @@ endif
all: $(APP)
-$(CLASS_DIR)/%.o: $(CLASS_DIR)/%.cpp
- $(AT)$(MAKE) -C $(CLASS_DIR)
-
-$(ALGO_CUDA_DIR)/%.o: $(ALGO_CUDA_DIR)/%.cpp
- $(AT)$(MAKE) -C $(ALGO_CUDA_DIR)
-
-$(ALGO_CUDA_DIR)/%.o: $(ALGO_CUDA_DIR)/%.cu
- $(AT)$(MAKE) -C $(ALGO_CUDA_DIR)
-
-$(ALGO_TRT_DIR)/%.o: $(ALGO_TRT_DIR)/%.cpp
- $(AT)$(MAKE) -C $(ALGO_TRT_DIR)
-
%.o: %.cpp
@echo "Compiling: $<"
$(CPP) $(CPPFLAGS) -c $< -o $@
-$(APP): $(OBJS)
+%.o: $(ARGUS_UTILS_DIR)/%.cpp
+ @echo "Compiling: $<"
+ $(CPP) $(CPPFLAGS) -c $< -o $@
+
+$(APP): $(OBJS) $(LINKDEPS)
@echo "Linking: $@"
- $(CPP) -o $@ $(OBJS) $(CPPFLAGS) $(LDFLAGS)
+ $(CPP) -o $@ $(OBJS) $(EXTRAOBJS) $(CPPFLAGS) $(CLASSES) $(LDFLAGS)
clean:
$(AT)rm -rf $(APP) $(OBJS)
+endif
diff --git a/samples/18_v4l2_camera_cuda_rgb/Makefile b/samples/18_v4l2_camera_cuda_rgb/Makefile
index 1b3ec95..e484a51 100644
--- a/samples/18_v4l2_camera_cuda_rgb/Makefile
+++ b/samples/18_v4l2_camera_cuda_rgb/Makefile
@@ -26,15 +26,8 @@ SRCS := \
capture.cpp \
yuv2rgb.cu
-ALL_CPPFLAGS := $(addprefix -Xcompiler ,$(filter-out -std=c++11, $(CPPFLAGS)))
-
-# CUDA code generation flags
-GENCODE_SM53 := -gencode arch=compute_53,code=sm_53
-GENCODE_SM62 := -gencode arch=compute_62,code=sm_62
-GENCODE_SM72 := -gencode arch=compute_72,code=sm_72
-GENCODE_SM87 := -gencode arch=compute_87,code=sm_87
-GENCODE_SM_PTX := -gencode arch=compute_72,code=compute_72
-GENCODE_FLAGS := $(GENCODE_SM53) $(GENCODE_SM62) $(GENCODE_SM72) $(GENCODE_SM87) $(GENCODE_SM_PTX)
+ALL_CPPFLAGS := $(NVCCFLAGS)
+ALL_CPPFLAGS += $(addprefix -Xcompiler ,$(filter-out -std=c++11, $(CPPFLAGS)))
all: $(APP)
diff --git a/samples/Rules.mk b/samples/Rules.mk diff --git a/samples/Rules.mk b/samples/Rules.mk
index 190c8e1..a4df626 100644 index 190c8e1..a4df626 100644
--- a/samples/Rules.mk --- a/samples/Rules.mk
@@ -970,91 +1077,6 @@ index 7336298..82e2bb8 100644
%.o: %.cpp %.o: %.cpp
@echo "Compiling: $<" @echo "Compiling: $<"
diff --git a/samples/frontend/Makefile b/samples/frontend/Makefile
index 35f3f56..8bfafb3 100644
--- a/samples/frontend/Makefile
+++ b/samples/frontend/Makefile
@@ -30,6 +30,15 @@
include ../Rules.mk
+ifneq ($(HAVE_OPENCV), 1)
+all:
+ :
+install:
+ :
+clean:
+ :
+else
+
APP := frontend
ARGUS_UTILS_DIR := $(TOP_DIR)/argus/samples/utils
@@ -41,7 +50,6 @@ SRCS := \
StreamConsumer.cpp \
VideoEncodeStreamConsumer.cpp \
VideoEncoder.cpp \
- $(wildcard $(CLASS_DIR)/*.cpp) \
$(ARGUS_UTILS_DIR)/Thread.cpp
ifeq ($(ENABLE_TRT), 1)
@@ -49,18 +57,17 @@ SRCS += \
TRTStreamConsumer.cpp
endif
-OBJS := $(SRCS:.cpp=.o)
+OBJS := $(notdir $(SRCS:.cpp=.o))
ifeq ($(ENABLE_TRT), 1)
CPPFLAGS += -DENABLE_TRT
-OBJS += \
- $(ALGO_CUDA_DIR)/NvAnalysis.o \
- $(ALGO_CUDA_DIR)/NvCudaProc.o \
- $(ALGO_TRT_DIR)/trt_inference.o
+LINKDEPS = algo_cuda algo_trt
+EXTRAOBJS = $(ALGO_CUDA_OBJS) $(ALGO_TRT_OBJS)
endif
CPPFLAGS += \
- -I"$(ARGUS_UTILS_DIR)"
+ -I"$(ARGUS_UTILS_DIR)" \
+ $(shell pkg-config --cflags opencv4)
LDFLAGS += -lnvargus_socketclient -lopencv_objdetect
ifeq ($(ENABLE_TRT), 1)
@@ -69,25 +76,18 @@ endif
all: $(APP)
-$(CLASS_DIR)/%.o: $(CLASS_DIR)/%.cpp
- $(AT)$(MAKE) -C $(CLASS_DIR)
-
-$(ALGO_CUDA_DIR)/%.o: $(ALGO_CUDA_DIR)/%.cpp
- $(AT)$(MAKE) -C $(ALGO_CUDA_DIR)
-
-$(ALGO_CUDA_DIR)/%.o: $(ALGO_CUDA_DIR)/%.cu
- $(AT)$(MAKE) -C $(ALGO_CUDA_DIR)
-
-$(ALGO_TRT_DIR)/%.o: $(ALGO_TRT_DIR)/%.cpp
- $(AT)$(MAKE) -C $(ALGO_TRT_DIR)
-
%.o: %.cpp
@echo "Compiling: $<"
$(CPP) $(CPPFLAGS) -c $< -o $@
-$(APP): $(OBJS)
+%.o: $(ARGUS_UTILS_DIR)/%.cpp
+ @echo "Compiling: $<"
+ $(CPP) $(CPPFLAGS) -c $< -o $@
+
+$(APP): $(OBJS) $(LINKDEPS)
@echo "Linking: $@"
- $(CPP) -o $@ $(OBJS) $(CPPFLAGS) $(LDFLAGS)
+ $(CPP) -o $@ $(OBJS) $(EXTRAOBJS) $(CPPFLAGS) $(CLASSES) $(LDFLAGS)
clean:
$(AT)rm -rf $(APP) $(OBJS)
+endif
diff --git a/samples/unittest_samples/camera_unit_sample/Makefile b/samples/unittest_samples/camera_unit_sample/Makefile diff --git a/samples/unittest_samples/camera_unit_sample/Makefile b/samples/unittest_samples/camera_unit_sample/Makefile
index 790a322..ec63a2d 100644 index 790a322..ec63a2d 100644
--- a/samples/unittest_samples/camera_unit_sample/Makefile --- a/samples/unittest_samples/camera_unit_sample/Makefile
@@ -1179,28 +1201,6 @@ index 404429b..1ede2ab 100644
clean: clean:
$(AT)rm -rf $(APP) $(OBJS) $(AT)rm -rf $(APP) $(OBJS)
diff --git a/samples/v4l2cuda/Makefile b/samples/v4l2cuda/Makefile
index 6a6c794..f856671 100644
--- a/samples/v4l2cuda/Makefile
+++ b/samples/v4l2cuda/Makefile
@@ -26,15 +26,8 @@ SRCS := \
capture.cpp \
yuv2rgb.cu
-ALL_CPPFLAGS := $(addprefix -Xcompiler ,$(filter-out -std=c++11, $(CPPFLAGS)))
-
-# CUDA code generation flags
-GENCODE_SM53 := -gencode arch=compute_53,code=sm_53
-GENCODE_SM62 := -gencode arch=compute_62,code=sm_62
-GENCODE_SM72 := -gencode arch=compute_72,code=sm_72
-GENCODE_SM87 := -gencode arch=compute_87,code=sm_87
-GENCODE_SM_PTX := -gencode arch=compute_72,code=compute_72
-GENCODE_FLAGS := $(GENCODE_SM53) $(GENCODE_SM62) $(GENCODE_SM72) $(GENCODE_SM87) $(GENCODE_SM_PTX)
+ALL_CPPFLAGS := $(NVCCFLAGS)
+ALL_CPPFLAGS += $(addprefix -Xcompiler ,$(filter-out -std=c++11, $(CPPFLAGS)))
all: $(APP)
-- --
2.32.0 2.34.1

6
recipes-multimedia/argus/tegra-mmapi-samples/0007-trt_inference-use-smart-pointers-during-model-conver.patch → recipes-multimedia/argus/tegra-mmapi-samples/0006-trt_inference-use-smart-pointers-during-model-conver.patch
View File

@@ -1,7 +1,7 @@
From 8c606a78724644e8bf6e1f085878cc72f413481c Mon Sep 17 00:00:00 2001 From ff34572aae54759226dd70c2656074d4206fde01 Mon Sep 17 00:00:00 2001
From: Ilies CHERGUI <ilies.chergui@gmail.com> From: Ilies CHERGUI <ilies.chergui@gmail.com>
Date: Wed, 30 Mar 2022 22:52:32 +0100 Date: Wed, 30 Mar 2022 22:52:32 +0100
Subject: [PATCH 7/9] trt_inference: use smart pointers during model Subject: [PATCH 6/8] trt_inference: use smart pointers during model
conversions conversions
instead of the old, deprecated style of using raw pointers instead of the old, deprecated style of using raw pointers
@@ -93,5 +93,5 @@ index e0d072d..459be89 100644
} }
-- --
2.32.0 2.34.1

14
recipes-multimedia/argus/tegra-mmapi-samples/0008-frontend-add-option-to-set-timeout.patch → recipes-multimedia/argus/tegra-mmapi-samples/0007-frontend-add-option-to-set-timeout.patch
View File

@@ -1,20 +1,20 @@
From 5edeb1a86dd1c25d6e9742900735a43557047102 Mon Sep 17 00:00:00 2001 From 7f47519ebe1f2df2b2ca5a3465582875364c9421 Mon Sep 17 00:00:00 2001
From: Ilies CHERGUI <ilies.chergui@gmail.com> From: Ilies CHERGUI <ilies.chergui@gmail.com>
Date: Wed, 30 Mar 2022 22:54:03 +0100 Date: Wed, 30 Mar 2022 22:54:03 +0100
Subject: [PATCH 8/9] frontend: add option to set timeout Subject: [PATCH 7/8] frontend: add option to set timeout
instead of requiring a human to type 'q' to quit, instead of requiring a human to type 'q' to quit,
to allow the sample to be used as an automated test. to allow the sample to be used as an automated test.
Signed-off-by: Matt Madison <matt@madison.systems> Signed-off-by: Matt Madison <matt@madison.systems>
--- ---
samples/frontend/main.cpp | 15 ++++++++++++--- samples/17_frontend/main.cpp | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-) 1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/samples/frontend/main.cpp b/samples/frontend/main.cpp diff --git a/samples/17_frontend/main.cpp b/samples/17_frontend/main.cpp
index 459aacb..9549364 100644 index 459aacb..9549364 100644
--- a/samples/frontend/main.cpp --- a/samples/17_frontend/main.cpp
+++ b/samples/frontend/main.cpp +++ b/samples/17_frontend/main.cpp
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
*/ */
@@ -73,5 +73,5 @@ index 459aacb..9549364 100644
g_bVerbose = true; g_bVerbose = true;
break; break;
-- --
2.32.0 2.34.1

22
recipes-multimedia/argus/tegra-mmapi-samples/0009-camera_v4l2_cuda-add-option-for-setting-max-frame-co.patch → recipes-multimedia/argus/tegra-mmapi-samples/0008-camera_v4l2_cuda-add-option-for-setting-max-frame-co.patch
View File

@@ -1,20 +1,20 @@
From 250c0c9031615421204279eadb541652e5dee6df Mon Sep 17 00:00:00 2001 From 88c64af0d0f97771df719070e9365211076cb502 Mon Sep 17 00:00:00 2001
From: Ilies CHERGUI <ilies.chergui@gmail.com> From: Ilies CHERGUI <ilies.chergui@gmail.com>
Date: Wed, 30 Mar 2022 23:02:28 +0100 Date: Wed, 30 Mar 2022 23:02:28 +0100
Subject: [PATCH 9/9] camera_v4l2_cuda: add option for setting max frame count Subject: [PATCH 8/8] camera_v4l2_cuda: add option for setting max frame count
to a allow for an automated timed run, instead of interactive. to a allow for an automated timed run, instead of interactive.
Signed-off-by: Matt Madison <matt@madison.systems> Signed-off-by: Matt Madison <matt@madison.systems>
--- ---
samples/12_camera_v4l2_cuda/camera_v4l2_cuda.cpp | 12 +++++++++++- samples/12_v4l2_camera_cuda/camera_v4l2_cuda.cpp | 12 +++++++++++-
samples/12_camera_v4l2_cuda/camera_v4l2_cuda.h | 1 + samples/12_v4l2_camera_cuda/camera_v4l2_cuda.h | 1 +
2 files changed, 12 insertions(+), 1 deletion(-) 2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/samples/12_camera_v4l2_cuda/camera_v4l2_cuda.cpp b/samples/12_camera_v4l2_cuda/camera_v4l2_cuda.cpp diff --git a/samples/12_v4l2_camera_cuda/camera_v4l2_cuda.cpp b/samples/12_v4l2_camera_cuda/camera_v4l2_cuda.cpp
index 44508d3..c755044 100644 index 44508d3..c755044 100644
--- a/samples/12_camera_v4l2_cuda/camera_v4l2_cuda.cpp --- a/samples/12_v4l2_camera_cuda/camera_v4l2_cuda.cpp
+++ b/samples/12_camera_v4l2_cuda/camera_v4l2_cuda.cpp +++ b/samples/12_v4l2_camera_cuda/camera_v4l2_cuda.cpp
@@ -61,6 +61,7 @@ print_usage(void) @@ -61,6 +61,7 @@ print_usage(void)
"\t-f\t\tSet output pixel format of video device (supports only YUYV/YVYU/UYVY/VYUY/GREY/MJPEG)\n" "\t-f\t\tSet output pixel format of video device (supports only YUYV/YVYU/UYVY/VYUY/GREY/MJPEG)\n"
"\t-r\t\tSet renderer frame rate (30 fps by default)\n" "\t-r\t\tSet renderer frame rate (30 fps by default)\n"
@@ -69,10 +69,10 @@ index 44508d3..c755044 100644
} }
} }
diff --git a/samples/12_camera_v4l2_cuda/camera_v4l2_cuda.h b/samples/12_camera_v4l2_cuda/camera_v4l2_cuda.h diff --git a/samples/12_v4l2_camera_cuda/camera_v4l2_cuda.h b/samples/12_v4l2_camera_cuda/camera_v4l2_cuda.h
index 094e6db..d6149f6 100644 index 094e6db..d6149f6 100644
--- a/samples/12_camera_v4l2_cuda/camera_v4l2_cuda.h --- a/samples/12_v4l2_camera_cuda/camera_v4l2_cuda.h
+++ b/samples/12_camera_v4l2_cuda/camera_v4l2_cuda.h +++ b/samples/12_v4l2_camera_cuda/camera_v4l2_cuda.h
@@ -73,6 +73,7 @@ typedef struct @@ -73,6 +73,7 @@ typedef struct
unsigned int cam_h; unsigned int cam_h;
unsigned int frame; unsigned int frame;
@@ -82,5 +82,5 @@ index 094e6db..d6149f6 100644
/* Global buffer ptr */ /* Global buffer ptr */
nv_buffer * g_buff; nv_buffer * g_buff;
-- --
2.32.0 2.34.1

77
recipes-multimedia/argus/tegra-mmapi-samples/0010-samples-apply-fix-for-encoder-unit-test.patch
View File

@@ -1,77 +0,0 @@
From 940988ba215622cfc3c4521124026bcbbe244eeb Mon Sep 17 00:00:00 2001
From: Matt Madison <matt@madison.systems>
Date: Mon, 3 Oct 2022 04:28:28 -0700
Subject: [PATCH] samples: apply fix for encoder unit test
See dev forum post:
https://forums.developer.nvidia.com/t/jetson-multimedia-api-35-1-0-encoder-unit-test-sample-failure/229588
Signed-off-by: Matt Madison <matt@madison.systems>
---
.../encoder_unit_sample.cpp | 26 +------------------
1 file changed, 1 insertion(+), 25 deletions(-)
diff --git a/samples/unittest_samples/encoder_unit_sample/encoder_unit_sample.cpp b/samples/unittest_samples/encoder_unit_sample/encoder_unit_sample.cpp
index 8af65f8..58182fb 100644
--- a/samples/unittest_samples/encoder_unit_sample/encoder_unit_sample.cpp
+++ b/samples/unittest_samples/encoder_unit_sample/encoder_unit_sample.cpp
@@ -809,14 +809,6 @@ encoder_process_blocking(context_t& ctx)
break;
}
- ret_val = NvBufSurfaceMap(nvbuf_surf, 0, j, NVBUF_MAP_READ_WRITE);
- if (ret_val)
- {
- cerr << "NvBufSurfaceMap failed\n" << endl;
- ctx.in_error = 1;
- break;
- }
-
ret_val = NvBufSurfaceSyncForDevice(nvbuf_surf, 0, j);
if (ret_val)
{
@@ -824,14 +816,6 @@ encoder_process_blocking(context_t& ctx)
ctx.in_error = 1;
break;
}
-
- ret_val = NvBufSurfaceUnMap(nvbuf_surf, 0, j);
- if (ret_val)
- {
- cerr << "NvBufSurfaceUnMap failed\n" << endl;
- ctx.in_error = 1;
- break;
- }
}
}
@@ -1154,17 +1138,9 @@ int main (int argc, char const *argv[])
CHECK_ERROR(ret < 0,
"Error while NvBufSurfaceFromFd at output plane", cleanup);
- ret = NvBufSurfaceMap(nvbuf_surf, 0, j, NVBUF_MAP_READ_WRITE);
- CHECK_ERROR(ret < 0,
- "Error while NvBufSurfaceMap at output plane", cleanup);
-
ret = NvBufSurfaceSyncForDevice(nvbuf_surf, 0, j);
CHECK_ERROR(ret < 0,
"Error while NvBufSurfaceSyncForDevice at output plane", cleanup);
-
- ret = NvBufSurfaceUnMap(nvbuf_surf, 0, j);
- CHECK_ERROR(ret < 0,
- "Error while NvBufSurfaceUnMap at output plane", cleanup);
}
}
@@ -1244,7 +1220,7 @@ cleanup:
if (ctx.in_error)
{
- cerr << "Encoder is in error << endl" << endl;
+ cerr << "Encoder is in error" << endl;
}
else
--
2.34.1

15
recipes-multimedia/argus/tegra-mmapi-samples_35.2.1.bb
View File

@@ -3,14 +3,13 @@ DESCRIPTION = "NVIDIA Tegra Multimedia API sample programs"
require recipes-multimedia/argus/tegra-mmapi-${PV}.inc require recipes-multimedia/argus/tegra-mmapi-${PV}.inc
SRC_URI += "\ SRC_URI += "\
file://0001-include-fix-jpeglib-header-inclusion.patch \ file://0002-include-fix-jpeglib-header-inclusion.patch \
file://0002-tools-update-GetPixel.py-to-Python-3.patch \ file://0003-tools-update-GetPixel.py-to-Python-3.patch \
file://0003-samples-classes-fix-a-data-race-in-shutting-down.patch \ file://0004-samples-classes-fix-a-data-race-in-shutting-down-deq.patch \
file://0006-samples-Rework-makefiles-and-rules.patch \ file://0005-samples-Rework-makefiles-and-rules.patch \
file://0007-trt_inference-use-smart-pointers-during-model-conver.patch \ file://0006-trt_inference-use-smart-pointers-during-model-conver.patch \
file://0008-frontend-add-option-to-set-timeout.patch \ file://0007-frontend-add-option-to-set-timeout.patch \
file://0009-camera_v4l2_cuda-add-option-for-setting-max-frame-co.patch \ file://0008-camera_v4l2_cuda-add-option-for-setting-max-frame-co.patch \
file://0010-samples-apply-fix-for-encoder-unit-test.patch \
" "
DEPENDS = "libdrm tegra-mmapi tegra-libraries-camera virtual/egl virtual/libgles1 virtual/libgles2 jpeg expat gstreamer1.0 glib-2.0 libv4l pango" DEPENDS = "libdrm tegra-mmapi tegra-libraries-camera virtual/egl virtual/libgles1 virtual/libgles2 jpeg expat gstreamer1.0 glib-2.0 libv4l pango"