caopengllayersink: Don't cache buffer pool

Pools cannot be used by the two elements at the same time.

https://bugzilla.gnome.org/show_bug.cgi?id=766611

diff --git a/ext/gl/caopengllayersink.h b/ext/gl/caopengllayersink.h
index b28eb3f9151b735014e4981cd194f0b244d3306c..e3de325d2ee3167fa9ae382b32c258820c64db14 100644 (file)
--- a/ext/gl/caopengllayersink.h
+++ b/ext/gl/caopengllayersink.h
@@ -66,8 +66,6 @@ struct _GstCAOpenGLLayerSink
     volatile gint to_quit;
     gboolean keep_aspect_ratio;
 
-    GstBufferPool *pool;
-
     /* avoid replacing the stored_buffer while drawing */
     GMutex drawing_lock;
     GstBuffer *stored_buffer;

diff --git a/ext/gl/caopengllayersink.m b/ext/gl/caopengllayersink.m
index ab1e0841ed1faefd253bb31c966597397c0984e4..83cb827c02addada0c668e7e392d8d121dcbcf0d 100644 (file)
--- a/ext/gl/caopengllayersink.m
+++ b/ext/gl/caopengllayersink.m
@@ -249,7 +249,6 @@ gst_ca_opengl_layer_sink_init (GstCAOpenGLLayerSink * ca_sink)
 {
   ca_sink->display = NULL;
   ca_sink->keep_aspect_ratio = TRUE;
-  ca_sink->pool = NULL;
   ca_sink->stored_buffer = NULL;
   ca_sink->redisplay_texture = 0;
 
@@ -454,11 +453,6 @@ gst_ca_opengl_layer_sink_stop (GstBaseSink * bsink)
 {
   GstCAOpenGLLayerSink *ca_sink = GST_CA_OPENGL_LAYER_SINK (bsink);
 
-  if (ca_sink->pool) {
-    gst_object_unref (ca_sink->pool);
-    ca_sink->pool = NULL;
-  }
-
   if (ca_sink->gl_caps) {
     gst_caps_unref (ca_sink->gl_caps);
     ca_sink->gl_caps = NULL;
@@ -531,12 +525,6 @@ gst_ca_opengl_layer_sink_change_state (GstElement * element, GstStateChange tran
       gst_buffer_replace (&ca_sink->next_sync, NULL);
       GST_CA_OPENGL_LAYER_SINK_UNLOCK (ca_sink);
 
-      if (ca_sink->pool) {
-        gst_buffer_pool_set_active (ca_sink->pool, FALSE);
-        gst_object_unref (ca_sink->pool);
-        ca_sink->pool = NULL;
-      }
-
       GST_VIDEO_SINK_WIDTH (ca_sink) = 1;
       GST_VIDEO_SINK_HEIGHT (ca_sink) = 1;
       if (ca_sink->context) {
@@ -765,6 +753,7 @@ static gboolean
 gst_ca_opengl_layer_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
 {
   GstCAOpenGLLayerSink *ca_sink = GST_CA_OPENGL_LAYER_SINK (bsink);
+  GstBufferPool *pool = NULL;
   GstStructure *config;
   GstCaps *caps;
   guint size;
@@ -787,36 +776,18 @@ gst_ca_opengl_layer_sink_propose_allocation (GstBaseSink * bsink, GstQuery * que
     /* the normal size of a frame */
     size = info.size;
 
-    if (ca_sink->pool) {
-      GstCaps *pcaps;
-
-      /* we had a pool, check caps */
-      GST_DEBUG_OBJECT (ca_sink, "check existing pool caps");
-      config = gst_buffer_pool_get_config (ca_sink->pool);
-      gst_buffer_pool_config_get_params (config, &pcaps, &size, NULL, NULL);
+    GST_DEBUG_OBJECT (ca_sink, "create new pool");
 
-      if (!gst_caps_is_equal (caps, pcaps)) {
-        GST_DEBUG_OBJECT (ca_sink, "pool has different caps");
-        /* different caps, we can't use this pool */
-        gst_object_unref (ca_sink->pool);
-        ca_sink->pool = NULL;
-      }
-      gst_structure_free (config);
-    }
-
-    if (ca_sink->pool == NULL) {
-      GST_DEBUG_OBJECT (ca_sink, "create new pool");
+    pool = gst_gl_buffer_pool_new (ca_sink->context);
+    config = gst_buffer_pool_get_config (pool);
+    gst_buffer_pool_config_set_params (config, caps, size, 0, 0);
 
-      ca_sink->pool = gst_gl_buffer_pool_new (ca_sink->context);
-      config = gst_buffer_pool_get_config (ca_sink->pool);
-      gst_buffer_pool_config_set_params (config, caps, size, 0, 0);
-
-      if (!gst_buffer_pool_set_config (ca_sink->pool, config))
+    if (!gst_buffer_pool_set_config (pool, config))
         goto config_failed;
-    }
 
     /* we need at least 2 buffer because we hold on to the last one */
-    gst_query_add_allocation_pool (query, ca_sink->pool, size, 2, 0);
+    gst_query_add_allocation_pool (query, pool, size, 2, 0);
+    gst_object_unref (pool);
   }
 
   if (ca_sink->context->gl_vtable->FenceSync)