From 50858a64bfc91a6d2717e2ecdd73b3f8322051fa Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 22 May 2012 20:33:24 +0200 Subject: Add Avid Meridien Uncompressed (AVUI) encoder. --- libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 2 +- libavcodec/avuienc.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- 4 files changed, 110 insertions(+), 2 deletions(-) create mode 100644 libavcodec/avuienc.c (limited to 'libavcodec') diff --git a/libavcodec/Makefile b/libavcodec/Makefile index f67952e..0a3b351 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -105,6 +105,7 @@ OBJS-$(CONFIG_AVRP_DECODER) += r210dec.o OBJS-$(CONFIG_AVRP_ENCODER) += r210enc.o OBJS-$(CONFIG_AVS_DECODER) += avs.o OBJS-$(CONFIG_AVUI_DECODER) += avuidec.o +OBJS-$(CONFIG_AVUI_ENCODER) += avuienc.o OBJS-$(CONFIG_AYUV_DECODER) += v408dec.o OBJS-$(CONFIG_AYUV_ENCODER) += v408enc.o OBJS-$(CONFIG_BETHSOFTVID_DECODER) += bethsoftvideo.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 631802b..ac05b9b 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -81,7 +81,7 @@ void avcodec_register_all(void) REGISTER_DECODER (AURA2, aura2); REGISTER_ENCDEC (AVRP, avrp); REGISTER_DECODER (AVS, avs); - REGISTER_DECODER (AVUI, avui); + REGISTER_ENCDEC (AVUI, avui); REGISTER_ENCDEC (AYUV, ayuv); REGISTER_DECODER (BETHSOFTVID, bethsoftvid); REGISTER_DECODER (BFI, bfi); diff --git a/libavcodec/avuienc.c b/libavcodec/avuienc.c new file mode 100644 index 0000000..2dae5cc --- /dev/null +++ b/libavcodec/avuienc.c @@ -0,0 +1,107 @@ +/* + * AVID Meridien encoder + * + * Copyright (c) 2012 Carl Eugen Hoyos + * + * This file is part of FFmpeg. + * + * 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. + * + * 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 FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "avcodec.h" +#include "internal.h" + +static av_cold int avui_encode_init(AVCodecContext *avctx) +{ + avctx->coded_frame = avcodec_alloc_frame(); + + if (avctx->width != 720 || avctx->height != 486 && avctx->height != 576) { + av_log(avctx, AV_LOG_ERROR, "Only 720x486 and 720x576 are supported.\n"); + return AVERROR(EINVAL); + } + if (!avctx->coded_frame) { + av_log(avctx, AV_LOG_ERROR, "Could not allocate frame.\n"); + return AVERROR(ENOMEM); + } + + return 0; +} + +static int avui_encode_frame(AVCodecContext *avctx, AVPacket *pkt, + const AVFrame *pic, int *got_packet) +{ + uint8_t *dst, *src = pic->data[0]; + int i, j, skip, ret, size, interlaced = pic->interlaced_frame; + + if (avctx->height == 486) { + skip = 10; + } else { + skip = 16; + } + size = 2 * avctx->width * (avctx->height + skip) + 8 * interlaced; + if ((ret = ff_alloc_packet2(avctx, pkt, size)) < 0) + return ret; + dst = pkt->data; + if (!(avctx->extradata = av_mallocz(24 + FF_INPUT_BUFFER_PADDING_SIZE))) + return AVERROR(ENOMEM); + avctx->extradata_size = 24; + memcpy(avctx->extradata, "\0\0\0\x18""APRGAPRG0001", 16); + if (interlaced) { + avctx->extradata[19] = 2; + } else { + avctx->extradata[19] = 1; + dst += avctx->width * skip; + } + + avctx->coded_frame->reference = 0; + avctx->coded_frame->key_frame = 1; + avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; + + for (i = 0; i <= interlaced; i++) { + if (interlaced && avctx->height == 486) { + src = pic->data[0] + (1 - i) * pic->linesize[0]; + } else { + src = pic->data[0] + i * pic->linesize[0]; + } + dst += avctx->width * skip + 4 * i; + for (j = 0; j < avctx->height; j += interlaced + 1) { + memcpy(dst, src, avctx->width * 2); + src += (interlaced + 1) * pic->linesize[0]; + dst += avctx->width * 2; + } + } + + pkt->flags |= AV_PKT_FLAG_KEY; + *got_packet = 1; + return 0; +} + +static av_cold int avui_encode_close(AVCodecContext *avctx) +{ + av_freep(&avctx->coded_frame); + + return 0; +} + +AVCodec ff_avui_encoder = { + .name = "avui", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_AVUI, + .init = avui_encode_init, + .encode2 = avui_encode_frame, + .close = avui_encode_close, + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_UYVY422, PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("Avid Meridien Uncompressed"), +}; diff --git a/libavcodec/version.h b/libavcodec/version.h index d176818..3c588d7 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -27,7 +27,7 @@ */ #define LIBAVCODEC_VERSION_MAJOR 54 -#define LIBAVCODEC_VERSION_MINOR 22 +#define LIBAVCODEC_VERSION_MINOR 23 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ -- cgit v1.1