From 87fd8ada3422d22c2e71bbf99b95cb543bbfbe7b Mon Sep 17 00:00:00 2001 From: Olivier Crete Date: Fri, 15 Aug 2008 17:26:18 +0000 Subject: gst/rtp/: Update the vorbis RTP pay/depay to RFC 5215. Original commit message from CVS: Patch by: Olivier Crete * gst/rtp/gstrtpvorbisdepay.c: (gst_rtp_vorbis_depay_setcaps), (gst_rtp_vorbis_depay_process): * gst/rtp/gstrtpvorbispay.c: (gst_rtp_vorbis_pay_finish_headers): Update the vorbis RTP pay/depay to RFC 5215. Fixes #547842. --- gst/rtp/gstrtpvorbispay.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'gst/rtp/gstrtpvorbispay.c') diff --git a/gst/rtp/gstrtpvorbispay.c b/gst/rtp/gstrtpvorbispay.c index 65e093af..0c13a09f 100644 --- a/gst/rtp/gstrtpvorbispay.c +++ b/gst/rtp/gstrtpvorbispay.c @@ -32,14 +32,14 @@ GST_DEBUG_CATEGORY_STATIC (rtpvorbispay_debug); #define GST_CAT_DEFAULT (rtpvorbispay_debug) /* references: - * http://svn.xiph.org/trunk/vorbis/doc/draft-ietf-avt-rtp-vorbis-04.txt + * http://www.rfc-editor.org/rfc/rfc5215.txt */ /* elementfactory information */ static const GstElementDetails gst_rtp_vorbispay_details = GST_ELEMENT_DETAILS ("RTP packet depayloader", "Codec/Payloader/Network", - "Payload-encode Vorbis audio into RTP packets (draft-01 RFC XXXX)", + "Payload-encode Vorbis audio into RTP packets (RFC 5215)", "Wim Taymans "); static GstStaticPadTemplate gst_rtp_vorbis_pay_src_template = @@ -55,11 +55,6 @@ GST_STATIC_PAD_TEMPLATE ("src", * "encoding-params = (string) " * "configuration = (string) ANY" */ - /* All optional parameters - * - * "delivery-method = (string) { inline, in_band, out_band/ } " - * "configuration-uri =" - */ ) ); @@ -410,11 +405,7 @@ gst_rtp_vorbis_pay_finish_headers (GstBaseRTPPayload * basepayload) gst_basertppayload_set_options (basepayload, "audio", TRUE, "VORBIS", rtpvorbispay->rate); gst_basertppayload_set_outcaps (basepayload, "encoding-params", G_TYPE_STRING, - cstr, "configuration", G_TYPE_STRING, configuration, - "delivery-method", G_TYPE_STRING, "inline", - /* don't set the other defaults - */ - NULL); + cstr, "configuration", G_TYPE_STRING, configuration, NULL); g_free (cstr); g_free (configuration); -- cgit