playsink: gen_video_chain() always returns a bin, no need to check for that

This commit is contained in:
Sebastian Dröge 2010-10-31 19:11:53 +01:00
parent 92133f7ce4
commit 66ce6200a8

View file

@ -2237,7 +2237,7 @@ gst_play_sink_reconfigure (GstPlaySink * playsink)
gst_ghost_pad_set_target (GST_GHOST_PAD_CAST (playsink->video_pad), gst_ghost_pad_set_target (GST_GHOST_PAD_CAST (playsink->video_pad),
playsink->video_sinkpad_stream_synchronizer); playsink->video_sinkpad_stream_synchronizer);
if (playsink->videochain && need_deinterlace) { if (need_deinterlace) {
if (!playsink->videodeinterlacechain) if (!playsink->videodeinterlacechain)
playsink->videodeinterlacechain = playsink->videodeinterlacechain =
gen_video_deinterlace_chain (playsink); gen_video_deinterlace_chain (playsink);
@ -2259,21 +2259,19 @@ gst_play_sink_reconfigure (GstPlaySink * playsink)
} }
} }
if (playsink->videochain) { GST_DEBUG_OBJECT (playsink, "adding video chain");
GST_DEBUG_OBJECT (playsink, "adding video chain"); add_chain (GST_PLAY_CHAIN (playsink->videochain), TRUE);
add_chain (GST_PLAY_CHAIN (playsink->videochain), TRUE); activate_chain (GST_PLAY_CHAIN (playsink->videochain), TRUE);
activate_chain (GST_PLAY_CHAIN (playsink->videochain), TRUE); /* if we are not part of vis or subtitles, set the ghostpad target */
/* if we are not part of vis or subtitles, set the ghostpad target */ if (!need_vis && !need_text && (!playsink->textchain
if (!need_vis && !need_text && (!playsink->textchain || !playsink->text_pad)) {
|| !playsink->text_pad)) { GST_DEBUG_OBJECT (playsink, "ghosting video sinkpad");
GST_DEBUG_OBJECT (playsink, "ghosting video sinkpad"); if (need_deinterlace)
if (need_deinterlace) gst_pad_link_full (playsink->videodeinterlacechain->srcpad,
gst_pad_link_full (playsink->videodeinterlacechain->srcpad, playsink->videochain->sinkpad, GST_PAD_LINK_CHECK_NOTHING);
playsink->videochain->sinkpad, GST_PAD_LINK_CHECK_NOTHING); else
else gst_pad_link_full (playsink->video_srcpad_stream_synchronizer,
gst_pad_link_full (playsink->video_srcpad_stream_synchronizer, playsink->videochain->sinkpad, GST_PAD_LINK_CHECK_NOTHING);
playsink->videochain->sinkpad, GST_PAD_LINK_CHECK_NOTHING);
}
} }
} else { } else {
GST_DEBUG_OBJECT (playsink, "no video needed"); GST_DEBUG_OBJECT (playsink, "no video needed");