mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 16:08:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

assrender: Return WRONG_STATE from the subtitle chain when flushing

Browse source
This commit is contained in:
Sebastian Dröge 2009-11-04 13:11:44 +01:00
parent e38fbc6795
commit 4c625bd569
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ext/assrender/gstassrender.c
View file

@ -262,8 +262,10 @@ gst_assrender_change_state (GstElement * element, GstStateChange transition)
GstStateChangeReturn ret; GstStateChangeReturn ret;
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY:
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
render->subtitle_flushing = FALSE;
break;
case GST_STATE_CHANGE_NULL_TO_READY:
case GST_STATE_CHANGE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
default: default:
break; break;
@ -612,6 +614,9 @@ gst_assrender_chain_text (GstPad * pad, GstBuffer * buffer)
render = GST_ASSRENDER (GST_PAD_PARENT (pad)); render = GST_ASSRENDER (GST_PAD_PARENT (pad));
if (render->subtitle_flushing)
return GST_FLOW_WRONG_STATE;
timestamp = GST_BUFFER_TIMESTAMP (buffer); timestamp = GST_BUFFER_TIMESTAMP (buffer);
if (timestamp > render->video_segment.last_stop) { if (timestamp > render->video_segment.last_stop) {
@ -741,6 +746,7 @@ gst_assrender_event_text (GstPad * pad, GstEvent * event)
break; break;
} }
case GST_EVENT_FLUSH_STOP: case GST_EVENT_FLUSH_STOP:
render->subtitle_flushing = FALSE;
gst_event_unref (event); gst_event_unref (event);
ret = TRUE; ret = TRUE;
break; break;
@ -761,6 +767,7 @@ gst_assrender_event_text (GstPad * pad, GstEvent * event)
if (render->subtitle_pending) if (render->subtitle_pending)
gst_buffer_unref (render->subtitle_pending); gst_buffer_unref (render->subtitle_pending);
render->subtitle_pending = NULL; render->subtitle_pending = NULL;
render->subtitle_flushing = TRUE;
g_cond_signal (render->subtitle_cond); g_cond_signal (render->subtitle_cond);
g_mutex_unlock (render->subtitle_mutex); g_mutex_unlock (render->subtitle_mutex);
gst_event_unref (event); gst_event_unref (event);

1
ext/assrender/gstassrender.h
View file

@ -55,6 +55,7 @@ struct _Gstassrender
GMutex *subtitle_mutex; GMutex *subtitle_mutex;
GCond *subtitle_cond; GCond *subtitle_cond;
GstBuffer *subtitle_pending; GstBuffer *subtitle_pending;
gboolean subtitle_flushing;
ASS_Library *ass_library; ASS_Library *ass_library;
ASS_Renderer *ass_renderer; ASS_Renderer *ass_renderer;