summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2005-09-30 16:36:49 +0000
committerWim Taymans <wim.taymans@gmail.com>2005-09-30 16:36:49 +0000
commit75a0669d5f145926e0a246cf12695ca59485a762 (patch)
treeebe541e5bb164f7da751955a798dc5decb12c6d8
parent9052406cedd529c74fefe72ca7301e015ac7c995 (diff)
gst/rtp/: Various class and caps fixes from Andre Magalhaes (andrunko)
Original commit message from CVS: * gst/rtp/gstrtpamrenc.c: (gst_rtpamrenc_setcaps): * gst/rtp/gstrtpgsmparse.c: * gst/rtp/gstrtph263penc.c: * gst/rtp/gstrtpmp4venc.c: (gst_rtpmp4venc_class_init), (gst_rtpmp4venc_parse_data), (gst_rtpmp4venc_handle_buffer), (gst_rtpmp4venc_set_property): * gst/rtp/gstrtpmpaenc.c: (gst_rtpmpaenc_handle_buffer): Various class and caps fixes from Andre Magalhaes (andrunko)
-rw-r--r--ChangeLog11
m---------common0
-rw-r--r--gst/rtp/gstrtpamrenc.c2
-rw-r--r--gst/rtp/gstrtpamrpay.c2
-rw-r--r--gst/rtp/gstrtpgsmdepay.c5
-rw-r--r--gst/rtp/gstrtpgsmparse.c5
-rw-r--r--gst/rtp/gstrtph263penc.c2
-rw-r--r--gst/rtp/gstrtph263ppay.c2
-rw-r--r--gst/rtp/gstrtpmp4venc.c2
-rw-r--r--gst/rtp/gstrtpmp4vpay.c2
-rw-r--r--gst/rtp/gstrtpmpaenc.c2
-rw-r--r--gst/rtp/gstrtpmpapay.c2
12 files changed, 27 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 76552146..94d8a0ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-09-30 Wim Taymans <wim@fluendo.com>
+
+ * gst/rtp/gstrtpamrenc.c: (gst_rtpamrenc_setcaps):
+ * gst/rtp/gstrtpgsmparse.c:
+ * gst/rtp/gstrtph263penc.c:
+ * gst/rtp/gstrtpmp4venc.c: (gst_rtpmp4venc_class_init),
+ (gst_rtpmp4venc_parse_data), (gst_rtpmp4venc_handle_buffer),
+ (gst_rtpmp4venc_set_property):
+ * gst/rtp/gstrtpmpaenc.c: (gst_rtpmpaenc_handle_buffer):
+ Various class and caps fixes from Andre Magalhaes (andrunko)
+
2005-09-29 Wim Taymans <wim@fluendo.com>
* gst/level/level-example.c: (main):
diff --git a/common b/common
-Subproject 7caeee4b949b4388927fec7fcf25f767429bde3
+Subproject 7d175466d3319fe55327608ea1f7a20619ab563
diff --git a/gst/rtp/gstrtpamrenc.c b/gst/rtp/gstrtpamrenc.c
index 29cdb2b0..2528a8c9 100644
--- a/gst/rtp/gstrtpamrenc.c
+++ b/gst/rtp/gstrtpamrenc.c
@@ -32,7 +32,7 @@
/* elementfactory information */
static GstElementDetails gst_rtp_amrenc_details = {
"RTP packet parser",
- "Codec/Parser/Network",
+ "Codec/Encoder/Network",
"Encode AMR audio into RTP packets (RFC 3267)",
"Wim Taymans <wim@fluendo.com>"
};
diff --git a/gst/rtp/gstrtpamrpay.c b/gst/rtp/gstrtpamrpay.c
index 29cdb2b0..2528a8c9 100644
--- a/gst/rtp/gstrtpamrpay.c
+++ b/gst/rtp/gstrtpamrpay.c
@@ -32,7 +32,7 @@
/* elementfactory information */
static GstElementDetails gst_rtp_amrenc_details = {
"RTP packet parser",
- "Codec/Parser/Network",
+ "Codec/Encoder/Network",
"Encode AMR audio into RTP packets (RFC 3267)",
"Wim Taymans <wim@fluendo.com>"
};
diff --git a/gst/rtp/gstrtpgsmdepay.c b/gst/rtp/gstrtpgsmdepay.c
index 97b43420..6b6122bd 100644
--- a/gst/rtp/gstrtpgsmdepay.c
+++ b/gst/rtp/gstrtpgsmdepay.c
@@ -52,7 +52,10 @@ static GstStaticPadTemplate gst_rtpgsmparse_sink_template =
GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("application/x-rtp")
+ GST_STATIC_CAPS ("application/x-rtp, "
+ "media = (string) \"audio\", "
+ "payload = (int) [ 96, 255 ], "
+ "clock-rate = (int) 8000, " "encoding-name = (string) \"GSM\"")
);
diff --git a/gst/rtp/gstrtpgsmparse.c b/gst/rtp/gstrtpgsmparse.c
index 97b43420..6b6122bd 100644
--- a/gst/rtp/gstrtpgsmparse.c
+++ b/gst/rtp/gstrtpgsmparse.c
@@ -52,7 +52,10 @@ static GstStaticPadTemplate gst_rtpgsmparse_sink_template =
GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("application/x-rtp")
+ GST_STATIC_CAPS ("application/x-rtp, "
+ "media = (string) \"audio\", "
+ "payload = (int) [ 96, 255 ], "
+ "clock-rate = (int) 8000, " "encoding-name = (string) \"GSM\"")
);
diff --git a/gst/rtp/gstrtph263penc.c b/gst/rtp/gstrtph263penc.c
index ebf1207f..c1402494 100644
--- a/gst/rtp/gstrtph263penc.c
+++ b/gst/rtp/gstrtph263penc.c
@@ -25,7 +25,7 @@
/* elementfactory information */
static GstElementDetails gst_rtp_h263penc_details = {
"RTP packet parser",
- "Codec/Parser/Network",
+ "Codec/Encoder/Network",
"Encodes H263+ video in RTP packets (RFC 2429)",
"Wim Taymans <wim@fluendo.com>"
};
diff --git a/gst/rtp/gstrtph263ppay.c b/gst/rtp/gstrtph263ppay.c
index ebf1207f..c1402494 100644
--- a/gst/rtp/gstrtph263ppay.c
+++ b/gst/rtp/gstrtph263ppay.c
@@ -25,7 +25,7 @@
/* elementfactory information */
static GstElementDetails gst_rtp_h263penc_details = {
"RTP packet parser",
- "Codec/Parser/Network",
+ "Codec/Encoder/Network",
"Encodes H263+ video in RTP packets (RFC 2429)",
"Wim Taymans <wim@fluendo.com>"
};
diff --git a/gst/rtp/gstrtpmp4venc.c b/gst/rtp/gstrtpmp4venc.c
index 08644edb..e73d8d06 100644
--- a/gst/rtp/gstrtpmp4venc.c
+++ b/gst/rtp/gstrtpmp4venc.c
@@ -25,7 +25,7 @@
/* elementfactory information */
static GstElementDetails gst_rtp_mp4venc_details = {
"RTP packet parser",
- "Codec/Parser/Network",
+ "Codec/Encoder/Network",
"Encode MPEG4 video as RTP packets (RFC 3016)",
"Wim Taymans <wim@fluendo.com>"
};
diff --git a/gst/rtp/gstrtpmp4vpay.c b/gst/rtp/gstrtpmp4vpay.c
index 08644edb..e73d8d06 100644
--- a/gst/rtp/gstrtpmp4vpay.c
+++ b/gst/rtp/gstrtpmp4vpay.c
@@ -25,7 +25,7 @@
/* elementfactory information */
static GstElementDetails gst_rtp_mp4venc_details = {
"RTP packet parser",
- "Codec/Parser/Network",
+ "Codec/Encoder/Network",
"Encode MPEG4 video as RTP packets (RFC 3016)",
"Wim Taymans <wim@fluendo.com>"
};
diff --git a/gst/rtp/gstrtpmpaenc.c b/gst/rtp/gstrtpmpaenc.c
index bc9f87a7..cbfc4a43 100644
--- a/gst/rtp/gstrtpmpaenc.c
+++ b/gst/rtp/gstrtpmpaenc.c
@@ -25,7 +25,7 @@
/* elementfactory information */
static GstElementDetails gst_rtp_mpaenc_details = {
"RTP packet parser",
- "Codec/Parser/Network",
+ "Codec/Encoder/Network",
"Encode MPEG audio as RTP packets (RFC 2038)",
"Wim Taymans <wim@fluendo.com>"
};
diff --git a/gst/rtp/gstrtpmpapay.c b/gst/rtp/gstrtpmpapay.c
index bc9f87a7..cbfc4a43 100644
--- a/gst/rtp/gstrtpmpapay.c
+++ b/gst/rtp/gstrtpmpapay.c
@@ -25,7 +25,7 @@
/* elementfactory information */
static GstElementDetails gst_rtp_mpaenc_details = {
"RTP packet parser",
- "Codec/Parser/Network",
+ "Codec/Encoder/Network",
"Encode MPEG audio as RTP packets (RFC 2038)",
"Wim Taymans <wim@fluendo.com>"
};