From 9a6ca70be2a0629c70ff22de76148ee85d572642 Mon Sep 17 00:00:00 2001 From: Philippe Kalaf Date: Wed, 14 Dec 2005 18:07:16 +0000 Subject: [PATCH] gst-plugins-good/gst/rtp/: Fixed payload range in payloder caps. Removed payload range completly from depayloaders as... Original commit message from CVS: 2005-12-14 Philippe Khalaf * gst-plugins-good/gst/rtp/gstasteriskh263.c: * gst-plugins-good/gst/rtp/gstrtpamrdepay.c: * gst-plugins-good/gst/rtp/gstrtpamrpay.c: * gst-plugins-good/gst/rtp/gstrtpg711depay.c: * gst-plugins-good/gst/rtp/gstrtpg711depay.c: * gst-plugins-good/gst/rtp/gstrtpgsmdepay.c: * gst-plugins-good/gst/rtp/gstrtph263pay.c: * gst-plugins-good/gst/rtp/gstrtph263pdepay.c: * gst-plugins-good/gst/rtp/gstrtph263ppay.c: * gst-plugins-good/gst/rtp/gstrtpmp4vdepay.c: * gst-plugins-good/gst/rtp/gstrtpmp4vpay.c: * gst-plugins-good/gst/rtp/gstrtpmpadepay.c: * gst-plugins-good/gst/rtp/gstrtpmpapay.c: * gst-plugins-good/gst/rtp/README: Fixed payload range in payloder caps. Removed payload range completly from depayloaders as they don't require payload type in their caps. In effect, there isn't any specific payload type for any given codec, only suggestions. Fixes bug #324011. --- ChangeLog | 21 +++++++++++++++++++++ gst/rtp/README | 2 +- gst/rtp/gstasteriskh263.c | 2 +- gst/rtp/gstrtpamrdepay.c | 1 - gst/rtp/gstrtpamrpay.c | 2 +- gst/rtp/gstrtpg711depay.c | 2 -- gst/rtp/gstrtpgsmdepay.c | 1 - gst/rtp/gstrtph263pay.c | 2 +- gst/rtp/gstrtph263pdepay.c | 1 - gst/rtp/gstrtph263ppay.c | 2 +- gst/rtp/gstrtpmp4vdepay.c | 1 - gst/rtp/gstrtpmp4vpay.c | 2 +- gst/rtp/gstrtpmpadepay.c | 1 - gst/rtp/gstrtpmpapay.c | 2 +- 14 files changed, 28 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 17c276d0e3..60f6186047 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2005-12-14 Philippe Khalaf + + * gst-plugins-good/gst/rtp/gstasteriskh263.c: + * gst-plugins-good/gst/rtp/gstrtpamrdepay.c: + * gst-plugins-good/gst/rtp/gstrtpamrpay.c: + * gst-plugins-good/gst/rtp/gstrtpg711depay.c: + * gst-plugins-good/gst/rtp/gstrtpg711depay.c: + * gst-plugins-good/gst/rtp/gstrtpgsmdepay.c: + * gst-plugins-good/gst/rtp/gstrtph263pay.c: + * gst-plugins-good/gst/rtp/gstrtph263pdepay.c: + * gst-plugins-good/gst/rtp/gstrtph263ppay.c: + * gst-plugins-good/gst/rtp/gstrtpmp4vdepay.c: + * gst-plugins-good/gst/rtp/gstrtpmp4vpay.c: + * gst-plugins-good/gst/rtp/gstrtpmpadepay.c: + * gst-plugins-good/gst/rtp/gstrtpmpapay.c: + * gst-plugins-good/gst/rtp/README: + Fixed payload range in payloder caps. Removed payload range completly from + depayloaders as they don't require payload type in their caps. In effect, + there isn't any specific payload type for any given codec, only suggestions. + Fixes bug #324011. + 2005-12-13 Julien MOUTTE * gst/videomixer/videomixer.c: (gst_videomixer_init), diff --git a/gst/rtp/README b/gst/rtp/README index ed1a27b66c..6b16ab1c0c 100644 --- a/gst/rtp/README +++ b/gst/rtp/README @@ -9,7 +9,7 @@ The following fields can or must (*) be specified in the structure: * media: (String) [ "audio", "video", "application", "data", "control" ] Defined in RFC 2327 in the SDP media announcement field. - * payload: (int) [0, 255] + * payload: (int) [0, 127] For audio and video, these will normally be a media payload type as defined in the RTP Audio/Video Profile. For dynamicaly allocated payload types, this value will be >= 96 and the encoding-name must be diff --git a/gst/rtp/gstasteriskh263.c b/gst/rtp/gstasteriskh263.c index cb331ba25b..9597261cff 100644 --- a/gst/rtp/gstasteriskh263.c +++ b/gst/rtp/gstasteriskh263.c @@ -74,7 +74,7 @@ GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_ALWAYS, GST_STATIC_CAPS ("application/x-rtp, " "media = (string) \"video\", " - "payload = (int) [ 96, 255 ], " + "payload = (int) [ 96, 127 ], " "clock-rate = (int) 90000, " "encoding-name = (string) \"H263-1998\"") ); diff --git a/gst/rtp/gstrtpamrdepay.c b/gst/rtp/gstrtpamrdepay.c index c4bc9f4ece..2314c368d8 100644 --- a/gst/rtp/gstrtpamrdepay.c +++ b/gst/rtp/gstrtpamrdepay.c @@ -59,7 +59,6 @@ GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_ALWAYS, GST_STATIC_CAPS ("application/x-rtp, " "media = (string) \"audio\", " - "payload = (int) [ 96, 255 ], " "clock-rate = (int) 8000, " "encoding-name = (string) \"AMR\", " "encoding-params = (string) \"1\", " diff --git a/gst/rtp/gstrtpamrpay.c b/gst/rtp/gstrtpamrpay.c index 80f4b85c3d..8dfed7124d 100644 --- a/gst/rtp/gstrtpamrpay.c +++ b/gst/rtp/gstrtpamrpay.c @@ -50,7 +50,7 @@ GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_ALWAYS, GST_STATIC_CAPS ("application/x-rtp, " "media = (string) \"audio\", " - "payload = (int) [ 96, 255 ], " + "payload = (int) [ 96, 127 ], " "clock-rate = (int) 8000, " "encoding-name = (string) \"AMR\", " "encoding-params = (string) \"1\", " diff --git a/gst/rtp/gstrtpg711depay.c b/gst/rtp/gstrtpg711depay.c index bd96918afa..e4cc6cefde 100644 --- a/gst/rtp/gstrtpg711depay.c +++ b/gst/rtp/gstrtpg711depay.c @@ -48,12 +48,10 @@ static GstStaticPadTemplate gst_rtp_g711_depay_sink_template = GST_PAD_ALWAYS, GST_STATIC_CAPS ("application/x-rtp, " "media = (string) \"audio\", " - "payload = (int) [ 0, 255 ], " "clock-rate = (int) 8000, " "encoding-name = (string) \"PCMU\"; " "application/x-rtp, " "media = (string) \"audio\", " - "payload = (int) [ 0, 255 ], " "clock-rate = (int) 8000, " "encoding-name = (string) \"PCMA\"") ); diff --git a/gst/rtp/gstrtpgsmdepay.c b/gst/rtp/gstrtpgsmdepay.c index a6cc5d4ae9..6f5fb775d7 100644 --- a/gst/rtp/gstrtpgsmdepay.c +++ b/gst/rtp/gstrtpgsmdepay.c @@ -49,7 +49,6 @@ GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_ALWAYS, GST_STATIC_CAPS ("application/x-rtp, " "media = (string) \"audio\", " - "payload = (int) [ 0, 255 ], " "clock-rate = (int) 8000, " "encoding-name = (string) \"GSM\"") ); diff --git a/gst/rtp/gstrtph263pay.c b/gst/rtp/gstrtph263pay.c index 0f9ae3a860..78477723a7 100644 --- a/gst/rtp/gstrtph263pay.c +++ b/gst/rtp/gstrtph263pay.c @@ -159,7 +159,7 @@ GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_ALWAYS, GST_STATIC_CAPS ("application/x-rtp, " "media = (string) \"video\", " - "payload = (int) [ 96, 255 ], " + "payload = (int) [ 96, 127 ], " "clock-rate = (int) 90000, " "encoding-name = (string) \"H263-1998\"") ); diff --git a/gst/rtp/gstrtph263pdepay.c b/gst/rtp/gstrtph263pdepay.c index 9e8d06dc7d..a6af0ce824 100644 --- a/gst/rtp/gstrtph263pdepay.c +++ b/gst/rtp/gstrtph263pdepay.c @@ -55,7 +55,6 @@ GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_ALWAYS, GST_STATIC_CAPS ("application/x-rtp, " "media = (string) \"video\", " - "payload = (int) [ 96, 255 ], " "clock-rate = (int) 90000, " "encoding-name = (string) \"H263-1998\"") ); diff --git a/gst/rtp/gstrtph263ppay.c b/gst/rtp/gstrtph263ppay.c index d41e5fa64a..c35de198c1 100644 --- a/gst/rtp/gstrtph263ppay.c +++ b/gst/rtp/gstrtph263ppay.c @@ -43,7 +43,7 @@ GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_ALWAYS, GST_STATIC_CAPS ("application/x-rtp, " "media = (string) \"video\", " - "payload = (int) [ 96, 255 ], " + "payload = (int) [ 96, 127 ], " "clock-rate = (int) 90000, " "encoding-name = (string) \"H263-1998\"") ); diff --git a/gst/rtp/gstrtpmp4vdepay.c b/gst/rtp/gstrtpmp4vdepay.c index aceea3c459..9cd25aefb7 100644 --- a/gst/rtp/gstrtpmp4vdepay.c +++ b/gst/rtp/gstrtpmp4vdepay.c @@ -56,7 +56,6 @@ GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_ALWAYS, GST_STATIC_CAPS ("application/x-rtp, " "media = (string) \"video\", " - "payload = (int) [ 96, 255 ], " "clock-rate = (int) [1, MAX ], " "encoding-name = (string) \"MP4V-ES\"" /* All optional parameters * diff --git a/gst/rtp/gstrtpmp4vpay.c b/gst/rtp/gstrtpmp4vpay.c index e3dc6b4e76..91ef88d0f0 100644 --- a/gst/rtp/gstrtpmp4vpay.c +++ b/gst/rtp/gstrtpmp4vpay.c @@ -44,7 +44,7 @@ GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_ALWAYS, GST_STATIC_CAPS ("application/x-rtp, " "media = (string) \"video\", " - "payload = (int) [ 96, 255 ], " + "payload = (int) [ 96, 127 ], " "clock-rate = (int) [1, MAX ], " "encoding-name = (string) \"MP4V-ES\"" /* two string params * diff --git a/gst/rtp/gstrtpmpadepay.c b/gst/rtp/gstrtpmpadepay.c index d6c6e5044a..3a6e7fe4b2 100644 --- a/gst/rtp/gstrtpmpadepay.c +++ b/gst/rtp/gstrtpmpadepay.c @@ -55,7 +55,6 @@ GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_ALWAYS, GST_STATIC_CAPS ("application/x-rtp, " "media = (string) \"audio\", " - "payload = (int) [ 96, 255 ], " "clock-rate = (int) 90000, " "encoding-name = (string) \"MPA\"") ); diff --git a/gst/rtp/gstrtpmpapay.c b/gst/rtp/gstrtpmpapay.c index 4b13c7d269..0979d3f271 100644 --- a/gst/rtp/gstrtpmpapay.c +++ b/gst/rtp/gstrtpmpapay.c @@ -43,7 +43,7 @@ GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_ALWAYS, GST_STATIC_CAPS ("application/x-rtp, " "media = (string) \"audio\", " - "payload = (int) [ 96, 255 ], " + "payload = (int) [ 96, 127 ], " "clock-rate = (int) 90000, " "encoding-name = (string) \"MPA\"") );