diff options
Diffstat (limited to 'libavcodec/frwu.c')
| -rw-r--r-- | libavcodec/frwu.c | 39 |
1 files changed, 32 insertions, 7 deletions
diff --git a/libavcodec/frwu.c b/libavcodec/frwu.c index 3f8f6baf6a..43feb012f2 100644 --- a/libavcodec/frwu.c +++ b/libavcodec/frwu.c @@ -3,26 +3,32 @@ * * Copyright (c) 2009 Reimar Döffinger <Reimar.Doeffinger@gmx.de> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg 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. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg 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 Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avcodec.h" #include "bytestream.h" #include "internal.h" +#include "libavutil/opt.h" + +typedef struct { + AVClass *av_class; + int change_field_order; +} FRWUContext; static av_cold int decode_init(AVCodecContext *avctx) { @@ -42,6 +48,7 @@ static av_cold int decode_init(AVCodecContext *avctx) static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { + FRWUContext *s = avctx->priv_data; int field, ret; AVFrame *pic = avctx->coded_frame; const uint8_t *buf = avpkt->data; @@ -67,8 +74,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, pic->pict_type = AV_PICTURE_TYPE_I; pic->key_frame = 1; - pic->interlaced_frame = 1; - pic->top_field_first = 1; for (field = 0; field < 2; field++) { int i; @@ -87,9 +92,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, av_log(avctx, AV_LOG_ERROR, "Packet is too small, need %i, have %i\n", field_size, (int)(buf_end - buf)); return AVERROR_INVALIDDATA; } - if (field) + if (field ^ s->change_field_order) { dst += pic->linesize[0]; + } else if (s->change_field_order) { + dst += 2 * pic->linesize[0]; + } for (i = 0; i < field_h; i++) { + if (s->change_field_order && field && i == field_h - 1) + dst = pic->data[0]; memcpy(dst, buf, avctx->width * 2); buf += avctx->width * 2; dst += pic->linesize[0] << 1; @@ -113,13 +123,28 @@ static av_cold int decode_close(AVCodecContext *avctx) return 0; } +static const AVOption frwu_options[] = { + {"change_field_order", "Change field order", offsetof(FRWUContext, change_field_order), FF_OPT_TYPE_INT, + {.i64 = 0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_VIDEO_PARAM}, + {NULL} +}; + +static const AVClass frwu_class = { + .class_name = "frwu Decoder", + .item_name = av_default_item_name, + .option = frwu_options, + .version = LIBAVUTIL_VERSION_INT, +}; + AVCodec ff_frwu_decoder = { .name = "frwu", .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_FRWU, + .priv_data_size = sizeof(FRWUContext), .init = decode_init, .close = decode_close, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, .long_name = NULL_IF_CONFIG_SMALL("Forward Uncompressed"), + .priv_class = &frwu_class, }; |