Am Sonntag, den 03.07.2016, 18:05 +0200 schrieb Moritz Barsnick:
> On Sun, Jul 03, 2016 at 17:20:41 +0200, Jens Ziller wrote:
> >
> > Am Samstag, den 02.07.2016, 17:54 +0200 schrieb Moritz Barsnick:
> > >
> > > On Sun, Jun 26, 2016 at 17:12:14 +0200, Jens Ziller wrote:
> > > >
> > > >
> > > > + ctx->interlaced_frame = !(interlace_type.eMode ==
> > > > MMAL_InterlaceProgressive);
> > > What's wrong with using the "!=" operator instead?
> > "!=" is a comparing. "= !()" assign with a negate. Here is "= !()"
> > needed.
> I meant the comparison, not the assignment, so replacing:
> ctx->interlaced_frame = !(interlace_type.eMode ==
> MMAL_InterlaceProgressive)
> with
> ctx->interlaced_frame = (interlace_type.eMode !=
> MMAL_InterlaceProgressive)
>
> The former is rather ... convoluted.
> (Brackets optional, but probably better for readability.)
>
> Moritz
Oh, sorry! I'am so blind. Yes, that's not really smart. I changed that.
The new patch is attached.
Regards Jens
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
From b724bbe3a13addb055da883cbe802eee74d7c65e Mon Sep 17 00:00:00 2001
From: Jens Ziller <zille...@gmx.de>
Date: Sun, 3 Jul 2016 19:25:23 +0200
Subject: [PATCH] v4 fill AVFrame->interlaced_frame with
MMAL_PARAMETER_VIDEO_INTERLACE_TYPE_T, add a pointer data[2] to
MMAL_ES_FORMAT_T that user application can invoke MMAL components like
deinterlacer and renderer with it
---
libavcodec/mmaldec.c | 17 +++++++++++++++++
libavutil/pixfmt.h | 3 ++-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c
index 099a8c5..2e7b43c 100644
--- a/libavcodec/mmaldec.c
+++ b/libavcodec/mmaldec.c
@@ -88,6 +88,7 @@ typedef struct MMALDecodeContext {
int eos_received;
int eos_sent;
int extradata_sent;
+ int interlaced_frame;
} MMALDecodeContext;
// Assume decoder is guaranteed to produce output after at least this many
@@ -274,6 +275,7 @@ static int ffmal_update_format(AVCodecContext *avctx)
int ret = 0;
MMAL_COMPONENT_T *decoder = ctx->decoder;
MMAL_ES_FORMAT_T *format_out = decoder->output[0]->format;
+ MMAL_PARAMETER_VIDEO_INTERLACE_TYPE_T interlace_type;
ffmmal_poolref_unref(ctx->pool_out);
if (!(ctx->pool_out = av_mallocz(sizeof(*ctx->pool_out)))) {
@@ -300,6 +302,15 @@ static int ffmal_update_format(AVCodecContext *avctx)
if ((status = mmal_port_format_commit(decoder->output[0])))
goto fail;
+ interlace_type.hdr.id = MMAL_PARAMETER_VIDEO_INTERLACE_TYPE;
+ interlace_type.hdr.size = sizeof(MMAL_PARAMETER_VIDEO_INTERLACE_TYPE_T);
+ status = mmal_port_parameter_get(decoder->output[0], &interlace_type.hdr);
+ if (status != MMAL_SUCCESS) {
+ av_log(avctx, AV_LOG_ERROR, "Cannot read MMAL interlace information!\n");
+ } else {
+ ctx->interlaced_frame = (interlace_type.eMode != MMAL_InterlaceProgressive);
+ }
+
if ((ret = ff_set_dimensions(avctx, format_out->es->video.crop.x + format_out->es->video.crop.width,
format_out->es->video.crop.y + format_out->es->video.crop.height)) < 0)
goto fail;
@@ -609,7 +620,13 @@ static int ffmal_copy_frame(AVCodecContext *avctx, AVFrame *frame,
MMALDecodeContext *ctx = avctx->priv_data;
int ret = 0;
+ frame->interlaced_frame = ctx->interlaced_frame;
+
if (avctx->pix_fmt == AV_PIX_FMT_MMAL) {
+
+ // in data[2] give the format struct for configure deinterlacer and renderer
+ frame->data[2] = ctx->decoder->output[0]->format;
+
if (!ctx->pool_out)
return AVERROR_UNKNOWN; // format change code failed with OOM previously
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index 0ed01c4..98982f8 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -235,7 +235,8 @@ enum AVPixelFormat {
AV_PIX_FMT_QSV,
/**
* HW acceleration though MMAL, data[3] contains a pointer to the
- * MMAL_BUFFER_HEADER_T structure.
+ * MMAL_BUFFER_HEADER_T structure and data[2] contains a pointer to the
+ * MMAL_ES_FORMAT_T structure.
*/
AV_PIX_FMT_MMAL,
--
2.7.3
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
