virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

libavcodec/mmaldec.c: set AVFrame interlaced_frame and top_field_first, AVCodecContext framerate

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Jens Ziller 2016-08-14 16:44:39 +02:00 committed by Michael Niedermayer
parent b7760dd8d4
commit bc7066fd5d
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/mmaldec.c
View File

@ -88,6 +88,8 @@ typedef struct MMALDecodeContext {
int eos_received;
int eos_sent;
int extradata_sent;
int interlaced_frame;
int top_field_first;
} MMALDecodeContext;
// Assume decoder is guaranteed to produce output after at least this many
@ -274,6 +276,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 +303,16 @@ 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);
ctx->top_field_first = (interlace_type.eMode == MMAL_InterlaceFieldsInterleavedUpperFirst);
}
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;
@ -308,6 +321,10 @@ static int ffmal_update_format(AVCodecContext *avctx)
avctx->sample_aspect_ratio.num = format_out->es->video.par.num;
avctx->sample_aspect_ratio.den = format_out->es->video.par.den;
}
if (format_out->es->video.frame_rate.num && format_out->es->video.frame_rate.den) {
avctx->framerate.num = format_out->es->video.frame_rate.num;
avctx->framerate.den = format_out->es->video.frame_rate.den;
}
avctx->colorspace = ffmmal_csp_to_av_csp(format_out->es->video.color_space);
@ -609,6 +626,9 @@ static int ffmal_copy_frame(AVCodecContext *avctx, AVFrame *frame,
MMALDecodeContext *ctx = avctx->priv_data;
int ret = 0;
frame->interlaced_frame = ctx->interlaced_frame;
frame->top_field_first = ctx->top_field_first;
if (avctx->pix_fmt == AV_PIX_FMT_MMAL) {
if (!ctx->pool_out)
return AVERROR_UNKNOWN; // format change code failed with OOM previously