mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

omxaudioenc: Use gst_buffer_extract() to copy the input buffer data to the OpenMAX buffer

Browse source
This commit is contained in:
Sebastian Dröge 2012-04-16 08:34:56 +02:00
parent e6e3f05948
commit 3523724970
1 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
omx/gstomxaudioenc.c
View file

@ -733,9 +733,9 @@ gst_omx_audio_enc_handle_frame (GstAudioEncoder * encoder, GstBuffer * inbuf)
GstOMXAcquireBufferReturn acq_ret = GST_OMX_ACQUIRE_BUFFER_ERROR; GstOMXAcquireBufferReturn acq_ret = GST_OMX_ACQUIRE_BUFFER_ERROR;
GstOMXAudioEnc *self; GstOMXAudioEnc *self;
GstOMXBuffer *buf; GstOMXBuffer *buf;
gsize size;
guint offset = 0; guint offset = 0;
GstClockTime timestamp, duration, timestamp_offset = 0; GstClockTime timestamp, duration, timestamp_offset = 0;
GstMapInfo map = GST_MAP_INFO_INIT;
self = GST_OMX_AUDIO_ENC (encoder); self = GST_OMX_AUDIO_ENC (encoder);
@ -759,9 +759,8 @@ gst_omx_audio_enc_handle_frame (GstAudioEncoder * encoder, GstBuffer * inbuf)
timestamp = GST_BUFFER_TIMESTAMP (inbuf); timestamp = GST_BUFFER_TIMESTAMP (inbuf);
duration = GST_BUFFER_DURATION (inbuf); duration = GST_BUFFER_DURATION (inbuf);
gst_buffer_map (inbuf, &map, GST_MAP_READ); size = gst_buffer_get_size (inbuf);
while (offset < size) {
while (offset < map.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 */
@ -801,15 +800,15 @@ gst_omx_audio_enc_handle_frame (GstAudioEncoder * encoder, GstBuffer * inbuf)
/* 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 = buf->omx_buf->nFilledLen =
MIN (map.size - offset, MIN (size - offset, buf->omx_buf->nAllocLen - buf->omx_buf->nOffset);
buf->omx_buf->nAllocLen - buf->omx_buf->nOffset); gst_buffer_extract (inbuf, offset,
memcpy (buf->omx_buf->pBuffer + buf->omx_buf->nOffset, buf->omx_buf->pBuffer + buf->omx_buf->nOffset,
map.data + offset, buf->omx_buf->nFilledLen); buf->omx_buf->nFilledLen);
/* 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 = gst_util_uint64_scale (offset, duration, map.size); timestamp_offset = gst_util_uint64_scale (offset, duration, size);
} }
if (timestamp != GST_CLOCK_TIME_NONE) { if (timestamp != GST_CLOCK_TIME_NONE) {
@ -820,7 +819,7 @@ gst_omx_audio_enc_handle_frame (GstAudioEncoder * encoder, GstBuffer * inbuf)
} }
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, map.size); gst_util_uint64_scale (buf->omx_buf->nFilledLen, duration, size);
self->last_upstream_ts += duration; self->last_upstream_ts += duration;
} }
@ -829,14 +828,10 @@ gst_omx_audio_enc_handle_frame (GstAudioEncoder * encoder, GstBuffer * inbuf)
gst_omx_port_release_buffer (self->in_port, buf); gst_omx_port_release_buffer (self->in_port, buf);
} }
gst_buffer_unmap (inbuf, &map);
return self->downstream_flow_ret; return self->downstream_flow_ret;
full_buffer: full_buffer:
{ {
gst_buffer_unmap (inbuf, &map);
GST_ELEMENT_ERROR (self, LIBRARY, FAILED, (NULL), GST_ELEMENT_ERROR (self, LIBRARY, FAILED, (NULL),
("Got OpenMAX buffer with no free space (%p, %u/%u)", buf, ("Got OpenMAX buffer with no free space (%p, %u/%u)", buf,
buf->omx_buf->nOffset, buf->omx_buf->nAllocLen)); buf->omx_buf->nOffset, buf->omx_buf->nAllocLen));
@ -844,7 +839,6 @@ full_buffer:
} }
component_error: component_error:
{ {
gst_buffer_unmap (inbuf, &map);
GST_ELEMENT_ERROR (self, LIBRARY, FAILED, (NULL), GST_ELEMENT_ERROR (self, LIBRARY, FAILED, (NULL),
("OpenMAX component in error state %s (0x%08x)", ("OpenMAX component in error state %s (0x%08x)",
gst_omx_component_get_last_error_string (self->component), gst_omx_component_get_last_error_string (self->component),
@ -854,13 +848,11 @@ component_error:
flushing: flushing:
{ {
gst_buffer_unmap (inbuf, &map);
GST_DEBUG_OBJECT (self, "Flushing -- returning FLUSHING"); GST_DEBUG_OBJECT (self, "Flushing -- returning FLUSHING");
return GST_FLOW_FLUSHING; return GST_FLOW_FLUSHING;
} }
reconfigure_error: reconfigure_error:
{ {
gst_buffer_unmap (inbuf, &map);
GST_ELEMENT_ERROR (self, LIBRARY, SETTINGS, (NULL), GST_ELEMENT_ERROR (self, LIBRARY, SETTINGS, (NULL),
("Unable to reconfigure input port")); ("Unable to reconfigure input port"));
return GST_FLOW_ERROR; return GST_FLOW_ERROR;