mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 16:21:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

omxvideodec: simplify _find_nearest_frame

Browse source 
No need to make it more complicated and error prone than
necessary. Also give the function a gst_omx_video_dec prefix
to distinct it from the encoder function.

https://bugzilla.gnome.org/show_bug.cgi?id=724236
This commit is contained in:
Christian König 2013-09-05 02:23:39 -06:00 committed by Sebastian Dröge
parent bf0d2614c3
commit 2cfe70ed5d
1 changed files with 13 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
omx/gstomxvideodec.c
View file

@ -646,18 +646,6 @@ gst_omx_buffer_pool_new (GstElement * element, GstOMXComponent * component,
return GST_BUFFER_POOL (pool); return GST_BUFFER_POOL (pool);
} }
typedef struct _BufferIdentification BufferIdentification;
struct _BufferIdentification
{
guint64 timestamp;
};
static void
buffer_identification_free (BufferIdentification * id)
{
g_slice_free (BufferIdentification, id);
}
/* prototypes */ /* prototypes */
static void gst_omx_video_dec_finalize (GObject * object); static void gst_omx_video_dec_finalize (GObject * object);
@ -1009,40 +997,29 @@ gst_omx_video_dec_change_state (GstElement * element, GstStateChange transition)
} }
static GstVideoCodecFrame * static GstVideoCodecFrame *
_find_nearest_frame (GstOMXVideoDec * self, GstOMXBuffer * buf) gst_omx_video_dec_find_nearest_frame (GstOMXVideoDec * self, GstOMXBuffer * buf)
{ {
GstVideoCodecFrame *best = NULL; GstVideoCodecFrame *best = NULL;
guint64 best_diff = G_MAXUINT64; GstClockTimeDiff best_diff = G_MAXINT64;
GstClockTime timestamp;
GList *frames; GList *frames;
GList *l; GList *l;
timestamp =
gst_util_uint64_scale (buf->omx_buf->nTimeStamp, GST_SECOND,
OMX_TICKS_PER_SECOND);
frames = gst_video_decoder_get_frames (GST_VIDEO_DECODER (self)); frames = gst_video_decoder_get_frames (GST_VIDEO_DECODER (self));
for (l = frames; l; l = l->next) { for (l = frames; l; l = l->next) {
GstVideoCodecFrame *tmp = l->data; GstVideoCodecFrame *tmp = l->data;
BufferIdentification *id = gst_video_codec_frame_get_user_data (tmp); GstClockTimeDiff diff = ABS (GST_CLOCK_DIFF (timestamp, tmp->pts));
guint64 timestamp, diff;
/* This happens for frames that were just added but if (diff < best_diff) {
* which were not passed to the component yet. Ignore
* them here!
*/
if (!id)
continue;
timestamp = id->timestamp;
if (timestamp > buf->omx_buf->nTimeStamp)
diff = timestamp - buf->omx_buf->nTimeStamp;
else
diff = buf->omx_buf->nTimeStamp - timestamp;
if (best == NULL || diff < best_diff) {
best = tmp; best = tmp;
best_diff = diff; best_diff = diff;
/* For frames without timestamp we simply take the first frame */ if (diff == 0)
if ((buf->omx_buf->nTimeStamp == 0 && timestamp == 0) || diff == 0)
break; break;
} }
} }
@ -1947,7 +1924,7 @@ gst_omx_video_dec_loop (GstOMXVideoDec * self)
(guint) buf->omx_buf->nFlags, (guint64) buf->omx_buf->nTimeStamp); (guint) buf->omx_buf->nFlags, (guint64) buf->omx_buf->nTimeStamp);
GST_VIDEO_DECODER_STREAM_LOCK (self); GST_VIDEO_DECODER_STREAM_LOCK (self);
frame = _find_nearest_frame (self, buf); frame = gst_omx_video_dec_find_nearest_frame (self, buf);
if (frame if (frame
&& (deadline = gst_video_decoder_get_max_decode_time && (deadline = gst_video_decoder_get_max_decode_time
@ -2924,16 +2901,8 @@ gst_omx_video_dec_handle_frame (GstVideoDecoder * decoder,
buf->omx_buf->nTickCount = 0; buf->omx_buf->nTickCount = 0;
} }
if (offset == 0) { if (offset == 0 && GST_VIDEO_CODEC_FRAME_IS_SYNC_POINT (frame))
BufferIdentification *id = g_slice_new0 (BufferIdentification); buf->omx_buf->nFlags |= OMX_BUFFERFLAG_SYNCFRAME;
if (GST_VIDEO_CODEC_FRAME_IS_SYNC_POINT (frame))
buf->omx_buf->nFlags |= OMX_BUFFERFLAG_SYNCFRAME;
id->timestamp = buf->omx_buf->nTimeStamp;
gst_video_codec_frame_set_user_data (frame, id,
(GDestroyNotify) buffer_identification_free);
}
/* TODO: Set flags /* TODO: Set flags
* - OMX_BUFFERFLAG_DECODEONLY for buffers that are outside * - OMX_BUFFERFLAG_DECODEONLY for buffers that are outside