From: <wt...@fr...> - 2006-02-13 16:03:15
|
CVS Root: /cvs/gstreamer Module: gst-plugins-base Changes by: wtay Date: Mon Feb 13 2006 08:00:01 PST Log message: * gst/playback/gstplaybin.c: (gen_vis_element): Update vis bin docs. Move queue after tee so we don't queue video buffers but audio samples instead. Fixes problems where the video queue is filled and the audio queue empty. Modified files: . : ChangeLog gst/playback : gstplaybin.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.2377&r2=1.2378 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst/playback/gstplaybin.c.diff?r1=1.79&r2=1.80 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v retrieving revision 1.2377 retrieving revision 1.2378 diff -u -d -r1.2377 -r1.2378 --- ChangeLog 13 Feb 2006 15:17:34 -0000 1.2377 +++ ChangeLog 13 Feb 2006 15:59:48 -0000 1.2378 @@ -1,3 +1,11 @@ +2006-02-13 Wim Taymans <wi...@fl...> + + * gst/playback/gstplaybin.c: (gen_vis_element): + Update vis bin docs. + Move queue after tee so we don't queue video buffers but + audio samples instead. Fixes problems where the video queue + is filled and the audio queue empty. 2006-02-13 Tim-Philipp Müller <tim at centricular dot net> * gst-libs/gst/cdda/gstcddabasesrc.c: (gst_cdda_base_src_create): Index: gstplaybin.c RCS file: /cvs/gstreamer/gst-plugins-base/gst/playback/gstplaybin.c,v retrieving revision 1.79 retrieving revision 1.80 diff -u -d -r1.79 -r1.80 --- gstplaybin.c 5 Feb 2006 12:06:25 -0000 1.79 +++ gstplaybin.c 13 Feb 2006 15:59:48 -0000 1.80 @@ -793,21 +793,21 @@ * normal video bin. The video bin is run in a thread to make sure it does * not block the audio playback pipeline. * - * +--------------------------------------------------------------------------+ - * | visbin | - * | +------+ +----------------+ | - * | | tee | | abin ... | | - * | +-sink src-sink | | - * | | | | +----------------+ +-------------------+ | - * | | | | | vthread | | - * | | | | +---------+ +------+ +------+ | +--------------+ | | - * | | | | |audioconv| | vis | |vqueue| | | vbin ... | | | - * | | | src-sink src-sink src-sink src-sink | | | - * | | | | +-------------------+ | - * | | +------+ | - * sink-+ | - +--------------------------------------------------------------------------+ + * +--------------------------------------------------------------------+ + * | visbin | + * | +------+ +--------+ +----------------+ | + * | | tee | | aqueue | | abin ... | | + * | +-sink src-sink src-sink | | + * | | | | +--------+ +----------------+ | + * | | | | | + * | | | | +------+ +---------+ +------+ +-----------+ | + * | | | | |vqueue| |audioconv| | vis | | vbin ... | | + * | | | src-sink src-sink src-sink src-sink | | + * | | +------+ | + * sink-+ | + +---------------------------------------------------------------------+ */ static GstElement * gen_vis_element (GstPlayBin * play_bin) @@ -853,10 +853,9 @@ gst_bin_add (GST_BIN (element), conv); gst_bin_add (GST_BIN (element), vis); + gst_element_link_pads (vqueue, "src", conv, "sink"); gst_element_link_pads (conv, "src", vis, "sink"); - gst_element_link_pads (vis, "src", vqueue, "sink"); - - gst_element_link_pads (vqueue, "src", vsink, "sink"); + gst_element_link_pads (vis, "src", vsink, "sink"); pad = gst_element_get_pad (aqueue, "sink"); rpad = gst_element_get_request_pad (tee, "src%d"); @@ -865,7 +864,7 @@ gst_object_unref (pad); gst_element_link_pads (aqueue, "src", asink, "sink"); - pad = gst_element_get_pad (conv, "sink"); + pad = gst_element_get_pad (vqueue, "sink"); gst_pad_link (rpad, pad); gst_object_unref (rpad); |