RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 16:52:31 +00:00
Code Issues Projects Releases Wiki Activity

mmaldec: refactor to have more context per MMAL input buffer

Browse Source 
The next commit needs 1 bit of additional information per MMAL buffer
sent to the MMAL input port. This information will be needed when the
buffer is recycled (i.e. returned by the input port's callback).
Normally, we could use MMAL_BUFFER_HEADER_FLAG_USER0, but that is
unexpectedly not preserved.

Do this by storing a pointer to FFBufferEntry in the MMAL buffer's
user data, instead of an AVBufferRef. This also changes the lifetime
of FFBufferEntry.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
wm4 2015-09-23 20:27:24 +02:00 committed by Luca Barbato
parent eae58428bd
commit 65db4899fa
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/mmaldec.c
View File

@ -188,8 +188,9 @@ static av_cold int ffmmal_close_decoder(AVCodecContext *avctx)
static void input_callback(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer) static void input_callback(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer)
{ {
if (!buffer->cmd) { if (!buffer->cmd) {
AVBufferRef *buf = buffer->user_data; FFBufferEntry *entry = buffer->user_data;
av_buffer_unref(&buf); av_buffer_unref(&entry->ref);
av_free(entry);
} }
mmal_buffer_header_release(buffer); mmal_buffer_header_release(buffer);
} }
@ -535,19 +536,19 @@ static int ffmmal_fill_input_port(AVCodecContext *avctx)
mbuffer->flags = buffer->flags; mbuffer->flags = buffer->flags;
mbuffer->data = buffer->data; mbuffer->data = buffer->data;
mbuffer->length = buffer->length; mbuffer->length = buffer->length;
mbuffer->user_data = buffer->ref; mbuffer->user_data = buffer;
mbuffer->alloc_size = ctx->decoder->input[0]->buffer_size; mbuffer->alloc_size = ctx->decoder->input[0]->buffer_size;
if ((status = mmal_port_send_buffer(ctx->decoder->input[0], mbuffer))) {
mmal_buffer_header_release(mbuffer);
av_buffer_unref(&buffer->ref);
}
// Remove from start of the list // Remove from start of the list
ctx->waiting_buffers = buffer->next; ctx->waiting_buffers = buffer->next;
if (ctx->waiting_buffers_tail == buffer) if (ctx->waiting_buffers_tail == buffer)
ctx->waiting_buffers_tail = NULL; ctx->waiting_buffers_tail = NULL;
av_free(buffer);
if ((status = mmal_port_send_buffer(ctx->decoder->input[0], mbuffer))) {
mmal_buffer_header_release(mbuffer);
av_buffer_unref(&buffer->ref);
av_free(buffer);
}
if (status) { if (status) {
av_log(avctx, AV_LOG_ERROR, "MMAL error %d when sending input\n", (int)status); av_log(avctx, AV_LOG_ERROR, "MMAL error %d when sending input\n", (int)status);