mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-08 13:18:52 +00:00
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.
226 lines
6.7 KiB
C
226 lines
6.7 KiB
C
/* GStreamer
|
|
* Copyright (C) <2006> Philippe Khalaf <burger@speedy.org>
|
|
*
|
|
* 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 <stdlib.h>
|
|
#include <gst/rtp/gstrtpbuffer.h>
|
|
#include "gstrtpilbcpay.h"
|
|
|
|
/* elementfactory information */
|
|
static GstElementDetails gst_rtpilbcpay_details = {
|
|
"RTP Payloader for iLBC Audio",
|
|
"Codec/Payloader/Network",
|
|
"Packetize iLBC audio streams into RTP packets",
|
|
"Philippe Kalaf <philippe.kalaf@collabora.co.uk>"
|
|
};
|
|
|
|
GST_DEBUG_CATEGORY_STATIC (rtpilbcpay_debug);
|
|
#define GST_CAT_DEFAULT (rtpilbcpay_debug)
|
|
|
|
static GstStaticPadTemplate gst_rtpilbcpay_sink_template =
|
|
GST_STATIC_PAD_TEMPLATE ("sink",
|
|
GST_PAD_SINK,
|
|
GST_PAD_ALWAYS,
|
|
GST_STATIC_CAPS ("audio/x-iLBC, " "mode = (int) {20, 30}")
|
|
);
|
|
|
|
static GstStaticPadTemplate gst_rtpilbcpay_src_template =
|
|
GST_STATIC_PAD_TEMPLATE ("src",
|
|
GST_PAD_SRC,
|
|
GST_PAD_ALWAYS,
|
|
GST_STATIC_CAPS ("application/x-rtp, "
|
|
"media = (string) \"audio\", "
|
|
"payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
|
|
"clock-rate = (int) 8000, "
|
|
"encoding-name = (string) \"ILBC\", "
|
|
"mode = (string) { \"20\", \"30\" }")
|
|
);
|
|
|
|
|
|
static GstCaps *gst_rtpilbcpay_sink_getcaps (GstBaseRTPPayload * payload,
|
|
GstPad * pad);
|
|
static gboolean gst_rtpilbcpay_sink_setcaps (GstBaseRTPPayload * payload,
|
|
GstCaps * caps);
|
|
|
|
GST_BOILERPLATE (GstRTPILBCPay, gst_rtpilbcpay, GstBaseRTPAudioPayload,
|
|
GST_TYPE_BASE_RTP_AUDIO_PAYLOAD);
|
|
|
|
static void
|
|
gst_rtpilbcpay_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_rtpilbcpay_sink_template));
|
|
gst_element_class_add_pad_template (element_class,
|
|
gst_static_pad_template_get (&gst_rtpilbcpay_src_template));
|
|
gst_element_class_set_details (element_class, &gst_rtpilbcpay_details);
|
|
}
|
|
|
|
static void
|
|
gst_rtpilbcpay_class_init (GstRTPILBCPayClass * klass)
|
|
{
|
|
GObjectClass *gobject_class;
|
|
GstElementClass *gstelement_class;
|
|
GstBaseRTPPayloadClass *gstbasertppayload_class;
|
|
|
|
gobject_class = (GObjectClass *) klass;
|
|
gstelement_class = (GstElementClass *) klass;
|
|
gstbasertppayload_class = (GstBaseRTPPayloadClass *) klass;
|
|
|
|
parent_class = g_type_class_ref (GST_TYPE_BASE_RTP_PAYLOAD);
|
|
|
|
gstbasertppayload_class->set_caps = gst_rtpilbcpay_sink_setcaps;
|
|
gstbasertppayload_class->get_caps = gst_rtpilbcpay_sink_getcaps;
|
|
|
|
GST_DEBUG_CATEGORY_INIT (rtpilbcpay_debug, "rtpilbcpay", 0,
|
|
"iLBC audio RTP payloader");
|
|
}
|
|
|
|
static void
|
|
gst_rtpilbcpay_init (GstRTPILBCPay * rtpilbcpay, GstRTPILBCPayClass * klass)
|
|
{
|
|
GstBaseRTPPayload *basertppayload;
|
|
GstBaseRTPAudioPayload *basertpaudiopayload;
|
|
|
|
basertppayload = GST_BASE_RTP_PAYLOAD (rtpilbcpay);
|
|
basertpaudiopayload = GST_BASE_RTP_AUDIO_PAYLOAD (rtpilbcpay);
|
|
|
|
/* we don't set the payload type, it should be set by the application using
|
|
* the pt property or the default 96 will be used */
|
|
basertppayload->clock_rate = 8000;
|
|
|
|
rtpilbcpay->mode = -1;
|
|
|
|
/* tell basertpaudiopayload that this is a frame based codec */
|
|
gst_base_rtp_audio_payload_set_frame_based (basertpaudiopayload);
|
|
}
|
|
|
|
static gboolean
|
|
gst_rtpilbcpay_sink_setcaps (GstBaseRTPPayload * basertppayload, GstCaps * caps)
|
|
{
|
|
GstRTPILBCPay *rtpilbcpay;
|
|
GstBaseRTPAudioPayload *basertpaudiopayload;
|
|
gboolean ret;
|
|
gint mode;
|
|
gchar *mode_str;
|
|
GstStructure *structure;
|
|
const char *payload_name;
|
|
|
|
rtpilbcpay = GST_RTP_ILBC_PAY (basertppayload);
|
|
basertpaudiopayload = GST_BASE_RTP_AUDIO_PAYLOAD (basertppayload);
|
|
|
|
structure = gst_caps_get_structure (caps, 0);
|
|
|
|
payload_name = gst_structure_get_name (structure);
|
|
if (g_ascii_strcasecmp ("audio/x-iLBC", payload_name))
|
|
goto wrong_caps;
|
|
|
|
if (!gst_structure_get_int (structure, "mode", &mode))
|
|
goto no_mode;
|
|
|
|
if (mode != 20 && mode != 30)
|
|
goto wrong_mode;
|
|
|
|
gst_basertppayload_set_options (basertppayload, "audio", TRUE, "ILBC", 8000);
|
|
/* set options for this frame based audio codec */
|
|
gst_base_rtp_audio_payload_set_frame_options (basertpaudiopayload,
|
|
mode, mode == 30 ? 50 : 38);
|
|
|
|
mode_str = g_strdup_printf ("%d", mode);
|
|
ret =
|
|
gst_basertppayload_set_outcaps (basertppayload, "mode", G_TYPE_STRING,
|
|
mode_str, NULL);
|
|
g_free (mode_str);
|
|
|
|
if (mode != rtpilbcpay->mode && rtpilbcpay->mode != -1)
|
|
goto mode_changed;
|
|
|
|
rtpilbcpay->mode = mode;
|
|
|
|
return ret;
|
|
|
|
/* ERRORS */
|
|
wrong_caps:
|
|
{
|
|
GST_ERROR_OBJECT (rtpilbcpay, "expected audio/x-iLBC, received %s",
|
|
payload_name);
|
|
return FALSE;
|
|
}
|
|
no_mode:
|
|
{
|
|
GST_ERROR_OBJECT (rtpilbcpay, "did not receive a mode");
|
|
return FALSE;
|
|
}
|
|
wrong_mode:
|
|
{
|
|
GST_ERROR_OBJECT (rtpilbcpay, "mode must be 20 or 30, received %d", mode);
|
|
return FALSE;
|
|
}
|
|
mode_changed:
|
|
{
|
|
GST_ERROR_OBJECT (rtpilbcpay, "Mode has changed from %d to %d! "
|
|
"Mode cannot change while streaming", rtpilbcpay->mode, mode);
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
/* we return the padtemplate caps with the mode field fixated to a value if we
|
|
* can */
|
|
static GstCaps *
|
|
gst_rtpilbcpay_sink_getcaps (GstBaseRTPPayload * rtppayload, GstPad * pad)
|
|
{
|
|
GstCaps *otherpadcaps;
|
|
GstCaps *caps;
|
|
|
|
otherpadcaps = gst_pad_get_allowed_caps (rtppayload->srcpad);
|
|
caps = gst_caps_copy (gst_pad_get_pad_template_caps (pad));
|
|
|
|
if (otherpadcaps) {
|
|
if (!gst_caps_is_empty (otherpadcaps)) {
|
|
GstStructure *structure;
|
|
const gchar *mode_str;
|
|
gint mode;
|
|
|
|
structure = gst_caps_get_structure (otherpadcaps, 0);
|
|
|
|
/* parse mode, if we can */
|
|
mode_str = gst_structure_get_string (structure, "mode");
|
|
if (mode_str) {
|
|
mode = strtol (mode_str, NULL, 10);
|
|
if (mode == 20 || mode == 30) {
|
|
structure = gst_caps_get_structure (caps, 0);
|
|
gst_structure_set (structure, "mode", G_TYPE_INT, mode, NULL);
|
|
}
|
|
}
|
|
}
|
|
gst_caps_unref (otherpadcaps);
|
|
}
|
|
return caps;
|
|
}
|
|
|
|
gboolean
|
|
gst_rtp_ilbc_pay_plugin_init (GstPlugin * plugin)
|
|
{
|
|
return gst_element_register (plugin, "rtpilbcpay",
|
|
GST_RANK_NONE, GST_TYPE_RTP_ILBC_PAY);
|
|
}
|