mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-27 09:38:17 +00:00
collectpads: port API changes
This commit is contained in:
parent
7cc4b72550
commit
8643d1caaf
9 changed files with 12 additions and 11 deletions
|
@ -285,7 +285,7 @@ gst_text_overlay_init (GstCairoTextOverlay * overlay,
|
||||||
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_pads_add_pad (overlay->collect,
|
||||||
overlay->video_sinkpad, sizeof (GstCollectData));
|
overlay->video_sinkpad, sizeof (GstCollectData), NULL);
|
||||||
|
|
||||||
/* 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
|
* GstCollectPads; because it sets its own event function giving the
|
||||||
|
@ -641,7 +641,7 @@ gst_text_overlay_text_pad_linked (GstPad * pad, GstPad * peer)
|
||||||
|
|
||||||
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_pads_add_pad (overlay->collect,
|
||||||
overlay->text_sinkpad, sizeof (GstCollectData));
|
overlay->text_sinkpad, sizeof (GstCollectData), NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
overlay->need_render = TRUE;
|
overlay->need_render = TRUE;
|
||||||
|
|
|
@ -977,7 +977,7 @@ gst_avi_mux_request_new_pad (GstElement * element,
|
||||||
g_free (name);
|
g_free (name);
|
||||||
|
|
||||||
avipad->collect = gst_collect_pads_add_pad (avimux->collect,
|
avipad->collect = gst_collect_pads_add_pad (avimux->collect,
|
||||||
newpad, sizeof (GstAviCollectData));
|
newpad, sizeof (GstAviCollectData), NULL);
|
||||||
((GstAviCollectData *) (avipad->collect))->avipad = avipad;
|
((GstAviCollectData *) (avipad->collect))->avipad = avipad;
|
||||||
/* 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
|
* GstCollectPads; because it sets its own event function giving the
|
||||||
|
|
|
@ -565,7 +565,7 @@ gst_flv_mux_request_new_pad (GstElement * element,
|
||||||
|
|
||||||
pad = gst_pad_new_from_template (templ, name);
|
pad = gst_pad_new_from_template (templ, name);
|
||||||
cpad = (GstFlvPad *)
|
cpad = (GstFlvPad *)
|
||||||
gst_collect_pads_add_pad (mux->collect, pad, sizeof (GstFlvPad));
|
gst_collect_pads_add_pad (mux->collect, pad, sizeof (GstFlvPad), NULL);
|
||||||
|
|
||||||
cpad->audio_codec_data = NULL;
|
cpad->audio_codec_data = NULL;
|
||||||
cpad->video_codec_data = NULL;
|
cpad->video_codec_data = NULL;
|
||||||
|
|
|
@ -500,7 +500,8 @@ gst_interleave_request_new_pad (GstElement * element, GstPadTemplate * templ,
|
||||||
gst_pad_set_getcaps_function (new_pad,
|
gst_pad_set_getcaps_function (new_pad,
|
||||||
GST_DEBUG_FUNCPTR (gst_interleave_sink_getcaps));
|
GST_DEBUG_FUNCPTR (gst_interleave_sink_getcaps));
|
||||||
|
|
||||||
gst_collect_pads_add_pad (self->collect, new_pad, sizeof (GstCollectData));
|
gst_collect_pads_add_pad (self->collect, new_pad, sizeof (GstCollectData),
|
||||||
|
NULL);
|
||||||
|
|
||||||
/* 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
|
* GstCollectPads; because it sets its own event function giving the
|
||||||
|
|
|
@ -3418,7 +3418,7 @@ gst_qt_mux_request_new_pad (GstElement * element,
|
||||||
newpad = gst_pad_new_from_template (templ, name);
|
newpad = gst_pad_new_from_template (templ, name);
|
||||||
g_free (name);
|
g_free (name);
|
||||||
collect_pad = (GstQTPad *)
|
collect_pad = (GstQTPad *)
|
||||||
gst_collect_pads_add_pad_full (qtmux->collect, newpad, sizeof (GstQTPad),
|
gst_collect_pads_add_pad (qtmux->collect, newpad, sizeof (GstQTPad),
|
||||||
(GstCollectDataDestroyNotify) (gst_qt_mux_pad_reset));
|
(GstCollectDataDestroyNotify) (gst_qt_mux_pad_reset));
|
||||||
/* set up pad */
|
/* set up pad */
|
||||||
gst_qt_mux_pad_reset (collect_pad);
|
gst_qt_mux_pad_reset (collect_pad);
|
||||||
|
|
|
@ -1901,7 +1901,7 @@ gst_matroska_mux_request_new_pad (GstElement * element,
|
||||||
newpad = gst_pad_new_from_template (templ, pad_name);
|
newpad = gst_pad_new_from_template (templ, pad_name);
|
||||||
g_free (name);
|
g_free (name);
|
||||||
collect_pad = (GstMatroskaPad *)
|
collect_pad = (GstMatroskaPad *)
|
||||||
gst_collect_pads_add_pad_full (mux->collect, newpad,
|
gst_collect_pads_add_pad (mux->collect, newpad,
|
||||||
sizeof (GstMatroskaPad),
|
sizeof (GstMatroskaPad),
|
||||||
(GstCollectDataDestroyNotify) gst_matroska_pad_free);
|
(GstCollectDataDestroyNotify) gst_matroska_pad_free);
|
||||||
|
|
||||||
|
|
|
@ -195,7 +195,7 @@ gst_multipart_mux_request_new_pad (GstElement * element,
|
||||||
|
|
||||||
multipartpad = (GstMultipartPadData *)
|
multipartpad = (GstMultipartPadData *)
|
||||||
gst_collect_pads_add_pad (multipart_mux->collect, newpad,
|
gst_collect_pads_add_pad (multipart_mux->collect, newpad,
|
||||||
sizeof (GstMultipartPadData));
|
sizeof (GstMultipartPadData), NULL);
|
||||||
|
|
||||||
/* save a pointer to our data in the pad */
|
/* save a pointer to our data in the pad */
|
||||||
multipartpad->pad = newpad;
|
multipartpad->pad = newpad;
|
||||||
|
|
|
@ -366,9 +366,9 @@ gst_smpte_init (GstSMPTE * smpte)
|
||||||
gst_collect_pads_start (smpte->collect);
|
gst_collect_pads_start (smpte->collect);
|
||||||
|
|
||||||
gst_collect_pads_add_pad (smpte->collect, smpte->sinkpad1,
|
gst_collect_pads_add_pad (smpte->collect, smpte->sinkpad1,
|
||||||
sizeof (GstCollectData));
|
sizeof (GstCollectData), NULL);
|
||||||
gst_collect_pads_add_pad (smpte->collect, smpte->sinkpad2,
|
gst_collect_pads_add_pad (smpte->collect, smpte->sinkpad2,
|
||||||
sizeof (GstCollectData));
|
sizeof (GstCollectData), NULL);
|
||||||
|
|
||||||
smpte->fps = DEFAULT_PROP_FPS;
|
smpte->fps = DEFAULT_PROP_FPS;
|
||||||
smpte->type = DEFAULT_PROP_TYPE;
|
smpte->type = DEFAULT_PROP_TYPE;
|
||||||
|
|
|
@ -1231,7 +1231,7 @@ gst_videomixer_request_new_pad (GstElement * element,
|
||||||
|
|
||||||
mixcol = (GstVideoMixerCollect *)
|
mixcol = (GstVideoMixerCollect *)
|
||||||
gst_collect_pads_add_pad (mix->collect, GST_PAD (mixpad),
|
gst_collect_pads_add_pad (mix->collect, GST_PAD (mixpad),
|
||||||
sizeof (GstVideoMixerCollect));
|
sizeof (GstVideoMixerCollect), NULL);
|
||||||
|
|
||||||
/* 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
|
* GstCollectPads; because it sets its own event function giving the
|
||||||
|
|
Loading…
Reference in a new issue