mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-11 01:45:33 +00:00
gst/rtp/: Fix caps with payload numbers.
Original commit message from CVS: * gst/rtp/gstrtpamrdepay.c: * gst/rtp/gstrtpgsmdepay.c: * gst/rtp/gstrtph263pdepay.c: * gst/rtp/gstrtph263ppay.c: * gst/rtp/gstrtph264depay.c: * gst/rtp/gstrtpilbcdepay.c: * gst/rtp/gstrtpmp2tdepay.c: * gst/rtp/gstrtpmp4gdepay.c: * gst/rtp/gstrtpmp4gpay.c: * gst/rtp/gstrtpmp4vdepay.c: (gst_rtp_mp4v_depay_class_init): * gst/rtp/gstrtpmp4vpay.c: * gst/rtp/gstrtpmpadepay.c: (gst_rtp_mpa_depay_class_init), (gst_rtp_mpa_depay_init), (gst_rtp_mpa_depay_setcaps), (gst_rtp_mpa_depay_process): * gst/rtp/gstrtpmpvdepay.c: (gst_rtp_mpv_depay_class_init), (gst_rtp_mpv_depay_init), (gst_rtp_mpv_depay_process): * gst/rtp/gstrtppcmadepay.c: * gst/rtp/gstrtppcmudepay.c: * gst/rtp/gstrtpspeexdepay.c: * gst/rtp/gstrtpspeexpay.c: * gst/rtp/gstrtpsv3vdepay.c: * gst/rtp/gstrtptheoradepay.c: * gst/rtp/gstrtptheorapay.c: * gst/rtp/gstrtpvorbisdepay.c: * gst/rtp/gstrtpvorbispay.c: Fix caps with payload numbers. Add some fixed payload numbers to caps when possible.
This commit is contained in:
parent
1cf20feb6e
commit
3df533de2c
23 changed files with 79 additions and 19 deletions
30
ChangeLog
30
ChangeLog
|
@ -1,3 +1,33 @@
|
|||
2007-01-24 Wim Taymans <wim@fluendo.com>
|
||||
|
||||
* gst/rtp/gstrtpamrdepay.c:
|
||||
* gst/rtp/gstrtpgsmdepay.c:
|
||||
* gst/rtp/gstrtph263pdepay.c:
|
||||
* gst/rtp/gstrtph263ppay.c:
|
||||
* gst/rtp/gstrtph264depay.c:
|
||||
* gst/rtp/gstrtpilbcdepay.c:
|
||||
* gst/rtp/gstrtpmp2tdepay.c:
|
||||
* gst/rtp/gstrtpmp4gdepay.c:
|
||||
* gst/rtp/gstrtpmp4gpay.c:
|
||||
* gst/rtp/gstrtpmp4vdepay.c: (gst_rtp_mp4v_depay_class_init):
|
||||
* gst/rtp/gstrtpmp4vpay.c:
|
||||
* gst/rtp/gstrtpmpadepay.c: (gst_rtp_mpa_depay_class_init),
|
||||
(gst_rtp_mpa_depay_init), (gst_rtp_mpa_depay_setcaps),
|
||||
(gst_rtp_mpa_depay_process):
|
||||
* gst/rtp/gstrtpmpvdepay.c: (gst_rtp_mpv_depay_class_init),
|
||||
(gst_rtp_mpv_depay_init), (gst_rtp_mpv_depay_process):
|
||||
* gst/rtp/gstrtppcmadepay.c:
|
||||
* gst/rtp/gstrtppcmudepay.c:
|
||||
* gst/rtp/gstrtpspeexdepay.c:
|
||||
* gst/rtp/gstrtpspeexpay.c:
|
||||
* gst/rtp/gstrtpsv3vdepay.c:
|
||||
* gst/rtp/gstrtptheoradepay.c:
|
||||
* gst/rtp/gstrtptheorapay.c:
|
||||
* gst/rtp/gstrtpvorbisdepay.c:
|
||||
* gst/rtp/gstrtpvorbispay.c:
|
||||
Fix caps with payload numbers.
|
||||
Add some fixed payload numbers to caps when possible.
|
||||
|
||||
2007-01-23 Sebastian Dröge <slomo@circular-chaos.org>
|
||||
|
||||
reviewed by: Stefan Kost <ensonic@users.sf.net>
|
||||
|
|
|
@ -63,6 +63,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
|
|||
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) \"AMR\", "
|
||||
"encoding-params = (string) \"1\", "
|
||||
|
|
|
@ -49,12 +49,17 @@ GST_STATIC_PAD_TEMPLATE ("src",
|
|||
);
|
||||
|
||||
static GstStaticPadTemplate gst_rtp_gsm_depay_sink_template =
|
||||
GST_STATIC_PAD_TEMPLATE ("sink",
|
||||
GST_STATIC_PAD_TEMPLATE ("sink",
|
||||
GST_PAD_SINK,
|
||||
GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS ("application/x-rtp, "
|
||||
"media = (string) \"audio\", "
|
||||
"clock-rate = (int) 8000, " "encoding-name = (string) \"GSM\"")
|
||||
"payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
|
||||
"clock-rate = (int) 8000, " "encoding-name = (string) \"GSM\";"
|
||||
"application/x-rtp, "
|
||||
"media = (string) \"audio\", "
|
||||
"payload = (int) " GST_RTP_PAYLOAD_GSM_STRING ", "
|
||||
"clock-rate = (int) 8000")
|
||||
);
|
||||
|
||||
static GstBuffer *gst_rtp_gsm_depay_process (GstBaseRTPDepayload * _depayload,
|
||||
|
|
|
@ -60,6 +60,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
|
|||
GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS ("application/x-rtp, "
|
||||
"media = (string) \"video\", "
|
||||
"payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
|
||||
"clock-rate = (int) 90000, " "encoding-name = (string) \"H263-1998\"")
|
||||
);
|
||||
|
||||
|
|
|
@ -48,7 +48,7 @@ GST_STATIC_PAD_TEMPLATE ("src",
|
|||
GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS ("application/x-rtp, "
|
||||
"media = (string) \"video\", "
|
||||
"payload = (int) [ 96, 127 ], "
|
||||
"payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
|
||||
"clock-rate = (int) 90000, " "encoding-name = (string) \"H263-1998\"")
|
||||
);
|
||||
|
||||
|
|
|
@ -59,6 +59,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
|
|||
GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS ("application/x-rtp, "
|
||||
"media = (string) \"video\", "
|
||||
"payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
|
||||
"clock-rate = (int) 90000, " "encoding-name = (string) \"H264\"")
|
||||
/** optional parameters **/
|
||||
/* "profile-level-id = (string) ANY, " */
|
||||
|
|
|
@ -51,6 +51,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
|
|||
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 = (int) { 20, 30 }")
|
||||
);
|
||||
|
|
|
@ -55,18 +55,22 @@ GST_STATIC_PAD_TEMPLATE ("src",
|
|||
);
|
||||
|
||||
static GstStaticPadTemplate gst_rtp_mp2t_depay_sink_template =
|
||||
GST_STATIC_PAD_TEMPLATE ("sink",
|
||||
GST_STATIC_PAD_TEMPLATE ("sink",
|
||||
GST_PAD_SINK,
|
||||
GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS ("application/x-rtp, "
|
||||
"media = (string) \"video\", "
|
||||
"clock-rate = (int) [1, MAX ], " "encoding-name = (string) \"MP2T-ES\""
|
||||
"payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
|
||||
"clock-rate = (int) [1, MAX ], " "encoding-name = (string) \"MP2T-ES\";"
|
||||
/* All optional parameters
|
||||
*
|
||||
* "profile-level-id=[1,MAX]"
|
||||
* "config="
|
||||
*/
|
||||
)
|
||||
"application/x-rtp, "
|
||||
"media = (string) \"video\", "
|
||||
"payload = (int) " GST_RTP_PAYLOAD_MP2T_STRING ", "
|
||||
"clock-rate = (int) [1, MAX ]")
|
||||
);
|
||||
|
||||
GST_BOILERPLATE (GstRtpMP2TDepay, gst_rtp_mp2t_depay, GstBaseRTPDepayload,
|
||||
|
|
|
@ -63,7 +63,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
|
|||
GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS ("application/x-rtp, "
|
||||
"media = (string) { \"video\", \"audio\", \"application\" }, "
|
||||
"payload = (int) [ 96, 127 ], "
|
||||
"payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
|
||||
"clock-rate = (int) [1, MAX ], "
|
||||
"encoding-name = (string) \"mpeg4-generic\", "
|
||||
/* required string params */
|
||||
|
|
|
@ -52,7 +52,7 @@ GST_STATIC_PAD_TEMPLATE ("src",
|
|||
GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS ("application/x-rtp, "
|
||||
"media = (string) { \"video\", \"audio\", \"application\" }, "
|
||||
"payload = (int) [ 96, 127 ], "
|
||||
"payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
|
||||
"clock-rate = (int) [1, MAX ], "
|
||||
"encoding-name = (string) \"mpeg4-generic\", "
|
||||
/* required string params */
|
||||
|
|
|
@ -63,6 +63,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
|
|||
GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS ("application/x-rtp, "
|
||||
"media = (string) \"video\", "
|
||||
"payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
|
||||
"clock-rate = (int) [1, MAX ], " "encoding-name = (string) \"MP4V-ES\""
|
||||
/* All optional parameters
|
||||
*
|
||||
|
|
|
@ -51,7 +51,7 @@ GST_STATIC_PAD_TEMPLATE ("src",
|
|||
GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS ("application/x-rtp, "
|
||||
"media = (string) \"video\", "
|
||||
"payload = (int) [ 96, 127 ], "
|
||||
"payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
|
||||
"clock-rate = (int) [1, MAX ], " "encoding-name = (string) \"MP4V-ES\""
|
||||
/* two string params
|
||||
*
|
||||
|
|
|
@ -61,6 +61,7 @@ static GstStaticPadTemplate gst_rtp_mpa_depay_sink_template =
|
|||
GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS ("application/x-rtp, "
|
||||
"media = (string) \"audio\", "
|
||||
"payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
|
||||
"clock-rate = (int) 90000, " "encoding-name = (string) \"MPA\";"
|
||||
"application/x-rtp, "
|
||||
"media = (string) \"audio\", "
|
||||
|
|
|
@ -52,7 +52,7 @@ static GstStaticPadTemplate gst_rtp_mpv_depay_src_template =
|
|||
GST_STATIC_PAD_TEMPLATE ("src",
|
||||
GST_PAD_SRC,
|
||||
GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS ("video/mpeg")
|
||||
GST_STATIC_CAPS ("video/mpeg, systemstream = (boolean) FALSE")
|
||||
);
|
||||
|
||||
static GstStaticPadTemplate gst_rtp_mpv_depay_sink_template =
|
||||
|
@ -61,6 +61,7 @@ static GstStaticPadTemplate gst_rtp_mpv_depay_sink_template =
|
|||
GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS ("application/x-rtp, "
|
||||
"media = (string) \"video\", "
|
||||
"payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
|
||||
"clock-rate = (int) 90000, " "encoding-name = (string) \"MPV\";"
|
||||
"application/x-rtp, "
|
||||
"media = (string) \"video\", "
|
||||
|
|
|
@ -47,12 +47,17 @@ enum
|
|||
};
|
||||
|
||||
static GstStaticPadTemplate gst_rtp_pcma_depay_sink_template =
|
||||
GST_STATIC_PAD_TEMPLATE ("sink",
|
||||
GST_STATIC_PAD_TEMPLATE ("sink",
|
||||
GST_PAD_SINK,
|
||||
GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS ("application/x-rtp, "
|
||||
"media = (string) \"audio\", "
|
||||
"clock-rate = (int) 8000, " "encoding-name = (string) \"PCMA\"")
|
||||
"payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
|
||||
"clock-rate = (int) 8000, " "encoding-name = (string) \"PCMA\";"
|
||||
"application/x-rtp, "
|
||||
"media = (string) \"audio\", "
|
||||
"payload = (int) " GST_RTP_PAYLOAD_PCMA_STRING ", "
|
||||
"clock-rate = (int) 8000")
|
||||
);
|
||||
|
||||
static GstStaticPadTemplate gst_rtp_pcma_depay_src_template =
|
||||
|
|
|
@ -47,13 +47,17 @@ enum
|
|||
};
|
||||
|
||||
static GstStaticPadTemplate gst_rtp_pcmu_depay_sink_template =
|
||||
GST_STATIC_PAD_TEMPLATE ("sink",
|
||||
GST_STATIC_PAD_TEMPLATE ("sink",
|
||||
GST_PAD_SINK,
|
||||
GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS ("application/x-rtp, "
|
||||
"media = (string) \"audio\", "
|
||||
"clock-rate = (int) 8000, " "encoding-name = (string) \"PCMU\"")
|
||||
|
||||
"payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
|
||||
"clock-rate = (int) 8000, " "encoding-name = (string) \"PCMU\";"
|
||||
"application/x-rtp, "
|
||||
"media = (string) \"audio\", "
|
||||
"payload = (int) " GST_RTP_PAYLOAD_PCMU_STRING ", "
|
||||
"clock-rate = (int) 8000")
|
||||
);
|
||||
|
||||
static GstStaticPadTemplate gst_rtp_pcmu_depay_src_template =
|
||||
|
|
|
@ -50,6 +50,7 @@ GST_STATIC_PAD_TEMPLATE ("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\"")
|
||||
|
|
|
@ -47,7 +47,7 @@ GST_STATIC_PAD_TEMPLATE ("src",
|
|||
GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS ("application/x-rtp, "
|
||||
"media = (string) \"audio\", "
|
||||
"payload = (int) [ 96, 127 ], "
|
||||
"payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
|
||||
"clock-rate = (int) 8000, "
|
||||
"encoding-name = (string) \"speex\", "
|
||||
"encoding-params = (string) \"1\"")
|
||||
|
|
|
@ -59,7 +59,9 @@ GST_STATIC_PAD_TEMPLATE ("sink",
|
|||
GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS ("application/x-rtp, "
|
||||
"media = (string) \"video\", "
|
||||
"clock-rate = (int) 90000, " "encoding-name = (string) \"X-SV3V-ES\"")
|
||||
"payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
|
||||
"clock-rate = (int) 90000, "
|
||||
"encoding-name = (string) { \"X-SV3V-ES\", \"X-SorensonVideo\" }")
|
||||
);
|
||||
|
||||
GST_BOILERPLATE (GstRtpSV3VDepay, gst_rtp_sv3v_depay, GstBaseRTPDepayload,
|
||||
|
|
|
@ -55,6 +55,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
|
|||
GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS ("application/x-rtp, "
|
||||
"media = (string) \"video\", "
|
||||
"payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
|
||||
"clock-rate = (int) [1, MAX ], " "encoding-name = (string) \"theora\""
|
||||
/* All required parameters
|
||||
*
|
||||
|
|
|
@ -49,7 +49,7 @@ GST_STATIC_PAD_TEMPLATE ("src",
|
|||
GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS ("application/x-rtp, "
|
||||
"media = (string) \"video\", "
|
||||
"payload = (int) [ 96, 127 ], "
|
||||
"payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
|
||||
"clock-rate = (int) [1, MAX ], " "encoding-name = (string) \"theora\""
|
||||
/* All required parameters
|
||||
*
|
||||
|
|
|
@ -55,6 +55,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
|
|||
GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS ("application/x-rtp, "
|
||||
"media = (string) \"audio\", "
|
||||
"payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
|
||||
"clock-rate = (int) [1, MAX ], " "encoding-name = (string) \"vorbis\""
|
||||
/* All required parameters
|
||||
*
|
||||
|
|
|
@ -47,7 +47,7 @@ GST_STATIC_PAD_TEMPLATE ("src",
|
|||
GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS ("application/x-rtp, "
|
||||
"media = (string) \"audio\", "
|
||||
"payload = (int) [ 96, 127 ], "
|
||||
"payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
|
||||
"clock-rate = (int) [1, MAX ], " "encoding-name = (string) \"vorbis\""
|
||||
/* All required parameters
|
||||
*
|
||||
|
|
Loading…
Reference in a new issue