On 03/21/2014 09:56 PM, Vittorio Giovara wrote:
> From: Aleksi Nurmi <[email protected]>
>
> Further enhancements by Vittorio Giovara and Paul B Mahol.
>
> Signed-off-by: Vittorio Giovara <[email protected]>
> ---
> With the original standard palette table!
> Loading custom palettes is probably overkill and work for another time.
> Commented many parts and amended as requested.
>
> Vittorio
>
> Changelog | 1 +
> doc/general.texi | 2 +
> libavcodec/Makefile | 1 +
> libavcodec/allcodecs.c | 1 +
> libavcodec/avcodec.h | 1 +
> libavcodec/brenderpix.c | 274
> ++++++++++++++++++++++++++++++++++++++++++++++++
> libavcodec/codec_desc.c | 7 ++
> libavcodec/version.h | 4 +-
> libavformat/img2.c | 1 +
> 9 files changed, 290 insertions(+), 2 deletions(-)
> create mode 100644 libavcodec/brenderpix.c
>
> diff --git a/Changelog b/Changelog
> index d0939a2..949e71f 100644
> --- a/Changelog
> +++ b/Changelog
> @@ -5,6 +5,7 @@ version <next>:
> - libx265 encoder
> - compand audio filter
> - shuffleplanes filter
> +- BRender PIX image decoder
>
>
> version 10:
> diff --git a/doc/general.texi b/doc/general.texi
> index 8c0cb1b..9ac573d 100644
> --- a/doc/general.texi
> +++ b/doc/general.texi
> @@ -428,6 +428,8 @@ following image formats are supported:
> @tab Only uncompressed GIFs are generated.
> @item BMP @tab X @tab X
> @tab Microsoft BMP image
> +@item BRender PIX @tab @tab X
> + @tab Argonaut BRender 3D engine image format.
> @item DPX @tab X @tab X
> @tab Digital Picture Exchange
> @item JPEG @tab X @tab X
> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
> index c04b3f1..436e4a5 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -122,6 +122,7 @@ OBJS-$(CONFIG_BMP_DECODER) += bmp.o msrledec.o
> OBJS-$(CONFIG_BMP_ENCODER) += bmpenc.o
> OBJS-$(CONFIG_BMV_VIDEO_DECODER) += bmv.o
> OBJS-$(CONFIG_BMV_AUDIO_DECODER) += bmv.o
> +OBJS-$(CONFIG_BRENDER_PIX_DECODER) += brenderpix.o
> OBJS-$(CONFIG_C93_DECODER) += c93.o
> OBJS-$(CONFIG_CAVS_DECODER) += cavs.o cavsdec.o cavsdsp.o \
> cavsdata.o mpeg12data.o
> diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
> index ed6d7ff..da1b06e 100644
> --- a/libavcodec/allcodecs.c
> +++ b/libavcodec/allcodecs.c
> @@ -111,6 +111,7 @@ void avcodec_register_all(void)
> REGISTER_DECODER(BINK, bink);
> REGISTER_ENCDEC (BMP, bmp);
> REGISTER_DECODER(BMV_VIDEO, bmv_video);
> + REGISTER_DECODER(BRENDER_PIX, brender_pix);
> REGISTER_DECODER(C93, c93);
> REGISTER_DECODER(CAVS, cavs);
> REGISTER_DECODER(CDGRAPHICS, cdgraphics);
> diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
> index 7beb277..e7d6c00 100644
> --- a/libavcodec/avcodec.h
> +++ b/libavcodec/avcodec.h
> @@ -284,6 +284,7 @@ enum AVCodecID {
> AV_CODEC_ID_HNM4_VIDEO,
> AV_CODEC_ID_HEVC,
> AV_CODEC_ID_FIC,
> + AV_CODEC_ID_BRENDER_PIX,
>
> /* various PCM "codecs" */
> AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the
> start of audio codecs
> diff --git a/libavcodec/brenderpix.c b/libavcodec/brenderpix.c
> new file mode 100644
> index 0000000..82833f9
> --- /dev/null
> +++ b/libavcodec/brenderpix.c
> @@ -0,0 +1,274 @@
> +/*
> + * BRender PIX (.pix) image decoder
> + * Copyright (c) 2012 Aleksi Nurmi
> + *
> + * 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
> + */
> +
> +/* Tested against samples from I-War / Independence War and Defiance. */
> +
> +#include "libavutil/imgutils.h"
> +
> +#include "avcodec.h"
> +#include "bytestream.h"
> +#include "internal.h"
> +
> +/* In 8-bit colour mode, 256 colours are available at any time. Which 256
> + * colours are available is determined by the contents of the hardware
> palette
> + * (or CLUT). In this case, the palette supplied with BRender (std.pal) has
> + * been loaded into the CLUT.
> + *
> + * The 256 colours in std.pal are divided into seven ranges, or `colour
> ramps'.
> + * The first 64 colours represent shades of grey ranging from very dark grey
> + * (black) to very light grey (white). The following colours are 32-element
> + * ramps for six colours as shown below.
> + */
> +static const uint32_t std_pal_table[256] = {
> + 0x000000, 0x030303, 0x060606, 0x090909, 0x0C0C0C, 0x0F0F0F, 0x121212,
> + 0x151515, 0x181818, 0x1B1B1B, 0x1E1E1E, 0x212121, 0x242424, 0x272727,
> + 0x2A2A2A, 0x2D2D2D, 0x313131, 0x343434, 0x373737, 0x3A3A3A, 0x3D3D3D,
> + 0x404040, 0x434343, 0x464646, 0x494949, 0x4C4C4C, 0x4F4F4F, 0x525252,
> + 0x555555, 0x585858, 0x5B5B5B, 0x5E5E5E, 0x626262, 0x656565, 0x686868,
> + 0x6B6B6B, 0x6E6E6E, 0x717171, 0x747474, 0x777777, 0x7A7A7A, 0x7D7D7D,
> + 0x808080, 0x838383, 0x868686, 0x898989, 0x8C8C8C, 0x8F8F8F, 0x939393,
> + 0x999999, 0xA0A0A0, 0xA7A7A7, 0xAEAEAE, 0xB4B4B4, 0xBBBBBB, 0xC2C2C2,
> + 0xC9C9C9, 0xCFCFCF, 0xD6D6D6, 0xDDDDDD, 0xE4E4E4, 0xEAEAEA, 0xF1F1F1,
> + 0xF8F8F8,
> +
> + 0x000000, 0x020209, 0x050513, 0x07071D, 0x0A0A27, 0x0C0C31, 0x0F0F3B,
> + 0x111145, 0x14144F, 0x161659, 0x181863, 0x1B1B6D, 0x1E1E77, 0x202080,
> + 0x22228A, 0x252594, 0x28289E, 0x2A2AA8, 0x2D2DB2, 0x2F2FBC, 0x3131C6,
> + 0x3434D0, 0x3737DA, 0x3939E4, 0x3C3CEE, 0x5454F0, 0x6C6CF2, 0x8585F4,
> + 0x9D9DF6, 0xB5B5F8, 0xCECEFA, 0xE6E6FC,
> +
> + 0x000000, 0x020902, 0x051305, 0x071D07, 0x0A270A, 0x0C310C, 0x0F3B0F,
> + 0x114511, 0x144F14, 0x165916, 0x186318, 0x1B6D1B, 0x1E771E, 0x208020,
> + 0x228A22, 0x259425, 0x289E28, 0x2AA82A, 0x2DB22D, 0x2FBC2F, 0x31C631,
> + 0x34D034, 0x37DA37, 0x39E439, 0x3CEE3C, 0x54F054, 0x6CF26C, 0x85F485,
> + 0x9DF69D, 0xB5F8B5, 0xCEFACE, 0xE6FCE6,
> +
> + 0x000000, 0x020909, 0x051313, 0x071D1D, 0x0A2727, 0x0C3131, 0x0F3B3B,
> + 0x114545, 0x144F4F, 0x165959, 0x186363, 0x1B6D6D, 0x1E7777, 0x208080,
> + 0x228A8A, 0x259494, 0x289E9E, 0x2AA8A8, 0x2DB2B2, 0x2FBCBC, 0x31C6C6,
> + 0x34D0D0, 0x37DADA, 0x39E4E4, 0x3CEEEE, 0x54F0F0, 0x6CF2F2, 0x85F4F4,
> + 0x9DF6F6, 0xB5F8F8, 0xCEFAFA, 0xE6FCFC,
> +
> + 0x000000, 0x090202, 0x130505, 0x1D0707, 0x270A0A, 0x310C0C, 0x3B0F0F,
> + 0x451111, 0x4F1414, 0x591616, 0x631818, 0x6D1B1B, 0x771E1E, 0x802020,
> + 0x8A2222, 0x942525, 0x9E2828, 0xA82A2A, 0xB22D2D, 0xBC2F2F, 0xC63131,
> + 0xD03434, 0xDA3737, 0xE43939, 0xEE3C3C, 0xF05454, 0xF26C6C, 0xF48585,
> + 0xF69D9D, 0xF8B5B5, 0xFACECE, 0xFCE6E6,
> +
> + 0x000000, 0x090209, 0x130513, 0x1D071D, 0x270A27, 0x310C31, 0x3B0F3B,
> + 0x451145, 0x4F144F, 0x591659, 0x631863, 0x6D1B6D, 0x771E77, 0x802080,
> + 0x8A228A, 0x942594, 0x9E289E, 0xA82AA8, 0xB22DB2, 0xBC2FBC, 0xC631C6,
> + 0xD034D0, 0xDA37DA, 0xE439E4, 0xEE3CEE, 0xF054F0, 0xF26CF2, 0xF485F4,
> + 0xF69DF6, 0xF8B5F8, 0xFACEFA, 0xFCE6FC,
> +
> + 0x000000, 0x090902, 0x131305, 0x1D1D07, 0x27270A, 0x31310C, 0x3B3B0F,
> + 0x454511, 0x4F4F14, 0x595916, 0x636318, 0x6D6D1B, 0x77771E, 0x808020,
> + 0x8A8A22, 0x949425, 0x9E9E28, 0xA8A82A, 0xB2B22D, 0xBCBC2F, 0xC6C631,
> + 0xD0D034, 0xDADA37, 0xE4E439, 0xEEEE3C, 0xF0F054, 0xF2F26C, 0xF4F485,
> + 0xF6F69D, 0xF8F8B5, 0xFAFACE, 0xFCFCE6,
> +};
> +
> +typedef struct PixHeader {
> + int width;
> + int height;
> + int format;
> +} PixHeader;
> +
> +static int pix_decode_header(PixHeader *out, GetByteContext *pgb)
> +{
> + unsigned int header_len = bytestream2_get_be32(pgb);
> +
> + out->format = bytestream2_get_byte(pgb);
> + bytestream2_skip(pgb, 2);
> + out->width = bytestream2_get_be16(pgb);
> + out->height = bytestream2_get_be16(pgb);
> +
> + // the header is at least 11 bytes long; we read the first 7
> + if (header_len < 11)
> + return AVERROR_INVALIDDATA;
> +
> + // skip the rest of the header
> + bytestream2_skip(pgb, header_len - 7);
> +
> + return 0;
> +}
> +
> +static int pix_decode_frame(AVCodecContext *avctx, void *data, int
> *got_frame,
> + AVPacket *avpkt)
> +{
> + AVFrame *frame = data;
> +
> + int ret;
> + GetByteContext gb;
> +
> + unsigned int bytes_pp;
> + unsigned int magic[4];
> + unsigned int chunk_type;
> + unsigned int data_len;
> + unsigned int bytes_per_scanline;
> + unsigned int bytes_left;
> + PixHeader hdr;
> +
> + bytestream2_init(&gb, avpkt->data, avpkt->size);
> +
> + magic[0] = bytestream2_get_be32(&gb);
> + magic[1] = bytestream2_get_be32(&gb);
> + magic[2] = bytestream2_get_be32(&gb);
> + magic[3] = bytestream2_get_be32(&gb);
> +
> + if (magic[0] != 0x12 ||
> + magic[1] != 0x08 ||
> + magic[2] != 0x02 ||
> + magic[3] != 0x02) {
> + av_log(avctx, AV_LOG_ERROR, "Not a BRender PIX file\n");
> + return AVERROR_INVALIDDATA;
> + }
> +
> + chunk_type = bytestream2_get_be32(&gb);
> + if (chunk_type != 0x03 && chunk_type != 0x3d) {
> + av_log(avctx, AV_LOG_ERROR, "Invalid chunk type %d\n", chunk_type);
> + return AVERROR_INVALIDDATA;
> + }
Could you #define the chunk types please? Even vague names are better
than magic numbers. e.g. HEADER1_CHUNK, HEADER2_CHUNK, IMAGE_DATA_CHUNK.
(and no C1/C2 please)
> +
> + ret = pix_decode_header(&hdr, &gb);
> + if (ret < 0) {
> + av_log(avctx, AV_LOG_ERROR, "Invalid header length\n");
> + return AVERROR_INVALIDDATA;
> + }
> + switch (hdr.format) {
> + case 3:
> + avctx->pix_fmt = AV_PIX_FMT_PAL8;
> + bytes_pp = 1;
> + break;
> + case 4:
> + avctx->pix_fmt = AV_PIX_FMT_RGB555BE;
> + bytes_pp = 2;
> + break;
> + case 5:
> + avctx->pix_fmt = AV_PIX_FMT_RGB565BE;
> + bytes_pp = 2;
> + break;
> + case 6:
> + avctx->pix_fmt = AV_PIX_FMT_RGB24;
> + bytes_pp = 3;
> + break;
> + case 7:
> + case 8: // this is speculative
> + avctx->pix_fmt = AV_PIX_FMT_ARGB;
> + bytes_pp = 4;
> + break;
> + case 18:
> + avctx->pix_fmt = AV_PIX_FMT_Y400A;
> + bytes_pp = 2;
> + break;
> + default:
> + avpriv_request_sample(avctx, "Format %d", hdr.format);
> + return AVERROR_PATCHWELCOME;
> + }
> +
> + if ((ret = ff_set_dimensions(avctx, hdr.width, hdr.height)) < 0)
> + return ret;
> +
> + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
> + return ret;
> +
> + chunk_type = bytestream2_get_be32(&gb);
> +
> + if (avctx->pix_fmt == AV_PIX_FMT_PAL8 &&
> + (chunk_type == 0x03 || // C1 header
> + chunk_type == 0x3d)) { // C2 header
> + /* read palette data from data[1] */
> + PixHeader palhdr;
> + uint32_t *pal_out = (uint32_t *)frame->data[1];
> + int i;
> +
> + ret = pix_decode_header(&palhdr, &gb);
> + if (ret < 0) {
> + av_log(avctx, AV_LOG_ERROR, "Invalid palette header length.\n");
> + return AVERROR_INVALIDDATA;
> + }
> + if (palhdr.format != 7) {
> + av_log(avctx, AV_LOG_ERROR, "Palette is not in RGB format.\n");
> + return AVERROR_INVALIDDATA;
> + }
I wonder if any files might use 6 here instead of 7? Maybe request a
sample instead of considering it invalid data.
> +
> + chunk_type = bytestream2_get_be32(&gb);
> + data_len = bytestream2_get_be32(&gb);
> + bytestream2_skip(&gb, 8);
> + if (chunk_type != 0x21 || data_len != 1032 ||
> + bytestream2_get_bytes_left(&gb) < 1032) {
> + av_log(avctx, AV_LOG_ERROR, "Invalid palette data.\n");
> + return AVERROR_INVALIDDATA;
> + }
This is still weird. I think it should be
bytestream2_get_bytes_left(&gb) < 1024 since 8 bytes have already been
skipped.
> + // convert to machine endian format (ARGB)
> + for (i = 0; i < 256; ++i)
> + *pal_out++ = (0xFFU << 24) | bytestream2_get_be32u(&gb);
> + bytestream2_skip(&gb, 8);
You may want to check, but I think that this 8 bytes is another magic
number header. If so, it should be grouped below with reading of the
next chunk type.
> +
> + frame->palette_has_changed = 1;
> +
> + chunk_type = bytestream2_get_be32(&gb);
> + } else if (avctx->pix_fmt == AV_PIX_FMT_PAL8) {
> + /* no palette supplied, use the default one */
> + uint32_t *pal_out = (uint32_t *)frame->data[1];
> + int i;
> +
> + // TODO: add an AVOption to load custom palette files
> +
> + for (i = 0; i < 256; i++)
> + *pal_out++ = (0xFFU << 24) | std_pal_table[i];
Include the 0xFF in the table and memcpy()
> +
> + frame->palette_has_changed = 1;
> + }
> +
> + data_len = bytestream2_get_be32(&gb);
> + bytestream2_skip(&gb, 8);
> +
> + // read the image data to the buffer
> + bytes_per_scanline = bytes_pp * hdr.width;
> + bytes_left = bytestream2_get_bytes_left(&gb);
The variable is only used once. Just use bytestream2_get_bytes_left(&gb)
directly instead.
> +
> + if (chunk_type != 0x21 || // C1 pix data
> + data_len > bytes_left) {
> + av_log(avctx, AV_LOG_ERROR, "Invalid image data.\n");
> + return AVERROR_INVALIDDATA;
> + }
> +
> + av_image_copy_plane(frame->data[0], frame->linesize[0],
> + avpkt->data + bytestream2_tell(&gb),
> + bytes_per_scanline,
> + bytes_per_scanline, hdr.height);
> +
> + frame->pict_type = AV_PICTURE_TYPE_I;
> + frame->key_frame = 1;
> + *got_frame = 1;
> +
> + return avpkt->size;
> +}
> +
> +AVCodec ff_brender_pix_decoder = {
> + .name = "brender_pix",
> + .long_name = NULL_IF_CONFIG_SMALL("BRender PIX image"),
> + .type = AVMEDIA_TYPE_VIDEO,
> + .id = AV_CODEC_ID_BRENDER_PIX,
> + .decode = pix_decode_frame,
> + .capabilities = CODEC_CAP_DR1,
> +};
> diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
> index 2ad5326..db9ca1d 100644
> --- a/libavcodec/codec_desc.c
> +++ b/libavcodec/codec_desc.c
> @@ -1102,6 +1102,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
> .props = AV_CODEC_PROP_LOSSY,
> },
> {
> + .id = AV_CODEC_ID_BRENDER_PIX,
> + .type = AVMEDIA_TYPE_VIDEO,
> + .name = "brender_pix",
> + .long_name = NULL_IF_CONFIG_SMALL("BRender PIX image"),
> + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
> + },
> + {
> .id = AV_CODEC_ID_DPX,
> .type = AVMEDIA_TYPE_VIDEO,
> .name = "dpx",
> diff --git a/libavcodec/version.h b/libavcodec/version.h
> index 5ab49d5..d2f80ad 100644
> --- a/libavcodec/version.h
> +++ b/libavcodec/version.h
> @@ -29,8 +29,8 @@
> #include "libavutil/version.h"
>
> #define LIBAVCODEC_VERSION_MAJOR 55
> -#define LIBAVCODEC_VERSION_MINOR 34
> -#define LIBAVCODEC_VERSION_MICRO 1
> +#define LIBAVCODEC_VERSION_MINOR 35
> +#define LIBAVCODEC_VERSION_MICRO 0
>
> #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
> LIBAVCODEC_VERSION_MINOR, \
> diff --git a/libavformat/img2.c b/libavformat/img2.c
> index ed59281..03c366d 100644
> --- a/libavformat/img2.c
> +++ b/libavformat/img2.c
> @@ -55,6 +55,7 @@ static const IdStrMap img_tags[] = {
> { AV_CODEC_ID_TIFF, "tif" },
> { AV_CODEC_ID_SGI, "sgi" },
> { AV_CODEC_ID_PTX, "ptx" },
> + { AV_CODEC_ID_BRENDER_PIX,"pix" },
> { AV_CODEC_ID_PCX, "pcx" },
> { AV_CODEC_ID_SUNRAST, "sun" },
> { AV_CODEC_ID_SUNRAST, "ras" },
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
