mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-25 07:26:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

vaapidecode: fix dead-locks with decoder task.

Browse source 
Review all interactions between the main video decoder stream thread
and the decode task to derive a correct sequence of operations for
decoding. Also avoid extra atomic operations that become implicit under
the GstVideoDecoder stream lock.
This commit is contained in:
Gwenole Beauchesne 2013-11-20 19:21:05 +01:00
parent 6e85f08e33
commit af4785b722
2 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
gst/vaapi/gstvaapidecode.c
View file

@ -238,10 +238,6 @@ gst_vaapidecode_decode_frame(GstVideoDecoder *vdec, GstVideoCodecFrame *frame)
GstVaapiDecoderStatus status; GstVaapiDecoderStatus status;
GstFlowReturn ret; GstFlowReturn ret;
ret = g_atomic_int_get(&decode->decoder_loop_status);
if (ret != GST_FLOW_OK)
return ret;
/* Decode current frame */ /* Decode current frame */
for (;;) { for (;;) {
status = gst_vaapi_decoder_decode(decode->decoder, frame); status = gst_vaapi_decoder_decode(decode->decoder, frame);
@ -251,6 +247,8 @@ gst_vaapidecode_decode_frame(GstVideoDecoder *vdec, GstVideoCodecFrame *frame)
g_cond_wait(&decode->decoder_ready, &decode->decoder_mutex); g_cond_wait(&decode->decoder_ready, &decode->decoder_mutex);
g_mutex_unlock(&decode->decoder_mutex); g_mutex_unlock(&decode->decoder_mutex);
GST_VIDEO_DECODER_STREAM_LOCK(vdec); GST_VIDEO_DECODER_STREAM_LOCK(vdec);
if (decode->decoder_loop_status < 0)
goto error_decode_loop;
continue; continue;
} }
if (status != GST_VAAPI_DECODER_STATUS_SUCCESS) if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
@ -259,10 +257,17 @@ gst_vaapidecode_decode_frame(GstVideoDecoder *vdec, GstVideoCodecFrame *frame)
} }
/* Try to report back early any error that occured in the decode task */ /* Try to report back early any error that occured in the decode task */
ret = g_atomic_int_get(&decode->decoder_loop_status); GST_VIDEO_DECODER_STREAM_UNLOCK(vdec);
return ret; GST_VIDEO_DECODER_STREAM_LOCK(vdec);
return decode->decoder_loop_status;
/* ERRORS */ /* ERRORS */
error_decode_loop:
{
GST_ERROR("decode loop error %d", decode->decoder_loop_status);
gst_video_decoder_drop_frame(vdec, frame);
return decode->decoder_loop_status;
}
error_decode: error_decode:
{ {
GST_ERROR("decode error %d", status); GST_ERROR("decode error %d", status);
@ -282,12 +287,11 @@ error_decode:
} }
static GstFlowReturn static GstFlowReturn
gst_vaapidecode_push_decoded_frame(GstVideoDecoder *vdec) gst_vaapidecode_push_decoded_frame(GstVideoDecoder *vdec,
GstVideoCodecFrame *out_frame)
{ {
GstVaapiDecode * const decode = GST_VAAPIDECODE(vdec); GstVaapiDecode * const decode = GST_VAAPIDECODE(vdec);
GstVaapiSurfaceProxy *proxy; GstVaapiSurfaceProxy *proxy;
GstVaapiDecoderStatus status;
GstVideoCodecFrame *out_frame;
GstFlowReturn ret; GstFlowReturn ret;
#if GST_CHECK_VERSION(1,0,0) #if GST_CHECK_VERSION(1,0,0)
const GstVaapiRectangle *crop_rect; const GstVaapiRectangle *crop_rect;
@ -295,11 +299,6 @@ gst_vaapidecode_push_decoded_frame(GstVideoDecoder *vdec)
guint flags; guint flags;
#endif #endif
status = gst_vaapi_decoder_get_frame_with_timeout(decode->decoder,
&out_frame, 100000);
if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
return GST_VIDEO_DECODER_FLOW_NEED_DATA;
if (!GST_VIDEO_CODEC_FRAME_IS_DECODE_ONLY(out_frame)) { if (!GST_VIDEO_CODEC_FRAME_IS_DECODE_ONLY(out_frame)) {
proxy = gst_video_codec_frame_get_user_data(out_frame); proxy = gst_video_codec_frame_get_user_data(out_frame);
@ -407,13 +406,30 @@ static void
gst_vaapidecode_decode_loop(GstVaapiDecode *decode) gst_vaapidecode_decode_loop(GstVaapiDecode *decode)
{ {
GstVideoDecoder * const vdec = GST_VIDEO_DECODER(decode); GstVideoDecoder * const vdec = GST_VIDEO_DECODER(decode);
GstVaapiDecoderStatus status;
GstVideoCodecFrame *out_frame;
GstFlowReturn ret; GstFlowReturn ret;
ret = gst_vaapidecode_push_decoded_frame(vdec); status = gst_vaapi_decoder_get_frame_with_timeout(decode->decoder,
&out_frame, 100000);
GST_VIDEO_DECODER_STREAM_LOCK(vdec);
switch (status) {
case GST_VAAPI_DECODER_STATUS_SUCCESS:
ret = gst_vaapidecode_push_decoded_frame(vdec, out_frame);
break;
case GST_VAAPI_DECODER_STATUS_ERROR_NO_DATA:
ret = GST_VIDEO_DECODER_FLOW_NEED_DATA;
break;
default:
ret = GST_FLOW_ERROR;
break;
}
decode->decoder_loop_status = ret;
GST_VIDEO_DECODER_STREAM_UNLOCK(vdec);
if (ret == GST_FLOW_OK) if (ret == GST_FLOW_OK)
return; return;
g_atomic_int_compare_and_exchange(&decode->decoder_loop_status,
GST_FLOW_OK, ret);
/* If invoked from gst_vaapidecode_finish(), then return right /* If invoked from gst_vaapidecode_finish(), then return right
away no matter the errors, or the GstVaapiDecoder needs further away no matter the errors, or the GstVaapiDecoder needs further

2
gst/vaapi/gstvaapidecode.h
View file

@ -72,7 +72,7 @@ struct _GstVaapiDecode {
GstVaapiDecoder *decoder; GstVaapiDecoder *decoder;
GMutex decoder_mutex; GMutex decoder_mutex;
GCond decoder_ready; GCond decoder_ready;
volatile gint decoder_loop_status; GstFlowReturn decoder_loop_status;
volatile gboolean decoder_finish; volatile gboolean decoder_finish;
GCond decoder_finish_done; GCond decoder_finish_done;
GstCaps *decoder_caps; GstCaps *decoder_caps;