nicesink: unblock pending write on component change
authorJakub Adam <jakub.adam@ktknet.cz>
Thu, 25 Sep 2014 13:50:30 +0000 (15:50 +0200)
committerOlivier CrĂȘte <olivier.crete@collabora.com>
Thu, 29 Jan 2015 03:32:31 +0000 (22:32 -0500)
When a nicesink switches to a different component, we should unblock any
pending write waiting in gst_nice_sink_render() for writable_cond being
signalled because if the new transport already is writable, we'll never
get notified about the condition and thus nicesink will wait forever.

That way, either the pending data are immediately sent or the nicesink
blocks again until the transport becomes writable.

gst/gstnicesink.c

index 80cca40..a6f099d 100644 (file)
@@ -1,3 +1,4 @@
+
 /*
  * This file is part of the Nice GLib ICE library.
  *
@@ -301,9 +302,15 @@ gst_nice_sink_set_property (
       break;
 
     case PROP_COMPONENT:
-      GST_OBJECT_LOCK (sink);
-      sink->component_id = g_value_get_uint (value);
-      GST_OBJECT_UNLOCK (sink);
+      {
+        guint new_component_id = g_value_get_uint (value);
+        GST_OBJECT_LOCK (sink);
+        if (sink->component_id != new_component_id) {
+          sink->component_id = new_component_id;
+          g_cond_broadcast (&sink->writable_cond);
+        }
+        GST_OBJECT_UNLOCK (sink);
+      }
       break;
 
     default: