mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:06:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/videomixer/videomixer.c: Don't call gst_object_sync_values() unless we have a valid timestamp.

Browse source 
Original commit message from CVS:
* gst/videomixer/videomixer.c: (gst_videomixer_blend_buffers):
Don't call gst_object_sync_values() unless we have a valid timestamp.
This commit is contained in:
Michael Smith 2008-02-29 12:35:24 +00:00
parent a2104e0994
commit 86700041a8
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-02-29 Michael Smith <msmith@fluendo.com>
* gst/videomixer/videomixer.c: (gst_videomixer_blend_buffers):
Don't call gst_object_sync_values() unless we have a valid timestamp.
2008-02-28 David Schleef <ds@schleef.org> 2008-02-28 David Schleef <ds@schleef.org>
* gst/matroska/matroska-demux.c: * gst/matroska/matroska-demux.c:

5
gst/videomixer/videomixer.c
View file

@ -1031,8 +1031,9 @@ gst_videomixer_blend_buffers (GstVideoMixer * mix, GstBuffer * outbuf)
walk = g_slist_next (walk); walk = g_slist_next (walk);
if (mixcol->buffer != NULL) { if (mixcol->buffer != NULL) {
gst_object_sync_values (G_OBJECT (pad), if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_TIMESTAMP (mixcol->buffer)))
GST_BUFFER_TIMESTAMP (mixcol->buffer)); gst_object_sync_values (G_OBJECT (pad),
GST_BUFFER_TIMESTAMP (mixcol->buffer));
gst_videomixer_blend_ayuv_ayuv (GST_BUFFER_DATA (mixcol->buffer), gst_videomixer_blend_ayuv_ayuv (GST_BUFFER_DATA (mixcol->buffer),
pad->xpos, pad->ypos, pad->in_width, pad->in_height, pad->alpha, pad->xpos, pad->ypos, pad->in_width, pad->in_height, pad->alpha,
GST_BUFFER_DATA (outbuf), mix->out_width, mix->out_height); GST_BUFFER_DATA (outbuf), mix->out_width, mix->out_height);