mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-22 14:06:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3dvideosink: Don't leak all surfaces

Browse source 
This was broken when disabling the buffer pool exporting.

Also disable buffer pool a bit more efficient...
This commit is contained in:
Sebastian Dröge 2014-07-02 10:31:49 +02:00
parent 28d250ec3f
commit 25974ac0a9
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/d3dvideosink/d3dhelpers.c
View file

@ -1881,13 +1881,9 @@ d3d_render_buffer (GstD3DVideoSink * sink, GstBuffer * buf)
surface = ((GstD3DSurfaceMemory *) mem)->surface; surface = ((GstD3DSurfaceMemory *) mem)->surface;
#ifndef DISABLE_BUFFER_POOL
/* Need to keep an additional ref until the next buffer /* Need to keep an additional ref until the next buffer
* to make sure it isn't reused until then */ * to make sure it isn't reused until then */
sink->fallback_buffer = buf; sink->fallback_buffer = buf;
#else
sink->fallback_buffer = NULL;
#endif
} else { } else {
mem = gst_buffer_peek_memory (buf, 0); mem = gst_buffer_peek_memory (buf, 0);
surface = ((GstD3DSurfaceMemory *) mem)->surface; surface = ((GstD3DSurfaceMemory *) mem)->surface;
@ -1900,9 +1896,7 @@ d3d_render_buffer (GstD3DVideoSink * sink, GstBuffer * buf)
if (sink->d3d.surface) if (sink->d3d.surface)
IDirect3DSurface9_Release (sink->d3d.surface); IDirect3DSurface9_Release (sink->d3d.surface);
#ifndef DISABLE_BUFFER_POOL
IDirect3DSurface9_AddRef (surface); IDirect3DSurface9_AddRef (surface);
#endif
sink->d3d.surface = surface; sink->d3d.surface = surface;
if (!d3d_present_swap_chain (sink)) { if (!d3d_present_swap_chain (sink)) {

6
sys/d3dvideosink/d3dvideosink.c
View file

@ -472,6 +472,10 @@ gst_d3dvideosink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL); gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL);
gst_query_add_allocation_meta (query, GST_VIDEO_CROP_META_API_TYPE, NULL); gst_query_add_allocation_meta (query, GST_VIDEO_CROP_META_API_TYPE, NULL);
#ifdef DISABLE_BUFFER_POOL
return TRUE;
#endif
GST_OBJECT_LOCK (sink); GST_OBJECT_LOCK (sink);
pool = sink->pool ? gst_object_ref (sink->pool) : NULL; pool = sink->pool ? gst_object_ref (sink->pool) : NULL;
GST_OBJECT_UNLOCK (sink); GST_OBJECT_UNLOCK (sink);
@ -520,9 +524,7 @@ gst_d3dvideosink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
if (pool) { if (pool) {
/* we need at least 2 buffer because we hold on to the last one */ /* we need at least 2 buffer because we hold on to the last one */
#ifndef DISABLE_BUFFER_POOL
gst_query_add_allocation_pool (query, pool, size, 2, 0); gst_query_add_allocation_pool (query, pool, size, 2, 0);
#endif
gst_object_unref (pool); gst_object_unref (pool);
} }