mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

videomixer: Make sure to send EOS if the buffer end time equals the segment end time

Browse source 
Otherwize EOS never gets sent in that particular case.
This commit is contained in:
Thibault Saunier 2013-08-06 11:58:38 +02:00
parent d14d4c436c
commit c5fa4666b7
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst/videomixer/videomixer2.c
View file

@ -1004,7 +1004,13 @@ gst_videomixer2_collected (GstCollectPads * pads, GstVideoMixer2 * mix)
else else
output_start_time = mix->segment.position; output_start_time = mix->segment.position;
if (output_start_time >= mix->segment.stop) { output_end_time =
mix->ts_offset + gst_util_uint64_scale_round (mix->nframes + 1,
GST_SECOND * GST_VIDEO_INFO_FPS_D (&mix->info),
GST_VIDEO_INFO_FPS_N (&mix->info)) + mix->segment.start;
if (output_start_time >= mix->segment.stop ||
output_end_time == mix->segment.stop) {
GST_DEBUG_OBJECT (mix, "Segment done"); GST_DEBUG_OBJECT (mix, "Segment done");
GST_VIDEO_MIXER2_UNLOCK (mix); GST_VIDEO_MIXER2_UNLOCK (mix);
gst_pad_push_event (mix->srcpad, gst_event_new_eos ()); gst_pad_push_event (mix->srcpad, gst_event_new_eos ());
@ -1012,10 +1018,6 @@ gst_videomixer2_collected (GstCollectPads * pads, GstVideoMixer2 * mix)
goto done_unlocked; goto done_unlocked;
} }
output_end_time =
mix->ts_offset + gst_util_uint64_scale_round (mix->nframes + 1,
GST_SECOND * GST_VIDEO_INFO_FPS_D (&mix->info),
GST_VIDEO_INFO_FPS_N (&mix->info)) + mix->segment.start;
if (mix->segment.stop != -1) if (mix->segment.stop != -1)
output_end_time = MIN (output_end_time, mix->segment.stop); output_end_time = MIN (output_end_time, mix->segment.stop);