From 42b8b3a37f5ab9cda3dc63b362d4f59ec0b8109a Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 9 Jan 2007 12:23:48 +0000 Subject: gst/rtp/: Added RFC 2250 MPEG Video Depayloader. Original commit message from CVS: * gst/rtp/Makefile.am: * gst/rtp/gstrtp.c: (plugin_init): * gst/rtp/gstrtpmpvdepay.c: (gst_rtp_mpv_depay_base_init), (gst_rtp_mpv_depay_class_init), (gst_rtp_mpv_depay_init), (gst_rtp_mpv_depay_setcaps), (gst_rtp_mpv_depay_process), (gst_rtp_mpv_depay_set_property), (gst_rtp_mpv_depay_get_property), (gst_rtp_mpv_depay_change_state), (gst_rtp_mpv_depay_plugin_init): * gst/rtp/gstrtpmpvdepay.h: Added RFC 2250 MPEG Video Depayloader. * gst/rtp/gstrtpL16depay.h: * gst/rtp/gstrtph263pdepay.c: (gst_rtp_h263p_depay_setcaps), (gst_rtp_h263p_depay_process): Fix Header file. Small cleanups. * gst/rtp/gstrtpmp4gdepay.c: (gst_rtp_mp4g_depay_class_init), (gst_rtp_mp4g_depay_init), (gst_rtp_mp4g_depay_finalize), (gst_rtp_mp4g_depay_process), (gst_rtp_mp4g_depay_change_state): * gst/rtp/gstrtpmp4vdepay.c: (gst_rtp_mp4v_depay_class_init), (gst_rtp_mp4v_depay_init), (gst_rtp_mp4v_depay_finalize), (gst_rtp_mp4v_depay_setcaps), (gst_rtp_mp4v_depay_process), (gst_rtp_mp4v_depay_change_state): Remove usused code. Remove Adapter from state Change. Added debug. * gst/rtp/gstrtpmpadepay.c: (gst_rtp_mpa_depay_base_init), (gst_rtp_mpa_depay_class_init), (gst_rtp_mpa_depay_init), (gst_rtp_mpa_depay_setcaps), (gst_rtp_mpa_depay_process): * gst/rtp/gstrtpmpadepay.h: Subclass base depayloader. Added debug. Support static payload type assignment as well. * gst/rtp/gstrtpmpapay.c: Fix caps. --- gst/rtp/gstrtph263pdepay.c | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) (limited to 'gst/rtp/gstrtph263pdepay.c') diff --git a/gst/rtp/gstrtph263pdepay.c b/gst/rtp/gstrtph263pdepay.c index b0b2dcf4..999fda79 100644 --- a/gst/rtp/gstrtph263pdepay.c +++ b/gst/rtp/gstrtph263pdepay.c @@ -138,18 +138,14 @@ gst_rtp_h263p_depay_finalize (GObject * object) G_OBJECT_CLASS (parent_class)->finalize (object); } -// only on the sink gboolean gst_rtp_h263p_depay_setcaps (GstBaseRTPDepayload * filter, GstCaps * caps) { GstStructure *structure = gst_caps_get_structure (caps, 0); - gint clock_rate = 90000; // default - - if (gst_structure_has_field (structure, "clock-rate")) { - gst_structure_get_int (structure, "clock-rate", &clock_rate); - } + gint clock_rate = 90000; /* default */ + gst_structure_get_int (structure, "clock-rate", &clock_rate); filter->clock_rate = clock_rate; return TRUE; @@ -163,18 +159,11 @@ gst_rtp_h263p_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf) GstRtpH263PDepay *rtph263pdepay; GstBuffer *outbuf; - /* GstRTPPayload pt; */ - rtph263pdepay = GST_RTP_H263P_DEPAY (depayload); if (!gst_rtp_buffer_validate (buf)) goto bad_packet; - /* - if ((pt = gst_rtp_buffer_get_payload_type (buf)) != 0) - goto bad_payload; - */ - { gint payload_len; guint8 *payload; @@ -249,29 +238,16 @@ gst_rtp_h263p_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf) memcpy (GST_BUFFER_DATA (outbuf), payload, payload_len); gst_adapter_push (rtph263pdepay->adapter, outbuf); - } - } - return NULL; bad_packet: { GST_ELEMENT_WARNING (rtph263pdepay, STREAM, DECODE, ("Packet did not validate"), (NULL)); - return NULL; } - /* - bad_payload: - { - GST_DEBUG ("Unexpected payload type %u", pt); - - gst_buffer_unref (buf); - return GST_FLOW_ERROR; - } - */ } static void -- cgit