const unsigned char *buf;
int size;
+ int is_16bpp;
const unsigned char *stream_ptr;
const unsigned char *stream_end;
+ const uint8_t *mv_ptr;
+ const uint8_t *mv_end;
unsigned char *pixel_ptr;
int line_inc;
int stride;
} IpvideoContext;
-#define CHECK_STREAM_PTR(n) \
- if (s->stream_end - s->stream_ptr < n) { \
+#define CHECK_STREAM_PTR(stream_ptr, stream_end, n) \
+ if (stream_end - stream_ptr < n) { \
av_log(s->avctx, AV_LOG_ERROR, "Interplay video warning: stream_ptr out of bounds (%p >= %p)\n", \
- s->stream_ptr + n, s->stream_end); \
+ stream_ptr + n, stream_end); \
return -1; \
}
static int copy_from(IpvideoContext *s, AVFrame *src, int delta_x, int delta_y)
{
int current_offset = s->pixel_ptr - s->current_frame.data[0];
- int motion_offset = current_offset + delta_y * s->stride + delta_x;
+ int motion_offset = current_offset + delta_y * s->current_frame.linesize[0]
+ + delta_x * (1 + s->is_16bpp);
if (motion_offset < 0) {
av_log(s->avctx, AV_LOG_ERROR, " Interplay video: motion offset < 0 (%d)\n", motion_offset);
return -1;
motion_offset, s->upper_motion_limit_offset);
return -1;
}
- s->dsp.put_pixels_tab[1][0](s->pixel_ptr, src->data[0] + motion_offset, s->stride, 8);
+ s->dsp.put_pixels_tab[!s->is_16bpp][0](s->pixel_ptr, src->data[0] + motion_offset,
+ s->current_frame.linesize[0], 8);
return 0;
}
int x, y;
/* copy block from 2 frames ago using a motion vector; need 1 more byte */
- CHECK_STREAM_PTR(1);
- B = *s->stream_ptr++;
+ if (!s->is_16bpp) {
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 1);
+ B = *s->stream_ptr++;
+ } else {
+ CHECK_STREAM_PTR(s->mv_ptr, s->mv_end, 1);
+ B = *s->mv_ptr++;
+ }
if (B < 56) {
x = 8 + (B % 7);
/* copy 8x8 block from current frame from an up/left block */
/* need 1 more byte for motion */
- CHECK_STREAM_PTR(1);
- B = *s->stream_ptr++;
+ if (!s->is_16bpp) {
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 1);
+ B = *s->stream_ptr++;
+ } else {
+ CHECK_STREAM_PTR(s->mv_ptr, s->mv_end, 1);
+ B = *s->mv_ptr++;
+ }
if (B < 56) {
x = -(8 + (B % 7));
unsigned char B, BL, BH;
/* copy a block from the previous frame; need 1 more byte */
- CHECK_STREAM_PTR(1);
+ if (!s->is_16bpp) {
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 1);
+ B = *s->stream_ptr++;
+ } else {
+ CHECK_STREAM_PTR(s->mv_ptr, s->mv_end, 1);
+ B = *s->mv_ptr++;
+ }
- B = *s->stream_ptr++;
BL = B & 0x0F;
BH = (B >> 4) & 0x0F;
x = -8 + BL;
/* copy a block from the previous frame using an expanded range;
* need 2 more bytes */
- CHECK_STREAM_PTR(2);
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 2);
x = *s->stream_ptr++;
y = *s->stream_ptr++;
unsigned int flags;
/* 2-color encoding */
- CHECK_STREAM_PTR(2);
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 2);
P[0] = *s->stream_ptr++;
P[1] = *s->stream_ptr++;
if (P[0] <= P[1]) {
/* need 8 more bytes from the stream */
- CHECK_STREAM_PTR(8);
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 8);
for (y = 0; y < 8; y++) {
flags = *s->stream_ptr++ | 0x100;
} else {
/* need 2 more bytes from the stream */
- CHECK_STREAM_PTR(2);
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 2);
flags = bytestream_get_le16(&s->stream_ptr);
for (y = 0; y < 8; y += 2) {
/* 2-color encoding for each 4x4 quadrant, or 2-color encoding on
* either top and bottom or left and right halves */
- CHECK_STREAM_PTR(2);
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 2);
P[0] = *s->stream_ptr++;
P[1] = *s->stream_ptr++;
if (P[0] <= P[1]) {
- CHECK_STREAM_PTR(14);
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 14);
s->stream_ptr -= 2;
for (y = 0; y < 16; y++) {
} else {
/* need 10 more bytes */
- CHECK_STREAM_PTR(10);
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 10);
if (s->stream_ptr[4] <= s->stream_ptr[5]) {
unsigned char P[4];
/* 4-color encoding */
- CHECK_STREAM_PTR(4);
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 4);
memcpy(P, s->stream_ptr, 4);
s->stream_ptr += 4;
if (P[2] <= P[3]) {
/* 1 of 4 colors for each pixel, need 16 more bytes */
- CHECK_STREAM_PTR(16);
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 16);
for (y = 0; y < 8; y++) {
/* get the next set of 8 2-bit flags */
uint32_t flags;
/* 1 of 4 colors for each 2x2 block, need 4 more bytes */
- CHECK_STREAM_PTR(4);
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 4);
flags = bytestream_get_le32(&s->stream_ptr);
uint64_t flags;
/* 1 of 4 colors for each 2x1 or 1x2 block, need 8 more bytes */
- CHECK_STREAM_PTR(8);
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 8);
flags = bytestream_get_le64(&s->stream_ptr);
if (P[2] <= P[3]) {
/* 4-color encoding for each 4x4 quadrant, or 4-color encoding on
* either top and bottom or left and right halves */
- CHECK_STREAM_PTR(24);
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 24);
if (s->stream_ptr[0] <= s->stream_ptr[1]) {
/* 4-color encoding for each quadrant; need 32 bytes */
- CHECK_STREAM_PTR(32);
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 32);
for (y = 0; y < 16; y++) {
// new values for each 4x4 block
int y;
/* 64-color encoding (each pixel in block is a different color) */
- CHECK_STREAM_PTR(64);
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 64);
for (y = 0; y < 8; y++) {
memcpy(s->pixel_ptr, s->stream_ptr, 8);
int x, y;
/* 16-color block encoding: each 2x2 block is a different color */
- CHECK_STREAM_PTR(16);
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 16);
for (y = 0; y < 8; y += 2) {
for (x = 0; x < 8; x += 2) {
unsigned char P[2];
/* 4-color block encoding: each 4x4 block is a different color */
- CHECK_STREAM_PTR(4);
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 4);
for (y = 0; y < 8; y++) {
if (!(y & 3)) {
unsigned char pix;
/* 1-color encoding: the whole block is 1 solid color */
- CHECK_STREAM_PTR(1);
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 1);
pix = *s->stream_ptr++;
for (y = 0; y < 8; y++) {
unsigned char sample[2];
/* dithered encoding */
- CHECK_STREAM_PTR(2);
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 2);
sample[0] = *s->stream_ptr++;
sample[1] = *s->stream_ptr++;
return 0;
}
+static int ipvideo_decode_block_opcode_0x6_16(IpvideoContext *s)
+{
+ signed char x, y;
+
+ /* copy a block from the second last frame using an expanded range */
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 2);
+
+ x = *s->stream_ptr++;
+ y = *s->stream_ptr++;
+
+ debug_interplay (" motion bytes = %d, %d\n", x, y);
+ return copy_from(s, &s->second_last_frame, x, y);
+}
+
+static int ipvideo_decode_block_opcode_0x7_16(IpvideoContext *s)
+{
+ int x, y;
+ uint16_t P[2];
+ unsigned int flags;
+ uint16_t *pixel_ptr = (uint16_t*)s->pixel_ptr;
+
+ /* 2-color encoding */
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 4);
+
+ P[0] = bytestream_get_le16(&s->stream_ptr);
+ P[1] = bytestream_get_le16(&s->stream_ptr);
+
+ if (!(P[0] & 0x8000)) {
+
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 8);
+
+ for (y = 0; y < 8; y++) {
+ flags = *s->stream_ptr++ | 0x100;
+ for (; flags != 1; flags >>= 1)
+ *pixel_ptr++ = P[flags & 1];
+ pixel_ptr += s->line_inc;
+ }
+
+ } else {
+
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 2);
+
+ flags = bytestream_get_le16(&s->stream_ptr);
+ for (y = 0; y < 8; y += 2) {
+ for (x = 0; x < 8; x += 2, flags >>= 1) {
+ pixel_ptr[x ] =
+ pixel_ptr[x + 1 ] =
+ pixel_ptr[x + s->stride] =
+ pixel_ptr[x + 1 + s->stride] = P[flags & 1];
+ }
+ pixel_ptr += s->stride * 2;
+ }
+ }
+
+ return 0;
+}
+
+static int ipvideo_decode_block_opcode_0x8_16(IpvideoContext *s)
+{
+ int x, y;
+ uint16_t P[2];
+ unsigned int flags = 0;
+ uint16_t *pixel_ptr = (uint16_t*)s->pixel_ptr;
+
+ /* 2-color encoding for each 4x4 quadrant, or 2-color encoding on
+ * either top and bottom or left and right halves */
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 4);
+
+ P[0] = bytestream_get_le16(&s->stream_ptr);
+ P[1] = bytestream_get_le16(&s->stream_ptr);
+
+ if (!(P[0] & 0x8000)) {
+
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 24);
+ s->stream_ptr -= 4;
+
+ for (y = 0; y < 16; y++) {
+ // new values for each 4x4 block
+ if (!(y & 3)) {
+ P[0] = bytestream_get_le16(&s->stream_ptr);
+ P[1] = bytestream_get_le16(&s->stream_ptr);
+ flags = bytestream_get_le16(&s->stream_ptr);
+ }
+
+ for (x = 0; x < 4; x++, flags >>= 1)
+ *pixel_ptr++ = P[flags & 1];
+ pixel_ptr += s->stride - 4;
+ // switch to right half
+ if (y == 7) pixel_ptr -= 8 * s->stride - 4;
+ }
+
+ } else {
+
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 12);
+
+ if (!(AV_RL16(s->stream_ptr + 4) & 0x8000)) {
+
+ flags = bytestream_get_le32(&s->stream_ptr);
+
+ /* vertical split; left & right halves are 2-color encoded */
+
+ for (y = 0; y < 16; y++) {
+ for (x = 0; x < 4; x++, flags >>= 1)
+ *pixel_ptr++ = P[flags & 1];
+ pixel_ptr += s->stride - 4;
+ // switch to right half
+ if (y == 7) {
+ pixel_ptr -= 8 * s->stride - 4;
+ P[0] = bytestream_get_le16(&s->stream_ptr);
+ P[1] = bytestream_get_le16(&s->stream_ptr);
+ flags = bytestream_get_le32(&s->stream_ptr);
+ }
+ }
+
+ } else {
+
+ /* horizontal split; top & bottom halves are 2-color encoded */
+
+ for (y = 0; y < 8; y++) {
+ if (y == 4) {
+ P[0] = bytestream_get_le16(&s->stream_ptr);
+ P[1] = bytestream_get_le16(&s->stream_ptr);
+ }
+ flags = *s->stream_ptr++ | 0x100;
+
+ for (; flags != 1; flags >>= 1)
+ *pixel_ptr++ = P[flags & 1];
+ pixel_ptr += s->line_inc;
+ }
+ }
+ }
+
+ /* report success */
+ return 0;
+}
+
+static int ipvideo_decode_block_opcode_0x9_16(IpvideoContext *s)
+{
+ int x, y;
+ uint16_t P[4];
+ uint16_t *pixel_ptr = (uint16_t*)s->pixel_ptr;
+
+ /* 4-color encoding */
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 8);
+
+ for (x = 0; x < 4; x++)
+ P[x] = bytestream_get_le16(&s->stream_ptr);
+
+ if (!(P[0] & 0x8000)) {
+ if (!(P[2] & 0x8000)) {
+
+ /* 1 of 4 colors for each pixel */
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 16);
+
+ for (y = 0; y < 8; y++) {
+ /* get the next set of 8 2-bit flags */
+ int flags = bytestream_get_le16(&s->stream_ptr);
+ for (x = 0; x < 8; x++, flags >>= 2)
+ *pixel_ptr++ = P[flags & 0x03];
+ pixel_ptr += s->line_inc;
+ }
+
+ } else {
+ uint32_t flags;
+
+ /* 1 of 4 colors for each 2x2 block */
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 4);
+
+ flags = bytestream_get_le32(&s->stream_ptr);
+
+ for (y = 0; y < 8; y += 2) {
+ for (x = 0; x < 8; x += 2, flags >>= 2) {
+ pixel_ptr[x ] =
+ pixel_ptr[x + 1 ] =
+ pixel_ptr[x + s->stride] =
+ pixel_ptr[x + 1 + s->stride] = P[flags & 0x03];
+ }
+ pixel_ptr += s->stride * 2;
+ }
+
+ }
+ } else {
+ uint64_t flags;
+
+ /* 1 of 4 colors for each 2x1 or 1x2 block */
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 8);
+
+ flags = bytestream_get_le64(&s->stream_ptr);
+ if (!(P[2] & 0x8000)) {
+ for (y = 0; y < 8; y++) {
+ for (x = 0; x < 8; x += 2, flags >>= 2) {
+ pixel_ptr[x ] =
+ pixel_ptr[x + 1] = P[flags & 0x03];
+ }
+ pixel_ptr += s->stride;
+ }
+ } else {
+ for (y = 0; y < 8; y += 2) {
+ for (x = 0; x < 8; x++, flags >>= 2) {
+ pixel_ptr[x ] =
+ pixel_ptr[x + s->stride] = P[flags & 0x03];
+ }
+ pixel_ptr += s->stride * 2;
+ }
+ }
+ }
+
+ /* report success */
+ return 0;
+}
+
+static int ipvideo_decode_block_opcode_0xA_16(IpvideoContext *s)
+{
+ int x, y;
+ uint16_t P[4];
+ int flags = 0;
+ uint16_t *pixel_ptr = (uint16_t*)s->pixel_ptr;
+
+ /* 4-color encoding for each 4x4 quadrant, or 4-color encoding on
+ * either top and bottom or left and right halves */
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 24);
+
+ if (!(AV_RL16(s->stream_ptr) & 0x8000)) {
+
+ /* 4-color encoding for each quadrant */
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 48);
+
+ for (y = 0; y < 16; y++) {
+ // new values for each 4x4 block
+ if (!(y & 3)) {
+ for (x = 0; x < 4; x++)
+ P[x] = bytestream_get_le16(&s->stream_ptr);
+ flags = bytestream_get_le32(&s->stream_ptr);
+ }
+
+ for (x = 0; x < 4; x++, flags >>= 2)
+ *pixel_ptr++ = P[flags & 0x03];
+
+ pixel_ptr += s->stride - 4;
+ // switch to right half
+ if (y == 7) pixel_ptr -= 8 * s->stride - 4;
+ }
+
+ } else {
+ // vertical split?
+ int vert = !(AV_RL16(s->stream_ptr + 16) & 0x8000);
+ uint64_t flags = 0;
+
+ /* 4-color encoding for either left and right or top and bottom
+ * halves */
+
+ for (y = 0; y < 16; y++) {
+ // load values for each half
+ if (!(y & 7)) {
+ for (x = 0; x < 4; x++)
+ P[x] = bytestream_get_le16(&s->stream_ptr);
+ flags = bytestream_get_le64(&s->stream_ptr);
+ }
+
+ for (x = 0; x < 4; x++, flags >>= 2)
+ *pixel_ptr++ = P[flags & 0x03];
+
+ if (vert) {
+ pixel_ptr += s->stride - 4;
+ // switch to right half
+ if (y == 7) pixel_ptr -= 8 * s->stride - 4;
+ } else if (y & 1) pixel_ptr += s->line_inc;
+ }
+ }
+
+ /* report success */
+ return 0;
+}
+
+static int ipvideo_decode_block_opcode_0xB_16(IpvideoContext *s)
+{
+ int x, y;
+ uint16_t *pixel_ptr = (uint16_t*)s->pixel_ptr;
+
+ /* 64-color encoding (each pixel in block is a different color) */
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 128);
+
+ for (y = 0; y < 8; y++) {
+ for (x = 0; x < 8; x++)
+ pixel_ptr[x] = bytestream_get_le16(&s->stream_ptr);
+ pixel_ptr += s->stride;
+ }
+
+ /* report success */
+ return 0;
+}
+
+static int ipvideo_decode_block_opcode_0xC_16(IpvideoContext *s)
+{
+ int x, y;
+ uint16_t *pixel_ptr = (uint16_t*)s->pixel_ptr;
+
+ /* 16-color block encoding: each 2x2 block is a different color */
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 32);
+
+ for (y = 0; y < 8; y += 2) {
+ for (x = 0; x < 8; x += 2) {
+ pixel_ptr[x ] =
+ pixel_ptr[x + 1 ] =
+ pixel_ptr[x + s->stride] =
+ pixel_ptr[x + 1 + s->stride] = bytestream_get_le16(&s->stream_ptr);
+ }
+ pixel_ptr += s->stride * 2;
+ }
+
+ /* report success */
+ return 0;
+}
+
+static int ipvideo_decode_block_opcode_0xD_16(IpvideoContext *s)
+{
+ int x, y;
+ uint16_t P[2];
+ uint16_t *pixel_ptr = (uint16_t*)s->pixel_ptr;
+
+ /* 4-color block encoding: each 4x4 block is a different color */
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 8);
+
+ for (y = 0; y < 8; y++) {
+ if (!(y & 3)) {
+ P[0] = bytestream_get_le16(&s->stream_ptr);
+ P[1] = bytestream_get_le16(&s->stream_ptr);
+ }
+ for (x = 0; x < 8; x++)
+ pixel_ptr[x] = P[x >> 2];
+ pixel_ptr += s->stride;
+ }
+
+ /* report success */
+ return 0;
+}
+
+static int ipvideo_decode_block_opcode_0xE_16(IpvideoContext *s)
+{
+ int x, y;
+ uint16_t pix;
+ uint16_t *pixel_ptr = (uint16_t*)s->pixel_ptr;
+
+ /* 1-color encoding: the whole block is 1 solid color */
+ CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 2);
+ pix = bytestream_get_le16(&s->stream_ptr);
+
+ for (y = 0; y < 8; y++) {
+ for (x = 0; x < 8; x++)
+ pixel_ptr[x] = pix;
+ pixel_ptr += s->stride;
+ }
+
+ /* report success */
+ return 0;
+}
+
static int (* const ipvideo_decode_block[])(IpvideoContext *s) = {
ipvideo_decode_block_opcode_0x0, ipvideo_decode_block_opcode_0x1,
ipvideo_decode_block_opcode_0x2, ipvideo_decode_block_opcode_0x3,
ipvideo_decode_block_opcode_0xE, ipvideo_decode_block_opcode_0xF,
};
+static int (* const ipvideo_decode_block16[])(IpvideoContext *s) = {
+ ipvideo_decode_block_opcode_0x0, ipvideo_decode_block_opcode_0x1,
+ ipvideo_decode_block_opcode_0x2, ipvideo_decode_block_opcode_0x3,
+ ipvideo_decode_block_opcode_0x4, ipvideo_decode_block_opcode_0x5,
+ ipvideo_decode_block_opcode_0x6_16, ipvideo_decode_block_opcode_0x7_16,
+ ipvideo_decode_block_opcode_0x8_16, ipvideo_decode_block_opcode_0x9_16,
+ ipvideo_decode_block_opcode_0xA_16, ipvideo_decode_block_opcode_0xB_16,
+ ipvideo_decode_block_opcode_0xC_16, ipvideo_decode_block_opcode_0xD_16,
+ ipvideo_decode_block_opcode_0xE_16, ipvideo_decode_block_opcode_0x1,
+};
+
static void ipvideo_decode_opcodes(IpvideoContext *s)
{
int x, y;
debug_interplay("------------------ frame %d\n", frame);
frame++;
- /* this is PAL8, so make the palette available */
- memcpy(s->current_frame.data[1], s->avctx->palctrl->palette, PALETTE_COUNT * 4);
+ if (!s->is_16bpp) {
+ /* this is PAL8, so make the palette available */
+ memcpy(s->current_frame.data[1], s->avctx->palctrl->palette, PALETTE_COUNT * 4);
- s->stride = s->current_frame.linesize[0];
- s->stream_ptr = s->buf + 14; /* data starts 14 bytes in */
- s->stream_end = s->buf + s->size;
+ s->stride = s->current_frame.linesize[0];
+ s->stream_ptr = s->buf + 14; /* data starts 14 bytes in */
+ s->stream_end = s->buf + s->size;
+ } else {
+ s->stride = s->current_frame.linesize[0] >> 1;
+ s->stream_ptr = s->buf + 16;
+ s->stream_end =
+ s->mv_ptr = s->buf + 14 + AV_RL16(s->buf+14);
+ s->mv_end = s->buf + s->size;
+ }
s->line_inc = s->stride - 8;
- s->upper_motion_limit_offset = (s->avctx->height - 8) * s->stride
- + s->avctx->width - 8;
+ s->upper_motion_limit_offset = (s->avctx->height - 8) * s->current_frame.linesize[0]
+ + (s->avctx->width - 8) * (1 + s->is_16bpp);
init_get_bits(&gb, s->decoding_map, s->decoding_map_size * 8);
for (y = 0; y < s->avctx->height; y += 8) {
debug_interplay(" block @ (%3d, %3d): encoding 0x%X, data ptr @ %p\n",
x, y, opcode, s->stream_ptr);
- s->pixel_ptr = s->current_frame.data[0] + x
- + y*s->current_frame.linesize[0];
- ret = ipvideo_decode_block[opcode](s);
+ if (!s->is_16bpp) {
+ s->pixel_ptr = s->current_frame.data[0] + x
+ + y*s->current_frame.linesize[0];
+ ret = ipvideo_decode_block[opcode](s);
+ } else {
+ s->pixel_ptr = s->current_frame.data[0] + x*2
+ + y*s->current_frame.linesize[0];
+ ret = ipvideo_decode_block16[opcode](s);
+ }
if (ret != 0) {
av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode problem on frame %d, @ block (%d, %d)\n",
frame, x, y);
s->avctx = avctx;
- if (s->avctx->palctrl == NULL) {
+ s->is_16bpp = avctx->bits_per_coded_sample == 16;
+ avctx->pix_fmt = s->is_16bpp ? PIX_FMT_RGB555 : PIX_FMT_PAL8;
+ if (!s->is_16bpp && s->avctx->palctrl == NULL) {
av_log(avctx, AV_LOG_ERROR, " Interplay video: palette expected.\n");
return -1;
}
- avctx->pix_fmt = PIX_FMT_PAL8;
dsputil_init(&s->dsp, avctx);
/* decoding map contains 4 bits of information per 8x8 block */
ipvideo_decode_opcodes(s);
- if (palette_control->palette_changed) {
+ if (!s->is_16bpp && palette_control->palette_changed) {
palette_control->palette_changed = 0;
s->current_frame.palette_has_changed = 1;
}
AVCodec interplay_video_decoder = {
"interplayvideo",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_INTERPLAY_VIDEO,
sizeof(IpvideoContext),
ipvideo_decode_init,
projects / ffmpeg / blobdiff