From 75a0669d5f145926e0a246cf12695ca59485a762 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 30 Sep 2005 16:36:49 +0000 Subject: [PATCH] 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) --- ChangeLog | 11 +++++++++++ common | 2 +- gst/rtp/gstrtpamrenc.c | 2 +- gst/rtp/gstrtpamrpay.c | 2 +- gst/rtp/gstrtpgsmdepay.c | 5 ++++- gst/rtp/gstrtpgsmparse.c | 5 ++++- gst/rtp/gstrtph263penc.c | 2 +- gst/rtp/gstrtph263ppay.c | 2 +- gst/rtp/gstrtpmp4venc.c | 2 +- gst/rtp/gstrtpmp4vpay.c | 2 +- gst/rtp/gstrtpmpaenc.c | 2 +- gst/rtp/gstrtpmpapay.c | 2 +- 12 files changed, 28 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7655214605..94d8a0cee0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2005-09-30 Wim Taymans + + * 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 * gst/level/level-example.c: (main): diff --git a/common b/common index 7caeee4b94..7d175466d3 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 7caeee4b949b4388927fec7fcf25f767429bde30 +Subproject commit 7d175466d3319fe55327608ea1f7a20619ab5634 diff --git a/gst/rtp/gstrtpamrenc.c b/gst/rtp/gstrtpamrenc.c index 29cdb2b030..2528a8c9cc 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 " }; diff --git a/gst/rtp/gstrtpamrpay.c b/gst/rtp/gstrtpamrpay.c index 29cdb2b030..2528a8c9cc 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 " }; diff --git a/gst/rtp/gstrtpgsmdepay.c b/gst/rtp/gstrtpgsmdepay.c index 97b43420f8..6b6122bd95 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 97b43420f8..6b6122bd95 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 ebf1207f89..c140249406 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 " }; diff --git a/gst/rtp/gstrtph263ppay.c b/gst/rtp/gstrtph263ppay.c index ebf1207f89..c140249406 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 " }; diff --git a/gst/rtp/gstrtpmp4venc.c b/gst/rtp/gstrtpmp4venc.c index 08644edb96..e73d8d061a 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 " }; diff --git a/gst/rtp/gstrtpmp4vpay.c b/gst/rtp/gstrtpmp4vpay.c index 08644edb96..e73d8d061a 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 " }; diff --git a/gst/rtp/gstrtpmpaenc.c b/gst/rtp/gstrtpmpaenc.c index bc9f87a7b8..cbfc4a4366 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 " }; diff --git a/gst/rtp/gstrtpmpapay.c b/gst/rtp/gstrtpmpapay.c index bc9f87a7b8..cbfc4a4366 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 " };