diff options
author | Wim Taymans <wim.taymans@gmail.com> | 2002-01-13 22:27:25 +0000 |
---|---|---|
committer | Wim Taymans <wim.taymans@gmail.com> | 2002-01-13 22:27:25 +0000 |
commit | 97454065ce4921877100d0f829d4638438424dfe (patch) | |
tree | b7fba2905e195b55f136e65332777fb96fee3d65 /gst/law | |
parent | 1ea946d2d26998d7056d233548d88b57322ffdcf (diff) |
Bring the plugins in sync with the new core capsnego system.
Original commit message from CVS:
Bring the plugins in sync with the new core capsnego system.
Added some features, enhancements...
Diffstat (limited to 'gst/law')
-rw-r--r-- | gst/law/alaw-decode.c | 8 | ||||
-rw-r--r-- | gst/law/alaw-encode.c | 6 | ||||
-rw-r--r-- | gst/law/mulaw-decode.c | 6 | ||||
-rw-r--r-- | gst/law/mulaw-encode.c | 6 |
4 files changed, 17 insertions, 9 deletions
diff --git a/gst/law/alaw-decode.c b/gst/law/alaw-decode.c index 872d5335..23dd6084 100644 --- a/gst/law/alaw-decode.c +++ b/gst/law/alaw-decode.c @@ -46,7 +46,8 @@ static void gst_alawdec_chain (GstPad *pad, GstBuffer *buf); static GstElementClass *parent_class = NULL; //static guint gst_stereo_signals[LAST_SIGNAL] = { 0 }; - +// +/* static GstPadNegotiateReturn alawdec_negotiate_sink (GstPad *pad, GstCaps **caps, gint counter) { @@ -65,7 +66,7 @@ alawdec_negotiate_sink (GstPad *pad, GstCaps **caps, gint counter) gst_caps_set(tempcaps,"width",GST_PROPS_INT(16)); gst_caps_set(tempcaps,"signed",GST_PROPS_BOOLEAN(TRUE)); - if (gst_pad_set_caps (alawdec->srcpad, tempcaps)) + if (gst_pad_try_set_caps (alawdec->srcpad, tempcaps)) { return GST_PAD_NEGOTIATE_AGREE; } @@ -74,6 +75,7 @@ alawdec_negotiate_sink (GstPad *pad, GstCaps **caps, gint counter) return GST_PAD_NEGOTIATE_FAIL; } } +*/ GType gst_alawdec_get_type(void) { @@ -115,7 +117,7 @@ gst_alawdec_init (GstALawDec *alawdec) { alawdec->sinkpad = gst_pad_new_from_template(alawdec_sink_template,"sink"); alawdec->srcpad = gst_pad_new_from_template(alawdec_src_template,"src"); - gst_pad_set_negotiate_function(alawdec->sinkpad, alawdec_negotiate_sink); + //gst_pad_set_negotiate_function(alawdec->sinkpad, alawdec_negotiate_sink); gst_element_add_pad(GST_ELEMENT(alawdec),alawdec->sinkpad); gst_pad_set_chain_function(alawdec->sinkpad,gst_alawdec_chain); diff --git a/gst/law/alaw-encode.c b/gst/law/alaw-encode.c index ab54bd16..ed4f6851 100644 --- a/gst/law/alaw-encode.c +++ b/gst/law/alaw-encode.c @@ -47,6 +47,7 @@ static void gst_alawenc_chain (GstPad *pad, GstBuffer *buf); static GstElementClass *parent_class = NULL; //static guint gst_stereo_signals[LAST_SIGNAL] = { 0 }; +/* static GstPadNegotiateReturn alawenc_negotiate_sink (GstPad *pad, GstCaps **caps, gint counter) { @@ -65,7 +66,7 @@ alawenc_negotiate_sink (GstPad *pad, GstCaps **caps, gint counter) gst_caps_set(tempcaps,"width",GST_PROPS_INT(8)); gst_caps_set(tempcaps,"signed",GST_PROPS_BOOLEAN(FALSE)); - if (gst_pad_set_caps (alawenc->srcpad, tempcaps)) + if (gst_pad_try_set_caps (alawenc->srcpad, tempcaps)) { return GST_PAD_NEGOTIATE_AGREE; } @@ -74,6 +75,7 @@ alawenc_negotiate_sink (GstPad *pad, GstCaps **caps, gint counter) return GST_PAD_NEGOTIATE_FAIL; } } +*/ GType gst_alawenc_get_type(void) { @@ -115,7 +117,7 @@ gst_alawenc_init (GstALawEnc *alawenc) { alawenc->sinkpad = gst_pad_new_from_template(alawenc_sink_template,"sink"); alawenc->srcpad = gst_pad_new_from_template(alawenc_src_template,"src"); - gst_pad_set_negotiate_function(alawenc->sinkpad, alawenc_negotiate_sink); + //gst_pad_set_negotiate_function(alawenc->sinkpad, alawenc_negotiate_sink); gst_element_add_pad(GST_ELEMENT(alawenc),alawenc->sinkpad); gst_pad_set_chain_function(alawenc->sinkpad,gst_alawenc_chain); diff --git a/gst/law/mulaw-decode.c b/gst/law/mulaw-decode.c index d93c6904..8e27c8fc 100644 --- a/gst/law/mulaw-decode.c +++ b/gst/law/mulaw-decode.c @@ -46,6 +46,7 @@ static void gst_mulawdec_chain (GstPad *pad, GstBuffer *buf); static GstElementClass *parent_class = NULL; //static guint gst_stereo_signals[LAST_SIGNAL] = { 0 }; +/* static GstPadNegotiateReturn mulawdec_negotiate_sink (GstPad *pad, GstCaps **caps, gint counter) { @@ -64,7 +65,7 @@ mulawdec_negotiate_sink (GstPad *pad, GstCaps **caps, gint counter) gst_caps_set(tempcaps,"width",GST_PROPS_INT(16)); gst_caps_set(tempcaps,"signed",GST_PROPS_BOOLEAN(TRUE)); - if (gst_pad_set_caps (mulawdec->srcpad, tempcaps)) + if (gst_pad_try_set_caps (mulawdec->srcpad, tempcaps)) { return GST_PAD_NEGOTIATE_AGREE; } @@ -73,6 +74,7 @@ mulawdec_negotiate_sink (GstPad *pad, GstCaps **caps, gint counter) return GST_PAD_NEGOTIATE_FAIL; } } +*/ GType gst_mulawdec_get_type(void) { @@ -114,7 +116,7 @@ gst_mulawdec_init (GstMuLawDec *mulawdec) { mulawdec->sinkpad = gst_pad_new_from_template(mulawdec_sink_template,"sink"); mulawdec->srcpad = gst_pad_new_from_template(mulawdec_src_template,"src"); - gst_pad_set_negotiate_function(mulawdec->sinkpad, mulawdec_negotiate_sink); + //gst_pad_set_negotiate_function(mulawdec->sinkpad, mulawdec_negotiate_sink); gst_element_add_pad(GST_ELEMENT(mulawdec),mulawdec->sinkpad); gst_pad_set_chain_function(mulawdec->sinkpad,gst_mulawdec_chain); diff --git a/gst/law/mulaw-encode.c b/gst/law/mulaw-encode.c index 40d868d9..3c88121c 100644 --- a/gst/law/mulaw-encode.c +++ b/gst/law/mulaw-encode.c @@ -46,6 +46,7 @@ static void gst_mulawenc_chain (GstPad *pad, GstBuffer *buf); static GstElementClass *parent_class = NULL; //static guint gst_stereo_signals[LAST_SIGNAL] = { 0 }; +/* static GstPadNegotiateReturn mulawenc_negotiate_sink (GstPad *pad, GstCaps **caps, gint counter) { @@ -64,7 +65,7 @@ mulawenc_negotiate_sink (GstPad *pad, GstCaps **caps, gint counter) gst_caps_set(tempcaps,"width",GST_PROPS_INT(8)); gst_caps_set(tempcaps,"signed",GST_PROPS_BOOLEAN(FALSE)); - if (gst_pad_set_caps (mulawenc->srcpad, tempcaps)) + if (gst_pad_try_set_caps (mulawenc->srcpad, tempcaps)) { return GST_PAD_NEGOTIATE_AGREE; } @@ -73,6 +74,7 @@ mulawenc_negotiate_sink (GstPad *pad, GstCaps **caps, gint counter) return GST_PAD_NEGOTIATE_FAIL; } } +*/ GType gst_mulawenc_get_type(void) { @@ -114,7 +116,7 @@ gst_mulawenc_init (GstMuLawEnc *mulawenc) { mulawenc->sinkpad = gst_pad_new_from_template(mulawenc_sink_template,"sink"); mulawenc->srcpad = gst_pad_new_from_template(mulawenc_src_template,"src"); - gst_pad_set_negotiate_function(mulawenc->sinkpad, mulawenc_negotiate_sink); + //gst_pad_set_negotiate_function(mulawenc->sinkpad, mulawenc_negotiate_sink); gst_element_add_pad(GST_ELEMENT(mulawenc),mulawenc->sinkpad); gst_pad_set_chain_function(mulawenc->sinkpad,gst_mulawenc_chain); |