mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 05:59:10 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/videomixer/videomixer.c: Fix videomixer so that it can handle any combination of framerates.

Browse source 
Original commit message from CVS:
Patch by: Mark Nauwelaerts  <manauw at skynet be>
* gst/videomixer/videomixer.c: (gst_videomixer_update_queues):
Fix videomixer so that it can handle any combination of framerates.
Fixes #367221.
This commit is contained in:
Mark Nauwelaerts 2006-10-30 08:17:08 +00:00 committed by Wim Taymans
parent c152d13c6a
commit ccce64b293
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2006-10-30 Wim Taymans <wim@fluendo.com>
Patch by: Mark Nauwelaerts <manauw at skynet be>
* gst/videomixer/videomixer.c: (gst_videomixer_update_queues):
Fix videomixer so that it can handle any combination of framerates.
Fixes #367221.
2006-10-28 Wim Taymans <wim@fluendo.com> 2006-10-28 Wim Taymans <wim@fluendo.com>
* gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query), * gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query),

4
gst/videomixer/videomixer.c
View file

@ -125,7 +125,7 @@ struct _GstVideoMixerPad
{ {
GstPad parent; /* subclass the pad */ GstPad parent; /* subclass the pad */
guint64 queued; gint64 queued;
guint in_width, in_height; guint in_width, in_height;
gint fps_n; gint fps_n;
@ -1036,7 +1036,7 @@ gst_videomixer_update_queues (GstVideoMixer * mix)
if (mixcol->buffer != NULL && GST_CLOCK_TIME_IS_VALID (pad->queued)) { if (mixcol->buffer != NULL && GST_CLOCK_TIME_IS_VALID (pad->queued)) {
pad->queued -= interval; pad->queued -= interval;
GST_DEBUG_OBJECT (pad, "queued now %lld", pad->queued); GST_DEBUG_OBJECT (pad, "queued now %lld", pad->queued);
if (pad->queued == 0) { if (pad->queued <= 0) {
GST_DEBUG ("unreffing buffer"); GST_DEBUG ("unreffing buffer");
gst_buffer_unref (mixcol->buffer); gst_buffer_unref (mixcol->buffer);
mixcol->buffer = NULL; mixcol->buffer = NULL;