don't use underscores

Original commit message from CVS:
don't use underscores

diff --git a/gst/rtp/README b/gst/rtp/README
index b809df8..13f0fd9 100644 (file)
--- a/gst/rtp/README
+++ b/gst/rtp/README
@@ -12,28 +12,28 @@ The following fields can or must (*) be specified in the structure:
  * payload: (int) [0, 255]
      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
+     payload types, this value will be >= 96 and the encoding-name must be
      set.
 
- * clock_rate: (int) [0 - MAXINT]
+ * clock-rate: (int) [0 - MAXINT]
     the RTP clock rate
 
    ssrc: (uint) [0 - MAXINT]
     The ssrc value currently in use.
 
-   clock_base: (uint) [0 - MAXINT]
+   clock-base: (uint) [0 - MAXINT]
     The RTP time representing time 0
 
-   seqnum_base:
+   seqnum-base:
     The RTP sequence number representing the first rtp packet
 
-   encoding_name: (String) ANY
+   encoding-name: (String) ANY
      typically second part of the mime type. ex. MP4V-ES. only required if
      payload type >= 96
 
-   encoding_params: (String) ANY
+   encoding-params: (String) ANY
      extra encoding parameters (as in the SDP a=rtpmap: field). only required
-     if different from the default of the encoding_name.
+     if different from the default of the encoding-name.
      
    Optional parameters as key/value pairs, media type specific.
 
@@ -42,9 +42,9 @@ The following fields can or must (*) be specified in the structure:
   "application/x-rtp",
       "media", G_TYPE_STRING, "audio",         -]
       "payload", G_TYPE_INT, 96,                 ] - required
-      "clock_rate", G_TYPE_INT, 8000,           -]
-      "encoding_name", G_TYPE_STRING, "AMR",    -] - required since payload >= 96
-      "encoding_params", G_TYPE_STRING, "1",   -] - optional param for AMR
+      "clock-rate", G_TYPE_INT, 8000,           -]
+      "encoding-name", G_TYPE_STRING, "AMR",    -] - required since payload >= 96
+      "encoding-params", G_TYPE_STRING, "1",   -] - optional param for AMR
       "octet-align", G_TYPE_BOOLEAN, TRUE,     -]
       "crc", G_TYPE_BOOLEAN, FALSE,              ]
       "robust-sorting", G_TYPE_BOOLEAN, FALSE,   ]  AMR specific params.
@@ -53,7 +53,7 @@ The following fields can or must (*) be specified in the structure:
  Mapping of caps to and from SDP fields:
 
    m=<media> <udp port> RTP/AVP <payload>       -] media and payload from caps
-   a=rtpmap:<payload> <encoding_name>/<clock_rate>[/<encoding_params>]
+   a=rtpmap:<payload> <encoding-name>/<clock-rate>[/<encoding-params>]
               -> when <payload> >= 96
    a=fmtp:<payload> <param>=<value>;...
 

