mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-09 10:59:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

vaapidecode: push all decoded frames from within the task.

Browse source 
Make sure to push all decoded frames from the task so that the unlying
VA surfaces could all be rendered from the same thread.
This commit is contained in:
Gwenole Beauchesne 2013-08-29 11:55:05 +02:00
parent 1362352825
commit 91736b3a60
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gst/vaapi/gstvaapidecode.c
View file

@ -410,11 +410,22 @@ gst_vaapidecode_decode_loop(GstVaapiDecode *decode)
GstFlowReturn ret;
ret = gst_vaapidecode_push_decoded_frame(vdec);
if (ret == GST_FLOW_OK || ret == GST_VIDEO_DECODER_FLOW_NEED_DATA)
if (ret == GST_FLOW_OK)
return;
/* ERRORS */
gst_pad_pause_task(decode->srcpad);
/* If invoked from gst_vaapidecode_finish(), then return right
away no matter the errors, or the GstVaapiDecoder needs further
data to complete decoding (there no more data to feed in) */
if (decode->decoder_finish) {
g_mutex_lock(&decode->decoder_mutex);
g_cond_signal(&decode->decoder_finish_done);
g_mutex_unlock(&decode->decoder_mutex);
return;
}
/* Suspend the task if an error occurred */
if (ret != GST_VIDEO_DECODER_FLOW_NEED_DATA)
gst_pad_pause_task(decode->srcpad);
}
static GstFlowReturn
@ -430,12 +441,12 @@ gst_vaapidecode_finish(GstVideoDecoder *vdec)
/* Make sure the decode loop function has a chance to return, thus
possibly unlocking gst_video_decoder_finish_frame() */
GST_VIDEO_DECODER_STREAM_UNLOCK(vdec);
g_mutex_lock(&decode->decoder_mutex);
decode->decoder_finish = TRUE;
g_cond_wait(&decode->decoder_finish_done, &decode->decoder_mutex);
g_mutex_unlock(&decode->decoder_mutex);
gst_pad_stop_task(decode->srcpad);
GST_VIDEO_DECODER_STREAM_LOCK(vdec);
/* Submit all frames that got decoded so far */
while (gst_vaapidecode_push_decoded_frame(vdec) == GST_FLOW_OK)
;
return GST_FLOW_OK;
/* ERRORS */
@ -621,6 +632,7 @@ gst_vaapidecode_finalize(GObject *object)
gst_vaapi_display_replace(&decode->display, NULL);
g_cond_clear(&decode->decoder_finish_done);
g_cond_clear(&decode->decoder_ready);
g_mutex_clear(&decode->decoder_mutex);
@ -881,6 +893,7 @@ gst_vaapidecode_init(GstVaapiDecode *decode)
g_mutex_init(&decode->decoder_mutex);
g_cond_init(&decode->decoder_ready);
g_cond_init(&decode->decoder_finish_done);
gst_video_decoder_set_packetized(vdec, FALSE);

2
gst/vaapi/gstvaapidecode.h
View file

@ -72,6 +72,8 @@ struct _GstVaapiDecode {
GstVaapiDecoder *decoder;
GMutex decoder_mutex;
GCond decoder_ready;
volatile gboolean decoder_finish;
GCond decoder_finish_done;
GstCaps *decoder_caps;
GstCaps *allowed_caps;
gint64 render_time_base;