diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gst/rtp/Makefile.am | 4 | ||||
| -rw-r--r-- | gst/rtp/gstrtp.c | 8 | ||||
| -rw-r--r-- | gst/rtp/gstrtpilbcpay.c | 4 |
4 files changed, 22 insertions, 2 deletions
@@ -1,5 +1,13 @@ 2006-10-31 Wim Taymans <wim@fluendo.com> + * gst/rtp/Makefile.am: + * gst/rtp/gstrtp.c: (plugin_init): + * gst/rtp/gstrtpilbcpay.c: (gst_rtpilbcpay_init), + (gst_rtpilbcpay_setcaps): + Fix and activate ILBC pay and depayloaders. Fixes #368162. + +2006-10-31 Wim Taymans <wim@fluendo.com> + * ext/speex/gstspeexdec.c: (speex_dec_convert), (speex_dec_sink_event), (speex_dec_chain_parse_header): Some small cleanups, use _scale. diff --git a/gst/rtp/Makefile.am b/gst/rtp/Makefile.am index d7527349..e1916c77 100644 --- a/gst/rtp/Makefile.am +++ b/gst/rtp/Makefile.am @@ -3,6 +3,8 @@ plugin_LTLIBRARIES = libgstrtp.la libgstrtp_la_SOURCES = \ gstrtp.c \ gstrtpdepay.c \ + gstrtpilbcdepay.c \ + gstrtpilbcpay.c \ gstrtpmpadepay.c \ gstrtpmpapay.c \ gstrtppcmadepay.c \ @@ -47,6 +49,8 @@ noinst_HEADERS = \ gstrtpL16pay.h \ gstrtpamrdepay.h \ gstrtpamrpay.h \ + gstrtpilbcdepay.h \ + gstrtpilbcpay.h \ gstrtppcmadepay.h \ gstrtppcmudepay.h \ gstrtppcmupay.h \ diff --git a/gst/rtp/gstrtp.c b/gst/rtp/gstrtp.c index 7280642a..3d4aa841 100644 --- a/gst/rtp/gstrtp.c +++ b/gst/rtp/gstrtp.c @@ -22,6 +22,8 @@ #endif #include "gstrtpdepay.h" +#include "gstrtpilbcdepay.h" +#include "gstrtpilbcpay.h" #include "gstrtppcmupay.h" #include "gstrtppcmapay.h" #include "gstrtppcmadepay.h" @@ -54,6 +56,12 @@ plugin_init (GstPlugin * plugin) if (!gst_rtp_depay_plugin_init (plugin)) return FALSE; + if (!gst_rtp_ilbc_pay_plugin_init (plugin)) + return FALSE; + + if (!gst_rtp_ilbc_depay_plugin_init (plugin)) + return FALSE; + if (!gst_rtp_gsm_depay_plugin_init (plugin)) return FALSE; diff --git a/gst/rtp/gstrtpilbcpay.c b/gst/rtp/gstrtpilbcpay.c index cb9409cd..40e431ff 100644 --- a/gst/rtp/gstrtpilbcpay.c +++ b/gst/rtp/gstrtpilbcpay.c @@ -106,7 +106,7 @@ gst_rtpilbcpay_init (GstRTPILBCPay * rtpilbcpay, GstRTPILBCPayClass * klass) rtpilbcpay->mode = -1; /* tell basertpaudiopayload that this is a frame based codec */ - gst_basertpaudiopayload_set_frame_based (basertpaudiopayload); + gst_base_rtp_audio_payload_set_frame_based (basertpaudiopayload); } static gboolean @@ -134,7 +134,7 @@ gst_rtpilbcpay_setcaps (GstBaseRTPPayload * basertppayload, GstCaps * caps) gst_basertppayload_set_options (basertppayload, "audio", TRUE, "iLBC", 8000); /* set options for this frame based audio codec */ - gst_basertpaudiopayload_set_frame_options (basertpaudiopayload, + gst_base_rtp_audio_payload_set_frame_options (basertpaudiopayload, mode, mode == 30 ? 50 : 38); } else { return FALSE; |