mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

collectpads2: rename to collectpads

Browse source
This commit is contained in:
Mark Nauwelaerts 2012-04-17 15:36:12 +02:00
parent 09ee556c84
commit 5c9d454517
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
ext/ffmpeg/gstffmpegmux.c
View file

@ -29,7 +29,7 @@
#endif #endif
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstcollectpads2.h> #include <gst/base/gstcollectpads.h>
#include "gstffmpeg.h" #include "gstffmpeg.h"
#include "gstffmpegcodecmap.h" #include "gstffmpegcodecmap.h"
@ -40,7 +40,7 @@ typedef struct _GstFFMpegMuxPad GstFFMpegMuxPad;
struct _GstFFMpegMuxPad struct _GstFFMpegMuxPad
{ {
GstCollectData2 collect; /* we extend the CollectData2 */ GstCollectData collect; /* we extend the CollectData */
gint padnum; gint padnum;
}; };
@ -49,7 +49,7 @@ struct _GstFFMpegMux
{ {
GstElement element; GstElement element;
GstCollectPads2 *collect; GstCollectPads *collect;
/* We need to keep track of our pads, so we do so here. */ /* We need to keep track of our pads, so we do so here. */
GstPad *srcpad; GstPad *srcpad;
@ -114,7 +114,7 @@ static void gst_ffmpegmux_finalize (GObject * object);
static gboolean gst_ffmpegmux_setcaps (GstPad * pad, GstCaps * caps); static gboolean gst_ffmpegmux_setcaps (GstPad * pad, GstCaps * caps);
static GstPad *gst_ffmpegmux_request_new_pad (GstElement * element, static GstPad *gst_ffmpegmux_request_new_pad (GstElement * element,
GstPadTemplate * templ, const gchar * name, const GstCaps * caps); GstPadTemplate * templ, const gchar * name, const GstCaps * caps);
static GstFlowReturn gst_ffmpegmux_collected (GstCollectPads2 * pads, static GstFlowReturn gst_ffmpegmux_collected (GstCollectPads * pads,
gpointer user_data); gpointer user_data);
static gboolean gst_ffmpegmux_sink_event (GstPad * pad, GstObject * parent, static gboolean gst_ffmpegmux_sink_event (GstPad * pad, GstObject * parent,
@ -329,9 +329,9 @@ gst_ffmpegmux_init (GstFFMpegMux * ffmpegmux, GstFFMpegMuxClass * g_class)
gst_pad_set_caps (ffmpegmux->srcpad, gst_pad_template_get_caps (templ)); gst_pad_set_caps (ffmpegmux->srcpad, gst_pad_template_get_caps (templ));
gst_element_add_pad (GST_ELEMENT (ffmpegmux), ffmpegmux->srcpad); gst_element_add_pad (GST_ELEMENT (ffmpegmux), ffmpegmux->srcpad);
ffmpegmux->collect = gst_collect_pads2_new (); ffmpegmux->collect = gst_collect_pads_new ();
gst_collect_pads2_set_function (ffmpegmux->collect, gst_collect_pads_set_function (ffmpegmux->collect,
(GstCollectPads2Function) gst_ffmpegmux_collected, ffmpegmux); (GstCollectPadsFunction) gst_ffmpegmux_collected, ffmpegmux);
ffmpegmux->context = g_new0 (AVFormatContext, 1); ffmpegmux->context = g_new0 (AVFormatContext, 1);
ffmpegmux->context->oformat = oclass->in_plugin; ffmpegmux->context->oformat = oclass->in_plugin;
@ -437,7 +437,7 @@ gst_ffmpegmux_request_new_pad (GstElement * element,
/* create pad */ /* create pad */
pad = gst_pad_new_from_template (templ, padname); pad = gst_pad_new_from_template (templ, padname);
collect_pad = (GstFFMpegMuxPad *) collect_pad = (GstFFMpegMuxPad *)
gst_collect_pads2_add_pad (ffmpegmux->collect, pad, gst_collect_pads_add_pad (ffmpegmux->collect, pad,
sizeof (GstFFMpegMuxPad)); sizeof (GstFFMpegMuxPad));
collect_pad->padnum = ffmpegmux->context->nb_streams; collect_pad->padnum = ffmpegmux->context->nb_streams;
@ -543,7 +543,7 @@ beach:
} }
static GstFlowReturn static GstFlowReturn
gst_ffmpegmux_collected (GstCollectPads2 * pads, gpointer user_data) gst_ffmpegmux_collected (GstCollectPads * pads, gpointer user_data)
{ {
GstFFMpegMux *ffmpegmux = (GstFFMpegMux *) user_data; GstFFMpegMux *ffmpegmux = (GstFFMpegMux *) user_data;
GSList *collected; GSList *collected;
@ -592,8 +592,8 @@ gst_ffmpegmux_collected (GstCollectPads2 * pads, gpointer user_data)
/* FIXME : This doesn't work for RAW AUDIO... /* FIXME : This doesn't work for RAW AUDIO...
* in fact I'm wondering if it even works for any kind of audio... */ * in fact I'm wondering if it even works for any kind of audio... */
buffer = gst_collect_pads2_peek (ffmpegmux->collect, buffer = gst_collect_pads_peek (ffmpegmux->collect,
(GstCollectData2 *) collect_pad); (GstCollectData *) collect_pad);
if (buffer) { if (buffer) {
st->codec->frame_size = st->codec->frame_size =
st->codec->sample_rate * st->codec->sample_rate *
@ -686,8 +686,8 @@ gst_ffmpegmux_collected (GstCollectPads2 * pads, gpointer user_data)
for (collected = ffmpegmux->collect->data; collected; for (collected = ffmpegmux->collect->data; collected;
collected = g_slist_next (collected)) { collected = g_slist_next (collected)) {
GstFFMpegMuxPad *collect_pad = (GstFFMpegMuxPad *) collected->data; GstFFMpegMuxPad *collect_pad = (GstFFMpegMuxPad *) collected->data;
GstBuffer *buffer = gst_collect_pads2_peek (ffmpegmux->collect, GstBuffer *buffer = gst_collect_pads_peek (ffmpegmux->collect,
(GstCollectData2 *) collect_pad); (GstCollectData *) collect_pad);
/* if there's no buffer, just continue */ /* if there's no buffer, just continue */
if (buffer == NULL) { if (buffer == NULL) {
@ -724,8 +724,8 @@ gst_ffmpegmux_collected (GstCollectPads2 * pads, gpointer user_data)
GstMapInfo map; GstMapInfo map;
/* push out current buffer */ /* push out current buffer */
buf = gst_collect_pads2_pop (ffmpegmux->collect, buf =
(GstCollectData2 *) best_pad); gst_collect_pads_pop (ffmpegmux->collect, (GstCollectData *) best_pad);
ffmpegmux->context->streams[best_pad->padnum]->codec->frame_number++; ffmpegmux->context->streams[best_pad->padnum]->codec->frame_number++;
@ -802,12 +802,12 @@ gst_ffmpegmux_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
gst_collect_pads2_start (ffmpegmux->collect); gst_collect_pads_start (ffmpegmux->collect);
break; break;
case GST_STATE_CHANGE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break; break;
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_collect_pads2_stop (ffmpegmux->collect); gst_collect_pads_stop (ffmpegmux->collect);
break; break;
default: default:
break; break;