mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

onnx: Update to build against 1.16.1

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4916>
This commit is contained in:
Olivier Crête 2023-10-19 16:16:21 -04:00 committed by GStreamer Marge Bot
parent 1ff585233a
commit 62f292ac73
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
subprojects/gst-plugins-bad/ext/onnx/gstonnxclient.cpp
View file

@ -1,6 +1,6 @@
/* /*
* GStreamer gstreamer-onnxclient * GStreamer gstreamer-onnxclient
* Copyright (C) 2021 Collabora Ltd * Copyright (C) 2021-2023 Collabora Ltd
* *
* gstonnxclient.cpp * gstonnxclient.cpp
* *
@ -22,7 +22,7 @@
#include "gstonnxclient.h" #include "gstonnxclient.h"
#include <tensor/gsttensorid.h> #include <tensor/gsttensorid.h>
#include <providers/cpu/cpu_provider_factory.h> #include <cpu_provider_factory.h>
#include <sstream> #include <sstream>
namespace GstOnnxNamespace namespace GstOnnxNamespace

6
subprojects/gst-plugins-bad/ext/onnx/meson.build
View file

@ -3,7 +3,7 @@ if get_option('onnx').disabled()
endif endif
onnxrt_dep = dependency('libonnxruntime', version : '>= 1.15.1', required : get_option('onnx')) onnxrt_dep = dependency('libonnxruntime', version : '>= 1.16.1', required : get_option('onnx'))
extra_args = [] extra_args = []
extra_deps = [] extra_deps = []
@ -13,8 +13,6 @@ if gstcuda_dep.found()
endif endif
if onnxrt_dep.found() if onnxrt_dep.found()
onnxrt_include_root = onnxrt_dep.get_variable('includedir')
onnxrt_includes = [onnxrt_include_root / 'core/session', onnxrt_include_root / 'core']
gstonnx = library('gstonnx', gstonnx = library('gstonnx',
'gstonnx.c', 'gstonnx.c',
'decoders/gstobjectdetectorutils.cpp', 'decoders/gstobjectdetectorutils.cpp',
@ -26,7 +24,7 @@ if onnxrt_dep.found()
c_args : gst_plugins_bad_args + extra_args, c_args : gst_plugins_bad_args + extra_args,
cpp_args : gst_plugins_bad_args + extra_args, cpp_args : gst_plugins_bad_args + extra_args,
link_args : noseh_link_args, link_args : noseh_link_args,
include_directories : [configinc, libsinc, onnxrt_includes, cuda_stubinc], include_directories : [configinc, libsinc, cuda_stubinc],
dependencies : [gstbase_dep, gstvideo_dep, onnxrt_dep, libm] + extra_deps, dependencies : [gstbase_dep, gstvideo_dep, onnxrt_dep, libm] + extra_deps,
install : true, install : true,
install_dir : plugins_install_dir, install_dir : plugins_install_dir,