On Mon, Feb 13, 2012 at 03:35:47PM +0000, Paul B Mahol wrote:
>
> Signed-off-by: Paul B Mahol <[email protected]>
> ---
> Changelog | 1 +
> doc/general.texi | 4 +
> libavcodec/Makefile | 1 +
> libavcodec/allcodecs.c | 1 +
> libavcodec/avcodec.h | 1 +
> libavcodec/cdxl.c | 275
> ++++++++++++++++++++++++++++++++++++++++++++++
> libavcodec/version.h | 2 +-
> libavformat/Makefile | 1 +
> libavformat/allformats.c | 1 +
> libavformat/cdxl.c | 168 ++++++++++++++++++++++++++++
> libavformat/version.h | 2 +-
> 11 files changed, 455 insertions(+), 2 deletions(-)
> create mode 100644 libavcodec/cdxl.c
> create mode 100644 libavformat/cdxl.c
>
> diff --git a/Changelog b/Changelog
> index cc7420c..8bcccf4 100644
> --- a/Changelog
> +++ b/Changelog
> @@ -6,6 +6,7 @@ version <next>:
> - XWD encoder and decoder
> - Support for fragmentation in the mov/mp4 muxer
> - ISMV (Smooth Streaming) muxer
> +- CDXL demuxer and decoder
>
>
> version 0.8:
> diff --git a/doc/general.texi b/doc/general.texi
> index 50ae764..bfbaaa3 100644
> --- a/doc/general.texi
> +++ b/doc/general.texi
> @@ -131,6 +131,8 @@ library:
> @tab Multimedia format used by Delphine Software games.
> @item CD+G @tab @tab X
> @tab Video format used by CD+G karaoke disks
> +@item Commodore CDXL @tab @tab X
> + @tab CD video format for Amiga
> @item Core Audio Format @tab @tab X
> @tab Apple Core Audio Format
> @item CRC testing format @tab X @tab
> @@ -435,6 +437,8 @@ following image formats are supported:
> @tab fourcc: CSCD
> @item CD+G @tab @tab X
> @tab Video codec for CD+G karaoke disks
> +@item CDXL @tab @tab X
> + @tab Video codec for CDXL format
> @item Chinese AVS video @tab E @tab X
> @tab AVS1-P2, JiZhun profile, encoding through external library libxavs
> @item Delphine Software International CIN video @tab @tab X
> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
> index a891651..2eaef6b 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -102,6 +102,7 @@ OBJS-$(CONFIG_C93_DECODER) += c93.o
> OBJS-$(CONFIG_CAVS_DECODER) += cavs.o cavsdec.o cavsdsp.o \
> mpeg12data.o mpegvideo.o
> OBJS-$(CONFIG_CDGRAPHICS_DECODER) += cdgraphics.o
> +OBJS-$(CONFIG_CDXL_DECODER) += cdxl.o
> OBJS-$(CONFIG_CINEPAK_DECODER) += cinepak.o
> OBJS-$(CONFIG_CLJR_DECODER) += cljr.o
> OBJS-$(CONFIG_CLJR_ENCODER) += cljr.o
> diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
> index cda71e0..1c72177 100644
> --- a/libavcodec/allcodecs.c
> +++ b/libavcodec/allcodecs.c
> @@ -86,6 +86,7 @@ void avcodec_register_all(void)
> REGISTER_DECODER (C93, c93);
> REGISTER_DECODER (CAVS, cavs);
> REGISTER_DECODER (CDGRAPHICS, cdgraphics);
> + REGISTER_DECODER (CDXL, cdxl);
> REGISTER_DECODER (CINEPAK, cinepak);
> REGISTER_ENCDEC (CLJR, cljr);
> REGISTER_DECODER (CSCD, cscd);
> diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
> index 6afa140..51b956b 100644
> --- a/libavcodec/avcodec.h
> +++ b/libavcodec/avcodec.h
> @@ -244,6 +244,7 @@ enum CodecID {
> CODEC_ID_DXTORY,
> CODEC_ID_V410,
> CODEC_ID_XWD,
> + CODEC_ID_CDXL,
>
> /* various PCM "codecs" */
> CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the
> start of audio codecs
> diff --git a/libavcodec/cdxl.c b/libavcodec/cdxl.c
> new file mode 100644
> index 0000000..7248bc8
> --- /dev/null
> +++ b/libavcodec/cdxl.c
> @@ -0,0 +1,275 @@
> +/*
> + * CDXL video decoder
> + * Copyright (c) 2011-2012 Paul B Mahol
> + *
> + * This file is part of Libav.
> + *
> + * Libav 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,
> + * 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
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
> USA
> + */
> +
> +#include "libavutil/intreadwrite.h"
> +#include "libavutil/imgutils.h"
> +#include "avcodec.h"
> +#include "get_bits.h"
> +
> +typedef struct {
> + AVCodecContext *avctx;
> + AVFrame frame;
> + int bpp;
> + const uint8_t *palette;
> + int palette_size;
> + const uint8_t *video;
> + int video_size;
> + uint8_t *new_video;
> + int new_video_size;
> +} CDXLVideoContext;
> +
> +static av_cold int cdxl_decode_init(AVCodecContext *avctx)
> +{
> + CDXLVideoContext *c = avctx->priv_data;
> +
> + avcodec_get_frame_defaults(&c->frame);
> + c->new_video_size = 0;
> + c->avctx = avctx;
> +
> + return 0;
> +}
> +
> +static void import_palette(CDXLVideoContext *c, uint32_t *new_palette)
> +{
> + int i;
> +
> + for (i = 0; i < c->palette_size / 2; i++) {
> + unsigned xxx = AV_RB16(&c->palette[i * 2]);
nit: 'rgb' as variable name would be more logical here
> + unsigned r = ((xxx >> 8) & 0xF) * 0x11;
> + unsigned g = ((xxx >> 4) & 0xF) * 0x11;
> + unsigned b = (xxx & 0xF) * 0x11;
> + AV_WN32(&new_palette[i], (r << 16) | (g << 8) | b);
> + }
> +}
> +
> +static void bitplanar2chunky(CDXLVideoContext *c, int width, int linesize,
> uint8_t *out)
> +{
> + GetBitContext gb;
> + int x, y, plane;
> +
> + init_get_bits(&gb, c->video, c->video_size * 8);
> + memset(out, 0, linesize * c->avctx->height);
> + for (plane = 0; plane < c->bpp; plane++)
> + for (y = 0; y < c->avctx->height; y++)
> + for (x = 0; x < width; x++)
> + out[linesize * y + x] |= get_bits1(&gb) << plane;
> +}
> +
> +static void cdxl_decode_rgb(CDXLVideoContext *c)
> +{
> + uint32_t *new_palette = (uint32_t *) c->frame.data[1];
> + int padded_width = FFALIGN(c->avctx->width, 16);
> +
> + import_palette(c, new_palette);
> + bitplanar2chunky(c, padded_width, c->frame.linesize[0],
> c->frame.data[0]);
> +}
> +
> +static void cdxl_decode_ham6(CDXLVideoContext *c)
> +{
> + AVCodecContext *avctx = c->avctx;
> + uint32_t new_palette[16], r, g, b;
> + uint8_t *ptr, *out, index, op;
> + int x, y;
> +
> + ptr = c->new_video;
> + out = c->frame.data[0];
> +
> + import_palette(c, new_palette);
> + bitplanar2chunky(c, avctx->width, avctx->width, c->new_video);
> +
> + for (y = 0; y < avctx->height; y++) {
> + r = new_palette[0] & 0xFF0000;
> + g = new_palette[0] & 0xFF00;
> + b = new_palette[0] & 0xFF;
> + for (x = 0; x < avctx->width; x++) {
> + index = *ptr++;
> + op = index >> 4;
> + index &= 15;
> + switch (op) {
> + case 0:
> + r = new_palette[index] & 0xFF0000;
> + g = new_palette[index] & 0xFF00;
> + b = new_palette[index] & 0xFF;
> + break;
> + case 1:
> + b = index * 0x11;
> + break;
> + case 2:
> + r = index * 0x11 << 16;
> + break;
> + case 3:
> + g = index * 0x11 << 8;
> + break;
> + }
> + AV_WN32(out + x * 3, r | g | b);
> + }
> + out += c->frame.linesize[0];
> + }
> +}
> +
> +static void cdxl_decode_ham8(CDXLVideoContext *c)
> +{
> + AVCodecContext *avctx = c->avctx;
> + uint32_t new_palette[64], r, g, b;
> + uint8_t *ptr, *out, index, op;
> + int x, y;
> +
> + ptr = c->new_video;
> + out = c->frame.data[0];
> +
> + import_palette(c, new_palette);
> + bitplanar2chunky(c, avctx->width, avctx->width, c->new_video);
> +
> + for (y = 0; y < avctx->height; y++) {
> + r = new_palette[0] & 0xFF0000;
> + g = new_palette[0] & 0xFF00;
> + b = new_palette[0] & 0xFF;
> + for (x = 0; x < avctx->width; x++) {
> + index = *ptr++;
> + op = index >> 6;
> + index &= 63;
> + switch (op) {
> + case 0:
> + r = new_palette[index] & 0xFF0000;
> + g = new_palette[index] & 0xFF00;
> + b = new_palette[index] & 0xFF;
> + break;
> + case 1:
> + b = (index << 2) | (b & 3);
> + break;
> + case 2:
> + r = (index << 18) | (r & (3 << 16));
> + break;
> + case 3:
> + g = (index << 10) | (g & (3 << 8));
> + break;
> + }
> + AV_WN32(out + x * 3, r | g | b);
> + }
> + out += c->frame.linesize[0];
> + }
> +}
> +
> +static int cdxl_decode_frame(AVCodecContext *avctx, void *data, int
> *data_size,
> + AVPacket *pkt)
> +{
> + CDXLVideoContext *c = avctx->priv_data;
> + AVFrame * const p = &c->frame;
> + int ret, w, h, encoding, format, buf_size = pkt->size;
> + const uint8_t *buf = pkt->data;
> +
> + if (buf_size < 32)
> + return AVERROR_INVALIDDATA;
> + encoding = buf[1] & 7;
> + format = buf[1] & 0xE0;
> + w = AV_RB16(&buf[14]);
> + h = AV_RB16(&buf[16]);
> + c->bpp = buf[19];
> + c->palette_size = AV_RB16(&buf[20]);
> + c->palette = buf + 32;
> + c->video = c->palette + c->palette_size;
> + c->video_size = buf_size - c->palette_size - 32;
> +
> + if (c->palette_size > 512)
> + return AVERROR_INVALIDDATA;
> + if (buf_size < c->palette_size + 32)
> + return AVERROR_INVALIDDATA;
> + if (c->bpp < 1)
> + return AVERROR_INVALIDDATA;
> + if (c->bpp > 8) {
> + av_log_ask_for_sample(avctx, "unsupported pixel size: %d\n", c->bpp);
> + return AVERROR_PATCHWELCOME;
> + }
> + if (format) {
> + av_log_ask_for_sample(avctx, "unsupported pixel format: %d\n",
> format);
> + return AVERROR_PATCHWELCOME;
> + }
> +
> + if ((ret = av_image_check_size(w, h, 0, avctx)) < 0)
> + return ret;
> + if (w != avctx->width || h != avctx->height)
> + avcodec_set_dimensions(avctx, w, h);
> +
> + if (encoding == 0) {
> + if (c->video_size < FFALIGN(avctx->width, 16) * avctx->height *
> c->bpp / 8)
> + return AVERROR_INVALIDDATA;
> + avctx->pix_fmt = PIX_FMT_PAL8;
> + } else if (encoding == 1) {
> + if (c->palette_size != (1 << (c->bpp - 1)))
> + return AVERROR_INVALIDDATA;
> + if (c->video_size < avctx->width * avctx->height * c->bpp / 8)
> + return AVERROR_INVALIDDATA;
> + avctx->pix_fmt = PIX_FMT_BGR24;
> + } else {
> + av_log_ask_for_sample(avctx, "unsupported video format: %d\n",
> encoding);
> + return AVERROR_PATCHWELCOME;
> + }
> +
> + if (p->data[0])
> + avctx->release_buffer(avctx, p);
> +
> + p->reference = 0;
> + if ((ret = avctx->get_buffer(avctx, p)) < 0) {
> + av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
> + return ret;
> + }
> + p->pict_type = AV_PICTURE_TYPE_I;
> +
> + if (encoding) {
> + av_fast_padded_malloc(&c->new_video, &c->new_video_size,
> + h * w + FF_INPUT_BUFFER_PADDING_SIZE);
> + if (!c->new_video)
> + return AVERROR(ENOMEM);
> + if (c->bpp > 6)
> + cdxl_decode_ham8(c);
> + else
> + cdxl_decode_ham6(c);
shouldn't you also check for (probably invalid) ham5 or ham7 encodings?
the rest LGTM
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
