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

gst/videomixer/videomixer.c: Code cleanup and re-enabling queued time validity check for correct EOS handling.

Browse source 
Original commit message from CVS:
2005-12-13  Julien MOUTTE  <julien@moutte.net>

* gst/videomixer/videomixer.c: (gst_videomixer_init),
(gst_videomixer_fill_queues), (gst_videomixer_blend_buffers),
(gst_videomixer_collected): Code cleanup and re-enabling
queued time validity check for correct EOS handling.
This commit is contained in:
Julien Moutte 2005-12-13 21:58:42 +00:00
parent bca6983cab
commit ee4e5b79a5
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2005-12-13 Julien MOUTTE <julien@moutte.net>
* gst/videomixer/videomixer.c: (gst_videomixer_init),
(gst_videomixer_fill_queues), (gst_videomixer_blend_buffers),
(gst_videomixer_collected): Code cleanup and re-enabling
queued time validity check for correct EOS handling.
2005-12-13 Tim-Philipp Müller <tim at centricular dot net> 2005-12-13 Tim-Philipp Müller <tim at centricular dot net>
* sys/oss/gstossmixerelement.c: (gst_oss_mixer_element_class_init), * sys/oss/gstossmixerelement.c: (gst_oss_mixer_element_class_init),

10
gst/videomixer/videomixer.c
View file

@ -107,7 +107,7 @@ enum
ARG_PAD_ZORDER, ARG_PAD_ZORDER,
ARG_PAD_XPOS, ARG_PAD_XPOS,
ARG_PAD_YPOS, ARG_PAD_YPOS,
ARG_PAD_ALPHA, ARG_PAD_ALPHA
}; };
struct _GstVideoMixerCollect struct _GstVideoMixerCollect
@ -267,7 +267,7 @@ typedef enum
{ {
VIDEO_MIXER_BACKGROUND_CHECKER, VIDEO_MIXER_BACKGROUND_CHECKER,
VIDEO_MIXER_BACKGROUND_BLACK, VIDEO_MIXER_BACKGROUND_BLACK,
VIDEO_MIXER_BACKGROUND_WHITE, VIDEO_MIXER_BACKGROUND_WHITE
} }
GstVideoMixerBackground; GstVideoMixerBackground;
@ -415,7 +415,7 @@ enum
enum enum
{ {
ARG_0, ARG_0,
ARG_BACKGROUND, ARG_BACKGROUND
}; };
#define GST_TYPE_VIDEO_MIXER_BACKGROUND (gst_video_mixer_background_get_type()) #define GST_TYPE_VIDEO_MIXER_BACKGROUND (gst_video_mixer_background_get_type())
@ -555,6 +555,7 @@ gst_videomixer_init (GstVideoMixer * mix)
mix->in_height = 0; mix->in_height = 0;
mix->out_width = 0; mix->out_width = 0;
mix->out_height = 0; mix->out_height = 0;
mix->fps_n = mix->fps_d = 0;
gst_collect_pads_set_function (mix->collect, gst_collect_pads_set_function (mix->collect,
(GstCollectPadsFunction) gst_videomixer_collected, mix); (GstCollectPadsFunction) gst_videomixer_collected, mix);
@ -969,8 +970,7 @@ gst_videomixer_fill_queues (GstVideoMixer * mix)
GST_LOG ("pop returned a NULL buffer"); GST_LOG ("pop returned a NULL buffer");
} }
} }
if (mixcol->buffer != if (mixcol->buffer != NULL && GST_CLOCK_TIME_IS_VALID (mixpad->queued)) {
NULL /* && GST_CLOCK_TIME_IS_VALID (mixpad->queued) */ ) {
/* got a buffer somewhere so we're not eos */ /* got a buffer somewhere so we're not eos */
eos = FALSE; eos = FALSE;
} }