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

dvbsuboverlay: Really choose the latest possible subpictures

Browse source 
And not the first subpictures that are still valid according to the
page timeout.
This commit is contained in:
Sebastian Dröge 2010-12-06 17:05:28 +01:00 committed by Edward Hervey
parent e25a1dc0cc
commit 68b8fca047
1 changed files with 48 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
gst/dvbsuboverlay/gstdvbsuboverlay.c
View file

@ -518,6 +518,8 @@ blit_i420 (GstDVBSubOverlay * overlay, DVBSubtitles * subs, GstBuffer * buffer)
v_stride = gst_video_format_get_row_stride (GST_VIDEO_FORMAT_I420, 2, width); v_stride = gst_video_format_get_row_stride (GST_VIDEO_FORMAT_I420, 2, width);
for (counter = 0; counter < subs->num_rects; counter++) { for (counter = 0; counter < subs->num_rects; counter++) {
gint dw, dh;
sub_region = subs->rects[counter]; sub_region = subs->rects[counter];
if (sub_region->y > height || sub_region->x > width) if (sub_region->y > height || sub_region->x > width)
continue; continue;
@ -526,6 +528,13 @@ blit_i420 (GstDVBSubOverlay * overlay, DVBSubtitles * subs, GstBuffer * buffer)
w = MIN (sub_region->w, width - sub_region->x); w = MIN (sub_region->w, width - sub_region->x);
h = MIN (sub_region->h, height - sub_region->y); h = MIN (sub_region->h, height - sub_region->y);
/* TODO
dw = MIN (sub_region->dw, width - sub_region->x);
dh = MIN (sub_region->dh, height - sub_region->y);
*/
dw = w;
dh = h + 10;
w2 = (w + 1) / 2; w2 = (w + 1) / 2;
h2 = (h + 1) / 2; h2 = (h + 1) / 2;
@ -854,7 +863,7 @@ gst_dvbsub_overlay_chain_video (GstPad * pad, GstBuffer * buffer)
gint64 start, stop; gint64 start, stop;
gint64 cstart, cstop; gint64 cstart, cstop;
gboolean in_seg; gboolean in_seg;
GstClockTime vid_running_time; GstClockTime vid_running_time, vid_running_time_end;
if (overlay->format == GST_VIDEO_FORMAT_UNKNOWN) if (overlay->format == GST_VIDEO_FORMAT_UNKNOWN)
return GST_FLOW_NOT_NEGOTIATED; return GST_FLOW_NOT_NEGOTIATED;
@ -892,7 +901,14 @@ gst_dvbsub_overlay_chain_video (GstPad * pad, GstBuffer * buffer)
vid_running_time = vid_running_time =
gst_segment_to_running_time (&overlay->video_segment, GST_FORMAT_TIME, gst_segment_to_running_time (&overlay->video_segment, GST_FORMAT_TIME,
GST_BUFFER_TIMESTAMP (buffer)); cstart);
if (GST_BUFFER_DURATION_IS_VALID (buffer))
vid_running_time_end =
gst_segment_to_running_time (&overlay->video_segment, GST_FORMAT_TIME,
cstop);
else
vid_running_time_end = vid_running_time;
GST_DEBUG_OBJECT (overlay, "Video running time: %" GST_TIME_FORMAT, GST_DEBUG_OBJECT (overlay, "Video running time: %" GST_TIME_FORMAT,
GST_TIME_ARGS (vid_running_time)); GST_TIME_ARGS (vid_running_time));
@ -901,40 +917,47 @@ gst_dvbsub_overlay_chain_video (GstPad * pad, GstBuffer * buffer)
g_mutex_lock (overlay->dvbsub_mutex); g_mutex_lock (overlay->dvbsub_mutex);
if (!g_queue_is_empty (overlay->pending_subtitles)) { if (!g_queue_is_empty (overlay->pending_subtitles)) {
DVBSubtitles *pending_sub = NULL; DVBSubtitles *tmp, *candidate = NULL;
while (!g_queue_is_empty (overlay->pending_subtitles)) { while (!g_queue_is_empty (overlay->pending_subtitles)) {
pending_sub = g_queue_peek_head (overlay->pending_subtitles); tmp = g_queue_peek_head (overlay->pending_subtitles);
if (pending_sub->pts + if (tmp->pts > vid_running_time_end) {
pending_sub->page_time_out * GST_SECOND * /* For a future video frame */
overlay->subtitle_segment.abs_rate < vid_running_time) { break;
/* Drop all subpictures that are too late anyway */ } else if (tmp->num_rects == 0) {
dvb_subtitles_free (pending_sub);
g_queue_pop_head (overlay->pending_subtitles);
pending_sub = NULL;
} else if (pending_sub->num_rects == 0) {
/* Clear screen */ /* Clear screen */
if (overlay->current_subtitle) if (overlay->current_subtitle)
dvb_subtitles_free (overlay->current_subtitle); dvb_subtitles_free (overlay->current_subtitle);
overlay->current_subtitle = NULL; overlay->current_subtitle = NULL;
dvb_subtitles_free (pending_sub); if (candidate)
dvb_subtitles_free (candidate);
candidate = NULL;
g_queue_pop_head (overlay->pending_subtitles);
} else if (tmp->pts + tmp->page_time_out * GST_SECOND *
overlay->subtitle_segment.abs_rate >= vid_running_time) {
if (candidate)
dvb_subtitles_free (candidate);
candidate = tmp;
g_queue_pop_head (overlay->pending_subtitles); g_queue_pop_head (overlay->pending_subtitles);
} else if (vid_running_time >= pending_sub->pts) {
GST_DEBUG_OBJECT (overlay,
"Time to show the next subtitle page (%" GST_TIME_FORMAT " >= %"
GST_TIME_FORMAT ") - it has %u regions",
GST_TIME_ARGS (vid_running_time), GST_TIME_ARGS (pending_sub->pts),
pending_sub->num_rects);
dvb_subtitles_free (overlay->current_subtitle);
overlay->current_subtitle =
g_queue_pop_head (overlay->pending_subtitles);
/* FIXME: Pre-convert current_subtitle to a quick-blend format, num_rects=0 means that there are no regions, e.g, a subtitle "clear" happened */
} else { } else {
/* Keep old */ /* Too late */
break; dvb_subtitles_free (tmp);
tmp = NULL;
g_queue_pop_head (overlay->pending_subtitles);
} }
} }
if (candidate) {
GST_DEBUG_OBJECT (overlay,
"Time to show the next subtitle page (%" GST_TIME_FORMAT " >= %"
GST_TIME_FORMAT ") - it has %u regions",
GST_TIME_ARGS (vid_running_time), GST_TIME_ARGS (candidate->pts),
candidate->num_rects);
dvb_subtitles_free (overlay->current_subtitle);
overlay->current_subtitle = candidate;
/* FIXME: Pre-convert current_subtitle to a quick-blend format, num_rects=0 means that there are no regions, e.g, a subtitle "clear" happened */
}
} }
/* Check that we haven't hit the fallback timeout for current subtitle page */ /* Check that we haven't hit the fallback timeout for current subtitle page */