[vlc-devel] [PATCH v4 3/3] codec/mmal: Add mmal based decoder plugin
Julian Scheel
julian at jusst.de
Wed May 21 13:46:41 CEST 2014
From: Dennis Hamester <dennis.hamester at gmail.com>
This plugin is capable of decoding MPEG-2 and H264 video through the Multi
Media Abstraction Layer (MMAL) by Broadcom. It is supported by recent Broadcom
SoCs and found on the widely spread Raspberry Pi.
Signed-off-by: Dennis Hamester <dennis.hamester at gmail.com>
Signed-off-by: Julian Scheel <julian at jusst.de>
---
Changes in v4:
- Improve pool size computations for non-opaque mode
Changes in v3:
- Send new data to decoder no matter if a frame can be returned or not
-> Seems to work a little better regarding frame drops
NEWS | 1 +
configure.ac | 27 +++
modules/MODULES_LIST | 1 +
modules/codec/Makefile.am | 10 +
modules/codec/mmal.c | 599 ++++++++++++++++++++++++++++++++++++++++++++++
po/POTFILES.in | 1 +
6 files changed, 639 insertions(+)
create mode 100644 modules/codec/mmal.c
diff --git a/NEWS b/NEWS
index 3ec4a6b..25eb7a7 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,7 @@ Decoder:
* Add tx3g subtitles decoder
* Add Media Foundation Transform decoder
* Add decoder module based on GStreamer. Currently supports only video decode.
+ * Add mmal based mpeg2/h264 decoder
Encoder:
* Support for MPEG-2 encoding using x262
diff --git a/configure.ac b/configure.ac
index 410d806..cd20f82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2147,6 +2147,33 @@ then
fi
dnl
+dnl MMAL codec plugin
+dnl
+AC_ARG_ENABLE(mmal-codec,
+ AS_HELP_STRING([--enable-mmal-codec],
+ [Multi-Media Abstraction Layer (MMAL) based codec plugin for Raspberry Pi (default enable)]))
+if test "${enable_mmal_codec}" != "no"; then
+ VLC_SAVE_FLAGS
+ LDFLAGS="${LDFLAGS} -L/opt/vc/lib"
+ CPPFLAGS="${CPPFLAGS} -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vcos/linux"
+ AC_CHECK_HEADERS(interface/mmal/mmal.h,
+ [ AC_CHECK_LIB(bcm_host, bcm_host_init, [
+ VLC_ADD_PLUGIN([mmal_codec])
+ VLC_ADD_LDFLAGS([mmal_codec],[ -L/opt/vc/lib ])
+ VLC_ADD_CFLAGS([mmal_codec],[ -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vcos/linux ])
+ VLC_ADD_LIBS([mmal_codec],[ -lbcm_host -lmmal ]) ], [
+ AS_IF([test "${enable_mmal_codec}" = "yes"],
+ [ AC_MSG_ERROR([Cannot find bcm library...]) ],
+ [ AC_MSG_WARN([Cannot find bcm library...]) ])
+ ],
+ [])
+ ] , [ AS_IF([test "${enable_mmal_codec}" = "yes"],
+ [ AC_MSG_ERROR([Cannot find development headers for mmal...]) ],
+ [ AC_MSG_WARN([Cannot find development headers for mmal...]) ]) ])
+ VLC_RESTORE_FLAGS
+fi
+
+dnl
dnl CrystalHD codec plugin
dnl
AC_ARG_ENABLE(crystalhd,
diff --git a/modules/MODULES_LIST b/modules/MODULES_LIST
index 1a0cc19..61ad62b 100644
--- a/modules/MODULES_LIST
+++ b/modules/MODULES_LIST
@@ -206,6 +206,7 @@ $Id$
* mirror: mirror video filter
* mjpeg: a demuxer for multipart and concatenated JPEG data
* mkv: Matroska demuxer
+ * mmal_codec: mmal based video decoder
* mmal_vout: mmal based video renderer
* mmdevice: Windows Audio Session API audio output using MMDevice
* mod: MOD demuxer
diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index a90ecca..b825128 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -374,6 +374,16 @@ codec_LTLIBRARIES += libiomx_plugin.la libmediacodec_plugin.la
endif
+### MMAL ###
+
+libmmal_codec_plugin_la_SOURCES = codec/mmal.c
+libmmal_codec_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_mmal_codec)
+libmmal_codec_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' $(LDFLAGS_mmal_codec)
+libmmal_codec_plugin_la_LIBADD = $(LIBS_mmal_codec)
+EXTRA_LTLIBRARIES += libmmal_codec_plugin.la
+codec_LTLIBRARIES += $(LTLIBmmal_codec)
+
+
### X26x encoders ###
libx265_plugin_la_SOURCES = codec/x265.c
diff --git a/modules/codec/mmal.c b/modules/codec/mmal.c
new file mode 100644
index 0000000..f60ac7d
--- /dev/null
+++ b/modules/codec/mmal.c
@@ -0,0 +1,599 @@
+/*****************************************************************************
+ * mmal.c: MMAL-based decoder plugin for Raspberry Pi
+ *****************************************************************************
+ * Copyright © 2014 jusst technologies GmbH
+ * $Id$
+ *
+ * Authors: Dennis Hamester <dennis.hamester at gmail.com>
+ * Julian Scheel <julian at jusst.de>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_codec.h>
+#include <vlc_threads.h>
+
+#include <bcm_host.h>
+#include <interface/mmal/mmal.h>
+#include <interface/mmal/util/mmal_util.h>
+#include <interface/mmal/util/mmal_default_components.h>
+
+/* This value must match the define in video_output/mmal.c
+ * Think twice before changing this. Incorrect values cause havoc.
+ */
+#define NUM_ACTUAL_OPAQUE_BUFFERS 40
+
+#define NUM_EXTRA_BUFFERS 10
+#define NUM_OPAQUE_BUFFERS 20
+
+#define MIN_NUM_BUFFERS_IN_TRANSIT 2
+
+#define MMAL_ZEROCOPY_NAME "mmal-zerocopy"
+#define MMAL_ZEROCOPY_TEXT N_("Decode frames directly into RPI VideoCore instead of host memory.")
+#define MMAL_ZEROCOPY_LONGTEXT N_("Decode frames directly into RPI VideoCore instead of host memory. This option must only be used with the MMAL video output plugin.")
+
+static int OpenDecoder(decoder_t *dec);
+static void CloseDecoder(decoder_t *dec);
+
+vlc_module_begin()
+ set_shortname(N_("MMAL decoder"))
+ set_description(N_("MMAL-based decoder plugin for Raspberry Pi"))
+ set_capability("decoder", 90)
+ add_shortcut("mmal_decoder")
+ add_bool(MMAL_ZEROCOPY_NAME, true, MMAL_ZEROCOPY_TEXT, MMAL_ZEROCOPY_LONGTEXT, false)
+ set_callbacks(OpenDecoder, CloseDecoder)
+vlc_module_end()
+
+struct decoder_sys_t {
+ bool opaque;
+ MMAL_COMPONENT_T *component;
+ MMAL_PORT_T *input;
+ MMAL_POOL_T *input_pool;
+ MMAL_PORT_T *output;
+ MMAL_POOL_T *output_pool;
+ MMAL_ES_FORMAT_T *output_format;
+ MMAL_QUEUE_T *decoded_pictures;
+ vlc_mutex_t mutex;
+};
+
+/* Utilities */
+static int change_output_format(decoder_t *dec);
+static int send_output_buffer(decoder_t *dec);
+static void fill_output_port(decoder_t *dec);
+
+/* VLC decoder callback */
+static picture_t *decode(decoder_t *dec, block_t **block);
+
+/* MMAL callbacks */
+static void control_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer);
+static void input_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer);
+static void output_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer);
+
+static int OpenDecoder(decoder_t *dec)
+{
+ int ret = VLC_SUCCESS;
+ decoder_sys_t *sys;
+ MMAL_PARAMETER_BOOLEAN_T error_concealment;
+ MMAL_PARAMETER_UINT32_T extra_buffers;
+ MMAL_STATUS_T status;
+
+ if (dec->fmt_in.i_cat != VIDEO_ES)
+ return VLC_EGENERIC;
+
+ if (dec->fmt_in.i_codec != VLC_CODEC_MPGV &&
+ dec->fmt_in.i_codec != VLC_CODEC_H264)
+ return VLC_EGENERIC;
+
+ sys = calloc(1, sizeof(decoder_sys_t));
+ if (!sys) {
+ ret = VLC_ENOMEM;
+ goto out;
+ }
+ dec->p_sys = sys;
+ dec->b_need_packetized = true;
+
+ sys->opaque = var_InheritBool(dec, MMAL_ZEROCOPY_NAME);
+ bcm_host_init();
+
+ status = mmal_component_create(MMAL_COMPONENT_DEFAULT_VIDEO_DECODER, &sys->component);
+ if (status != MMAL_SUCCESS) {
+ msg_Err(dec, "Failed to create MMAL component %s (status=%"PRIx32" %s)",
+ MMAL_COMPONENT_DEFAULT_VIDEO_DECODER, status, mmal_status_to_string(status));
+ ret = VLC_EGENERIC;
+ goto out;
+ }
+
+ sys->component->control->userdata = (struct MMAL_PORT_USERDATA_T *)dec;
+ status = mmal_port_enable(sys->component->control, control_port_cb);
+ if (status != MMAL_SUCCESS) {
+ msg_Err(dec, "Failed to enable control port %s (status=%"PRIx32" %s)",
+ sys->component->control->name, status, mmal_status_to_string(status));
+ ret = VLC_EGENERIC;
+ goto out;
+ }
+
+ sys->input = sys->component->input[0];
+ sys->input->userdata = (struct MMAL_PORT_USERDATA_T *)dec;
+ if (dec->fmt_in.i_codec == VLC_CODEC_MPGV)
+ sys->input->format->encoding = MMAL_ENCODING_MP2V;
+ else
+ sys->input->format->encoding = MMAL_ENCODING_H264;
+
+ if (dec->fmt_in.i_codec == VLC_CODEC_H264) {
+ if (dec->fmt_in.i_extra > 0) {
+ status = mmal_format_extradata_alloc(sys->input->format,
+ dec->fmt_in.i_extra);
+ if (status == MMAL_SUCCESS) {
+ memcpy(sys->input->format->extradata, dec->fmt_in.p_extra,
+ dec->fmt_in.i_extra);
+ sys->input->format->extradata_size = dec->fmt_in.i_extra;
+ } else {
+ msg_Err(dec, "Failed to allocate extra format data on input port %s (status=%"PRIx32" %s)",
+ sys->input->name, status, mmal_status_to_string(status));
+ }
+ } else {
+ error_concealment.hdr.id = MMAL_PARAMETER_VIDEO_DECODE_ERROR_CONCEALMENT;
+ error_concealment.hdr.size = sizeof(MMAL_PARAMETER_BOOLEAN_T);
+ error_concealment.enable = MMAL_FALSE;
+ status = mmal_port_parameter_set(sys->input, &error_concealment.hdr);
+ if (status != MMAL_SUCCESS)
+ msg_Err(dec, "Failed to disable error concealment (status=%"PRIx32" %s)",
+ status, mmal_status_to_string(status));
+ }
+ }
+
+ status = mmal_port_format_commit(sys->input);
+ if (status != MMAL_SUCCESS) {
+ msg_Err(dec, "Failed to commit format for input port %s (status=%"PRIx32" %s)",
+ sys->input->name, status, mmal_status_to_string(status));
+ ret = VLC_EGENERIC;
+ goto out;
+ }
+ sys->input->buffer_size = sys->input->buffer_size_recommended;
+ sys->input->buffer_num = __MAX(sys->input->buffer_num_recommended, 80);
+
+ status = mmal_port_enable(sys->input, input_port_cb);
+ if (status != MMAL_SUCCESS) {
+ msg_Err(dec, "Failed to enable input port %s (status=%"PRIx32" %s)",
+ sys->input->name, status, mmal_status_to_string(status));
+ ret = VLC_EGENERIC;
+ goto out;
+ }
+
+ sys->output = sys->component->output[0];
+ sys->output->userdata = (struct MMAL_PORT_USERDATA_T *)dec;
+
+ if (sys->opaque) {
+ extra_buffers.hdr.id = MMAL_PARAMETER_EXTRA_BUFFERS;
+ extra_buffers.hdr.size = sizeof(MMAL_PARAMETER_UINT32_T);
+ extra_buffers.value = NUM_ACTUAL_OPAQUE_BUFFERS - NUM_OPAQUE_BUFFERS;
+ status = mmal_port_parameter_set(sys->output, &extra_buffers.hdr);
+ if (status != MMAL_SUCCESS) {
+ msg_Err(dec, "Failed to set MMAL_PARAMETER_EXTRA_BUFFERS on output port (status=%"PRIx32" %s)",
+ status, mmal_status_to_string(status));
+ ret = VLC_EGENERIC;
+ goto out;
+ }
+ }
+
+ status = mmal_port_enable(sys->output, output_port_cb);
+ if (status != MMAL_SUCCESS) {
+ msg_Err(dec, "Failed to enable output port %s (status=%"PRIx32" %s)",
+ sys->output->name, status, mmal_status_to_string(status));
+ ret = VLC_EGENERIC;
+ goto out;
+ }
+
+ status = mmal_component_enable(sys->component);
+ if (status != MMAL_SUCCESS) {
+ msg_Err(dec, "Failed to enable component %s (status=%"PRIx32" %s)",
+ sys->component->name, status, mmal_status_to_string(status));
+ ret = VLC_EGENERIC;
+ goto out;
+ }
+
+ sys->input_pool = mmal_pool_create(sys->input->buffer_num, 0);
+ sys->decoded_pictures = mmal_queue_create();
+
+ if (sys->opaque) {
+ dec->fmt_out.i_codec = VLC_CODEC_MMAL_OPAQUE;
+ dec->fmt_out.video.i_chroma = VLC_CODEC_MMAL_OPAQUE;
+ } else {
+ dec->fmt_out.i_codec = VLC_CODEC_I420;
+ dec->fmt_out.video.i_chroma = VLC_CODEC_I420;
+ }
+
+ dec->fmt_out.i_cat = VIDEO_ES;
+ dec->pf_decode_video = decode;
+
+ vlc_mutex_init_recursive(&sys->mutex);
+
+out:
+ if (ret != VLC_SUCCESS)
+ CloseDecoder(dec);
+
+ return ret;
+}
+
+static void CloseDecoder(decoder_t *dec)
+{
+ decoder_sys_t *sys = dec->p_sys;
+ MMAL_BUFFER_HEADER_T *buffer;
+
+ if (!sys)
+ return;
+
+ if (sys->component && sys->component->control->is_enabled)
+ mmal_port_disable(sys->component->control);
+
+ if (sys->input && sys->input->is_enabled)
+ mmal_port_disable(sys->input);
+
+ if (sys->output && sys->output->is_enabled)
+ mmal_port_disable(sys->output);
+
+ if (sys->component && sys->component->is_enabled)
+ mmal_component_disable(sys->component);
+
+ if (sys->input_pool)
+ mmal_pool_destroy(sys->input_pool);
+
+ if (sys->output_format)
+ mmal_format_free(sys->output_format);
+
+ /* Free pictures which are decoded but have not yet been sent
+ * out to the core */
+ while (buffer = mmal_queue_get(sys->decoded_pictures)) {
+ picture_t *pic = (picture_t *)buffer->user_data;
+ picture_Release(pic);
+
+ buffer->user_data = NULL;
+ buffer->alloc_size = 0;
+ buffer->data = NULL;
+ mmal_buffer_header_release(buffer);
+ }
+
+ if (sys->decoded_pictures)
+ mmal_queue_destroy(sys->decoded_pictures);
+
+ if (sys->output_pool)
+ mmal_pool_destroy(sys->output_pool);
+
+ if (sys->component)
+ mmal_component_release(sys->component);
+
+ free(sys);
+
+ bcm_host_deinit();
+}
+
+static int change_output_format(decoder_t *dec)
+{
+ decoder_sys_t *sys = dec->p_sys;
+ MMAL_STATUS_T status;
+ int pool_size;
+ int ret = 0;
+
+ status = mmal_port_disable(sys->output);
+ if (status != MMAL_SUCCESS) {
+ msg_Err(dec, "Failed to disable output port (status=%"PRIx32" %s)",
+ status, mmal_status_to_string(status));
+ ret = -1;
+ goto out;
+ }
+
+ mmal_format_full_copy(sys->output->format, sys->output_format);
+ status = mmal_port_format_commit(sys->output);
+ if (status != MMAL_SUCCESS) {
+ msg_Err(dec, "Failed to commit output format (status=%"PRIx32" %s)",
+ status, mmal_status_to_string(status));
+ ret = -1;
+ goto out;
+ }
+
+ if (sys->opaque) {
+ sys->output->buffer_num = NUM_ACTUAL_OPAQUE_BUFFERS;
+ pool_size = sys->output->buffer_num_recommended + NUM_EXTRA_BUFFERS;
+ } else {
+ sys->output->buffer_num = __MAX(sys->output->buffer_num_recommended,
+ MIN_NUM_BUFFERS_IN_TRANSIT);
+ pool_size = sys->output->buffer_num + NUM_EXTRA_BUFFERS;
+ }
+
+ sys->output->buffer_size = sys->output->buffer_size_recommended;
+
+ status = mmal_port_enable(sys->output, output_port_cb);
+ if (status != MMAL_SUCCESS) {
+ msg_Err(dec, "Failed to enable output port (status=%"PRIx32" %s)",
+ status, mmal_status_to_string(status));
+ ret = -1;
+ goto out;
+ }
+
+ if (!sys->output_pool) {
+ sys->output_pool = mmal_pool_create(pool_size, 0);
+ msg_Dbg(dec, "Created output pool with %d pictures", sys->output_pool->headers_num);
+
+ dec->i_extra_picture_buffers = sys->output_pool->headers_num;
+
+ if (dec->fmt_in.i_codec == VLC_CODEC_H264)
+ dec->i_extra_picture_buffers -= 16;
+ else
+ dec->i_extra_picture_buffers -= 4;
+
+ dec->i_extra_picture_buffers = __MAX(dec->i_extra_picture_buffers,
+ MIN_NUM_BUFFERS_IN_TRANSIT + 1);
+ msg_Dbg(dec, "Request %d extra pictures", dec->i_extra_picture_buffers);
+ }
+
+ dec->fmt_out.video.i_width = sys->output->format->es->video.width;
+ dec->fmt_out.video.i_height = sys->output->format->es->video.height;
+ dec->fmt_out.video.i_x_offset = sys->output->format->es->video.crop.x;
+ dec->fmt_out.video.i_y_offset = sys->output->format->es->video.crop.y;
+ dec->fmt_out.video.i_visible_width = sys->output->format->es->video.crop.width;
+ dec->fmt_out.video.i_visible_height = sys->output->format->es->video.crop.height;
+ dec->fmt_out.video.i_sar_num = sys->output->format->es->video.par.num;
+ dec->fmt_out.video.i_sar_den = sys->output->format->es->video.par.den;
+ dec->fmt_out.video.i_frame_rate = sys->output->format->es->video.frame_rate.num;
+ dec->fmt_out.video.i_frame_rate_base = sys->output->format->es->video.frame_rate.den;
+
+
+out:
+ mmal_format_free(sys->output_format);
+ sys->output_format = NULL;
+
+ return ret;
+}
+
+static int send_output_buffer(decoder_t *dec)
+{
+ decoder_sys_t *sys = dec->p_sys;
+ MMAL_BUFFER_HEADER_T *buffer;
+ picture_t *picture;
+ MMAL_STATUS_T status;
+ int ret = 0;
+
+ buffer = mmal_queue_get(sys->output_pool->queue);
+ if (!buffer) {
+ msg_Warn(dec, "Failed to get new buffer");
+ ret = -1;
+ goto out;
+ }
+
+ picture = decoder_NewPicture(dec);
+ if (!picture) {
+ msg_Warn(dec, "Failed to get new picture");
+ mmal_buffer_header_release(buffer);
+ ret = -1;
+ goto out;
+ }
+
+ mmal_buffer_header_reset(buffer);
+ buffer->user_data = picture;
+ buffer->cmd = 0;
+ buffer->alloc_size = sys->output->buffer_size;
+ buffer->data = picture->p[0].p_pixels;
+
+ status = mmal_port_send_buffer(sys->output, buffer);
+ if (status != MMAL_SUCCESS) {
+ msg_Err(dec, "Failed to send buffer to output port (status=%"PRIx32" %s)",
+ status, mmal_status_to_string(status));
+ mmal_buffer_header_release(buffer);
+ decoder_DeletePicture(dec, picture);
+ ret = -1;
+ goto out;
+ }
+
+out:
+ return ret;
+}
+
+static void fill_output_port(decoder_t *dec)
+{
+ decoder_sys_t *sys = dec->p_sys;
+ /* allow at least 2 buffers in transit */
+ unsigned max_buffers_in_transit = __MAX(sys->output->buffer_num_recommended,
+ MIN_NUM_BUFFERS_IN_TRANSIT);
+ unsigned buffers_available = mmal_queue_length(sys->output_pool->queue);
+ unsigned buffers_in_transit = sys->output_pool->headers_num - buffers_available -
+ mmal_queue_length(sys->decoded_pictures);
+ unsigned buffers_to_send = max_buffers_in_transit - buffers_in_transit;
+ unsigned i;
+
+ if (buffers_to_send > buffers_available)
+ buffers_to_send = buffers_available;
+
+#ifndef NDEBUG
+ msg_Dbg(dec, "Send %d buffers to output port (available: %d, in_transit: %d, buffer_num: %d)",
+ buffers_to_send, buffers_available, buffers_in_transit,
+ sys->output->buffer_num);
+#endif
+ for (i = 0; i < buffers_to_send; ++i)
+ if (send_output_buffer(dec) < 0)
+ break;
+}
+
+static picture_t *decode(decoder_t *dec, block_t **pblock)
+{
+ decoder_sys_t *sys = dec->p_sys;
+ block_t *block;
+ MMAL_BUFFER_HEADER_T *buffer;
+ uint32_t len;
+ uint32_t flags = 0;
+ MMAL_STATUS_T status;
+ picture_t *ret = NULL;
+
+ /*
+ * Configure output port if necessary
+ */
+ if (sys->output_format) {
+ vlc_mutex_lock(&sys->mutex);
+ if (change_output_format(dec) < 0)
+ msg_Err(dec, "Failed to change output port format");
+ vlc_mutex_unlock(&sys->mutex);
+ }
+
+ /*
+ * Send output buffers
+ */
+ if (sys->output_pool) {
+ vlc_mutex_lock(&sys->mutex);
+ buffer = mmal_queue_get(sys->decoded_pictures);
+ if (buffer) {
+ ret = (picture_t *)buffer->user_data;
+ ret->date = buffer->pts;
+
+ buffer->user_data = NULL;
+ buffer->alloc_size = 0;
+ buffer->data = NULL;
+ mmal_buffer_header_release(buffer);
+ }
+
+ fill_output_port(dec);
+ vlc_mutex_unlock(&sys->mutex);
+ }
+
+ if (ret)
+ goto out;
+
+ /*
+ * Process input
+ */
+ if (!pblock)
+ goto out;
+
+ block = *pblock;
+
+ if (!block)
+ goto out;
+
+ *pblock = NULL;
+
+ if (block->i_flags & BLOCK_FLAG_CORRUPTED)
+ flags |= MMAL_BUFFER_HEADER_FLAG_CORRUPTED;
+
+ if (block->i_flags & BLOCK_FLAG_DISCONTINUITY)
+ flags |= MMAL_BUFFER_HEADER_FLAG_DISCONTINUITY;
+
+ vlc_mutex_lock(&sys->mutex);
+ while (block->i_buffer > 0) {
+ buffer = mmal_queue_timedwait(sys->input_pool->queue, 2);
+ if (!buffer) {
+ msg_Err(dec, "Failed to retrieve buffer header for input data");
+ break;
+ }
+ mmal_buffer_header_reset(buffer);
+ buffer->cmd = 0;
+ buffer->pts = block->i_pts;
+ buffer->dts = block->i_dts;
+ buffer->alloc_size = sys->input->buffer_size;
+
+ len = block->i_buffer;
+ if (len > buffer->alloc_size)
+ len = buffer->alloc_size;
+
+ buffer->data = block->p_buffer;
+ block->p_buffer += len;
+ block->i_buffer -= len;
+ buffer->length = len;
+ if (block->i_buffer == 0)
+ buffer->user_data = block;
+ buffer->flags = flags;
+
+ status = mmal_port_send_buffer(sys->input, buffer);
+ if (status != MMAL_SUCCESS) {
+ msg_Err(dec, "Failed to send buffer to input port (status=%"PRIx32" %s)",
+ status, mmal_status_to_string(status));
+ break;
+ }
+ }
+ vlc_mutex_unlock(&sys->mutex);
+
+out:
+ return ret;
+}
+
+static void control_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer)
+{
+ decoder_t *dec = (decoder_t *)port->userdata;
+ MMAL_STATUS_T status;
+
+ if (buffer->cmd == MMAL_EVENT_ERROR) {
+ status = *(uint32_t *)buffer->data;
+ msg_Err(dec, "MMAL error %"PRIx32" \"%s\"", status,
+ mmal_status_to_string(status));
+ }
+
+ mmal_buffer_header_release(buffer);
+}
+
+static void input_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer)
+{
+ block_t *block = (block_t *)buffer->user_data;
+ decoder_t *dec = (decoder_t *)port->userdata;
+ decoder_sys_t *sys = dec->p_sys;
+ buffer->user_data = NULL;
+
+ mmal_buffer_header_release(buffer);
+ vlc_mutex_lock(&sys->mutex);
+ if (block)
+ block_Release(block);
+ vlc_mutex_unlock(&sys->mutex);
+}
+
+static void output_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer)
+{
+ decoder_t *dec = (decoder_t *)port->userdata;
+ decoder_sys_t *sys = dec->p_sys;
+ picture_t *picture;
+ MMAL_EVENT_FORMAT_CHANGED_T *fmt;
+ MMAL_ES_FORMAT_T *format;
+
+ vlc_mutex_lock(&sys->mutex);
+ if (buffer->cmd == 0) {
+ if (buffer->length > 0) {
+ mmal_queue_put(sys->decoded_pictures, buffer);
+ fill_output_port(dec);
+ } else {
+ picture = (picture_t *)buffer->user_data;
+ decoder_DeletePicture(dec, picture);
+ buffer->user_data = NULL;
+ buffer->alloc_size = 0;
+ buffer->data = NULL;
+ mmal_buffer_header_release(buffer);
+ }
+ } else if (buffer->cmd == MMAL_EVENT_FORMAT_CHANGED) {
+ fmt = mmal_event_format_changed_get(buffer);
+
+ format = mmal_format_alloc();
+ mmal_format_full_copy(format, fmt->format);
+
+ if (sys->opaque)
+ format->encoding = MMAL_ENCODING_OPAQUE;
+
+ sys->output_format = format;
+
+ mmal_buffer_header_release(buffer);
+ } else {
+ mmal_buffer_header_release(buffer);
+ }
+ vlc_mutex_unlock(&sys->mutex);
+}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7d16106..9cfa780 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -379,6 +379,7 @@ modules/codec/libass.c
modules/codec/libmpeg2.c
modules/codec/lpcm.c
modules/codec/mft.c
+modules/codec/mmal.c
modules/codec/mpeg_audio.c
modules/codec/omxil/android_mediacodec.c
modules/codec/omxil/omxil.c
--
1.9.3
More information about the vlc-devel
mailing list