*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
/*
#define QT_UINT64(a) ((((guint64)QT_UINT32(a))<<32)|QT_UINT32(((guint8 *)a)+4))
#define FOURCC_avc1 GST_MAKE_FOURCC('a','v','c','1')
+#define FOURCC_avc3 GST_MAKE_FOURCC('a','v','c','3')
#define FOURCC_avcC GST_MAKE_FOURCC('a','v','c','C')
GST_DEBUG_CATEGORY_STATIC (rtpxqtdepay_debug);
enum
{
- ARG_0,
+ PROP_0,
};
static GstStaticPadTemplate gst_rtp_xqt_depay_src_template =
);
#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 *
{
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);
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");
- gst_element_class_add_pad_template (gstelement_class,
- gst_static_pad_template_get (&gst_rtp_xqt_depay_src_template));
- gst_element_class_add_pad_template (gstelement_class,
- gst_static_pad_template_get (&gst_rtp_xqt_depay_sink_template));
+ gst_element_class_add_static_pad_template (gstelement_class,
+ &gst_rtp_xqt_depay_src_template);
+ gst_element_class_add_static_pad_template (gstelement_class,
+ &gst_rtp_xqt_depay_sink_template);
- gst_element_class_set_details_simple (gstelement_class,
+ gst_element_class_set_static_metadata (gstelement_class,
"RTP packet depayloader", "Codec/Depayloader/Network",
"Extracts Quicktime audio/video from RTP packets",
"Wim Taymans <wim@fluendo.com>");
switch (fourcc) {
case FOURCC_avc1:
+ case FOURCC_avc3:
{
guint32 chlen;
GstBuffer *buf;
gint size;
GstCaps *caps;
- guint8 *bdata;
GST_DEBUG_OBJECT (rtpxqtdepay, "found avcC codec_data in sd, %u",
chlen);
size = len - 8;
buf = gst_buffer_new_and_alloc (size);
- bdata = gst_buffer_map (buf, NULL, NULL, GST_MAP_WRITE);
- memcpy (bdata, data + 8, size);
- gst_buffer_unmap (buf, bdata, -1);
+ gst_buffer_fill (buf, 0, data + 8, size);
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;
}
}
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 */
}
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;
gboolean m;
- GstRTPBuffer rtp;
+ GstRTPBuffer rtp = { NULL };
rtpxqtdepay = GST_RTP_XQT_DEPAY (depayload);
gst_rtp_buffer_map (buf, GST_MAP_READ, &rtp);
- if (!gst_rtp_buffer_validate (buf))
- goto bad_packet;
-
if (GST_BUFFER_IS_DISCONT (buf)) {
/* discont, clear adapter and try to find a new packet start */
gst_adapter_clear (rtpxqtdepay->adapter);
guint8 *payload;
guint8 ver, pck;
gboolean s, q, l, d;
- guint8 *bdata;
- gsize bsize;
payload_len = gst_rtp_buffer_get_payload_len (&rtp);
payload = gst_rtp_buffer_get_payload (&rtp);
{
/* multiple samples per packet. */
outbuf = gst_buffer_new_and_alloc (payload_len);
- bdata = gst_buffer_map (outbuf, &bsize, NULL, GST_MAP_WRITE);
- memcpy (bdata, payload, payload_len);
- gst_buffer_unmap (outbuf, bdata, bsize);
+ gst_buffer_fill (outbuf, 0, payload, payload_len);
goto done;
}
slen = payload_len;
outbuf = gst_buffer_new_and_alloc (slen);
- bdata = gst_buffer_map (outbuf, &bsize, NULL, GST_MAP_WRITE);
- memcpy (bdata, payload, slen);
- gst_buffer_unmap (outbuf, bdata, bsize);
+ gst_buffer_fill (outbuf, 0, payload, slen);
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);
{
/* one sample per packet, use adapter to combine based on marker bit. */
outbuf = gst_buffer_new_and_alloc (payload_len);
- bdata = gst_buffer_map (outbuf, &bsize, NULL, GST_MAP_WRITE);
- memcpy (bdata, payload, payload_len);
- gst_buffer_unmap (outbuf, bdata, bsize);
+ gst_buffer_fill (outbuf, 0, payload, payload_len);
gst_adapter_push (rtpxqtdepay->adapter, outbuf);
+ outbuf = NULL;
if (!m)
goto done;
gst_rtp_buffer_unmap (&rtp);
return outbuf;
-bad_packet:
- {
- GST_ELEMENT_WARNING (rtpxqtdepay, STREAM, DECODE,
- ("Packet did not validate."), (NULL));
- goto done;
- }
need_resync:
{
GST_DEBUG_OBJECT (rtpxqtdepay, "waiting for marker");
projects / platform / upstream / gst-plugins-good.git / blobdiff