Skip to content

Commit e0dedc3

Browse files
committed
Merge branch 'release-0.5.3' into main
2 parents e99419b + f899b09 commit e0dedc3

File tree

4 files changed

+21
-15
lines changed

4 files changed

+21
-15
lines changed

README.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,16 @@ cd /opt/edge_ai_apps/docker
4646
cd /opt/edge_ai_apps
4747
./docker_run.sh
4848

49-
#Build the GStreamer plugin
50-
PKG_CONFIG_SYSROOT_DIR=/host PKG_CONFIG_LIBDIR=/host/usr/lib/pkgconfig/ meson build --prefix=/host/usr -Dpkg_config_path=pkgconfig
49+
#Build the tiovx modules
50+
cd /opt/edgeai-tiovx-modules/build
51+
cmake ..
52+
make -j$(nproc)
53+
make install
54+
55+
#Build the GStreamer plugin (same as native build)
56+
meson build --prefix=/usr -Dpkg_config_path=pkgconfig
5157
ninja -C build
5258
ninja -C build install
53-
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/host/usr/lib/edgeai-tiovx-modules/:/host/usr/lib/aarch64-linux-gnu # This will also be needed before running the element in another terminal for example
54-
ldconfig
55-
56-
# Since ninja will install these to the host you'll also need to call the following command before running a pipeline. "/host/usr/lib/aarch64-linux-gnu/gstreamer-1.0/" is not a standard GStreamer installation path
57-
export GST_PLUGIN_PATH=$GST_PLUGIN_PATH:/host/usr/lib/aarch64-linux-gnu/gstreamer-1.0/
5859

5960
#Test plugin is loaded correctly
6061
gst-inspect-1.0 tiovx
@@ -67,7 +68,7 @@ Plugin Details:
6768
Name tiovx
6869
Description GStreamer plugin for TIOVX
6970
Filename /usr/lib/gstreamer-1.0/libgsttiovx.so
70-
Version 0.5.2
71+
Version 0.5.3
7172
License Proprietary
7273
Source module GstTIOVX
7374
Binary package GstTIOVX source release

gst-libs/gst/tiovx/gsttiovxbufferutils.c

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ gst_tiovx_buffer_copy (GstDebugCategory * category, GstBufferPool * pool,
166166
tiovx_tensor_meta->tensor_info.dim_sizes[0] *
167167
tiovx_tensor_meta->tensor_info.dim_sizes[1] *
168168
tiovx_tensor_meta->tensor_info.dim_sizes[2] *
169-
gst_tiovx_tensor_get_tensor_bit_depth (tiovx_tensor_meta->tensor_info.
170-
data_type);
169+
gst_tiovx_tensor_get_tensor_bit_depth (tiovx_tensor_meta->
170+
tensor_info.data_type);
171171
plane_stride_x[0] = 1;
172172
plane_steps_x[0] = 1;
173173

@@ -235,14 +235,18 @@ gst_tiovx_buffer_copy (GstDebugCategory * category, GstBufferPool * pool,
235235
}
236236
}
237237

238-
if (total_copied != in_info.size) {
239-
GST_CAT_ERROR (category,
240-
"Copy and input size don't match. Copy size is :%d and input size is : %lud",
238+
if (total_copied > in_info.size) {
239+
GST_CAT_ERROR (gst_tiovx_buffer_performance,
240+
"Copy size is larger than input size. Copy size is :%d and input size is : %lu.",
241241
total_copied, in_info.size);
242242
if (NULL != out_buffer) {
243243
gst_buffer_unref (out_buffer);
244244
out_buffer = NULL;
245245
}
246+
} else if (total_copied < in_info.size) {
247+
GST_CAT_WARNING (gst_tiovx_buffer_performance,
248+
"Copy size is smaller than input size. Copy size is :%d and input size is : %lu."
249+
" Ignoring remaining lines and processing", total_copied, in_info.size);
246250
}
247251

248252
free:

gst-libs/gst/tiovx/gsttiovxmiso.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,8 @@ gst_tiovx_miso_aggregate (GstAggregator * agg, gboolean timeout)
617617

618618
if (all_pads_eos || eos) {
619619
ret = GST_FLOW_EOS;
620-
goto finish_buffer;
620+
gst_buffer_unref (outbuf);
621+
goto exit;
621622
}
622623

623624
/* Graph processing */

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
project('GstTIOVX', ['c'],
2-
version : '0.5.2',
2+
version : '0.5.3',
33
meson_version : '>= 0.50',)
44

55
project_name = meson.project_name()

0 commit comments

Comments
 (0)