diff options
| -rw-r--r-- | Changelog | 2 | ||||
| -rw-r--r-- | doc/general.texi | 1 | ||||
| -rw-r--r-- | libavcodec/Makefile | 1 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 1 | ||||
| -rw-r--r-- | libavcodec/aura.c | 138 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 2 |
6 files changed, 143 insertions, 2 deletions
@@ -46,7 +46,7 @@ version <next>: - IV8 demuxer - CDG demuxer and decoder - R210 decoder -- Auravision Aura decoder +- Auravision Aura 1 and 2 decoders diff --git a/doc/general.texi b/doc/general.texi index e7e2e0a043..b0668dff88 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -318,6 +318,7 @@ following image formats are supported: @item ATI VCR2 @tab @tab X @tab fourcc: VCR2 @item Auravision Aura @tab @tab X +@item Auravision Aura 2 @tab @tab X @item Autodesk Animator Flic video @tab @tab X @item Autodesk RLE @tab @tab X @tab fourcc: AASC diff --git a/libavcodec/Makefile b/libavcodec/Makefile index de00580743..35a4ce5768 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -61,6 +61,7 @@ OBJS-$(CONFIG_ASV2_ENCODER) += asv1.o mpeg12data.o OBJS-$(CONFIG_ATRAC1_DECODER) += atrac1.o atrac.o OBJS-$(CONFIG_ATRAC3_DECODER) += atrac3.o atrac.o OBJS-$(CONFIG_AURA_DECODER) += cyuv.o +OBJS-$(CONFIG_AURA2_DECODER) += aura.o OBJS-$(CONFIG_AVS_DECODER) += avs.o OBJS-$(CONFIG_BETHSOFTVID_DECODER) += bethsoftvideo.o OBJS-$(CONFIG_BFI_DECODER) += bfi.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 44517419eb..0cb5f3d21f 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -66,6 +66,7 @@ void avcodec_register_all(void) REGISTER_ENCDEC (ASV1, asv1); REGISTER_ENCDEC (ASV2, asv2); REGISTER_DECODER (AURA, aura); + REGISTER_DECODER (AURA2, aura2); REGISTER_DECODER (AVS, avs); REGISTER_DECODER (BETHSOFTVID, bethsoftvid); REGISTER_DECODER (BFI, bfi); diff --git a/libavcodec/aura.c b/libavcodec/aura.c new file mode 100644 index 0000000000..f783010223 --- /dev/null +++ b/libavcodec/aura.c @@ -0,0 +1,138 @@ +/* + * Aura 2 decoder + * + * 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 + */ + +/** + * @file libavcodec/aura.c + * Aura 2 decoder + */ + +#include "avcodec.h" + +typedef struct AuraDecodeContext { + AVCodecContext *avctx; + AVFrame frame; +} AuraDecodeContext; + +static av_cold int aura_decode_init(AVCodecContext *avctx) +{ + AuraDecodeContext *s = avctx->priv_data; + + s->avctx = avctx; + /* width needs to be divisible by 4 for this codec to work */ + if (avctx->width & 0x3) + return -1; + avctx->pix_fmt = PIX_FMT_YUV422P; + + return 0; +} + +static int aura_decode_frame(AVCodecContext *avctx, + void *data, int *data_size, + AVPacket *pkt) +{ + AuraDecodeContext *s=avctx->priv_data; + + uint8_t *Y, *U, *V; + uint8_t val; + int x, y; + const uint8_t *buf = pkt->data; + + /* prediction error tables (make it clear that they are signed values) */ + const int8_t *delta_table = (const int8_t*)buf + 16; + + if (pkt->size != 48 + avctx->height * avctx->width) { + av_log(avctx, AV_LOG_ERROR, "got a buffer with %d bytes when %d were expected\n", + pkt->size, 48 + avctx->height * avctx->width); + return -1; + } + + /* pixel data starts 48 bytes in, after 3x16-byte tables */ + buf += 48; + + if(s->frame.data[0]) + avctx->release_buffer(avctx, &s->frame); + + s->frame.buffer_hints = FF_BUFFER_HINTS_VALID; + s->frame.reference = 0; + if(avctx->get_buffer(avctx, &s->frame) < 0) { + av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + return -1; + } + + Y = s->frame.data[0]; + U = s->frame.data[1]; + V = s->frame.data[2]; + + /* iterate through each line in the height */ + for (y = 0; y < avctx->height; y++) { + /* reset predictors */ + val = *buf++; + U[0] = val & 0xF0; + Y[0] = val << 4; + val = *buf++; + V[0] = val & 0xF0; + Y[1] = Y[0] + delta_table[val & 0xF]; + Y += 2; U++; V++; + + /* iterate through the remaining pixel groups (4 pixels/group) */ + for (x = 1; x < (avctx->width >> 1); x++) { + val = *buf++; + U[0] = U[-1] + delta_table[val >> 4]; + Y[0] = Y[-1] + delta_table[val & 0xF]; + val = *buf++; + V[0] = V[-1] + delta_table[val >> 4]; + Y[1] = Y[ 0] + delta_table[val & 0xF]; + Y += 2; U++; V++; + } + Y += s->frame.linesize[0] - avctx->width; + U += s->frame.linesize[1] - (avctx->width >> 1); + V += s->frame.linesize[2] - (avctx->width >> 1); + } + + *data_size=sizeof(AVFrame); + *(AVFrame*)data= s->frame; + + return pkt->size; +} + +static av_cold int aura_decode_end(AVCodecContext *avctx) +{ + AuraDecodeContext *s = avctx->priv_data; + + if (s->frame.data[0]) + avctx->release_buffer(avctx, &s->frame); + + return 0; +} + +AVCodec aura2_decoder = { + "aura2", + CODEC_TYPE_VIDEO, + CODEC_ID_AURA2, + sizeof(AuraDecodeContext), + aura_decode_init, + NULL, + aura_decode_end, + aura_decode_frame, + CODEC_CAP_DR1, + NULL, + .long_name = NULL_IF_CONFIG_SMALL("Auravision Aura 2"), +}; + diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 933af7c23b..bb31919c44 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 52 -#define LIBAVCODEC_VERSION_MINOR 44 +#define LIBAVCODEC_VERSION_MINOR 45 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |