#include "libavutil/imgutils.h"
#include "avcodec.h"
#include "get_bits.h"
+#include "internal.h"
-typedef struct {
+#define BIT_PLANAR 0x00
+#define BYTE_PLANAR 0x20
+#define CHUNKY 0x40
+#define BIT_LINE 0x80
+#define BYTE_LINE 0xC0
+
+typedef struct CDXLVideoContext {
AVCodecContext *avctx;
- AVFrame frame;
int bpp;
+ int format;
+ int padded_bits;
const uint8_t *palette;
int palette_size;
const uint8_t *video;
{
CDXLVideoContext *c = avctx->priv_data;
- avcodec_get_frame_defaults(&c->frame);
c->new_video_size = 0;
c->avctx = avctx;
}
}
-static void bitplanar2chunky(CDXLVideoContext *c, int width,
- int linesize, uint8_t *out)
+static void bitplanar2chunky(CDXLVideoContext *c, 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++)
+ for (plane = 0; plane < c->bpp; plane++) {
+ for (y = 0; y < c->avctx->height; y++) {
+ for (x = 0; x < c->avctx->width; x++)
+ out[linesize * y + x] |= get_bits1(&gb) << plane;
+ skip_bits(&gb, c->padded_bits);
+ }
+ }
+}
+
+static void bitline2chunky(CDXLVideoContext *c, int linesize, uint8_t *out)
+{
+ GetBitContext gb;
+ int x, y, plane;
+
+ init_get_bits(&gb, c->video, c->video_size * 8);
+ for (y = 0; y < c->avctx->height; y++) {
+ for (plane = 0; plane < c->bpp; plane++) {
+ for (x = 0; x < c->avctx->width; x++)
out[linesize * y + x] |= get_bits1(&gb) << plane;
+ skip_bits(&gb, c->padded_bits);
+ }
+ }
}
-static void cdxl_decode_rgb(CDXLVideoContext *c)
+static void import_format(CDXLVideoContext *c, int linesize, uint8_t *out)
{
- uint32_t *new_palette = (uint32_t *)c->frame.data[1];
- int padded_width = FFALIGN(c->avctx->width, 16);
+ memset(out, 0, linesize * c->avctx->height);
+
+ switch (c->format) {
+ case BIT_PLANAR:
+ bitplanar2chunky(c, linesize, out);
+ break;
+ case BIT_LINE:
+ bitline2chunky(c, linesize, out);
+ break;
+ }
+}
+
+static void cdxl_decode_rgb(CDXLVideoContext *c, AVFrame *frame)
+{
+ uint32_t *new_palette = (uint32_t *)frame->data[1];
import_palette(c, new_palette);
- bitplanar2chunky(c, padded_width, c->frame.linesize[0], c->frame.data[0]);
+ import_format(c, frame->linesize[0], frame->data[0]);
}
-static void cdxl_decode_ham6(CDXLVideoContext *c)
+static void cdxl_decode_ham6(CDXLVideoContext *c, AVFrame *frame)
{
AVCodecContext *avctx = c->avctx;
uint32_t new_palette[16], r, g, b;
int x, y;
ptr = c->new_video;
- out = c->frame.data[0];
+ out = frame->data[0];
import_palette(c, new_palette);
- bitplanar2chunky(c, avctx->width, avctx->width, c->new_video);
+ import_format(c, avctx->width, c->new_video);
for (y = 0; y < avctx->height; y++) {
r = new_palette[0] & 0xFF0000;
g = index * 0x11 << 8;
break;
}
- AV_WN32(out + x * 3, r | g | b);
+ AV_WL24(out + x * 3, r | g | b);
}
- out += c->frame.linesize[0];
+ out += frame->linesize[0];
}
}
-static void cdxl_decode_ham8(CDXLVideoContext *c)
+static void cdxl_decode_ham8(CDXLVideoContext *c, AVFrame *frame)
{
AVCodecContext *avctx = c->avctx;
uint32_t new_palette[64], r, g, b;
int x, y;
ptr = c->new_video;
- out = c->frame.data[0];
+ out = frame->data[0];
import_palette(c, new_palette);
- bitplanar2chunky(c, avctx->width, avctx->width, c->new_video);
+ import_format(c, avctx->width, c->new_video);
for (y = 0; y < avctx->height; y++) {
r = new_palette[0] & 0xFF0000;
g = (index << 10) | (g & (3 << 8));
break;
}
- AV_WN32(out + x * 3, r | g | b);
+ AV_WL24(out + x * 3, r | g | b);
}
- out += c->frame.linesize[0];
+ out += frame->linesize[0];
}
}
static int cdxl_decode_frame(AVCodecContext *avctx, void *data,
- int *data_size, AVPacket *pkt)
+ int *got_frame, AVPacket *pkt)
{
CDXLVideoContext *c = avctx->priv_data;
- AVFrame * const p = &c->frame;
- int ret, w, h, encoding, format, buf_size = pkt->size;
+ AVFrame * const p = data;
+ int ret, w, h, encoding, aligned_width, 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;
+ c->format = buf[1] & 0xE0;
w = AV_RB16(&buf[14]);
h = AV_RB16(&buf[16]);
c->bpp = buf[19];
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);
+ if (c->format != BIT_PLANAR && c->format != BIT_LINE) {
+ avpriv_request_sample(avctx, "Pixel format 0x%0x", c->format);
return AVERROR_PATCHWELCOME;
}
- if ((ret = av_image_check_size(w, h, 0, avctx)) < 0)
+ if ((ret = ff_set_dimensions(avctx, w, h)) < 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;
+ aligned_width = FFALIGN(c->avctx->width, 16);
+ c->padded_bits = aligned_width - c->avctx->width;
+ if (c->video_size < aligned_width * avctx->height * c->bpp / 8)
+ return AVERROR_INVALIDDATA;
+ if (!encoding && c->palette_size && c->bpp <= 8) {
+ avctx->pix_fmt = AV_PIX_FMT_PAL8;
} else if (encoding == 1 && (c->bpp == 6 || c->bpp == 8)) {
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;
+ avctx->pix_fmt = AV_PIX_FMT_BGR24;
} else {
- av_log_ask_for_sample(avctx, "unsupported encoding %d and bpp %d\n",
+ avpriv_request_sample(avctx, "Encoding %d and bpp %d",
encoding, c->bpp);
return AVERROR_PATCHWELCOME;
}
- if (p->data[0])
- avctx->release_buffer(avctx, p);
-
- p->reference = 0;
- if ((ret = avctx->get_buffer(avctx, p)) < 0) {
+ if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret;
}
if (encoding) {
av_fast_padded_malloc(&c->new_video, &c->new_video_size,
- h * w + FF_INPUT_BUFFER_PADDING_SIZE);
+ h * w + AV_INPUT_BUFFER_PADDING_SIZE);
if (!c->new_video)
return AVERROR(ENOMEM);
if (c->bpp == 8)
- cdxl_decode_ham8(c);
+ cdxl_decode_ham8(c, p);
else
- cdxl_decode_ham6(c);
+ cdxl_decode_ham6(c, p);
} else {
- cdxl_decode_rgb(c);
+ cdxl_decode_rgb(c, p);
}
- *data_size = sizeof(AVFrame);
- *(AVFrame*)data = c->frame;
+ *got_frame = 1;
return buf_size;
}
CDXLVideoContext *c = avctx->priv_data;
av_free(c->new_video);
- if (c->frame.data[0])
- avctx->release_buffer(avctx, &c->frame);
return 0;
}
AVCodec ff_cdxl_decoder = {
.name = "cdxl",
+ .long_name = NULL_IF_CONFIG_SMALL("Commodore CDXL video"),
.type = AVMEDIA_TYPE_VIDEO,
- .id = CODEC_ID_CDXL,
+ .id = AV_CODEC_ID_CDXL,
.priv_data_size = sizeof(CDXLVideoContext),
.init = cdxl_decode_init,
.close = cdxl_decode_end,
.decode = cdxl_decode_frame,
- .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Commodore CDXL video"),
+ .capabilities = AV_CODEC_CAP_DR1,
};
projects / ffmpeg / blobdiff