diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2007-02-26 10:32:30 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2007-02-26 10:32:30 +0000 |
| commit | 13f01565870862c80e9485ebaf4a9e95ff2cea58 (patch) | |
| tree | 20507c3fb65fe71d9cd4f2a0075632be1fd2fcdf /gst | |
| parent | bc8d60a4e34445d4fe95e50654a737ad91d52772 (diff) | |
| download | gst-plugins-bad-13f01565870862c80e9485ebaf4a9e95ff2cea58.tar.gz gst-plugins-bad-13f01565870862c80e9485ebaf4a9e95ff2cea58.tar.bz2 gst-plugins-bad-13f01565870862c80e9485ebaf4a9e95ff2cea58.zip | |
gst/real/: Use gst_pad_use_fixed_caps() on source pads, to avoid negotiation errors in certain situations (e.g. dec !...
Original commit message from CVS:
* gst/real/gstrealaudiodec.c: (gst_real_audio_dec_init):
* gst/real/gstrealvideodec.c: (gst_real_video_dec_init):
Use gst_pad_use_fixed_caps() on source pads, to avoid negotiation
errors in certain situations (e.g. dec ! cs ! ximagesink and the
imagesink window is resized); also, some minor clean-ups.
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/real/gstrealaudiodec.c | 14 | ||||
| -rw-r--r-- | gst/real/gstrealvideodec.c | 17 |
2 files changed, 17 insertions, 14 deletions
diff --git a/gst/real/gstrealaudiodec.c b/gst/real/gstrealaudiodec.c index f2bbdc37..9e167578 100644 --- a/gst/real/gstrealaudiodec.c +++ b/gst/real/gstrealaudiodec.c @@ -319,13 +319,15 @@ could_not_set_caps: static void gst_real_audio_dec_init (GstRealAudioDec * dec, GstRealAudioDecClass * klass) { - dec->snk = - gst_pad_new_from_template (gst_static_pad_template_get (&snk_t), "sink"); - gst_pad_set_setcaps_function (dec->snk, gst_real_audio_dec_setcaps); - gst_pad_set_chain_function (dec->snk, gst_real_audio_dec_chain); + dec->snk = gst_pad_new_from_static_template (&snk_t, "sink"); + gst_pad_set_setcaps_function (dec->snk, + GST_DEBUG_FUNCPTR (gst_real_audio_dec_setcaps)); + gst_pad_set_chain_function (dec->snk, + GST_DEBUG_FUNCPTR (gst_real_audio_dec_chain)); gst_element_add_pad (GST_ELEMENT (dec), dec->snk); - dec->src = - gst_pad_new_from_template (gst_static_pad_template_get (&src_t), "src"); + + dec->src = gst_pad_new_from_static_template (&src_t, "src"); + gst_pad_use_fixed_caps (dec->src); gst_element_add_pad (GST_ELEMENT (dec), dec->src); } diff --git a/gst/real/gstrealvideodec.c b/gst/real/gstrealvideodec.c index 882e9d8c..0e4c17f1 100644 --- a/gst/real/gstrealvideodec.c +++ b/gst/real/gstrealvideodec.c @@ -743,19 +743,20 @@ close_library (GstRealVideoDecHooks hooks) static void gst_real_video_dec_init (GstRealVideoDec * dec, GstRealVideoDecClass * klass) { - dec->snk = - gst_pad_new_from_template (gst_static_pad_template_get (&snk_t), "sink"); - gst_pad_set_setcaps_function (dec->snk, gst_real_video_dec_setcaps); - gst_pad_set_chain_function (dec->snk, gst_real_video_dec_chain); + dec->snk = gst_pad_new_from_static_template (&snk_t, "sink"); + gst_pad_set_setcaps_function (dec->snk, + GST_DEBUG_FUNCPTR (gst_real_video_dec_setcaps)); + gst_pad_set_chain_function (dec->snk, + GST_DEBUG_FUNCPTR (gst_real_video_dec_chain)); gst_pad_set_activatepush_function (dec->snk, - gst_real_video_dec_activate_push); + GST_DEBUG_FUNCPTR (gst_real_video_dec_activate_push)); gst_element_add_pad (GST_ELEMENT (dec), dec->snk); - dec->src = - gst_pad_new_from_template (gst_static_pad_template_get (&src_t), "src"); + dec->src = gst_pad_new_from_static_template (&src_t, "src"); + gst_pad_use_fixed_caps (dec->src); gst_element_add_pad (GST_ELEMENT (dec), dec->src); - dec->adapter = g_object_new (GST_TYPE_ADAPTER, NULL); + dec->adapter = gst_adapter_new (); } static void |