diff --git a/gst/rtp/gstrtpamrdec.c b/gst/rtp/gstrtpamrdec.c
index a576e6f..7fc6c9d 100644 (file)
--- a/gst/rtp/gstrtpamrdec.c
+++ b/gst/rtp/gstrtpamrdec.c
@@ -60,13 +60,13 @@ GST_STATIC_PAD_TEMPLATE ("sink",
     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\", "
+        "clock-rate = (int) 8000, "
+        "encoding-name = (string) \"AMR\", "
+        "encoding-params = (string) \"1\", "
         "octet-align = (boolean) TRUE, "
         "crc = (boolean) FALSE, "
         "robust-sorting = (boolean) FALSE, " "interleaving = (boolean) FALSE"
-        /* following options are not needed for a decoder 
+        /* following options are not needed for a decoder
          *
          "mode-set = (int) [ 0, 7 ], "
          "mode-change-period = (int) [ 1, MAX ], "
@@ -215,16 +215,16 @@ gst_rtpamrdec_sink_setcaps (GstPad * pad, GstCaps * caps)
     rtpamrdec->octet_align = TRUE;
   }
 
-  if (!(params = gst_structure_get_string (structure, "encoding_params")))
+  if (!(params = gst_structure_get_string (structure, "encoding-params")))
     rtpamrdec->channels = 1;
   else {
     rtpamrdec->channels = atoi (params);
   }
 
-  if (!gst_structure_get_int (structure, "clock_rate", &rtpamrdec->rate))
+  if (!gst_structure_get_int (structure, "clock-rate", &rtpamrdec->rate))
     rtpamrdec->rate = 8000;
 
-  /* we require 1 channel, 8000 Hz, octet aligned, no CRC, 
+  /* we require 1 channel, 8000 Hz, octet aligned, no CRC,
    * no robust sorting, no interleaving for now */
   if (rtpamrdec->channels != 1)
     return FALSE;

diff --git a/gst/rtp/gstrtpamrdepay.c b/gst/rtp/gstrtpamrdepay.c
index a576e6f..7fc6c9d 100644 (file)
--- a/gst/rtp/gstrtpamrdepay.c
+++ b/gst/rtp/gstrtpamrdepay.c
@@ -60,13 +60,13 @@ GST_STATIC_PAD_TEMPLATE ("sink",
     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\", "
+        "clock-rate = (int) 8000, "
+        "encoding-name = (string) \"AMR\", "
+        "encoding-params = (string) \"1\", "
         "octet-align = (boolean) TRUE, "
         "crc = (boolean) FALSE, "
         "robust-sorting = (boolean) FALSE, " "interleaving = (boolean) FALSE"
-        /* following options are not needed for a decoder 
+        /* following options are not needed for a decoder
          *
          "mode-set = (int) [ 0, 7 ], "
          "mode-change-period = (int) [ 1, MAX ], "
@@ -215,16 +215,16 @@ gst_rtpamrdec_sink_setcaps (GstPad * pad, GstCaps * caps)
     rtpamrdec->octet_align = TRUE;
   }
 
-  if (!(params = gst_structure_get_string (structure, "encoding_params")))
+  if (!(params = gst_structure_get_string (structure, "encoding-params")))
     rtpamrdec->channels = 1;
   else {
     rtpamrdec->channels = atoi (params);
   }
 
-  if (!gst_structure_get_int (structure, "clock_rate", &rtpamrdec->rate))
+  if (!gst_structure_get_int (structure, "clock-rate", &rtpamrdec->rate))
     rtpamrdec->rate = 8000;
 
-  /* we require 1 channel, 8000 Hz, octet aligned, no CRC, 
+  /* we require 1 channel, 8000 Hz, octet aligned, no CRC,
    * no robust sorting, no interleaving for now */
   if (rtpamrdec->channels != 1)
     return FALSE;

diff --git a/gst/rtp/gstrtpamrenc.c b/gst/rtp/gstrtpamrenc.c
index 9b867cf..37e5dd0 100644 (file)
--- a/gst/rtp/gstrtpamrenc.c
+++ b/gst/rtp/gstrtpamrenc.c
@@ -51,9 +51,9 @@ GST_STATIC_PAD_TEMPLATE ("src",
     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\", "
+        "clock-rate = (int) 8000, "
+        "encoding-name = (string) \"AMR\", "
+        "encoding-params = (string) \"1\", "
         "octet-align = (boolean) TRUE, "
         "crc = (boolean) FALSE, "
         "robust-sorting = (boolean) FALSE, "
@@ -144,7 +144,7 @@ gst_rtpamrenc_setcaps (GstBaseRTPPayload * basepayload, GstCaps * caps)
 
   gst_basertppayload_set_options (basepayload, "audio", TRUE, "AMR", 8000);
   gst_basertppayload_set_outcaps (basepayload,
-      "encoding_params", G_TYPE_STRING, "1",
+      "encoding-params", G_TYPE_STRING, "1",
       "octet-align", G_TYPE_BOOLEAN, TRUE,
       "crc", G_TYPE_BOOLEAN, FALSE,
       "robust-sorting", G_TYPE_BOOLEAN, FALSE,

diff --git a/gst/rtp/gstrtpamrpay.c b/gst/rtp/gstrtpamrpay.c
index 9b867cf..37e5dd0 100644 (file)
--- a/gst/rtp/gstrtpamrpay.c
+++ b/gst/rtp/gstrtpamrpay.c
@@ -51,9 +51,9 @@ GST_STATIC_PAD_TEMPLATE ("src",
     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\", "
+        "clock-rate = (int) 8000, "
+        "encoding-name = (string) \"AMR\", "
+        "encoding-params = (string) \"1\", "
         "octet-align = (boolean) TRUE, "
         "crc = (boolean) FALSE, "
         "robust-sorting = (boolean) FALSE, "
@@ -144,7 +144,7 @@ gst_rtpamrenc_setcaps (GstBaseRTPPayload * basepayload, GstCaps * caps)
 
   gst_basertppayload_set_options (basepayload, "audio", TRUE, "AMR", 8000);
   gst_basertppayload_set_outcaps (basepayload,
-      "encoding_params", G_TYPE_STRING, "1",
+      "encoding-params", G_TYPE_STRING, "1",
       "octet-align", G_TYPE_BOOLEAN, TRUE,
       "crc", G_TYPE_BOOLEAN, FALSE,
       "robust-sorting", G_TYPE_BOOLEAN, FALSE,

diff --git a/gst/rtp/gstrtpgsmenc.c b/gst/rtp/gstrtpgsmenc.c
index 19930ac..0589e6e 100644 (file)
--- a/gst/rtp/gstrtpgsmenc.c
+++ b/gst/rtp/gstrtpgsmenc.c
@@ -49,7 +49,7 @@ GST_STATIC_PAD_TEMPLATE ("src",
     GST_STATIC_CAPS ("application/x-rtp, "
         "media = (string) \"audio\", "
         "payload = (int) [ 96, 255 ], "
-        "clock_rate = (int) 8000, " "encoding_name = (string) \"GSM\"")
+        "clock-rate = (int) 8000, " "encoding-name = (string) \"GSM\"")
     );
 
 

diff --git a/gst/rtp/gstrtpgsmpay.c b/gst/rtp/gstrtpgsmpay.c
index 19930ac..0589e6e 100644 (file)
--- a/gst/rtp/gstrtpgsmpay.c
+++ b/gst/rtp/gstrtpgsmpay.c
@@ -49,7 +49,7 @@ GST_STATIC_PAD_TEMPLATE ("src",
     GST_STATIC_CAPS ("application/x-rtp, "
         "media = (string) \"audio\", "
         "payload = (int) [ 96, 255 ], "
-        "clock_rate = (int) 8000, " "encoding_name = (string) \"GSM\"")
+        "clock-rate = (int) 8000, " "encoding-name = (string) \"GSM\"")
     );
 
 

diff --git a/gst/rtp/gstrtph263pdec.c b/gst/rtp/gstrtph263pdec.c
index 138388e..4a7467b 100644 (file)
--- a/gst/rtp/gstrtph263pdec.c
+++ b/gst/rtp/gstrtph263pdec.c
@@ -56,7 +56,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
     GST_STATIC_CAPS ("application/x-rtp, "
         "media = (string) \"video\", "
         "payload = (int) [ 96, 255 ], "
-        "clock_rate = (int) 90000, " "encoding_name = (string) \"H263-1998\"")
+        "clock-rate = (int) 90000, " "encoding-name = (string) \"H263-1998\"")
     );
 
 

diff --git a/gst/rtp/gstrtph263pdepay.c b/gst/rtp/gstrtph263pdepay.c
index 138388e..4a7467b 100644 (file)
--- a/gst/rtp/gstrtph263pdepay.c
+++ b/gst/rtp/gstrtph263pdepay.c
@@ -56,7 +56,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
     GST_STATIC_CAPS ("application/x-rtp, "
         "media = (string) \"video\", "
         "payload = (int) [ 96, 255 ], "
-        "clock_rate = (int) 90000, " "encoding_name = (string) \"H263-1998\"")
+        "clock-rate = (int) 90000, " "encoding-name = (string) \"H263-1998\"")
     );
 
 

