Skip to content

Commit

Permalink
Merge branch 'hotfix/add-new-event-callback'
Browse files Browse the repository at this point in the history
  • Loading branch information
jafet-chaves committed Jan 18, 2022
2 parents cd83b0a + f0f3b8e commit 814982e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Wiki](http://developer.ridgerun.com/wiki/index.php?title=GstInterpipe)
The API reference is uploaded to [GitHub's project
page](http://ridgerun.github.io/gst-interpipe/).

GstInterpipe copyright (C) 2016 RidgeRun LLC
GstInterpipe copyright (C) 2016-2022 RidgeRun LLC

This GStreamer plug-in is free software; you can redistribute it
and/or modify it under the terms of the GNU Lesser General Public
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dnl please read gstreamer/docs/random/autotools before changing this file
dnl initialize autoconf
dnl releases only do -Wall, git and prerelease does -Werror too
dnl use a three digit version number for releases, and four for git/pre
AC_INIT([GstInterpipe],[1.1.7],
AC_INIT([GstInterpipe],[1.1.8],
[http://www.github.com/RidgeRun/gst-interpipe-1.0],
[gst-interpipe],
[http://developer.ridgerun.com/wiki/index.php?title=GstInterpipe])
Expand Down
11 changes: 8 additions & 3 deletions gst/interpipe/gstinterpipesink.c
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,11 @@ gst_inter_pipe_sink_init (GstInterPipeSink * sink)

g_mutex_init (&sink->listeners_mutex);

/* Set the struct buffer to 0's so if in the future more callbacks are added
* does not cause a segmentation fault down the line
*/
memset (&callbacks, 0, sizeof (callbacks));

/* AppSink callbacks */
callbacks.eos = GST_DEBUG_FUNCPTR (gst_inter_pipe_sink_eos);
callbacks.new_sample = GST_DEBUG_FUNCPTR (gst_inter_pipe_sink_new_buffer);
Expand All @@ -220,7 +225,7 @@ gst_inter_pipe_sink_init (GstInterPipeSink * sink)
gst_base_sink_set_sync (GST_BASE_SINK (sink), FALSE);
gst_app_sink_set_max_buffers (GST_APP_SINK (sink), 3);

/* When a change in the interpipesink name happens, the callback function
/* When a change in the interpipesink name happens, the callback function
will update the node name and the nodes list */
g_object_notify (G_OBJECT (sink), "name");

Expand Down Expand Up @@ -747,9 +752,9 @@ gst_inter_pipe_sink_add_listener (GstInterPipeINode * iface,
has_listeners = 0 != g_hash_table_size (listeners);

if (!sink->caps_negotiated && !has_listeners
&& !gst_caps_is_equal (srccaps, sinkcaps)) {
&& !gst_caps_is_equal (srccaps, sinkcaps)) {

if (!gst_pad_push_event (GST_INTER_PIPE_SINK_PAD (sink),
if (!gst_pad_push_event (GST_INTER_PIPE_SINK_PAD (sink),
gst_event_new_reconfigure ()))
goto reconfigure_event_error;

Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project('gst-interpipes', 'c',
version : '1.1.7',
version : '1.1.8',
meson_version : '>= 0.50',)

gst_interpipes_version = meson.project_version()
Expand Down

0 comments on commit 814982e

Please sign in to comment.