rtppcmApay/depay: Static clock rates on static payloads, dynamic on dynamic

Partially reverts 397dc60b

diff --git a/gst/rtp/gstrtppcmadepay.c b/gst/rtp/gstrtppcmadepay.c
index 50c858a..91421a5 100644 (file)
--- a/gst/rtp/gstrtppcmadepay.c
+++ b/gst/rtp/gstrtppcmadepay.c
@@ -45,12 +45,12 @@ static GstStaticPadTemplate gst_rtp_pcma_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) [1, MAX ], " "encoding-name = (string) \"PCMA\";"
+        "payload = (int) " GST_RTP_PAYLOAD_PCMA_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) [1, MAX ]")
+        "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
+        "clock-rate = (int) [1, MAX ], encoding-name = (string) \"PCMA\"")
     );
 
 static GstStaticPadTemplate gst_rtp_pcma_depay_src_template =

diff --git a/gst/rtp/gstrtppcmapay.c b/gst/rtp/gstrtppcmapay.c
index d897ce1..8f3da0a 100644 (file)
--- a/gst/rtp/gstrtppcmapay.c
+++ b/gst/rtp/gstrtppcmapay.c
@@ -47,7 +47,7 @@ static GstStaticPadTemplate gst_rtp_pcma_pay_src_template =
         "application/x-rtp, "
         "media = (string) \"audio\", "
         "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
-        "clock-rate = (int) 8000, " "encoding-name = (string) \"PCMA\"")
+        "clock-rate = (int) [1, MAX ], " "encoding-name = (string) \"PCMA\"")
     );
 
 static gboolean gst_rtp_pcma_pay_setcaps (GstBaseRTPPayload * payload,

diff --git a/gst/rtp/gstrtppcmudepay.c b/gst/rtp/gstrtppcmudepay.c
index 395599b..df9a7f6 100644 (file)
--- a/gst/rtp/gstrtppcmudepay.c
+++ b/gst/rtp/gstrtppcmudepay.c
@@ -45,12 +45,12 @@ static GstStaticPadTemplate gst_rtp_pcmu_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) [1, MAX ], " "encoding-name = (string) \"PCMU\";"
+        "payload = (int) " GST_RTP_PAYLOAD_PCMU_STRING ", "
+        "encoding-name = (string) \"PCMU\", clock-rate = (int) 8000; "
         "application/x-rtp, "
         "media = (string) \"audio\", "
-        "payload = (int) " GST_RTP_PAYLOAD_PCMU_STRING ", "
-        "clock-rate = (int) [1, MAX ]")
+        "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
+        "encoding-name = (string) \"PCMU\", clock-rate = (int) [1, MAX ]")
     );
 
 static GstStaticPadTemplate gst_rtp_pcmu_depay_src_template =

diff --git a/gst/rtp/gstrtppcmupay.c b/gst/rtp/gstrtppcmupay.c
index e7a0995..9a95406 100644 (file)
--- a/gst/rtp/gstrtppcmupay.c
+++ b/gst/rtp/gstrtppcmupay.c
@@ -47,7 +47,7 @@ static GstStaticPadTemplate gst_rtp_pcmu_pay_src_template =
         "application/x-rtp, "
         "media = (string) \"audio\", "
         "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
-        "clock-rate = (int) 8000, " "encoding-name = (string) \"PCMU\"")
+        "clock-rate = (int) [1, MAX ], " "encoding-name = (string) \"PCMU\"")
     );
 
 static gboolean gst_rtp_pcmu_pay_setcaps (GstBaseRTPPayload * payload,