mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-06 23:45:35 +00:00
Code Issues 1 Projects Releases Wiki Activity

omxvideodec: Fix deadlock when finishing old frames that are left over by the decoder

Browse source
This commit is contained in:
Sebastian Dröge 2011-07-13 09:31:22 +02:00
parent 24e0196d1d
commit 1b08dfa2a6
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
omx/gstomxvideodec.c
View file

@ -329,6 +329,7 @@ static GstVideoFrame *
_find_nearest_frame (GstOMXVideoDec * self, GstOMXBuffer * buf) _find_nearest_frame (GstOMXVideoDec * self, GstOMXBuffer * buf)
{ {
GList *l, *best_l = NULL; GList *l, *best_l = NULL;
GList *finish_frames = NULL;
GstVideoFrame *best = NULL; GstVideoFrame *best = NULL;
guint64 best_timestamp = 0; guint64 best_timestamp = 0;
guint64 best_diff = G_MAXUINT64; guint64 best_diff = G_MAXUINT64;
@ -368,7 +369,7 @@ _find_nearest_frame (GstOMXVideoDec * self, GstOMXBuffer * buf)
} }
if (best_id) { if (best_id) {
for (l = GST_BASE_VIDEO_CODEC (self)->frames; l && l != best_l;) { for (l = GST_BASE_VIDEO_CODEC (self)->frames; l && l != best_l; l = l->next) {
GstVideoFrame *tmp = l->data; GstVideoFrame *tmp = l->data;
BufferIdentification *id = tmp->coder_hook; BufferIdentification *id = tmp->coder_hook;
guint64 diff_ticks, diff_frames; guint64 diff_ticks, diff_frames;
@ -384,18 +385,21 @@ _find_nearest_frame (GstOMXVideoDec * self, GstOMXBuffer * buf)
if (diff_ticks > MAX_FRAME_DIST_TICKS if (diff_ticks > MAX_FRAME_DIST_TICKS
|| diff_frames > MAX_FRAME_DIST_FRAMES) { || diff_frames > MAX_FRAME_DIST_FRAMES) {
g_warning ("Too old frame, bug in decoder -- please file a bug"); finish_frames = g_list_prepend (finish_frames, tmp);
gst_base_video_decoder_finish_frame (GST_BASE_VIDEO_DECODER (self),
tmp);
l = GST_BASE_VIDEO_CODEC (self)->frames;
} else {
l = l->next;
} }
} }
} }
GST_OBJECT_UNLOCK (self); GST_OBJECT_UNLOCK (self);
if (finish_frames) {
g_warning ("Too old frames, bug in decoder -- please file a bug");
for (l = finish_frames; l; l = l->next) {
gst_base_video_decoder_finish_frame (GST_BASE_VIDEO_DECODER (self),
l->data);
}
}
return best; return best;
} }