From f2e9c13e3fc87bcea21071610801c0ae16c03e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 15 Dec 2005 09:48:19 +0000 Subject: [PATCH] gst/playback/: Make sure the video frame buffer we return to apps via the "frame" property always has caps set on it.... Original commit message from CVS: * gst/playback/gstplaybasebin.c: * gst/playback/gstplaybin.c: (handoff): Make sure the video frame buffer we return to apps via the "frame" property always has caps set on it. Modify _gst_gvalue_set_object() macro to handle NULL objects gracefully too. --- ChangeLog | 9 +++++++++ gst/playback/gstplaybasebin.c | 10 +++++++--- gst/playback/gstplaybin.c | 25 +++++++++++++++++++------ 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index ade7af7f8c..4194584927 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-12-15 Tim-Philipp Müller + + * gst/playback/gstplaybasebin.c: + * gst/playback/gstplaybin.c: (handoff): + Make sure the video frame buffer we return to apps via the + "frame" property always has caps set on it. Modify + _gst_gvalue_set_object() macro to handle NULL objects + gracefully too. + 2005-12-14 Stefan Kost * gst/audiotestsrc/gstaudiotestsrc.c: diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c index b5fbd7e2b6..0496212c8f 100644 --- a/gst/playback/gstplaybasebin.c +++ b/gst/playback/gstplaybasebin.c @@ -40,9 +40,13 @@ GST_DEBUG_CATEGORY_STATIC (gst_play_base_bin_debug); #ifndef GST_HAVE_GLIB_2_8 #define _gst_gvalue_set_gstobject(gvalue,obj) \ - gst_object_ref (obj); \ - g_value_set_object (gvalue, obj); \ - g_object_unref (obj); + if (obj != NULL) { \ + gst_object_ref (obj); \ + g_value_set_object (gvalue, obj); \ + g_object_unref (obj); \ + } else { \ + g_value_set_object (gvalue, NULL); \ + } #else #define _gst_gvalue_set_gstobject(gvalue,obj) \ g_value_set_object (gvalue, obj); diff --git a/gst/playback/gstplaybin.c b/gst/playback/gstplaybin.c index 10de1a5df0..733c981ebd 100644 --- a/gst/playback/gstplaybin.c +++ b/gst/playback/gstplaybin.c @@ -41,9 +41,13 @@ GST_DEBUG_CATEGORY_STATIC (gst_play_bin_debug); #ifndef GST_HAVE_GLIB_2_8 #define _gst_gvalue_set_gstobject(gvalue,obj) \ - gst_object_ref (obj); \ - g_value_set_object (gvalue, obj); \ - g_object_unref (obj); + if (obj != NULL) { \ + gst_object_ref (obj); \ + g_value_set_object (gvalue, obj); \ + g_object_unref (obj); \ + } else { \ + g_value_set_object (gvalue, NULL); \ + } #else #define _gst_gvalue_set_gstobject(gvalue,obj) \ g_value_set_object (gvalue, obj); @@ -368,10 +372,19 @@ handoff (GstElement * identity, GstBuffer * frame, gpointer data) { GstPlayBin *play_bin = GST_PLAY_BIN (data); - if (play_bin->frame) { - gst_buffer_unref (play_bin->frame); + gst_mini_object_replace ((GstMiniObject **) & play_bin->frame, + GST_MINI_OBJECT_CAST (frame)); + + /* applications need to know the buffer caps, + * make sure they are always set on the frame */ + if (GST_BUFFER_CAPS (play_bin->frame) == NULL) { + GstPad *pad; + + if ((pad = gst_element_get_pad (identity, "sink"))) { + gst_buffer_set_caps (play_bin->frame, GST_PAD_CAPS (pad)); + gst_object_unref (pad); + } } - play_bin->frame = gst_buffer_ref (frame); } /* make the element (bin) that contains the elements needed to perform