From: <wt...@ke...> - 2008-03-24 14:08:34
|
CVS Root: /cvs/gstreamer Module: gst-plugins-base Changes by: wtay Date: Mon Mar 24 2008 14:08:37 UTC Log message: * gst/playback/gstqueue2.c: (gst_queue_is_filled): The queue is never filled when there are no buffers in the queue at all. Fixes #523993. Modified files: . : ChangeLog gst/playback : gstqueue2.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.3832&r2=1.3833 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst/playback/gstqueue2.c.diff?r1=1.24&r2=1.25 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v retrieving revision 1.3832 retrieving revision 1.3833 diff -u -d -r1.3832 -r1.3833 --- ChangeLog 24 Mar 2008 12:26:29 -0000 1.3832 +++ ChangeLog 24 Mar 2008 14:08:21 -0000 1.3833 @@ -1,5 +1,11 @@ 2008-03-24 Wim Taymans <wim...@co...> + * gst/playback/gstqueue2.c: (gst_queue_is_filled): + The queue is never filled when there are no buffers in the queue at all. + Fixes #523993. + +2008-03-24 Wim Taymans <wim...@co...> * gst/playback/gstplaybin2.c: (gst_play_bin_class_init), (init_group), (free_group), (gst_play_bin_init), (gst_play_bin_finalize), (gst_play_bin_set_uri), Index: gstqueue2.c RCS file: /cvs/gstreamer/gst-plugins-base/gst/playback/gstqueue2.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- gstqueue2.c 22 Mar 2008 15:00:49 -0000 1.24 +++ gstqueue2.c 24 Mar 2008 14:08:22 -0000 1.25 @@ -1288,6 +1288,10 @@ if (QUEUE_IS_USING_TEMP_FILE (queue)) return FALSE; + /* we are never filled when we have no buffers at all */ + if (queue->cur_level.buffers == 0) + return FALSE; #define CHECK_FILLED(format) ((queue->max_level.format) > 0 && \ (queue->cur_level.format) >= (queue->max_level.format)) |