mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-03 16:09:39 +00:00
2428a1ca55
Original commit message from CVS: * gst/rtp/gstrtpL16depay.c: (gst_rtp_L16_depay_setcaps), (gst_rtp_L16_depay_process): Check if clock-rate and channels are valid. Don't ignore the return value of setcaps. No need to validate the buffer, the base class does that for us. Use the marker bit to set the DISCONT flag on outgoing buffers. * gst/rtp/gstrtpL16pay.c: (gst_rtp_L16_pay_setcaps): Don't ignore the return value of set_outcaps. * gst/rtp/gstrtpac3depay.c: (gst_rtp_ac3_depay_setcaps), (gst_rtp_ac3_depay_process): Don't ignore the return value of set_caps. No need to validate the buffer, the base class does that for us. * gst/rtp/gstrtpamrdepay.c: (gst_rtp_amr_depay_setcaps), (gst_rtp_amr_depay_process): * gst/rtp/gstrtpamrdepay.h: Don't ignore the return value of setcaps. No need to validate the buffer, the base class does that for us. No need to set output caps on the buffers, the base class does that for us. The subclass will make sure we are negotiated. * gst/rtp/gstrtpdvdepay.c: (gst_rtp_dv_depay_setcaps), (gst_rtp_dv_depay_process), (gst_rtp_dv_depay_reset): * gst/rtp/gstrtpdvdepay.h: Clean up caps negotiation. The subclass will make sure we are negotiated. * gst/rtp/gstrtpg726depay.c: (gst_rtp_g726_depay_setcaps), (gst_rtp_g726_depay_process): Clean up caps negotiation. Use the marker bit to set the DISCONT flag on outgoing buffers. * gst/rtp/gstrtpg729depay.c: (gst_rtp_g729_depay_init), (gst_rtp_g729_depay_setcaps), (gst_rtp_g729_depay_process): * gst/rtp/gstrtpg729depay.h: The subclass will make sure we are negotiated. Use the marker bit to set the DISCONT flag on outgoing buffers. * gst/rtp/gstrtpgsmdepay.c: (gst_rtp_gsm_depay_setcaps), (gst_rtp_gsm_depay_process): Clean up caps negotiation. Use the marker bit to set the DISCONT flag on outgoing buffers. * gst/rtp/gstrtpgsmpay.c: (gst_rtp_gsm_pay_setcaps): Clean up caps negotiation. Don't ignore the return value of set_outcaps. * gst/rtp/gstrtph263depay.c: (gst_rtp_h263_depay_setcaps), (gst_rtp_h263_depay_process): Clean up caps negotiation. No need to validate the buffer, the base class does that for us. * gst/rtp/gstrtph263pay.c: (gst_rtp_h263_pay_setcaps), (gst_rtp_h263_pay_flush), (gst_rtp_h263_pay_handle_buffer): * gst/rtp/gstrtph263pay.h: Don't ignore the return value of set_outcaps. Do some more timestamps. * gst/rtp/gstrtph263pdepay.c: (gst_rtp_h263p_depay_setcaps), (gst_rtp_h263p_depay_process): Clean up caps negotiation. Don't ignore the return value of setcaps. No need to validate the buffer, the base class does that for us. * gst/rtp/gstrtph263ppay.c: (gst_rtp_h263p_pay_class_init), (gst_rtp_h263p_pay_setcaps), (gst_rtp_h263p_pay_flush), (gst_rtp_h263p_pay_handle_buffer): * gst/rtp/gstrtph263ppay.h: Don't ignore the return value of set_outcaps. Do some more timestamps. * gst/rtp/gstrtph264depay.c: (gst_rtp_h264_depay_setcaps), (gst_rtp_h264_depay_process): Clean up caps negotiation. Don't ignore the return value of setcaps. Fix possible caps leak. No need to validate the buffer, the base class does that for us. * gst/rtp/gstrtph264pay.c: (gst_rtp_h264_pay_setcaps): Add some more debug info. * gst/rtp/gstrtpilbcdepay.c: (gst_rtp_ilbc_depay_setcaps), (gst_rtp_ilbc_depay_process): Clean up caps negotiation. Use the marker bit to set the DISCONT flag on outgoing buffers. * gst/rtp/gstrtpilbcpay.c: (gst_rtpilbcpay_sink_setcaps): Clean up caps negotiation. * gst/rtp/gstrtpmp1sdepay.c: (gst_rtp_mp1s_depay_setcaps), (gst_rtp_mp1s_depay_process): Clean up caps negotiation. Don't ignore the return value of setcaps. No need to validate the buffer, the base class does that for us. No need to set caps on buffers, subclass does that for us. * gst/rtp/gstrtpmp2tdepay.c: (gst_rtp_mp2t_depay_setcaps), (gst_rtp_mp2t_depay_process): Clean up caps negotiation. Don't ignore the return value of setcaps. No need to validate the buffer, the base class does that for us. No need to set caps on buffers, subclass does that for us. * gst/rtp/gstrtpmp4adepay.c: (gst_rtp_mp4a_depay_setcaps), (gst_rtp_mp4a_depay_process): Clean up caps negotiation. Don't ignore the return value of setcaps. No need to validate the buffer, the base class does that for us. * gst/rtp/gstrtpmp4apay.c: (gst_rtp_mp4a_pay_new_caps), (gst_rtp_mp4a_pay_setcaps): Don't ignore the return value of set_outcaps. * gst/rtp/gstrtpmp4gdepay.c: (gst_rtp_mp4g_depay_setcaps), (gst_rtp_mp4g_depay_process): Clean up caps negotiation. Don't ignore the return value of setcaps. No need to validate the buffer, the base class does that for us. No need to set caps on buffers, subclass does that for us. * gst/rtp/gstrtpmp4gpay.c: (gst_rtp_mp4g_pay_finalize), (gst_rtp_mp4g_pay_new_caps), (gst_rtp_mp4g_pay_setcaps): Don't ignore the return value of set_outcaps. * gst/rtp/gstrtpmp4vdepay.c: (gst_rtp_mp4v_depay_setcaps), (gst_rtp_mp4v_depay_process): Clean up caps negotiation. Don't ignore the return value of setcaps. No need to validate the buffer, the base class does that for us. No need to set caps on buffers, subclass does that for us. * gst/rtp/gstrtpmp4vpay.c: (gst_rtp_mp4v_pay_new_caps), (gst_rtp_mp4v_pay_setcaps): Don't ignore the return value of set_outcaps. * gst/rtp/gstrtpmpadepay.c: (gst_rtp_mpa_depay_setcaps), (gst_rtp_mpa_depay_process): Clean up caps negotiation. Don't ignore the return value of setcaps. No need to validate the buffer, the base class does that for us. Use the marker bit to set the DISCONT flag on outgoing buffers. * gst/rtp/gstrtpmpapay.c: (gst_rtp_mpa_pay_setcaps): Don't ignore the return value of set_outcaps. * gst/rtp/gstrtpmpvdepay.c: (gst_rtp_mpv_depay_setcaps), (gst_rtp_mpv_depay_process): Clean up caps negotiation. Actually set output caps. No need to validate the buffer, the base class does that for us. * gst/rtp/gstrtpmpvpay.c: (gst_rtp_mpv_pay_setcaps): Don't ignore the return value of set_outcaps. * gst/rtp/gstrtppcmadepay.c: (gst_rtp_pcma_depay_setcaps), (gst_rtp_pcma_depay_process): Clean up caps negotiation. Set output buffer duration because we can. Use the marker bit to set the DISCONT flag on outgoing buffers. * gst/rtp/gstrtppcmapay.c: (gst_rtp_pcma_pay_setcaps): Don't ignore the return value of set_outcaps. * gst/rtp/gstrtppcmudepay.c: (gst_rtp_pcmu_depay_setcaps), (gst_rtp_pcmu_depay_process): Clean up caps negotiation. Use the marker bit to set the DISCONT flag on outgoing buffers. * gst/rtp/gstrtppcmupay.c: (gst_rtp_pcmu_pay_setcaps): Don't ignore the return value of set_outcaps. * gst/rtp/gstrtpspeexdepay.c: (gst_rtp_speex_depay_init), (gst_rtp_speex_depay_setcaps), (gst_rtp_speex_depay_process): Clean up caps negotiation. Set output caps on the pad and header buffers. Set duration on output buffers because we can. * gst/rtp/gstrtpspeexpay.c: (gst_rtp_speex_pay_parse_ident): Don't ignore the return value of set_outcaps. * gst/rtp/gstrtpsv3vdepay.c: (gst_rtp_sv3v_depay_setcaps), (gst_rtp_sv3v_depay_process): Clean up caps negotiation. No need to validate the buffer, the base class does that for us. No need to set caps out output buffers, subclass does that. * gst/rtp/gstrtptheoradepay.c: (gst_rtp_theora_depay_setcaps), (gst_rtp_theora_depay_process): Don't ignore the return value of setcaps. No need to validate the buffer, the base class does that for us. * gst/rtp/gstrtptheorapay.c: (gst_rtp_theora_pay_class_init), (gst_rtp_theora_pay_flush_packet), (encode_base64), (gst_rtp_theora_pay_finish_headers), (gst_rtp_theora_pay_parse_id), (gst_rtp_theora_pay_handle_buffer): Don't ignore the return value of set_outcaps. * gst/rtp/gstrtpvorbisdepay.c: (gst_rtp_vorbis_depay_setcaps), (gst_rtp_vorbis_depay_process): Don't ignore the return value of setcaps. No need to validate the buffer, the base class does that for us. * gst/rtp/gstrtpvorbispay.c: (gst_rtp_vorbis_pay_finish_headers): Don't ignore the return value of set_outcaps. * gst/rtp/gstrtpvrawdepay.c: (gst_rtp_vraw_depay_setcaps): Clean up caps negotiation, don't ignore setcaps return. * gst/rtp/gstrtpvrawpay.c: (gst_rtp_vraw_pay_setcaps): Don't ignore the return value of set_outcaps.
233 lines
6.7 KiB
C
233 lines
6.7 KiB
C
/* GStreamer
|
|
* Copyright (C) <2005> Edgard Lima <edgard.lima@indt.org.br>
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Library General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Library General Public License for more details.
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include "config.h"
|
|
#endif
|
|
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
#include <gst/rtp/gstrtpbuffer.h>
|
|
|
|
#include "gstrtpspeexdepay.h"
|
|
|
|
/* elementfactory information */
|
|
static const GstElementDetails gst_rtp_speexdepay_details =
|
|
GST_ELEMENT_DETAILS ("RTP packet depayloader",
|
|
"Codec/Depayloader/Network",
|
|
"Extracts Speex audio from RTP packets",
|
|
"Edgard Lima <edgard.lima@indt.org.br>");
|
|
|
|
/* RtpSPEEXDepay signals and args */
|
|
enum
|
|
{
|
|
/* FILL ME */
|
|
LAST_SIGNAL
|
|
};
|
|
|
|
enum
|
|
{
|
|
ARG_0
|
|
};
|
|
|
|
static GstStaticPadTemplate gst_rtp_speex_depay_sink_template =
|
|
GST_STATIC_PAD_TEMPLATE ("sink",
|
|
GST_PAD_SINK,
|
|
GST_PAD_ALWAYS,
|
|
GST_STATIC_CAPS ("application/x-rtp, "
|
|
"media = (string) \"audio\", "
|
|
"payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
|
|
"clock-rate = (int) [6000, 48000], "
|
|
"encoding-name = (string) \"SPEEX\", "
|
|
"encoding-params = (string) \"1\"")
|
|
);
|
|
|
|
static GstStaticPadTemplate gst_rtp_speex_depay_src_template =
|
|
GST_STATIC_PAD_TEMPLATE ("src",
|
|
GST_PAD_SRC,
|
|
GST_PAD_ALWAYS,
|
|
GST_STATIC_CAPS ("audio/x-speex")
|
|
);
|
|
|
|
static GstBuffer *gst_rtp_speex_depay_process (GstBaseRTPDepayload * depayload,
|
|
GstBuffer * buf);
|
|
static gboolean gst_rtp_speex_depay_setcaps (GstBaseRTPDepayload * depayload,
|
|
GstCaps * caps);
|
|
|
|
GST_BOILERPLATE (GstRtpSPEEXDepay, gst_rtp_speex_depay, GstBaseRTPDepayload,
|
|
GST_TYPE_BASE_RTP_DEPAYLOAD);
|
|
|
|
static void
|
|
gst_rtp_speex_depay_base_init (gpointer klass)
|
|
{
|
|
GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
|
|
|
|
gst_element_class_add_pad_template (element_class,
|
|
gst_static_pad_template_get (&gst_rtp_speex_depay_src_template));
|
|
gst_element_class_add_pad_template (element_class,
|
|
gst_static_pad_template_get (&gst_rtp_speex_depay_sink_template));
|
|
gst_element_class_set_details (element_class, &gst_rtp_speexdepay_details);
|
|
}
|
|
|
|
static void
|
|
gst_rtp_speex_depay_class_init (GstRtpSPEEXDepayClass * klass)
|
|
{
|
|
GObjectClass *gobject_class;
|
|
GstElementClass *gstelement_class;
|
|
GstBaseRTPDepayloadClass *gstbasertpdepayload_class;
|
|
|
|
gobject_class = (GObjectClass *) klass;
|
|
gstelement_class = (GstElementClass *) klass;
|
|
gstbasertpdepayload_class = (GstBaseRTPDepayloadClass *) klass;
|
|
|
|
gstbasertpdepayload_class->process = gst_rtp_speex_depay_process;
|
|
gstbasertpdepayload_class->set_caps = gst_rtp_speex_depay_setcaps;
|
|
}
|
|
|
|
static void
|
|
gst_rtp_speex_depay_init (GstRtpSPEEXDepay * rtpspeexdepay,
|
|
GstRtpSPEEXDepayClass * klass)
|
|
{
|
|
}
|
|
|
|
static gint
|
|
gst_rtp_speex_depay_get_mode (gint rate)
|
|
{
|
|
if (rate > 25000)
|
|
return 2;
|
|
else if (rate > 12500)
|
|
return 1;
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
/* len 4 bytes LE,
|
|
* vendor string (len bytes),
|
|
* user_len 4 (0) bytes LE
|
|
*/
|
|
static const gchar gst_rtp_speex_comment[] =
|
|
"\045\0\0\0Depayloaded with GStreamer speexdepay\0\0\0\0";
|
|
|
|
static gboolean
|
|
gst_rtp_speex_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
|
|
{
|
|
GstStructure *structure;
|
|
GstRtpSPEEXDepay *rtpspeexdepay;
|
|
gint clock_rate, nb_channels;
|
|
GstBuffer *buf;
|
|
guint8 *data;
|
|
const gchar *params;
|
|
GstCaps *srccaps;
|
|
gboolean res;
|
|
|
|
rtpspeexdepay = GST_RTP_SPEEX_DEPAY (depayload);
|
|
|
|
structure = gst_caps_get_structure (caps, 0);
|
|
|
|
if (!gst_structure_get_int (structure, "clock-rate", &clock_rate))
|
|
goto no_clockrate;
|
|
depayload->clock_rate = clock_rate;
|
|
|
|
if (!(params = gst_structure_get_string (structure, "encoding-params")))
|
|
nb_channels = 1;
|
|
else {
|
|
nb_channels = atoi (params);
|
|
}
|
|
|
|
/* construct minimal header and comment packet for the decoder */
|
|
buf = gst_buffer_new_and_alloc (80);
|
|
data = GST_BUFFER_DATA (buf);
|
|
memcpy (data, "Speex ", 8);
|
|
data += 8;
|
|
memcpy (data, "1.1.12", 7);
|
|
data += 20;
|
|
GST_WRITE_UINT32_LE (data, 1); /* version */
|
|
data += 4;
|
|
GST_WRITE_UINT32_LE (data, 80); /* header_size */
|
|
data += 4;
|
|
GST_WRITE_UINT32_LE (data, clock_rate); /* rate */
|
|
data += 4;
|
|
GST_WRITE_UINT32_LE (data, gst_rtp_speex_depay_get_mode (clock_rate)); /* mode */
|
|
data += 4;
|
|
GST_WRITE_UINT32_LE (data, 4); /* mode_bitstream_version */
|
|
data += 4;
|
|
GST_WRITE_UINT32_LE (data, nb_channels); /* nb_channels */
|
|
data += 4;
|
|
GST_WRITE_UINT32_LE (data, -1); /* bitrate */
|
|
data += 4;
|
|
GST_WRITE_UINT32_LE (data, 0xa0); /* frame_size */
|
|
data += 4;
|
|
GST_WRITE_UINT32_LE (data, 0); /* VBR */
|
|
data += 4;
|
|
GST_WRITE_UINT32_LE (data, 1); /* frames_per_packet */
|
|
data += 4;
|
|
GST_WRITE_UINT32_LE (data, 0); /* extra_headers */
|
|
data += 4;
|
|
GST_WRITE_UINT32_LE (data, 0); /* reserved1 */
|
|
data += 4;
|
|
GST_WRITE_UINT32_LE (data, 0); /* reserved2 */
|
|
|
|
srccaps = gst_caps_new_simple ("audio/x-speex", NULL);
|
|
res = gst_pad_set_caps (depayload->srcpad, srccaps);
|
|
gst_caps_unref (srccaps);
|
|
|
|
gst_buffer_set_caps (buf, GST_PAD_CAPS (depayload->srcpad));
|
|
gst_base_rtp_depayload_push (GST_BASE_RTP_DEPAYLOAD (rtpspeexdepay), buf);
|
|
|
|
buf = gst_buffer_new_and_alloc (sizeof (gst_rtp_speex_comment));
|
|
memcpy (GST_BUFFER_DATA (buf), gst_rtp_speex_comment,
|
|
sizeof (gst_rtp_speex_comment));
|
|
|
|
gst_buffer_set_caps (buf, GST_PAD_CAPS (depayload->srcpad));
|
|
gst_base_rtp_depayload_push (GST_BASE_RTP_DEPAYLOAD (rtpspeexdepay), buf);
|
|
|
|
return res;
|
|
|
|
/* ERRORS */
|
|
no_clockrate:
|
|
{
|
|
GST_DEBUG_OBJECT (depayload, "no clock-rate specified");
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
static GstBuffer *
|
|
gst_rtp_speex_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
|
|
{
|
|
GstBuffer *outbuf = NULL;
|
|
|
|
GST_DEBUG ("process : got %d bytes, mark %d ts %u seqn %d",
|
|
GST_BUFFER_SIZE (buf),
|
|
gst_rtp_buffer_get_marker (buf),
|
|
gst_rtp_buffer_get_timestamp (buf), gst_rtp_buffer_get_seq (buf));
|
|
|
|
/* nothing special to be done */
|
|
outbuf = gst_rtp_buffer_get_payload_buffer (buf);
|
|
|
|
GST_BUFFER_DURATION (outbuf) = 20 * GST_MSECOND;
|
|
|
|
return outbuf;
|
|
}
|
|
|
|
gboolean
|
|
gst_rtp_speex_depay_plugin_init (GstPlugin * plugin)
|
|
{
|
|
return gst_element_register (plugin, "rtpspeexdepay",
|
|
GST_RANK_MARGINAL, GST_TYPE_RTP_SPEEX_DEPAY);
|
|
}
|