FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

cairotextoverlay: port to GstCollectPads2

Browse Source
This commit is contained in:
Vincent Penquerc'h 2011-12-14 18:34:25 +00:00
parent ebfc77da19
commit cf344d50b1
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ext/cairo/gsttextoverlay.c
View File

@ -106,7 +106,7 @@ static gboolean gst_text_overlay_setcaps (GstPad * pad, GstCaps * caps);
static GstPadLinkReturn gst_text_overlay_text_pad_linked (GstPad * pad, static GstPadLinkReturn gst_text_overlay_text_pad_linked (GstPad * pad,
GstPad * peer); GstPad * peer);
static void gst_text_overlay_text_pad_unlinked (GstPad * pad); static void gst_text_overlay_text_pad_unlinked (GstPad * pad);
static GstFlowReturn gst_text_overlay_collected (GstCollectPads * pads, static GstFlowReturn gst_text_overlay_collected (GstCollectPads2 * pads,
gpointer data); gpointer data);
static void gst_text_overlay_finalize (GObject * object); static void gst_text_overlay_finalize (GObject * object);
static void gst_text_overlay_font_init (GstCairoTextOverlay * overlay); static void gst_text_overlay_font_init (GstCairoTextOverlay * overlay);
@ -215,7 +215,7 @@ gst_text_overlay_finalize (GObject * object)
{ {
GstCairoTextOverlay *overlay = GST_CAIRO_TEXT_OVERLAY (object); GstCairoTextOverlay *overlay = GST_CAIRO_TEXT_OVERLAY (object);
gst_collect_pads_stop (overlay->collect); gst_collect_pads2_stop (overlay->collect);
gst_object_unref (overlay->collect); gst_object_unref (overlay->collect);
g_free (overlay->text_fill_image); g_free (overlay->text_fill_image);
@ -279,16 +279,16 @@ gst_text_overlay_init (GstCairoTextOverlay * overlay,
overlay->fps_n = 0; overlay->fps_n = 0;
overlay->fps_d = 1; overlay->fps_d = 1;
overlay->collect = gst_collect_pads_new (); overlay->collect = gst_collect_pads2_new ();
gst_collect_pads_set_function (overlay->collect, gst_collect_pads2_set_function (overlay->collect,
GST_DEBUG_FUNCPTR (gst_text_overlay_collected), overlay); GST_DEBUG_FUNCPTR (gst_text_overlay_collected), overlay);
overlay->video_collect_data = gst_collect_pads_add_pad (overlay->collect, overlay->video_collect_data = gst_collect_pads2_add_pad (overlay->collect,
overlay->video_sinkpad, sizeof (GstCollectData)); overlay->video_sinkpad, sizeof (GstCollectData2));
/* FIXME: hacked way to override/extend the event function of /* FIXME: hacked way to override/extend the event function of
* GstCollectPads; because it sets its own event function giving the * GstCollectPads2; because it sets its own event function giving the
* element no access to events. Nicked from avimux. */ * element no access to events. Nicked from avimux. */
overlay->collect_event = overlay->collect_event =
(GstPadEventFunction) GST_PAD_EVENTFUNC (overlay->video_sinkpad); (GstPadEventFunction) GST_PAD_EVENTFUNC (overlay->video_sinkpad);
@ -640,8 +640,8 @@ gst_text_overlay_text_pad_linked (GstPad * pad, GstPad * peer)
GST_DEBUG_OBJECT (overlay, "Text pad linked"); GST_DEBUG_OBJECT (overlay, "Text pad linked");
if (overlay->text_collect_data == NULL) { if (overlay->text_collect_data == NULL) {
overlay->text_collect_data = gst_collect_pads_add_pad (overlay->collect, overlay->text_collect_data = gst_collect_pads2_add_pad (overlay->collect,
overlay->text_sinkpad, sizeof (GstCollectData)); overlay->text_sinkpad, sizeof (GstCollectData2));
} }
overlay->need_render = TRUE; overlay->need_render = TRUE;
@ -660,7 +660,7 @@ gst_text_overlay_text_pad_unlinked (GstPad * pad)
GST_DEBUG_OBJECT (overlay, "Text pad unlinked"); GST_DEBUG_OBJECT (overlay, "Text pad unlinked");
if (overlay->text_collect_data) { if (overlay->text_collect_data) {
gst_collect_pads_remove_pad (overlay->collect, overlay->text_sinkpad); gst_collect_pads2_remove_pad (overlay->collect, overlay->text_sinkpad);
overlay->text_collect_data = NULL; overlay->text_collect_data = NULL;
} }
@ -807,7 +807,7 @@ gst_text_overlay_pop_video (GstCairoTextOverlay * overlay)
{ {
GstBuffer *buf; GstBuffer *buf;
buf = gst_collect_pads_pop (overlay->collect, overlay->video_collect_data); buf = gst_collect_pads2_pop (overlay->collect, overlay->video_collect_data);
g_return_if_fail (buf != NULL); g_return_if_fail (buf != NULL);
gst_buffer_unref (buf); gst_buffer_unref (buf);
} }
@ -818,7 +818,7 @@ gst_text_overlay_pop_text (GstCairoTextOverlay * overlay)
GstBuffer *buf; GstBuffer *buf;
if (overlay->text_collect_data) { if (overlay->text_collect_data) {
buf = gst_collect_pads_pop (overlay->collect, overlay->text_collect_data); buf = gst_collect_pads2_pop (overlay->collect, overlay->text_collect_data);
g_return_if_fail (buf != NULL); g_return_if_fail (buf != NULL);
gst_buffer_unref (buf); gst_buffer_unref (buf);
} }
@ -828,7 +828,7 @@ gst_text_overlay_pop_text (GstCairoTextOverlay * overlay)
/* This function is called when there is data on all pads */ /* This function is called when there is data on all pads */
static GstFlowReturn static GstFlowReturn
gst_text_overlay_collected (GstCollectPads * pads, gpointer data) gst_text_overlay_collected (GstCollectPads2 * pads, gpointer data)
{ {
GstCairoTextOverlay *overlay; GstCairoTextOverlay *overlay;
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
@ -842,14 +842,14 @@ gst_text_overlay_collected (GstCollectPads * pads, gpointer data)
GST_DEBUG ("Collecting"); GST_DEBUG ("Collecting");
video_frame = gst_collect_pads_peek (overlay->collect, video_frame = gst_collect_pads2_peek (overlay->collect,
overlay->video_collect_data); overlay->video_collect_data);
/* send EOS if video stream EOSed regardless of text stream */ /* send EOS if video stream EOSed regardless of text stream */
if (video_frame == NULL) { if (video_frame == NULL) {
GST_DEBUG ("Video stream at EOS"); GST_DEBUG ("Video stream at EOS");
if (overlay->text_collect_data) { if (overlay->text_collect_data) {
text_buf = gst_collect_pads_pop (overlay->collect, text_buf = gst_collect_pads2_pop (overlay->collect,
overlay->text_collect_data); overlay->text_collect_data);
} }
gst_pad_push_event (overlay->srcpad, gst_event_new_eos ()); gst_pad_push_event (overlay->srcpad, gst_event_new_eos ());
@ -892,7 +892,7 @@ gst_text_overlay_collected (GstCollectPads * pads, gpointer data)
goto done; goto done;
} }
text_buf = gst_collect_pads_peek (overlay->collect, text_buf = gst_collect_pads2_peek (overlay->collect,
overlay->text_collect_data); overlay->text_collect_data);
/* just push the video frame if the text stream has EOSed */ /* just push the video frame if the text stream has EOSed */
@ -1004,7 +1004,7 @@ gst_text_overlay_video_event (GstPad * pad, GstEvent * event)
gst_pad_push_event (overlay->srcpad, event); gst_pad_push_event (overlay->srcpad, event);
} }
/* now GstCollectPads can take care of the rest, e.g. EOS */ /* now GstCollectPads2 can take care of the rest, e.g. EOS */
ret = overlay->collect_event (pad, event); ret = overlay->collect_event (pad, event);
gst_object_unref (overlay); gst_object_unref (overlay);
return ret; return ret;
@ -1018,12 +1018,12 @@ gst_text_overlay_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
gst_collect_pads_start (overlay->collect); gst_collect_pads2_start (overlay->collect);
break; break;
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
/* need to unblock the collectpads before calling the /* need to unblock the collectpads before calling the
* parent change_state so that streaming can finish */ * parent change_state so that streaming can finish */
gst_collect_pads_stop (overlay->collect); gst_collect_pads2_stop (overlay->collect);
break; break;
default: default:
break; break;

8
ext/cairo/gsttextoverlay.h
View File

@ -3,7 +3,7 @@
#define __GST_CAIRO_TEXT_OVERLAY_H__ #define __GST_CAIRO_TEXT_OVERLAY_H__
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstcollectpads.h> #include <gst/base/gstcollectpads2.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -45,9 +45,9 @@ struct _GstCairoTextOverlay {
GstPad *text_sinkpad; GstPad *text_sinkpad;
GstPad *srcpad; GstPad *srcpad;
GstCollectPads *collect; GstCollectPads2 *collect;
GstCollectData *video_collect_data; GstCollectData2 *video_collect_data;
GstCollectData *text_collect_data; GstCollectData2 *text_collect_data;
GstPadEventFunction collect_event; GstPadEventFunction collect_event;
gint width; gint width;