Commit 249d0083 authored by Wim Taymans's avatar Wim Taymans

update for base class rename

parent 3d9d2c6c
......@@ -92,13 +92,13 @@ GST_STATIC_PAD_TEMPLATE ("sink",
);
#define gst_rtp_xqt_depay_parent_class parent_class
G_DEFINE_TYPE (GstRtpXQTDepay, gst_rtp_xqt_depay, GST_TYPE_BASE_RTP_DEPAYLOAD);
G_DEFINE_TYPE (GstRtpXQTDepay, gst_rtp_xqt_depay, GST_TYPE_RTP_BASE_DEPAYLOAD);
static void gst_rtp_xqt_depay_finalize (GObject * object);
static gboolean gst_rtp_xqt_depay_setcaps (GstBaseRTPDepayload * depayload,
static gboolean gst_rtp_xqt_depay_setcaps (GstRTPBaseDepayload * depayload,
GstCaps * caps);
static GstBuffer *gst_rtp_xqt_depay_process (GstBaseRTPDepayload * depayload,
static GstBuffer *gst_rtp_xqt_depay_process (GstRTPBaseDepayload * depayload,
GstBuffer * buf);
static GstStateChangeReturn gst_rtp_xqt_depay_change_state (GstElement *
......@@ -110,11 +110,11 @@ gst_rtp_xqt_depay_class_init (GstRtpXQTDepayClass * klass)
{
GObjectClass *gobject_class;
GstElementClass *gstelement_class;
GstBaseRTPDepayloadClass *gstbasertpdepayload_class;
GstRTPBaseDepayloadClass *gstrtpbasedepayload_class;
gobject_class = (GObjectClass *) klass;
gstelement_class = (GstElementClass *) klass;
gstbasertpdepayload_class = (GstBaseRTPDepayloadClass *) klass;
gstrtpbasedepayload_class = (GstRTPBaseDepayloadClass *) klass;
parent_class = g_type_class_peek_parent (klass);
......@@ -122,8 +122,8 @@ gst_rtp_xqt_depay_class_init (GstRtpXQTDepayClass * klass)
gstelement_class->change_state = gst_rtp_xqt_depay_change_state;
gstbasertpdepayload_class->set_caps = gst_rtp_xqt_depay_setcaps;
gstbasertpdepayload_class->process = gst_rtp_xqt_depay_process;
gstrtpbasedepayload_class->set_caps = gst_rtp_xqt_depay_setcaps;
gstrtpbasedepayload_class->process = gst_rtp_xqt_depay_process;
GST_DEBUG_CATEGORY_INIT (rtpxqtdepay_debug, "rtpxqtdepay", 0,
"QT Media RTP Depayloader");
......@@ -213,7 +213,7 @@ gst_rtp_quicktime_parse_sd (GstRtpXQTDepay * rtpxqtdepay, guint8 * data,
caps = gst_caps_new_simple ("video/x-h264",
"codec_data", GST_TYPE_BUFFER, buf, NULL);
gst_buffer_unref (buf);
gst_pad_set_caps (GST_BASE_RTP_DEPAYLOAD (rtpxqtdepay)->srcpad, caps);
gst_pad_set_caps (GST_RTP_BASE_DEPAYLOAD (rtpxqtdepay)->srcpad, caps);
gst_caps_unref (caps);
break;
}
......@@ -235,7 +235,7 @@ too_short:
}
static gboolean
gst_rtp_xqt_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
gst_rtp_xqt_depay_setcaps (GstRTPBaseDepayload * depayload, GstCaps * caps)
{
GstStructure *structure;
gint clock_rate = 90000; /* default */
......@@ -249,7 +249,7 @@ gst_rtp_xqt_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
}
static GstBuffer *
gst_rtp_xqt_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
gst_rtp_xqt_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf)
{
GstRtpXQTDepay *rtpxqtdepay;
GstBuffer *outbuf = NULL;
......@@ -597,7 +597,7 @@ gst_rtp_xqt_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
if (!s)
GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DELTA_UNIT);
gst_base_rtp_depayload_push (depayload, outbuf);
gst_rtp_base_depayload_push (depayload, outbuf);
/* aligned on 32 bit boundary */
slen = GST_ROUND_UP_4 (slen);
......
......@@ -42,7 +42,7 @@ typedef struct _GstRtpXQTDepayClass GstRtpXQTDepayClass;
struct _GstRtpXQTDepay
{
GstBaseRTPDepayload depayload;
GstRTPBaseDepayload depayload;
GstAdapter *adapter;
......@@ -54,7 +54,7 @@ struct _GstRtpXQTDepay
struct _GstRtpXQTDepayClass
{
GstBaseRTPDepayloadClass parent_class;
GstRTPBaseDepayloadClass parent_class;
};
GType gst_rtp_xqt_depay_get_type (void);
......
......@@ -65,24 +65,24 @@ static GstStaticPadTemplate gst_rtp_L16_depay_sink_template =
);
#define gst_rtp_L16_depay_parent_class parent_class
G_DEFINE_TYPE (GstRtpL16Depay, gst_rtp_L16_depay, GST_TYPE_BASE_RTP_DEPAYLOAD);
G_DEFINE_TYPE (GstRtpL16Depay, gst_rtp_L16_depay, GST_TYPE_RTP_BASE_DEPAYLOAD);
static gboolean gst_rtp_L16_depay_setcaps (GstBaseRTPDepayload * depayload,
static gboolean gst_rtp_L16_depay_setcaps (GstRTPBaseDepayload * depayload,
GstCaps * caps);
static GstBuffer *gst_rtp_L16_depay_process (GstBaseRTPDepayload * depayload,
static GstBuffer *gst_rtp_L16_depay_process (GstRTPBaseDepayload * depayload,
GstBuffer * buf);
static void
gst_rtp_L16_depay_class_init (GstRtpL16DepayClass * klass)
{
GstElementClass *gstelement_class;
GstBaseRTPDepayloadClass *gstbasertpdepayload_class;
GstRTPBaseDepayloadClass *gstrtpbasedepayload_class;
gstelement_class = (GstElementClass *) klass;
gstbasertpdepayload_class = (GstBaseRTPDepayloadClass *) klass;
gstrtpbasedepayload_class = (GstRTPBaseDepayloadClass *) klass;
gstbasertpdepayload_class->set_caps = gst_rtp_L16_depay_setcaps;
gstbasertpdepayload_class->process = gst_rtp_L16_depay_process;
gstrtpbasedepayload_class->set_caps = gst_rtp_L16_depay_setcaps;
gstrtpbasedepayload_class->process = gst_rtp_L16_depay_process;
gst_element_class_add_pad_template (gstelement_class,
gst_static_pad_template_get (&gst_rtp_L16_depay_src_template));
......@@ -121,7 +121,7 @@ gst_rtp_L16_depay_parse_int (GstStructure * structure, const gchar * field,
}
static gboolean
gst_rtp_L16_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
gst_rtp_L16_depay_setcaps (GstRTPBaseDepayload * depayload, GstCaps * caps)
{
GstStructure *structure;
GstRtpL16Depay *rtpL16depay;
......@@ -211,7 +211,7 @@ no_clockrate:
}
static GstBuffer *
gst_rtp_L16_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
gst_rtp_L16_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf)
{
GstRtpL16Depay *rtpL16depay;
GstBuffer *outbuf;
......
......@@ -43,7 +43,7 @@ typedef struct _GstRtpL16DepayClass GstRtpL16DepayClass;
/* Definition of structure storing data for this element. */
struct _GstRtpL16Depay
{
GstBaseRTPDepayload depayload;
GstRTPBaseDepayload depayload;
guint rate;
guint channels;
......@@ -52,7 +52,7 @@ struct _GstRtpL16Depay
/* Standard definition defining a class for this element. */
struct _GstRtpL16DepayClass
{
GstBaseRTPDepayloadClass parent_class;
GstRTPBaseDepayloadClass parent_class;
};
GType gst_rtp_L16_depay_get_type (void);
......
......@@ -64,25 +64,25 @@ static GstStaticPadTemplate gst_rtp_L16_pay_src_template =
"clock-rate = (int) 44100")
);
static gboolean gst_rtp_L16_pay_setcaps (GstBaseRTPPayload * basepayload,
static gboolean gst_rtp_L16_pay_setcaps (GstRTPBasePayload * basepayload,
GstCaps * caps);
static GstCaps *gst_rtp_L16_pay_getcaps (GstBaseRTPPayload * rtppayload,
static GstCaps *gst_rtp_L16_pay_getcaps (GstRTPBasePayload * rtppayload,
GstPad * pad, GstCaps * filter);
#define gst_rtp_L16_pay_parent_class parent_class
G_DEFINE_TYPE (GstRtpL16Pay, gst_rtp_L16_pay, GST_TYPE_BASE_RTP_AUDIO_PAYLOAD);
G_DEFINE_TYPE (GstRtpL16Pay, gst_rtp_L16_pay, GST_TYPE_RTP_BASE_AUDIO_PAYLOAD);
static void
gst_rtp_L16_pay_class_init (GstRtpL16PayClass * klass)
{
GstElementClass *gstelement_class;
GstBaseRTPPayloadClass *gstbasertppayload_class;
GstRTPBasePayloadClass *gstrtpbasepayload_class;
gstelement_class = (GstElementClass *) klass;
gstbasertppayload_class = (GstBaseRTPPayloadClass *) klass;
gstrtpbasepayload_class = (GstRTPBasePayloadClass *) klass;
gstbasertppayload_class->set_caps = gst_rtp_L16_pay_setcaps;
gstbasertppayload_class->get_caps = gst_rtp_L16_pay_getcaps;
gstrtpbasepayload_class->set_caps = gst_rtp_L16_pay_setcaps;
gstrtpbasepayload_class->get_caps = gst_rtp_L16_pay_getcaps;
gst_element_class_add_pad_template (gstelement_class,
gst_static_pad_template_get (&gst_rtp_L16_pay_src_template));
......@@ -101,16 +101,16 @@ gst_rtp_L16_pay_class_init (GstRtpL16PayClass * klass)
static void
gst_rtp_L16_pay_init (GstRtpL16Pay * rtpL16pay)
{
GstBaseRTPAudioPayload *basertpaudiopayload;
GstRTPBaseAudioPayload *rtpbaseaudiopayload;
basertpaudiopayload = GST_BASE_RTP_AUDIO_PAYLOAD (rtpL16pay);
rtpbaseaudiopayload = GST_RTP_BASE_AUDIO_PAYLOAD (rtpL16pay);
/* tell basertpaudiopayload that this is a sample based codec */
gst_base_rtp_audio_payload_set_sample_based (basertpaudiopayload);
/* tell rtpbaseaudiopayload that this is a sample based codec */
gst_rtp_base_audio_payload_set_sample_based (rtpbaseaudiopayload);
}
static gboolean
gst_rtp_L16_pay_setcaps (GstBaseRTPPayload * basepayload, GstCaps * caps)
gst_rtp_L16_pay_setcaps (GstRTPBasePayload * basepayload, GstCaps * caps)
{
GstRtpL16Pay *rtpL16pay;
GstStructure *structure;
......@@ -119,9 +119,9 @@ gst_rtp_L16_pay_setcaps (GstBaseRTPPayload * basepayload, GstCaps * caps)
gchar *params;
GstAudioChannelPosition *pos;
const GstRTPChannelOrder *order;
GstBaseRTPAudioPayload *basertpaudiopayload;
GstRTPBaseAudioPayload *rtpbaseaudiopayload;
basertpaudiopayload = GST_BASE_RTP_AUDIO_PAYLOAD (basepayload);
rtpbaseaudiopayload = GST_RTP_BASE_AUDIO_PAYLOAD (basepayload);
rtpL16pay = GST_RTP_L16_PAY (basepayload);
structure = gst_caps_get_structure (caps, 0);
......@@ -140,7 +140,7 @@ gst_rtp_L16_pay_setcaps (GstBaseRTPPayload * basepayload, GstCaps * caps)
else
order = NULL;
gst_base_rtp_payload_set_options (basepayload, "audio", TRUE, "L16", rate);
gst_rtp_base_payload_set_options (basepayload, "audio", TRUE, "L16", rate);
params = g_strdup_printf ("%d", channels);
if (!order && channels > 2) {
......@@ -149,11 +149,11 @@ gst_rtp_L16_pay_setcaps (GstBaseRTPPayload * basepayload, GstCaps * caps)
}
if (order && order->name) {
res = gst_base_rtp_payload_set_outcaps (basepayload,
res = gst_rtp_base_payload_set_outcaps (basepayload,
"encoding-params", G_TYPE_STRING, params, "channels", G_TYPE_INT,
channels, "channel-order", G_TYPE_STRING, order->name, NULL);
} else {
res = gst_base_rtp_payload_set_outcaps (basepayload,
res = gst_rtp_base_payload_set_outcaps (basepayload,
"encoding-params", G_TYPE_STRING, params, "channels", G_TYPE_INT,
channels, NULL);
}
......@@ -165,7 +165,7 @@ gst_rtp_L16_pay_setcaps (GstBaseRTPPayload * basepayload, GstCaps * caps)
rtpL16pay->channels = channels;
/* octet-per-sample is 2 * channels for L16 */
gst_base_rtp_audio_payload_set_sample_options (basertpaudiopayload,
gst_rtp_base_audio_payload_set_sample_options (rtpbaseaudiopayload,
2 * rtpL16pay->channels);
return res;
......@@ -184,7 +184,7 @@ no_channels:
}
static GstCaps *
gst_rtp_L16_pay_getcaps (GstBaseRTPPayload * rtppayload, GstPad * pad,
gst_rtp_L16_pay_getcaps (GstRTPBasePayload * rtppayload, GstPad * pad,
GstCaps * filter)
{
GstCaps *otherpadcaps;
......
......@@ -41,7 +41,7 @@ typedef struct _GstRtpL16PayClass GstRtpL16PayClass;
struct _GstRtpL16Pay
{
GstBaseRTPAudioPayload payload;
GstRTPBaseAudioPayload payload;
gint rate;
gint channels;
......@@ -49,7 +49,7 @@ struct _GstRtpL16Pay
struct _GstRtpL16PayClass
{
GstBaseRTPAudioPayloadClass parent_class;
GstRTPBaseAudioPayloadClass parent_class;
};
GType gst_rtp_L16_pay_get_type (void);
......
......@@ -47,21 +47,21 @@ GST_STATIC_PAD_TEMPLATE ("sink",
"encoding-name = (string) \"AC3\"")
);
G_DEFINE_TYPE (GstRtpAC3Depay, gst_rtp_ac3_depay, GST_TYPE_BASE_RTP_DEPAYLOAD);
G_DEFINE_TYPE (GstRtpAC3Depay, gst_rtp_ac3_depay, GST_TYPE_RTP_BASE_DEPAYLOAD);
static gboolean gst_rtp_ac3_depay_setcaps (GstBaseRTPDepayload * depayload,
static gboolean gst_rtp_ac3_depay_setcaps (GstRTPBaseDepayload * depayload,
GstCaps * caps);
static GstBuffer *gst_rtp_ac3_depay_process (GstBaseRTPDepayload * depayload,
static GstBuffer *gst_rtp_ac3_depay_process (GstRTPBaseDepayload * depayload,
GstBuffer * buf);
static void
gst_rtp_ac3_depay_class_init (GstRtpAC3DepayClass * klass)
{
GstElementClass *gstelement_class;
GstBaseRTPDepayloadClass *gstbasertpdepayload_class;
GstRTPBaseDepayloadClass *gstrtpbasedepayload_class;
gstelement_class = (GstElementClass *) klass;
gstbasertpdepayload_class = (GstBaseRTPDepayloadClass *) klass;
gstrtpbasedepayload_class = (GstRTPBaseDepayloadClass *) klass;
gst_element_class_add_pad_template (gstelement_class,
gst_static_pad_template_get (&gst_rtp_ac3_depay_src_template));
......@@ -73,8 +73,8 @@ gst_rtp_ac3_depay_class_init (GstRtpAC3DepayClass * klass)
"Extracts AC3 audio from RTP packets (RFC 4184)",
"Wim Taymans <wim.taymans@gmail.com>");
gstbasertpdepayload_class->set_caps = gst_rtp_ac3_depay_setcaps;
gstbasertpdepayload_class->process = gst_rtp_ac3_depay_process;
gstrtpbasedepayload_class->set_caps = gst_rtp_ac3_depay_setcaps;
gstrtpbasedepayload_class->process = gst_rtp_ac3_depay_process;
GST_DEBUG_CATEGORY_INIT (rtpac3depay_debug, "rtpac3depay", 0,
"AC3 Audio RTP Depayloader");
......@@ -87,7 +87,7 @@ gst_rtp_ac3_depay_init (GstRtpAC3Depay * rtpac3depay)
}
static gboolean
gst_rtp_ac3_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
gst_rtp_ac3_depay_setcaps (GstRTPBaseDepayload * depayload, GstCaps * caps)
{
GstStructure *structure;
gint clock_rate;
......@@ -155,7 +155,7 @@ static const struct frmsize_s frmsizecod_tbl[] = {
};
static GstBuffer *
gst_rtp_ac3_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
gst_rtp_ac3_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf)
{
GstRtpAC3Depay *rtpac3depay;
GstBuffer *outbuf;
......
......@@ -41,12 +41,12 @@ typedef struct _GstRtpAC3DepayClass GstRtpAC3DepayClass;
struct _GstRtpAC3Depay
{
GstBaseRTPDepayload depayload;
GstRTPBaseDepayload depayload;
};
struct _GstRtpAC3DepayClass
{
GstBaseRTPDepayloadClass parent_class;
GstRTPBaseDepayloadClass parent_class;
};
GType gst_rtp_ac3_depay_get_type (void);
......
......@@ -53,30 +53,30 @@ static void gst_rtp_ac3_pay_finalize (GObject * object);
static GstStateChangeReturn gst_rtp_ac3_pay_change_state (GstElement * element,
GstStateChange transition);
static gboolean gst_rtp_ac3_pay_setcaps (GstBaseRTPPayload * payload,
static gboolean gst_rtp_ac3_pay_setcaps (GstRTPBasePayload * payload,
GstCaps * caps);
static gboolean gst_rtp_ac3_pay_handle_event (GstBaseRTPPayload * payload,
static gboolean gst_rtp_ac3_pay_handle_event (GstRTPBasePayload * payload,
GstEvent * event);
static GstFlowReturn gst_rtp_ac3_pay_flush (GstRtpAC3Pay * rtpac3pay);
static GstFlowReturn gst_rtp_ac3_pay_handle_buffer (GstBaseRTPPayload * payload,
static GstFlowReturn gst_rtp_ac3_pay_handle_buffer (GstRTPBasePayload * payload,
GstBuffer * buffer);
#define gst_rtp_ac3_pay_parent_class parent_class
G_DEFINE_TYPE (GstRtpAC3Pay, gst_rtp_ac3_pay, GST_TYPE_BASE_RTP_PAYLOAD);
G_DEFINE_TYPE (GstRtpAC3Pay, gst_rtp_ac3_pay, GST_TYPE_RTP_BASE_PAYLOAD);
static void
gst_rtp_ac3_pay_class_init (GstRtpAC3PayClass * klass)
{
GObjectClass *gobject_class;
GstElementClass *gstelement_class;
GstBaseRTPPayloadClass *gstbasertppayload_class;
GstRTPBasePayloadClass *gstrtpbasepayload_class;
GST_DEBUG_CATEGORY_INIT (rtpac3pay_debug, "rtpac3pay", 0,
"AC3 Audio RTP Depayloader");
gobject_class = (GObjectClass *) klass;
gstelement_class = (GstElementClass *) klass;
gstbasertppayload_class = (GstBaseRTPPayloadClass *) klass;
gstrtpbasepayload_class = (GstRTPBasePayloadClass *) klass;
gobject_class->finalize = gst_rtp_ac3_pay_finalize;
......@@ -92,9 +92,9 @@ gst_rtp_ac3_pay_class_init (GstRtpAC3PayClass * klass)
"Payload AC3 audio as RTP packets (RFC 4184)",
"Wim Taymans <wim.taymans@gmail.com>");
gstbasertppayload_class->set_caps = gst_rtp_ac3_pay_setcaps;
gstbasertppayload_class->handle_event = gst_rtp_ac3_pay_handle_event;
gstbasertppayload_class->handle_buffer = gst_rtp_ac3_pay_handle_buffer;
gstrtpbasepayload_class->set_caps = gst_rtp_ac3_pay_setcaps;
gstrtpbasepayload_class->handle_event = gst_rtp_ac3_pay_handle_event;
gstrtpbasepayload_class->handle_buffer = gst_rtp_ac3_pay_handle_buffer;
}
static void
......@@ -125,7 +125,7 @@ gst_rtp_ac3_pay_reset (GstRtpAC3Pay * pay)
}
static gboolean
gst_rtp_ac3_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps)
gst_rtp_ac3_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps)
{
gboolean res;
gint rate;
......@@ -136,14 +136,14 @@ gst_rtp_ac3_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps)
if (!gst_structure_get_int (structure, "rate", &rate))
rate = 90000; /* default */
gst_base_rtp_payload_set_options (payload, "audio", TRUE, "AC3", rate);
res = gst_base_rtp_payload_set_outcaps (payload, NULL);
gst_rtp_base_payload_set_options (payload, "audio", TRUE, "AC3", rate);
res = gst_rtp_base_payload_set_outcaps (payload, NULL);
return res;
}
static gboolean
gst_rtp_ac3_pay_handle_event (GstBaseRTPPayload * payload, GstEvent * event)
gst_rtp_ac3_pay_handle_event (GstRTPBasePayload * payload, GstEvent * event)
{
gboolean res;
GstRtpAC3Pay *rtpac3pay;
......@@ -163,7 +163,7 @@ gst_rtp_ac3_pay_handle_event (GstBaseRTPPayload * payload, GstEvent * event)
}
res =
GST_BASE_RTP_PAYLOAD_CLASS (parent_class)->handle_event (payload, event);
GST_RTP_BASE_PAYLOAD_CLASS (parent_class)->handle_event (payload, event);
return res;
}
......@@ -235,7 +235,7 @@ gst_rtp_ac3_pay_flush (GstRtpAC3Pay * rtpac3pay)
/* number of frames */
NF = rtpac3pay->NF;
mtu = GST_BASE_RTP_PAYLOAD_MTU (rtpac3pay);
mtu = GST_RTP_BASE_PAYLOAD_MTU (rtpac3pay);
GST_LOG_OBJECT (rtpac3pay, "flushing %u bytes", avail);
......@@ -310,14 +310,14 @@ gst_rtp_ac3_pay_flush (GstRtpAC3Pay * rtpac3pay)
GST_BUFFER_TIMESTAMP (outbuf) = rtpac3pay->first_ts;
GST_BUFFER_DURATION (outbuf) = rtpac3pay->duration;
ret = gst_base_rtp_payload_push (GST_BASE_RTP_PAYLOAD (rtpac3pay), outbuf);
ret = gst_rtp_base_payload_push (GST_RTP_BASE_PAYLOAD (rtpac3pay), outbuf);
}
return ret;
}
static GstFlowReturn
gst_rtp_ac3_pay_handle_buffer (GstBaseRTPPayload * basepayload,
gst_rtp_ac3_pay_handle_buffer (GstRTPBasePayload * basepayload,
GstBuffer * buffer)
{
GstRtpAC3Pay *rtpac3pay;
......@@ -385,7 +385,7 @@ gst_rtp_ac3_pay_handle_buffer (GstBaseRTPPayload * basepayload,
/* if this buffer is going to overflow the packet, flush what we
* have. */
if (gst_base_rtp_payload_is_filled (basepayload,
if (gst_rtp_base_payload_is_filled (basepayload,
packet_len, rtpac3pay->duration + duration)) {
ret = gst_rtp_ac3_pay_flush (rtpac3pay);
avail = 0;
......
......@@ -42,7 +42,7 @@ typedef struct _GstRtpAC3PayClass GstRtpAC3PayClass;
struct _GstRtpAC3Pay
{
GstBaseRTPPayload payload;
GstRTPBasePayload payload;
GstAdapter *adapter;
GstClockTime first_ts;
......@@ -52,7 +52,7 @@ struct _GstRtpAC3Pay
struct _GstRtpAC3PayClass
{
GstBaseRTPPayloadClass parent_class;
GstRTPBasePayloadClass parent_class;
};
GType gst_rtp_ac3_pay_get_type (void);
......
......@@ -106,22 +106,22 @@ static GstStaticPadTemplate gst_rtp_amr_depay_src_template =
"audio/AMR-WB, " "channels = (int) 1," "rate = (int) 16000")
);
static gboolean gst_rtp_amr_depay_setcaps (GstBaseRTPDepayload * depayload,
static gboolean gst_rtp_amr_depay_setcaps (GstRTPBaseDepayload * depayload,
GstCaps * caps);
static GstBuffer *gst_rtp_amr_depay_process (GstBaseRTPDepayload * depayload,
static GstBuffer *gst_rtp_amr_depay_process (GstRTPBaseDepayload * depayload,
GstBuffer * buf);
#define gst_rtp_amr_depay_parent_class parent_class
G_DEFINE_TYPE (GstRtpAMRDepay, gst_rtp_amr_depay, GST_TYPE_BASE_RTP_DEPAYLOAD);
G_DEFINE_TYPE (GstRtpAMRDepay, gst_rtp_amr_depay, GST_TYPE_RTP_BASE_DEPAYLOAD);
static void
gst_rtp_amr_depay_class_init (GstRtpAMRDepayClass * klass)
{
GstElementClass *gstelement_class;
GstBaseRTPDepayloadClass *gstbasertpdepayload_class;
GstRTPBaseDepayloadClass *gstrtpbasedepayload_class;
gstelement_class = (GstElementClass *) klass;
gstbasertpdepayload_class = (GstBaseRTPDepayloadClass *) klass;
gstrtpbasedepayload_class = (GstRTPBaseDepayloadClass *) klass;
gst_element_class_add_pad_template (gstelement_class,
gst_static_pad_template_get (&gst_rtp_amr_depay_src_template));
......@@ -133,8 +133,8 @@ gst_rtp_amr_depay_class_init (GstRtpAMRDepayClass * klass)
"Extracts AMR or AMR-WB audio from RTP packets (RFC 3267)",
"Wim Taymans <wim.taymans@gmail.com>");
gstbasertpdepayload_class->process = gst_rtp_amr_depay_process;
gstbasertpdepayload_class->set_caps = gst_rtp_amr_depay_setcaps;
gstrtpbasedepayload_class->process = gst_rtp_amr_depay_process;
gstrtpbasedepayload_class->set_caps = gst_rtp_amr_depay_setcaps;
GST_DEBUG_CATEGORY_INIT (rtpamrdepay_debug, "rtpamrdepay", 0,
"AMR/AMR-WB RTP Depayloader");
......@@ -143,15 +143,15 @@ gst_rtp_amr_depay_class_init (GstRtpAMRDepayClass * klass)
static void
gst_rtp_amr_depay_init (GstRtpAMRDepay * rtpamrdepay)
{
GstBaseRTPDepayload *depayload;
GstRTPBaseDepayload *depayload;
depayload = GST_BASE_RTP_DEPAYLOAD (rtpamrdepay);
depayload = GST_RTP_BASE_DEPAYLOAD (rtpamrdepay);
gst_pad_use_fixed_caps (GST_BASE_RTP_DEPAYLOAD_SRCPAD (depayload));
gst_pad_use_fixed_caps (GST_RTP_BASE_DEPAYLOAD_SRCPAD (depayload));
}
static gboolean
gst_rtp_amr_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
gst_rtp_amr_depay_setcaps (GstRTPBaseDepayload * depayload, GstCaps * caps)
{
GstStructure *structure;
GstCaps *srccaps;
......@@ -241,7 +241,7 @@ gst_rtp_amr_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
srccaps = gst_caps_new_simple (type,
"channels", G_TYPE_INT, rtpamrdepay->channels,
"rate", G_TYPE_INT, clock_rate, NULL);
res = gst_pad_set_caps (GST_BASE_RTP_DEPAYLOAD_SRCPAD (depayload), srccaps);
res = gst_pad_set_caps (GST_RTP_BASE_DEPAYLOAD_SRCPAD (depayload), srccaps);
gst_caps_unref (srccaps);
return res;
......@@ -266,7 +266,7 @@ static const gint wb_frame_size[16] = {
};
static GstBuffer *
gst_rtp_amr_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
gst_rtp_amr_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf)
{
GstRtpAMRDepay *rtpamrdepay;
const gint *frame_size;
......
......@@ -47,7 +47,7 @@ typedef enum {
struct _GstRtpAMRDepay
{
GstBaseRTPDepayload depayload;
GstRTPBaseDepayload depayload;
GstRtpAMRDepayMode mode;
......@@ -65,7 +65,7 @@ struct _GstRtpAMRDepay
struct _GstRtpAMRDepayClass
{
GstBaseRTPDepayloadClass parent_class;
GstRTPBaseDepayloadClass parent_class;
};
GType gst_rtp_amr_depay_get_type (void);
......
......@@ -85,25 +85,25 @@ static GstStaticPadTemplate gst_rtp_amr_pay_src_template =
"maxptime = (int) [ 20, MAX ], " "ptime = (int) [ 20, MAX ]")
);
static gboolean gst_rtp_amr_pay_setcaps (GstBaseRTPPayload * basepayload,
static gboolean gst_rtp_amr_pay_setcaps (GstRTPBasePayload * basepayload,
GstCaps * caps);
static GstFlowReturn gst_rtp_amr_pay_handle_buffer (GstBaseRTPPayload * pad,
static GstFlowReturn gst_rtp_amr_pay_handle_buffer (GstRTPBasePayload * pad,
GstBuffer * buffer);
static GstStateChangeReturn
gst_rtp_amr_pay_change_state (GstElement * element, GstStateChange transition);
#define gst_rtp_amr_pay_parent_class parent_class
G_DEFINE_TYPE (GstRtpAMRPay, gst_rtp_amr_pay, GST_TYPE_BASE_RTP_PAYLOAD);
G_DEFINE_TYPE (GstRtpAMRPay, gst_rtp_amr_pay, GST_TYPE_RTP_BASE_PAYLOAD);
static void
gst_rtp_amr_pay_class_init (GstRtpAMRPayClass * klass)
{
GstElementClass *gstelement_class;
GstBaseRTPPayloadClass *gstbasertppayload_class;
GstRTPBasePayloadClass *gstrtpbasepayload_class;
gstelement_class = (GstElementClass *) klass;
gstbasertppayload_class = (GstBaseRTPPayloadClass *) klass;
gstrtpbasepayload_class = (GstRTPBasePayloadClass *) klass;
gstelement_class->change_state = gst_rtp_amr_pay_change_state;
......@@ -117,8 +117,8 @@ gst_rtp_amr_pay_class_init (GstRtpAMRPayClass * klass)
"Payload-encode AMR or AMR-WB audio into RTP packets (RFC 3267)",
"Wim Taymans <wim.taymans@gmail.com>");
gstbasertppayload_class->set_caps = gst_rtp_amr_pay_setcaps;
gstbasertppayload_class->handle_buffer = gst_rtp_amr_pay_handle_buffer;
gstrtpbasepayload_class->set_caps = gst_rtp_amr_pay_setcaps;
gstrtpbasepayload_class->handle_buffer = gst_rtp_amr_pay_handle_buffer;
GST_DEBUG_CATEGORY_INIT (rtpamrpay_debug, "rtpamrpay", 0,
"AMR/AMR-WB RTP Payloader");
......@@ -138,7 +138,7 @@ gst_rtp_amr_pay_reset (GstRtpAMRPay * pay)
}
static gboolean
gst_rtp_amr_pay_setcaps (GstBaseRTPPayload * basepayload, GstCaps * caps)
gst_rtp_amr_pay_setcaps (GstRTPBasePayload * basepayload, GstCaps * caps)
{
GstRtpAMRPay *rtpamrpay;
gboolean res;
......@@ -160,12 +160,12 @@ gst_rtp_amr_pay_setcaps (GstBaseRTPPayload * basepayload, GstCaps * caps)
goto wrong_type;
if (rtpamrpay->mode == GST_RTP_AMR_P_MODE_NB)
gst_base_rtp_payload_set_options (basepayload, "audio", TRUE, "AMR", 8000);
gst_rtp_base_payload_set_options (basepayload, "audio", TRUE, "AMR", 8000);
else
gst_base_rtp_payload_set_options (basepayload, "audio", TRUE, "AMR-WB",
gst_rtp_base_payload_set_options (basepayload, "audio", TRUE, "AMR-WB",
16000);
res = gst_base_rtp_payload_set_outcaps (basepayload,
res = gst_rtp_base_payload_set_outcaps (basepayload,
"encoding-params", G_TYPE_STRING, "1", "octet-align", G_TYPE_STRING, "1",
/* don't set the defaults
*
......@@ -221,7 +221,7 @@ static const gint wb_frame_size[16] = {
};
static GstFlowReturn
gst_rtp_amr_pay_handle_buffer (GstBaseRTPPayload * basepayload,
gst_rtp_amr_pay_handle_buffer (GstRTPBasePayload * basepayload,
GstBuffer * buffer)
{
GstRtpAMRPay *rtpamrpay;
......@@ -239,7 +239,7 @@ gst_rtp_amr_pay_handle_buffer (GstBaseRTPPayload * basepayload,
GstRTPBuffer rtp = { NULL };
rtpamrpay = GST_RTP_AMR_PAY (basepayload);
mtu = GST_BASE_RTP_PAYLOAD_MTU (rtpamrpay);
mtu = GST_RTP_BASE_PAYLOAD_MTU (rtpamrpay);
data = gst_buffer_map (buffer, &size, NULL, GST_MAP_READ);
......@@ -376,7 +376,7 @@ gst_rtp_amr_pay_handle_buffer (GstBaseRTPPayload * basepayload,
gst_rtp_buffer_unmap (&rtp);
ret = gst_base_rtp_payload_push (basepayload, outbuf);
ret = gst_rtp_base_payload_push (basepayload, outbuf);
return ret;
......
......@@ -48,7 +48,7 @@ typedef enum {
struct _GstRtpAMRPay
{
GstBaseRTPPayload payload;
GstRTPBasePayload payload;
GstRtpAMRPayMode mode;
GstClockTime first_ts;
......@@ -58,7 +58,7 @@ struct _GstRtpAMRPay
struct _GstRtpAMRPayClass
{
GstBaseRTPPayloadClass parent_class;