diff --git a/gst/rtp/gstrtph263penc.c b/gst/rtp/gstrtph263penc.c
index c1fb93f..ebf1207 100644 (file)
--- a/gst/rtp/gstrtph263penc.c
+++ b/gst/rtp/gstrtph263penc.c
@@ -44,7 +44,7 @@ GST_STATIC_PAD_TEMPLATE ("src",
     GST_STATIC_CAPS ("application/x-rtp, "
         "media = (string) \"video\", "
         "payload = (int) [ 96, 255 ], "
-        "clock_rate = (int) 90000, " "encoding_name = (string) \"H263-1998\"")
+        "clock-rate = (int) 90000, " "encoding-name = (string) \"H263-1998\"")
     );
 
 static void gst_rtph263penc_class_init (GstRtpH263PEncClass * klass);

diff --git a/gst/rtp/gstrtph263ppay.c b/gst/rtp/gstrtph263ppay.c
index c1fb93f..ebf1207 100644 (file)
--- a/gst/rtp/gstrtph263ppay.c
+++ b/gst/rtp/gstrtph263ppay.c
@@ -44,7 +44,7 @@ GST_STATIC_PAD_TEMPLATE ("src",
     GST_STATIC_CAPS ("application/x-rtp, "
         "media = (string) \"video\", "
         "payload = (int) [ 96, 255 ], "
-        "clock_rate = (int) 90000, " "encoding_name = (string) \"H263-1998\"")
+        "clock-rate = (int) 90000, " "encoding-name = (string) \"H263-1998\"")
     );
 
 static void gst_rtph263penc_class_init (GstRtpH263PEncClass * klass);

