diff options
author | Ville Syrjala <ville.syrjala@movial.fi> | 2006-10-18 17:06:21 +0000 |
---|---|---|
committer | Wim Taymans <wim.taymans@gmail.com> | 2006-10-18 17:06:21 +0000 |
commit | 69ce71927e37d595424acef94f87b1aff9c3aa8c (patch) | |
tree | 7bce89af0eae2c3a9d60f1d0ef68c1bfca8d1c3a /gst | |
parent | b14738fb2062a766ca772d894acfc08fa178882b (diff) |
gst/rtp/: Add static payload numbers in addition to the dynamic ones.
Original commit message from CVS:
Patch by: Ville Syrjala <ville dot syrjala at movial dot fi>
* gst/rtp/gstrtpgsmpay.c:
* gst/rtp/gstrtph263pay.c:
* gst/rtp/gstrtpmpapay.c:
* gst/rtp/gstrtppcmapay.c: (gst_rtp_pcma_pay_flush),
(gst_rtp_pcma_pay_handle_buffer):
* gst/rtp/gstrtppcmupay.c: (gst_rtp_pcmu_pay_flush):
Add static payload numbers in addition to the dynamic ones.
Fixes #361639.
Diffstat (limited to 'gst')
-rw-r--r-- | gst/rtp/gstrtpgsmpay.c | 6 | ||||
-rw-r--r-- | gst/rtp/gstrtph263pay.c | 6 | ||||
-rw-r--r-- | gst/rtp/gstrtpmpapay.c | 8 | ||||
-rw-r--r-- | gst/rtp/gstrtppcmapay.c | 8 | ||||
-rw-r--r-- | gst/rtp/gstrtppcmupay.c | 6 |
5 files changed, 27 insertions, 7 deletions
diff --git a/gst/rtp/gstrtpgsmpay.c b/gst/rtp/gstrtpgsmpay.c index acbd5d25..bedee4c7 100644 --- a/gst/rtp/gstrtpgsmpay.c +++ b/gst/rtp/gstrtpgsmpay.c @@ -43,12 +43,16 @@ GST_STATIC_PAD_TEMPLATE ("sink", ); static GstStaticPadTemplate gst_rtp_gsm_pay_src_template = -GST_STATIC_PAD_TEMPLATE ("src", + 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_GSM_STRING ", " + "clock-rate = (int) 8000, " "encoding-name = (string) \"GSM\"; " + "application/x-rtp, " + "media = (string) \"audio\", " + "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", " "clock-rate = (int) 8000, " "encoding-name = (string) \"GSM\"") ); diff --git a/gst/rtp/gstrtph263pay.c b/gst/rtp/gstrtph263pay.c index 3f0af97d..31ce8891 100644 --- a/gst/rtp/gstrtph263pay.c +++ b/gst/rtp/gstrtph263pay.c @@ -158,12 +158,16 @@ GST_STATIC_PAD_TEMPLATE ("sink", ); static GstStaticPadTemplate gst_rtp_h263_pay_src_template = -GST_STATIC_PAD_TEMPLATE ("src", + GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ("application/x-rtp, " "media = (string) \"video\", " "payload = (int) " GST_RTP_PAYLOAD_H263_STRING ", " + "clock-rate = (int) 90000, " "encoding-name = (string) \"H263\"; " + "application/x-rtp, " + "media = (string) \"video\", " + "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", " "clock-rate = (int) 90000, " "encoding-name = (string) \"H263\"") ); diff --git a/gst/rtp/gstrtpmpapay.c b/gst/rtp/gstrtpmpapay.c index 2f483606..847f0fc7 100644 --- a/gst/rtp/gstrtpmpapay.c +++ b/gst/rtp/gstrtpmpapay.c @@ -42,12 +42,16 @@ GST_STATIC_PAD_TEMPLATE ("sink", ); static GstStaticPadTemplate gst_rtp_mpa_pay_src_template = -GST_STATIC_PAD_TEMPLATE ("src", + GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ("application/x-rtp, " "media = (string) \"audio\", " - "payload = (int) [ 96, 127 ], " + "payload = (int) " GST_RTP_PAYLOAD_MPA_STRING ", " + "clock-rate = (int) 90000, " "encoding-name = (string) \"MPA\"; " + "application/x-rtp, " + "media = (string) \"audio\", " + "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", " "clock-rate = (int) 90000, " "encoding-name = (string) \"MPA\"") ); diff --git a/gst/rtp/gstrtppcmapay.c b/gst/rtp/gstrtppcmapay.c index 3de906f8..77ee0afb 100644 --- a/gst/rtp/gstrtppcmapay.c +++ b/gst/rtp/gstrtppcmapay.c @@ -44,13 +44,17 @@ GST_STATIC_PAD_TEMPLATE ("sink", ); static GstStaticPadTemplate gst_rtp_pcma_pay_src_template = -GST_STATIC_PAD_TEMPLATE ("src", + 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_PCMA_STRING ", " - "clock-rate = (int) 8000, " "encoding-name = (string) \"PCMA\" ") + "clock-rate = (int) 8000, " "encoding-name = (string) \"PCMA\"; " + "application/x-rtp, " + "media = (string) \"audio\", " + "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", " + "clock-rate = (int) 8000, " "encoding-name = (string) \"PCMA\"") ); static gboolean gst_rtp_pcma_pay_setcaps (GstBaseRTPPayload * payload, diff --git a/gst/rtp/gstrtppcmupay.c b/gst/rtp/gstrtppcmupay.c index 9a3aee30..0f4d236a 100644 --- a/gst/rtp/gstrtppcmupay.c +++ b/gst/rtp/gstrtppcmupay.c @@ -44,12 +44,16 @@ GST_STATIC_PAD_TEMPLATE ("sink", ); static GstStaticPadTemplate gst_rtp_pcmu_pay_src_template = -GST_STATIC_PAD_TEMPLATE ("src", + 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_PCMU_STRING ", " + "clock-rate = (int) 8000, " "encoding-name = (string) \"PCMU\"; " + "application/x-rtp, " + "media = (string) \"audio\", " + "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", " "clock-rate = (int) 8000, " "encoding-name = (string) \"PCMU\"") ); |