mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

omxvideodec: Set the OMX buffer nFilledLength field properly

Browse source
This commit is contained in:
Sebastian Dröge 2012-12-20 19:30:38 +01:00
parent 29aabc223e
commit 1bf69c8f69
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
omx/gstomxvideodec.c
View file

@ -1192,7 +1192,7 @@ gst_omx_video_dec_handle_frame (GstVideoDecoder * decoder,
GstOMXVideoDecClass *klass; GstOMXVideoDecClass *klass;
GstOMXBuffer *buf; GstOMXBuffer *buf;
GstBuffer *codec_data = NULL; GstBuffer *codec_data = NULL;
guint offset = 0; guint offset = 0, size;
GstClockTime timestamp, duration, timestamp_offset = 0; GstClockTime timestamp, duration, timestamp_offset = 0;
self = GST_OMX_VIDEO_DEC (decoder); self = GST_OMX_VIDEO_DEC (decoder);
@ -1226,7 +1226,8 @@ gst_omx_video_dec_handle_frame (GstVideoDecoder * decoder,
} }
} }
while (offset < gst_buffer_get_size (frame->input_buffer)) { size = gst_buffer_get_size (frame->input_buffer);
while (offset < size) {
/* Make sure to release the base class stream lock, otherwise /* Make sure to release the base class stream lock, otherwise
* _loop() can't call _finish_frame() and we might block forever * _loop() can't call _finish_frame() and we might block forever
* because no input buffers are released */ * because no input buffers are released */
@ -1292,6 +1293,8 @@ gst_omx_video_dec_handle_frame (GstVideoDecoder * decoder,
/* Copy the buffer content in chunks of size as requested /* Copy the buffer content in chunks of size as requested
* by the port */ * by the port */
buf->omx_buf->nFilledLen =
MIN (size - offset, buf->omx_buf->nAllocLen - buf->omx_buf->nOffset);
gst_buffer_extract (frame->input_buffer, offset, gst_buffer_extract (frame->input_buffer, offset,
buf->omx_buf->pBuffer + buf->omx_buf->nOffset, buf->omx_buf->pBuffer + buf->omx_buf->nOffset,
buf->omx_buf->nFilledLen); buf->omx_buf->nFilledLen);
@ -1299,9 +1302,7 @@ gst_omx_video_dec_handle_frame (GstVideoDecoder * decoder,
/* Interpolate timestamps if we're passing the buffer /* Interpolate timestamps if we're passing the buffer
* in multiple chunks */ * in multiple chunks */
if (offset != 0 && duration != GST_CLOCK_TIME_NONE) { if (offset != 0 && duration != GST_CLOCK_TIME_NONE) {
timestamp_offset = timestamp_offset = gst_util_uint64_scale (offset, duration, size);
gst_util_uint64_scale (offset, duration,
gst_buffer_get_size (frame->input_buffer));
} }
if (timestamp != GST_CLOCK_TIME_NONE) { if (timestamp != GST_CLOCK_TIME_NONE) {
@ -1312,8 +1313,7 @@ gst_omx_video_dec_handle_frame (GstVideoDecoder * decoder,
} }
if (duration != GST_CLOCK_TIME_NONE) { if (duration != GST_CLOCK_TIME_NONE) {
buf->omx_buf->nTickCount = buf->omx_buf->nTickCount =
gst_util_uint64_scale (buf->omx_buf->nFilledLen, duration, gst_util_uint64_scale (buf->omx_buf->nFilledLen, duration, size);
gst_buffer_get_size (frame->input_buffer));
self->last_upstream_ts += duration; self->last_upstream_ts += duration;
} }