projects
/
platform
/
upstream
/
gst-plugins-good.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into 0.11
[platform/upstream/gst-plugins-good.git]
/
gst
/
rtp
/
gstrtpg729depay.c
diff --git
a/gst/rtp/gstrtpg729depay.c
b/gst/rtp/gstrtpg729depay.c
index
4a9b4af
..
a6017bb
100644
(file)
--- a/
gst/rtp/gstrtpg729depay.c
+++ b/
gst/rtp/gstrtpg729depay.c
@@
-71,26
+71,26
@@
GST_STATIC_PAD_TEMPLATE ("src",
GST_STATIC_CAPS ("audio/G729, " "channels = (int) 1," "rate = (int) 8000")
);
GST_STATIC_CAPS ("audio/G729, " "channels = (int) 1," "rate = (int) 8000")
);
-static gboolean gst_rtp_g729_depay_setcaps (Gst
BaseRTP
Depayload * depayload,
+static gboolean gst_rtp_g729_depay_setcaps (Gst
RTPBase
Depayload * depayload,
GstCaps * caps);
GstCaps * caps);
-static GstBuffer *gst_rtp_g729_depay_process (Gst
BaseRTP
Depayload * depayload,
+static GstBuffer *gst_rtp_g729_depay_process (Gst
RTPBase
Depayload * depayload,
GstBuffer * buf);
#define gst_rtp_g729_depay_parent_class parent_class
G_DEFINE_TYPE (GstRtpG729Depay, gst_rtp_g729_depay,
GstBuffer * buf);
#define gst_rtp_g729_depay_parent_class parent_class
G_DEFINE_TYPE (GstRtpG729Depay, gst_rtp_g729_depay,
- GST_TYPE_
BASE_RTP
_DEPAYLOAD);
+ GST_TYPE_
RTP_BASE
_DEPAYLOAD);
static void
gst_rtp_g729_depay_class_init (GstRtpG729DepayClass * klass)
{
GstElementClass *gstelement_class;
static void
gst_rtp_g729_depay_class_init (GstRtpG729DepayClass * klass)
{
GstElementClass *gstelement_class;
- Gst
BaseRTPDepayloadClass *gstbasertp
depayload_class;
+ Gst
RTPBaseDepayloadClass *gstrtpbase
depayload_class;
GST_DEBUG_CATEGORY_INIT (rtpg729depay_debug, "rtpg729depay", 0,
"G.729 RTP Depayloader");
gstelement_class = (GstElementClass *) klass;
GST_DEBUG_CATEGORY_INIT (rtpg729depay_debug, "rtpg729depay", 0,
"G.729 RTP Depayloader");
gstelement_class = (GstElementClass *) klass;
- gst
basertpdepayload_class = (GstBaseRTP
DepayloadClass *) klass;
+ gst
rtpbasedepayload_class = (GstRTPBase
DepayloadClass *) klass;
gst_element_class_add_pad_template (gstelement_class,
gst_static_pad_template_get (&gst_rtp_g729_depay_src_template));
gst_element_class_add_pad_template (gstelement_class,
gst_static_pad_template_get (&gst_rtp_g729_depay_src_template));
@@
-102,22
+102,22
@@
gst_rtp_g729_depay_class_init (GstRtpG729DepayClass * klass)
"Extracts G.729 audio from RTP packets (RFC 3551)",
"Laurent Glayal <spglegle@yahoo.fr>");
"Extracts G.729 audio from RTP packets (RFC 3551)",
"Laurent Glayal <spglegle@yahoo.fr>");
- gst
basertp
depayload_class->process = gst_rtp_g729_depay_process;
- gst
basertp
depayload_class->set_caps = gst_rtp_g729_depay_setcaps;
+ gst
rtpbase
depayload_class->process = gst_rtp_g729_depay_process;
+ gst
rtpbase
depayload_class->set_caps = gst_rtp_g729_depay_setcaps;
}
static void
gst_rtp_g729_depay_init (GstRtpG729Depay * rtpg729depay)
{
}
static void
gst_rtp_g729_depay_init (GstRtpG729Depay * rtpg729depay)
{
- Gst
BaseRTP
Depayload *depayload;
+ Gst
RTPBase
Depayload *depayload;
- depayload = GST_
BASE_RTP
_DEPAYLOAD (rtpg729depay);
+ depayload = GST_
RTP_BASE
_DEPAYLOAD (rtpg729depay);
- gst_pad_use_fixed_caps (GST_
BASE_RTP
_DEPAYLOAD_SRCPAD (depayload));
+ gst_pad_use_fixed_caps (GST_
RTP_BASE
_DEPAYLOAD_SRCPAD (depayload));
}
static gboolean
}
static gboolean
-gst_rtp_g729_depay_setcaps (Gst
BaseRTP
Depayload * depayload, GstCaps * caps)
+gst_rtp_g729_depay_setcaps (Gst
RTPBase
Depayload * depayload, GstCaps * caps)
{
GstStructure *structure;
GstCaps *srccaps;
{
GstStructure *structure;
GstCaps *srccaps;
@@
-149,7
+149,7
@@
gst_rtp_g729_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
srccaps = gst_caps_new_simple ("audio/G729",
"channels", G_TYPE_INT, channels, "rate", G_TYPE_INT, clock_rate, NULL);
srccaps = gst_caps_new_simple ("audio/G729",
"channels", G_TYPE_INT, channels, "rate", G_TYPE_INT, clock_rate, NULL);
- ret = gst_pad_set_caps (GST_
BASE_RTP
_DEPAYLOAD_SRCPAD (depayload), srccaps);
+ ret = gst_pad_set_caps (GST_
RTP_BASE
_DEPAYLOAD_SRCPAD (depayload), srccaps);
gst_caps_unref (srccaps);
return ret;
gst_caps_unref (srccaps);
return ret;
@@
-169,7
+169,7
@@
wrong_clock_rate:
}
static GstBuffer *
}
static GstBuffer *
-gst_rtp_g729_depay_process (Gst
BaseRTP
Depayload * depayload, GstBuffer * buf)
+gst_rtp_g729_depay_process (Gst
RTPBase
Depayload * depayload, GstBuffer * buf)
{
GstRtpG729Depay *rtpg729depay;
GstBuffer *outbuf = NULL;
{
GstRtpG729Depay *rtpg729depay;
GstBuffer *outbuf = NULL;
@@
-206,7
+206,7
@@
gst_rtp_g729_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DISCONT);
}
GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DISCONT);
}
- GST_LOG_OBJECT (depayload, "pushing buffer of size %
d"
,
+ GST_LOG_OBJECT (depayload, "pushing buffer of size %
" G_GSIZE_FORMAT
,
gst_buffer_get_size (outbuf));
return outbuf;
gst_buffer_get_size (outbuf));
return outbuf;