diff --git a/gst/rtp/gstrtpmp4vdec.c b/gst/rtp/gstrtpmp4vdec.c
index 4250e77..fba38d6 100644 (file)
--- a/gst/rtp/gstrtpmp4vdec.c
+++ b/gst/rtp/gstrtpmp4vdec.c
@@ -57,7 +57,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
     GST_STATIC_CAPS ("application/x-rtp, "
         "media = (string) \"video\", "
         "payload = (int) [ 96, 255 ], "
-        "clock_rate = (int) [1, MAX ], " "encoding_name = (string) \"MP4V-ES\""
+        "clock-rate = (int) [1, MAX ], " "encoding-name = (string) \"MP4V-ES\""
         /* All optional parameters
          *
          * "profile-level-id=[1,MAX]"
@@ -166,7 +166,7 @@ gst_rtpmp4vdec_setcaps (GstPad * pad, GstCaps * caps)
 
   structure = gst_caps_get_structure (caps, 0);
 
-  if (!gst_structure_get_int (structure, "clock_rate", &rtpmp4vdec->rate))
+  if (!gst_structure_get_int (structure, "clock-rate", &rtpmp4vdec->rate))
     rtpmp4vdec->rate = 90000;
 
   srccaps = gst_caps_new_simple ("video/mpeg",

diff --git a/gst/rtp/gstrtpmp4vdepay.c b/gst/rtp/gstrtpmp4vdepay.c
index 4250e77..fba38d6 100644 (file)
--- a/gst/rtp/gstrtpmp4vdepay.c
+++ b/gst/rtp/gstrtpmp4vdepay.c
@@ -57,7 +57,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
     GST_STATIC_CAPS ("application/x-rtp, "
         "media = (string) \"video\", "
         "payload = (int) [ 96, 255 ], "
-        "clock_rate = (int) [1, MAX ], " "encoding_name = (string) \"MP4V-ES\""
+        "clock-rate = (int) [1, MAX ], " "encoding-name = (string) \"MP4V-ES\""
         /* All optional parameters
          *
          * "profile-level-id=[1,MAX]"
@@ -166,7 +166,7 @@ gst_rtpmp4vdec_setcaps (GstPad * pad, GstCaps * caps)
 
   structure = gst_caps_get_structure (caps, 0);
 
-  if (!gst_structure_get_int (structure, "clock_rate", &rtpmp4vdec->rate))
+  if (!gst_structure_get_int (structure, "clock-rate", &rtpmp4vdec->rate))
     rtpmp4vdec->rate = 90000;
 
   srccaps = gst_caps_new_simple ("video/mpeg",

diff --git a/gst/rtp/gstrtpmp4venc.c b/gst/rtp/gstrtpmp4venc.c
index bba139a..d9de14c 100644 (file)
--- a/gst/rtp/gstrtpmp4venc.c
+++ b/gst/rtp/gstrtpmp4venc.c
@@ -45,8 +45,8 @@ GST_STATIC_PAD_TEMPLATE ("src",
     GST_STATIC_CAPS ("application/x-rtp, "
         "media = (string) \"video\", "
         "payload = (int) [ 96, 255 ], "
-        "clock_rate = (int) [1, MAX ], "
-        "encoding_name = (string) \"MP4V-ES\", " "profile-level-id=[1,MAX]"
+        "clock-rate = (int) [1, MAX ], "
+        "encoding-name = (string) \"MP4V-ES\", " "profile-level-id=[1,MAX]"
         /* All optional parameters
          *
          * "config="

diff --git a/gst/rtp/gstrtpmp4vpay.c b/gst/rtp/gstrtpmp4vpay.c
index bba139a..d9de14c 100644 (file)
--- a/gst/rtp/gstrtpmp4vpay.c
+++ b/gst/rtp/gstrtpmp4vpay.c
@@ -45,8 +45,8 @@ GST_STATIC_PAD_TEMPLATE ("src",
     GST_STATIC_CAPS ("application/x-rtp, "
         "media = (string) \"video\", "
         "payload = (int) [ 96, 255 ], "
-        "clock_rate = (int) [1, MAX ], "
-        "encoding_name = (string) \"MP4V-ES\", " "profile-level-id=[1,MAX]"
+        "clock-rate = (int) [1, MAX ], "
+        "encoding-name = (string) \"MP4V-ES\", " "profile-level-id=[1,MAX]"
         /* All optional parameters
          *
          * "config="

diff --git a/gst/rtp/gstrtpmpadec.c b/gst/rtp/gstrtpmpadec.c
index f2adc4b..0a3f315 100644 (file)
--- a/gst/rtp/gstrtpmpadec.c
+++ b/gst/rtp/gstrtpmpadec.c
@@ -56,7 +56,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
     GST_STATIC_CAPS ("application/x-rtp, "
         "media = (string) \"audio\", "
         "payload = (int) [ 96, 255 ], "
-        "clock_rate = (int) 90000, " "encoding_name = (string) \"MPA\"")
+        "clock-rate = (int) 90000, " "encoding-name = (string) \"MPA\"")
     );
 
 

diff --git a/gst/rtp/gstrtpmpadepay.c b/gst/rtp/gstrtpmpadepay.c
index f2adc4b..0a3f315 100644 (file)
--- a/gst/rtp/gstrtpmpadepay.c
+++ b/gst/rtp/gstrtpmpadepay.c
@@ -56,7 +56,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
     GST_STATIC_CAPS ("application/x-rtp, "
         "media = (string) \"audio\", "
         "payload = (int) [ 96, 255 ], "
-        "clock_rate = (int) 90000, " "encoding_name = (string) \"MPA\"")
+        "clock-rate = (int) 90000, " "encoding-name = (string) \"MPA\"")
     );
 
 

diff --git a/gst/rtp/gstrtpmpaenc.c b/gst/rtp/gstrtpmpaenc.c
index 691e556..34aa254 100644 (file)
--- a/gst/rtp/gstrtpmpaenc.c
+++ b/gst/rtp/gstrtpmpaenc.c
@@ -44,7 +44,7 @@ GST_STATIC_PAD_TEMPLATE ("src",
     GST_STATIC_CAPS ("application/x-rtp, "
         "media = (string) \"audio\", "
         "payload = (int) [ 96, 255 ], "
-        "clock_rate = (int) 90000, " "encoding_name = (string) \"MPA\"")
+        "clock-rate = (int) 90000, " "encoding-name = (string) \"MPA\"")
     );
 
 static void gst_rtpmpaenc_class_init (GstRtpMPAEncClass * klass);

diff --git a/gst/rtp/gstrtpmpapay.c b/gst/rtp/gstrtpmpapay.c
index 691e556..34aa254 100644 (file)
--- a/gst/rtp/gstrtpmpapay.c
+++ b/gst/rtp/gstrtpmpapay.c
@@ -44,7 +44,7 @@ GST_STATIC_PAD_TEMPLATE ("src",
     GST_STATIC_CAPS ("application/x-rtp, "
         "media = (string) \"audio\", "
         "payload = (int) [ 96, 255 ], "
-        "clock_rate = (int) 90000, " "encoding_name = (string) \"MPA\"")
+        "clock-rate = (int) 90000, " "encoding-name = (string) \"MPA\"")
     );
 
 static void gst_rtpmpaenc_class_init (GstRtpMPAEncClass * klass);