From a0d770f2af85e43d3b5582ca5fe30268293fef11 Mon Sep 17 00:00:00 2001 From: mleiva Date: Tue, 1 Sep 2020 14:53:49 -0600 Subject: [PATCH 1/4] Rename element library Plugin library has been changed (libgstinterpipes-1.0.so.1 -> libgstinterpipe.so) in order to remove the plugin version from the name since the version is not required for plugin libraries. Now the name is coherent with the library name created by autotools. --- gst/interpipe/meson.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gst/interpipe/meson.build b/gst/interpipe/meson.build index b627c6e..8f644b9 100644 --- a/gst/interpipe/meson.build +++ b/gst/interpipe/meson.build @@ -17,10 +17,9 @@ gst_interpipes_headers = [ ] # Build plugin library -gst_interpipes_lib = library('gstinterpipes-@0@'.format(apiversion), +gst_interpipes_lib = library('gstinterpipe', gst_interpipes_sources, c_args : gst_c_args, - version : apiversion, include_directories : configinc, install : true, install_dir : plugin_install_dir, From f314914e345b678f6bf13bb9fc5d8e2cde0505c9 Mon Sep 17 00:00:00 2001 From: jcaballeros Date: Wed, 9 Sep 2020 11:14:02 -0600 Subject: [PATCH 2/4] Allow interpipesink to add listener with empty caps If a listener not yet in play state is added to the interpipesink, it is rejected due to its empty caps, instead, it should be added to the listeners list and later when it goes to play, it would take the interpipesink caps. --- gst/interpipe/gstinterpipesink.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gst/interpipe/gstinterpipesink.c b/gst/interpipe/gstinterpipesink.c index cad622b..4e6eeb3 100644 --- a/gst/interpipe/gstinterpipesink.c +++ b/gst/interpipe/gstinterpipesink.c @@ -742,7 +742,7 @@ gst_inter_pipe_sink_add_listener (GstInterPipeINode * iface, gboolean has_listeners; if (!sinkcaps) - goto sinkcaps_null; + goto add_to_list; has_listeners = 0 != g_hash_table_size (listeners); @@ -786,6 +786,7 @@ gst_inter_pipe_sink_add_listener (GstInterPipeINode * iface, if (sinkcaps) gst_caps_unref (sinkcaps); +add_to_list: g_mutex_lock (&sink->listeners_mutex); if (g_hash_table_contains (listeners, listener_name)) goto already_registered; @@ -798,13 +799,6 @@ gst_inter_pipe_sink_add_listener (GstInterPipeINode * iface, return TRUE; /* Errors */ -sinkcaps_null: - { - GST_ERROR_OBJECT (sink, - "Can not add listener %s because our caps are not defined yet", - listener_name); - goto error; - } renegotiate_error: { GST_ERROR_OBJECT (sink, "Can not connect listener, caps do not intersect"); From 2925a18adb00160c4bb55e91837a200c1ecea139 Mon Sep 17 00:00:00 2001 From: jcaballeros Date: Mon, 21 Sep 2020 09:41:37 -0600 Subject: [PATCH 3/4] Downgrade common to 1.12 The latest GStreamer common version was causing a problem with gtkdoc-scan in systems with GStreamer 1.8 - 1.12. To avoid this, we downgrade the to the submodule common to the version for GStreamer 1.12. --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index 88e512c..dd9d403 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 88e512ca7197a45c4114f7fa993108f23245bf50 +Subproject commit dd9d4031075713cf37c656ce639b6d60d6f9dde3 From bcd8ffaca8ff535250fc4bb8445655d0fe1a8ff1 Mon Sep 17 00:00:00 2001 From: jcaballeros Date: Tue, 15 Sep 2020 16:56:41 -0600 Subject: [PATCH 4/4] Bump version to 1.1.3 --- configure.ac | 2 +- gst-interpipe.doap | 10 ++++++++++ meson.build | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 65cbb6f..1f750a4 100644 --- a/configure.ac +++ b/configure.ac @@ -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.2], +AC_INIT([GstInterpipe],[1.1.3], [http://www.github.com/RidgeRun/gst-interpipe-1.0], [gst-interpipe], [http://developer.ridgerun.com/wiki/index.php?title=GstInterpipe]) diff --git a/gst-interpipe.doap b/gst-interpipe.doap index 4c04fe1..8dd5865 100644 --- a/gst-interpipe.doap +++ b/gst-interpipe.doap @@ -30,6 +30,16 @@ GstInterpipe is a plug-in with two elements which allow the communication betwee + + + 1.1.3 + master + + 2020-09-15 + + + + 1.1.2 diff --git a/meson.build b/meson.build index 08dee92..78bbd81 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gst-interpipes', 'c', - version : '1.1.2', + version : '1.1.3', meson_version : '>= 0.50',) gst_interpipes_version = meson.project_version()