From 93c0a73ce0e1bf9add82206f97b605648fd17afb Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 20 Sep 2006 16:09:03 +0000 Subject: [PATCH] gst/rtp/: Added preliminary ASF depayloader. Original commit message from CVS: * gst/rtp/gstrtp.c: (plugin_init): * gst/rtp/gstrtpasfdepay.c: (gst_rtp_asf_depay_base_init), (gst_rtp_asf_depay_class_init), (gst_rtp_asf_depay_init), (decode_base64), (gst_rtp_asf_depay_setcaps), (gst_rtp_asf_depay_process), (gst_rtp_asf_depay_set_property), (gst_rtp_asf_depay_get_property), (gst_rtp_asf_depay_change_state), (gst_rtp_asf_depay_plugin_init): * gst/rtp/gstrtpasfdepay.h: Added preliminary ASF depayloader. * gst/rtp/gstrtph264depay.c: (decode_base64): Fix base64 decoding. --- ChangeLog | 15 +++++++++++++++ gst/rtp/gstrtp.c | 4 ++++ gst/rtp/gstrtph264depay.c | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5c655af32a..47b1a3173a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2006-09-20 Wim Taymans + + * gst/rtp/gstrtp.c: (plugin_init): + * gst/rtp/gstrtpasfdepay.c: (gst_rtp_asf_depay_base_init), + (gst_rtp_asf_depay_class_init), (gst_rtp_asf_depay_init), + (decode_base64), (gst_rtp_asf_depay_setcaps), + (gst_rtp_asf_depay_process), (gst_rtp_asf_depay_set_property), + (gst_rtp_asf_depay_get_property), (gst_rtp_asf_depay_change_state), + (gst_rtp_asf_depay_plugin_init): + * gst/rtp/gstrtpasfdepay.h: + Added preliminary ASF depayloader. + + * gst/rtp/gstrtph264depay.c: (decode_base64): + Fix base64 decoding. + 2006-09-20 Wim Taymans * gst/rtsp/URLS: diff --git a/gst/rtp/gstrtp.c b/gst/rtp/gstrtp.c index e7949b8e50..5830d266ef 100644 --- a/gst/rtp/gstrtp.c +++ b/gst/rtp/gstrtp.c @@ -21,6 +21,7 @@ #include "config.h" #endif +#include "gstrtpasfdepay.h" #include "gstrtpdepay.h" #include "gstrtppcmupay.h" #include "gstrtppcmapay.h" @@ -49,6 +50,9 @@ static gboolean plugin_init (GstPlugin * plugin) { + if (!gst_rtp_asf_depay_plugin_init (plugin)) + return FALSE; + if (!gst_rtp_depay_plugin_init (plugin)) return FALSE; diff --git a/gst/rtp/gstrtph264depay.c b/gst/rtp/gstrtph264depay.c index acb7943503..8028a014cf 100644 --- a/gst/rtp/gstrtph264depay.c +++ b/gst/rtp/gstrtph264depay.c @@ -179,7 +179,7 @@ decode_base64 (gchar * in, guint8 * out) guint len = 0; v1 = a2bin[(gint) * in]; - while (v1 < 63) { + while (v1 <= 63) { /* read 4 bytes, write 3 bytes, invalid base64 are zeroes */ v2 = a2bin[(gint) * ++in]; *out++ = (v1 << 2) | ((v2 & 0x3f) >> 4);