#include "avcodec.h"
#include "bytestream.h"
-#include "dsputil.h"
+#include "hpeldsp.h"
#define BITSTREAM_READER_LE
#include "get_bits.h"
+#include "internal.h"
#define PALETTE_COUNT 256
typedef struct IpvideoContext {
AVCodecContext *avctx;
- DSPContext dsp;
- AVFrame second_last_frame;
- AVFrame last_frame;
- AVFrame current_frame;
+ HpelDSPContext hdsp;
+ AVFrame *second_last_frame;
+ AVFrame *last_frame;
const unsigned char *decoding_map;
int decoding_map_size;
- 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;
+ GetByteContext stream_ptr, mv_ptr;
unsigned char *pixel_ptr;
int line_inc;
int stride;
uint32_t pal[256];
} IpvideoContext;
-#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", \
- stream_ptr + n, stream_end); \
- return -1; \
- }
-
-static int copy_from(IpvideoContext *s, AVFrame *src, int delta_x, int delta_y)
+static int copy_from(IpvideoContext *s, AVFrame *src, AVFrame *dst, 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->current_frame.linesize[0]
+ int current_offset = s->pixel_ptr - dst->data[0];
+ int motion_offset = current_offset + delta_y * dst->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;
+ return AVERROR_INVALIDDATA;
} else if (motion_offset > s->upper_motion_limit_offset) {
av_log(s->avctx, AV_LOG_ERROR, " Interplay video: motion offset above limit (%d >= %d)\n",
motion_offset, s->upper_motion_limit_offset);
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (src->data[0] == NULL) {
av_log(s->avctx, AV_LOG_ERROR, "Invalid decode type, corrupted header?\n");
return AVERROR(EINVAL);
}
- s->dsp.put_pixels_tab[!s->is_16bpp][0](s->pixel_ptr, src->data[0] + motion_offset,
- s->current_frame.linesize[0], 8);
+ s->hdsp.put_pixels_tab[!s->is_16bpp][0](s->pixel_ptr, src->data[0] + motion_offset,
+ dst->linesize[0], 8);
return 0;
}
-static int ipvideo_decode_block_opcode_0x0(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x0(IpvideoContext *s, AVFrame *frame)
{
- return copy_from(s, &s->last_frame, 0, 0);
+ return copy_from(s, s->last_frame, frame, 0, 0);
}
-static int ipvideo_decode_block_opcode_0x1(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x1(IpvideoContext *s, AVFrame *frame)
{
- return copy_from(s, &s->second_last_frame, 0, 0);
+ return copy_from(s, s->second_last_frame, frame, 0, 0);
}
-static int ipvideo_decode_block_opcode_0x2(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x2(IpvideoContext *s, AVFrame *frame)
{
unsigned char B;
int x, y;
/* copy block from 2 frames ago using a motion vector; need 1 more byte */
if (!s->is_16bpp) {
- CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 1);
- B = *s->stream_ptr++;
+ B = bytestream2_get_byte(&s->stream_ptr);
} else {
- CHECK_STREAM_PTR(s->mv_ptr, s->mv_end, 1);
- B = *s->mv_ptr++;
+ B = bytestream2_get_byte(&s->mv_ptr);
}
if (B < 56) {
}
av_dlog(NULL, " motion byte = %d, (x, y) = (%d, %d)\n", B, x, y);
- return copy_from(s, &s->second_last_frame, x, y);
+ return copy_from(s, s->second_last_frame, frame, x, y);
}
-static int ipvideo_decode_block_opcode_0x3(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x3(IpvideoContext *s, AVFrame *frame)
{
unsigned char B;
int x, y;
/* need 1 more byte for motion */
if (!s->is_16bpp) {
- CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 1);
- B = *s->stream_ptr++;
+ B = bytestream2_get_byte(&s->stream_ptr);
} else {
- CHECK_STREAM_PTR(s->mv_ptr, s->mv_end, 1);
- B = *s->mv_ptr++;
+ B = bytestream2_get_byte(&s->mv_ptr);
}
if (B < 56) {
}
av_dlog(NULL, " motion byte = %d, (x, y) = (%d, %d)\n", B, x, y);
- return copy_from(s, &s->current_frame, x, y);
+ return copy_from(s, frame, frame, x, y);
}
-static int ipvideo_decode_block_opcode_0x4(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x4(IpvideoContext *s, AVFrame *frame)
{
int x, y;
unsigned char B, BL, BH;
/* copy a block from the previous frame; need 1 more byte */
if (!s->is_16bpp) {
- CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 1);
- B = *s->stream_ptr++;
+ B = bytestream2_get_byte(&s->stream_ptr);
} else {
- CHECK_STREAM_PTR(s->mv_ptr, s->mv_end, 1);
- B = *s->mv_ptr++;
+ B = bytestream2_get_byte(&s->mv_ptr);
}
BL = B & 0x0F;
y = -8 + BH;
av_dlog(NULL, " motion byte = %d, (x, y) = (%d, %d)\n", B, x, y);
- return copy_from(s, &s->last_frame, x, y);
+ return copy_from(s, s->last_frame, frame, x, y);
}
-static int ipvideo_decode_block_opcode_0x5(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x5(IpvideoContext *s, AVFrame *frame)
{
signed char x, y;
/* copy a block from the previous frame using an expanded range;
* need 2 more bytes */
- CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 2);
-
- x = *s->stream_ptr++;
- y = *s->stream_ptr++;
+ x = bytestream2_get_byte(&s->stream_ptr);
+ y = bytestream2_get_byte(&s->stream_ptr);
av_dlog(NULL, " motion bytes = %d, %d\n", x, y);
- return copy_from(s, &s->last_frame, x, y);
+ return copy_from(s, s->last_frame, frame, x, y);
}
-static int ipvideo_decode_block_opcode_0x6(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x6(IpvideoContext *s, AVFrame *frame)
{
/* mystery opcode? skip multiple blocks? */
av_log(s->avctx, AV_LOG_ERROR, " Interplay video: Help! Mystery opcode 0x6 seen\n");
return 0;
}
-static int ipvideo_decode_block_opcode_0x7(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x7(IpvideoContext *s, AVFrame *frame)
{
int x, y;
unsigned char P[2];
unsigned int flags;
/* 2-color encoding */
- CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 2);
-
- P[0] = *s->stream_ptr++;
- P[1] = *s->stream_ptr++;
+ P[0] = bytestream2_get_byte(&s->stream_ptr);
+ P[1] = bytestream2_get_byte(&s->stream_ptr);
if (P[0] <= P[1]) {
/* need 8 more bytes from the stream */
- CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 8);
-
for (y = 0; y < 8; y++) {
- flags = *s->stream_ptr++ | 0x100;
+ flags = bytestream2_get_byte(&s->stream_ptr) | 0x100;
for (; flags != 1; flags >>= 1)
*s->pixel_ptr++ = P[flags & 1];
s->pixel_ptr += s->line_inc;
} else {
/* need 2 more bytes from the stream */
- CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 2);
-
- flags = bytestream_get_le16(&s->stream_ptr);
+ flags = bytestream2_get_le16(&s->stream_ptr);
for (y = 0; y < 8; y += 2) {
for (x = 0; x < 8; x += 2, flags >>= 1) {
s->pixel_ptr[x ] =
return 0;
}
-static int ipvideo_decode_block_opcode_0x8(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x8(IpvideoContext *s, AVFrame *frame)
{
int x, y;
- unsigned char P[2];
+ unsigned char P[4];
unsigned int flags = 0;
/* 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, 2);
-
- P[0] = *s->stream_ptr++;
- P[1] = *s->stream_ptr++;
+ P[0] = bytestream2_get_byte(&s->stream_ptr);
+ P[1] = bytestream2_get_byte(&s->stream_ptr);
if (P[0] <= P[1]) {
-
- CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 14);
- s->stream_ptr -= 2;
-
for (y = 0; y < 16; y++) {
// new values for each 4x4 block
if (!(y & 3)) {
- P[0] = *s->stream_ptr++; P[1] = *s->stream_ptr++;
- flags = bytestream_get_le16(&s->stream_ptr);
+ if (y) {
+ P[0] = bytestream2_get_byte(&s->stream_ptr);
+ P[1] = bytestream2_get_byte(&s->stream_ptr);
+ }
+ flags = bytestream2_get_le16(&s->stream_ptr);
}
for (x = 0; x < 4; x++, flags >>= 1)
}
} else {
+ flags = bytestream2_get_le32(&s->stream_ptr);
+ P[2] = bytestream2_get_byte(&s->stream_ptr);
+ P[3] = bytestream2_get_byte(&s->stream_ptr);
- /* need 10 more bytes */
- CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 10);
-
- if (s->stream_ptr[4] <= s->stream_ptr[5]) {
-
- flags = bytestream_get_le32(&s->stream_ptr);
+ if (P[2] <= P[3]) {
/* vertical split; left & right halves are 2-color encoded */
// switch to right half
if (y == 7) {
s->pixel_ptr -= 8 * s->stride - 4;
- P[0] = *s->stream_ptr++; P[1] = *s->stream_ptr++;
- flags = bytestream_get_le32(&s->stream_ptr);
+ P[0] = P[2];
+ P[1] = P[3];
+ flags = bytestream2_get_le32(&s->stream_ptr);
}
}
for (y = 0; y < 8; y++) {
if (y == 4) {
- P[0] = *s->stream_ptr++;
- P[1] = *s->stream_ptr++;
+ P[0] = P[2];
+ P[1] = P[3];
+ flags = bytestream2_get_le32(&s->stream_ptr);
}
- flags = *s->stream_ptr++ | 0x100;
- for (; flags != 1; flags >>= 1)
+ for (x = 0; x < 8; x++, flags >>= 1)
*s->pixel_ptr++ = P[flags & 1];
s->pixel_ptr += s->line_inc;
}
return 0;
}
-static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s, AVFrame *frame)
{
int x, y;
unsigned char P[4];
/* 4-color encoding */
- CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 4);
-
- memcpy(P, s->stream_ptr, 4);
- s->stream_ptr += 4;
+ bytestream2_get_buffer(&s->stream_ptr, P, 4);
if (P[0] <= P[1]) {
if (P[2] <= P[3]) {
/* 1 of 4 colors for each pixel, need 16 more bytes */
- 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);
+ int flags = bytestream2_get_le16(&s->stream_ptr);
for (x = 0; x < 8; x++, flags >>= 2)
*s->pixel_ptr++ = P[flags & 0x03];
s->pixel_ptr += s->line_inc;
uint32_t flags;
/* 1 of 4 colors for each 2x2 block, need 4 more bytes */
- CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 4);
-
- flags = bytestream_get_le32(&s->stream_ptr);
+ flags = bytestream2_get_le32(&s->stream_ptr);
for (y = 0; y < 8; y += 2) {
for (x = 0; x < 8; x += 2, flags >>= 2) {
uint64_t flags;
/* 1 of 4 colors for each 2x1 or 1x2 block, need 8 more bytes */
- CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 8);
-
- flags = bytestream_get_le64(&s->stream_ptr);
+ flags = bytestream2_get_le64(&s->stream_ptr);
if (P[2] <= P[3]) {
for (y = 0; y < 8; y++) {
for (x = 0; x < 8; x += 2, flags >>= 2) {
return 0;
}
-static int ipvideo_decode_block_opcode_0xA(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0xA(IpvideoContext *s, AVFrame *frame)
{
int x, y;
- unsigned char P[4];
+ unsigned char P[8];
int flags = 0;
+ bytestream2_get_buffer(&s->stream_ptr, P, 4);
+
/* 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 (s->stream_ptr[0] <= s->stream_ptr[1]) {
+ if (P[0] <= P[1]) {
/* 4-color encoding for each quadrant; need 32 bytes */
- CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 32);
-
for (y = 0; y < 16; y++) {
// new values for each 4x4 block
if (!(y & 3)) {
- memcpy(P, s->stream_ptr, 4);
- s->stream_ptr += 4;
- flags = bytestream_get_le32(&s->stream_ptr);
+ if (y) bytestream2_get_buffer(&s->stream_ptr, P, 4);
+ flags = bytestream2_get_le32(&s->stream_ptr);
}
for (x = 0; x < 4; x++, flags >>= 2)
} else {
// vertical split?
- int vert = s->stream_ptr[12] <= s->stream_ptr[13];
- uint64_t flags = 0;
+ int vert;
+ uint64_t flags = bytestream2_get_le64(&s->stream_ptr);
+
+ bytestream2_get_buffer(&s->stream_ptr, P + 4, 4);
+ vert = P[4] <= P[5];
/* 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)) {
- memcpy(P, s->stream_ptr, 4);
- s->stream_ptr += 4;
- flags = bytestream_get_le64(&s->stream_ptr);
- }
-
for (x = 0; x < 4; x++, flags >>= 2)
*s->pixel_ptr++ = P[flags & 0x03];
// switch to right half
if (y == 7) s->pixel_ptr -= 8 * s->stride - 4;
} else if (y & 1) s->pixel_ptr += s->line_inc;
+
+ // load values for second half
+ if (y == 7) {
+ memcpy(P, P + 4, 4);
+ flags = bytestream2_get_le64(&s->stream_ptr);
+ }
}
}
return 0;
}
-static int ipvideo_decode_block_opcode_0xB(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0xB(IpvideoContext *s, AVFrame *frame)
{
int y;
/* 64-color encoding (each pixel in block is a different color) */
- CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 64);
-
for (y = 0; y < 8; y++) {
- memcpy(s->pixel_ptr, s->stream_ptr, 8);
- s->stream_ptr += 8;
+ bytestream2_get_buffer(&s->stream_ptr, s->pixel_ptr, 8);
s->pixel_ptr += s->stride;
}
return 0;
}
-static int ipvideo_decode_block_opcode_0xC(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0xC(IpvideoContext *s, AVFrame *frame)
{
int x, y;
/* 16-color block encoding: each 2x2 block is a different color */
- CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 16);
-
for (y = 0; y < 8; y += 2) {
for (x = 0; x < 8; x += 2) {
s->pixel_ptr[x ] =
s->pixel_ptr[x + 1 ] =
s->pixel_ptr[x + s->stride] =
- s->pixel_ptr[x + 1 + s->stride] = *s->stream_ptr++;
+ s->pixel_ptr[x + 1 + s->stride] = bytestream2_get_byte(&s->stream_ptr);
}
s->pixel_ptr += s->stride * 2;
}
return 0;
}
-static int ipvideo_decode_block_opcode_0xD(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0xD(IpvideoContext *s, AVFrame *frame)
{
int y;
unsigned char P[2];
/* 4-color block encoding: each 4x4 block is a different color */
- CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 4);
-
for (y = 0; y < 8; y++) {
if (!(y & 3)) {
- P[0] = *s->stream_ptr++;
- P[1] = *s->stream_ptr++;
+ P[0] = bytestream2_get_byte(&s->stream_ptr);
+ P[1] = bytestream2_get_byte(&s->stream_ptr);
}
memset(s->pixel_ptr, P[0], 4);
memset(s->pixel_ptr + 4, P[1], 4);
return 0;
}
-static int ipvideo_decode_block_opcode_0xE(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0xE(IpvideoContext *s, AVFrame *frame)
{
int y;
unsigned char pix;
/* 1-color encoding: the whole block is 1 solid color */
- CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 1);
- pix = *s->stream_ptr++;
+ pix = bytestream2_get_byte(&s->stream_ptr);
for (y = 0; y < 8; y++) {
memset(s->pixel_ptr, pix, 8);
return 0;
}
-static int ipvideo_decode_block_opcode_0xF(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0xF(IpvideoContext *s, AVFrame *frame)
{
int x, y;
unsigned char sample[2];
/* dithered encoding */
- CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 2);
- sample[0] = *s->stream_ptr++;
- sample[1] = *s->stream_ptr++;
+ sample[0] = bytestream2_get_byte(&s->stream_ptr);
+ sample[1] = bytestream2_get_byte(&s->stream_ptr);
for (y = 0; y < 8; y++) {
for (x = 0; x < 8; x += 2) {
return 0;
}
-static int ipvideo_decode_block_opcode_0x6_16(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x6_16(IpvideoContext *s, AVFrame *frame)
{
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++;
+ x = bytestream2_get_byte(&s->stream_ptr);
+ y = bytestream2_get_byte(&s->stream_ptr);
av_dlog(NULL, " motion bytes = %d, %d\n", x, y);
- return copy_from(s, &s->second_last_frame, x, y);
+ return copy_from(s, s->second_last_frame, frame, x, y);
}
-static int ipvideo_decode_block_opcode_0x7_16(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x7_16(IpvideoContext *s, AVFrame *frame)
{
int x, y;
uint16_t P[2];
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);
+ P[0] = bytestream2_get_le16(&s->stream_ptr);
+ P[1] = bytestream2_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;
+ flags = bytestream2_get_byte(&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);
+ flags = bytestream2_get_le16(&s->stream_ptr);
for (y = 0; y < 8; y += 2) {
for (x = 0; x < 8; x += 2, flags >>= 1) {
pixel_ptr[x ] =
return 0;
}
-static int ipvideo_decode_block_opcode_0x8_16(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x8_16(IpvideoContext *s, AVFrame *frame)
{
int x, y;
- uint16_t P[2];
+ uint16_t P[4];
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);
+ P[0] = bytestream2_get_le16(&s->stream_ptr);
+ P[1] = bytestream2_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);
+ if (y) {
+ P[0] = bytestream2_get_le16(&s->stream_ptr);
+ P[1] = bytestream2_get_le16(&s->stream_ptr);
+ }
+ flags = bytestream2_get_le16(&s->stream_ptr);
}
for (x = 0; x < 4; x++, flags >>= 1)
} else {
- CHECK_STREAM_PTR(s->stream_ptr, s->stream_end, 12);
-
- if (!(AV_RL16(s->stream_ptr + 4) & 0x8000)) {
+ flags = bytestream2_get_le32(&s->stream_ptr);
+ P[2] = bytestream2_get_le16(&s->stream_ptr);
+ P[3] = bytestream2_get_le16(&s->stream_ptr);
- flags = bytestream_get_le32(&s->stream_ptr);
+ if (!(P[2] & 0x8000)) {
/* vertical split; left & right halves are 2-color encoded */
// 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);
+ P[0] = P[2];
+ P[1] = P[3];
+ flags = bytestream2_get_le32(&s->stream_ptr);
}
}
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);
+ P[0] = P[2];
+ P[1] = P[3];
+ flags = bytestream2_get_le32(&s->stream_ptr);
}
- flags = *s->stream_ptr++ | 0x100;
- for (; flags != 1; flags >>= 1)
+ for (x = 0; x < 8; x++, flags >>= 1)
*pixel_ptr++ = P[flags & 1];
pixel_ptr += s->line_inc;
}
return 0;
}
-static int ipvideo_decode_block_opcode_0x9_16(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x9_16(IpvideoContext *s, AVFrame *frame)
{
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);
+ P[x] = bytestream2_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);
+ int flags = bytestream2_get_le16(&s->stream_ptr);
for (x = 0; x < 8; x++, flags >>= 2)
*pixel_ptr++ = P[flags & 0x03];
pixel_ptr += s->line_inc;
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);
+ flags = bytestream2_get_le32(&s->stream_ptr);
for (y = 0; y < 8; y += 2) {
for (x = 0; x < 8; x += 2, flags >>= 2) {
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);
+ flags = bytestream2_get_le64(&s->stream_ptr);
if (!(P[2] & 0x8000)) {
for (y = 0; y < 8; y++) {
for (x = 0; x < 8; x += 2, flags >>= 2) {
return 0;
}
-static int ipvideo_decode_block_opcode_0xA_16(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0xA_16(IpvideoContext *s, AVFrame *frame)
{
int x, y;
- uint16_t P[4];
+ uint16_t P[8];
int flags = 0;
uint16_t *pixel_ptr = (uint16_t*)s->pixel_ptr;
+ for (x = 0; x < 4; x++)
+ P[x] = bytestream2_get_le16(&s->stream_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)) {
+ if (!(P[0] & 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);
+ if (y)
+ for (x = 0; x < 4; x++)
+ P[x] = bytestream2_get_le16(&s->stream_ptr);
+ flags = bytestream2_get_le32(&s->stream_ptr);
}
for (x = 0; x < 4; x++, flags >>= 2)
} else {
// vertical split?
- int vert = !(AV_RL16(s->stream_ptr + 16) & 0x8000);
- uint64_t flags = 0;
+ int vert;
+ uint64_t flags = bytestream2_get_le64(&s->stream_ptr);
+
+ for (x = 4; x < 8; x++)
+ P[x] = bytestream2_get_le16(&s->stream_ptr);
+ vert = !(P[4] & 0x8000);
/* 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];
// switch to right half
if (y == 7) pixel_ptr -= 8 * s->stride - 4;
} else if (y & 1) pixel_ptr += s->line_inc;
+
+ // load values for second half
+ if (y == 7) {
+ memcpy(P, P + 4, 8);
+ flags = bytestream2_get_le64(&s->stream_ptr);
+ }
}
}
return 0;
}
-static int ipvideo_decode_block_opcode_0xB_16(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0xB_16(IpvideoContext *s, AVFrame *frame)
{
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[x] = bytestream2_get_le16(&s->stream_ptr);
pixel_ptr += s->stride;
}
return 0;
}
-static int ipvideo_decode_block_opcode_0xC_16(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0xC_16(IpvideoContext *s, AVFrame *frame)
{
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[x + 1 + s->stride] = bytestream2_get_le16(&s->stream_ptr);
}
pixel_ptr += s->stride * 2;
}
return 0;
}
-static int ipvideo_decode_block_opcode_0xD_16(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0xD_16(IpvideoContext *s, AVFrame *frame)
{
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);
+ P[0] = bytestream2_get_le16(&s->stream_ptr);
+ P[1] = bytestream2_get_le16(&s->stream_ptr);
}
for (x = 0; x < 8; x++)
pixel_ptr[x] = P[x >> 2];
return 0;
}
-static int ipvideo_decode_block_opcode_0xE_16(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0xE_16(IpvideoContext *s, AVFrame *frame)
{
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);
+ pix = bytestream2_get_le16(&s->stream_ptr);
for (y = 0; y < 8; y++) {
for (x = 0; x < 8; x++)
return 0;
}
-static int (* const ipvideo_decode_block[])(IpvideoContext *s) = {
+static int (* const ipvideo_decode_block[])(IpvideoContext *s, AVFrame *frame) = {
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_0xE, ipvideo_decode_block_opcode_0xF,
};
-static int (* const ipvideo_decode_block16[])(IpvideoContext *s) = {
+static int (* const ipvideo_decode_block16[])(IpvideoContext *s, AVFrame *frame) = {
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_0xE_16, ipvideo_decode_block_opcode_0x1,
};
-static void ipvideo_decode_opcodes(IpvideoContext *s)
+static void ipvideo_decode_opcodes(IpvideoContext *s, AVFrame *frame)
{
int x, y;
unsigned char opcode;
int ret;
- static int frame = 0;
GetBitContext gb;
- av_dlog(NULL, "------------------ frame %d\n", frame);
- frame++;
-
+ bytestream2_skip(&s->stream_ptr, 14); /* data starts 14 bytes in */
if (!s->is_16bpp) {
/* this is PAL8, so make the palette available */
- memcpy(s->current_frame.data[1], s->pal, AVPALETTE_SIZE);
+ memcpy(frame->data[1], s->pal, AVPALETTE_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;
+ s->stride = frame->linesize[0];
} 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->stride = frame->linesize[0] >> 1;
+ s->mv_ptr = s->stream_ptr;
+ bytestream2_skip(&s->mv_ptr, bytestream2_get_le16(&s->stream_ptr));
}
s->line_inc = s->stride - 8;
- s->upper_motion_limit_offset = (s->avctx->height - 8) * s->current_frame.linesize[0]
+ s->upper_motion_limit_offset = (s->avctx->height - 8) * frame->linesize[0]
+ (s->avctx->width - 8) * (1 + s->is_16bpp);
init_get_bits(&gb, s->decoding_map, s->decoding_map_size * 8);
for (x = 0; x < s->avctx->width; x += 8) {
opcode = get_bits(&gb, 4);
- av_dlog(NULL, " block @ (%3d, %3d): encoding 0x%X, data ptr @ %p\n",
- x, y, opcode, s->stream_ptr);
+ av_dlog(s->avctx,
+ " block @ (%3d, %3d): encoding 0x%X, data ptr offset %d\n",
+ x, y, opcode, bytestream2_tell(&s->stream_ptr));
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);
+ s->pixel_ptr = frame->data[0] + x
+ + y*frame->linesize[0];
+ ret = ipvideo_decode_block[opcode](s, frame);
} else {
- s->pixel_ptr = s->current_frame.data[0] + x*2
- + y*s->current_frame.linesize[0];
- ret = ipvideo_decode_block16[opcode](s);
+ s->pixel_ptr = frame->data[0] + x*2
+ + y*frame->linesize[0];
+ ret = ipvideo_decode_block16[opcode](s, frame);
}
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->frame_number, x, y);
return;
}
}
}
- if (s->stream_end - s->stream_ptr > 1) {
- av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode finished with %td bytes left over\n",
- s->stream_end - s->stream_ptr);
+ if (bytestream2_get_bytes_left(&s->stream_ptr) > 1) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "Interplay video: decode finished with %d bytes left over\n",
+ bytestream2_get_bytes_left(&s->stream_ptr));
}
}
s->avctx = avctx;
s->is_16bpp = avctx->bits_per_coded_sample == 16;
- avctx->pix_fmt = s->is_16bpp ? PIX_FMT_RGB555 : PIX_FMT_PAL8;
+ avctx->pix_fmt = s->is_16bpp ? AV_PIX_FMT_RGB555 : AV_PIX_FMT_PAL8;
- dsputil_init(&s->dsp, avctx);
+ ff_hpeldsp_init(&s->hdsp, avctx->flags);
- s->current_frame.data[0] = s->last_frame.data[0] =
- s->second_last_frame.data[0] = NULL;
+ s->last_frame = av_frame_alloc();
+ s->second_last_frame = av_frame_alloc();
+ if (!s->last_frame || !s->second_last_frame) {
+ av_frame_free(&s->last_frame);
+ av_frame_free(&s->second_last_frame);
+ return AVERROR(ENOMEM);
+ }
return 0;
}
static int ipvideo_decode_frame(AVCodecContext *avctx,
- void *data, int *data_size,
+ void *data, int *got_frame,
AVPacket *avpkt)
{
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
IpvideoContext *s = avctx->priv_data;
+ AVFrame *frame = data;
+ int ret;
/* decoding map contains 4 bits of information per 8x8 block */
s->decoding_map_size = avctx->width * avctx->height / (8 * 8 * 2);
return buf_size;
s->decoding_map = buf;
- s->buf = buf + s->decoding_map_size;
- s->size = buf_size - s->decoding_map_size;
+ bytestream2_init(&s->stream_ptr, buf + s->decoding_map_size,
+ buf_size - s->decoding_map_size);
- s->current_frame.reference = 3;
- if (avctx->get_buffer(avctx, &s->current_frame)) {
+ if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) {
av_log(avctx, AV_LOG_ERROR, " Interplay Video: get_buffer() failed\n");
- return -1;
+ return ret;
}
if (!s->is_16bpp) {
const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
if (pal) {
- s->current_frame.palette_has_changed = 1;
+ frame->palette_has_changed = 1;
memcpy(s->pal, pal, AVPALETTE_SIZE);
}
}
- ipvideo_decode_opcodes(s);
+ ipvideo_decode_opcodes(s, frame);
- *data_size = sizeof(AVFrame);
- *(AVFrame*)data = s->current_frame;
+ *got_frame = 1;
/* shuffle frames */
- if (s->second_last_frame.data[0])
- avctx->release_buffer(avctx, &s->second_last_frame);
- s->second_last_frame = s->last_frame;
- s->last_frame = s->current_frame;
- s->current_frame.data[0] = NULL; /* catch any access attempts */
+ av_frame_unref(s->second_last_frame);
+ FFSWAP(AVFrame*, s->second_last_frame, s->last_frame);
+ if ((ret = av_frame_ref(s->last_frame, frame)) < 0)
+ return ret;
/* report that the buffer was completely consumed */
return buf_size;
{
IpvideoContext *s = avctx->priv_data;
- /* release the last frame */
- if (s->last_frame.data[0])
- avctx->release_buffer(avctx, &s->last_frame);
- if (s->second_last_frame.data[0])
- avctx->release_buffer(avctx, &s->second_last_frame);
+ av_frame_free(&s->last_frame);
+ av_frame_free(&s->second_last_frame);
return 0;
}
AVCodec ff_interplay_video_decoder = {
.name = "interplayvideo",
+ .long_name = NULL_IF_CONFIG_SMALL("Interplay MVE video"),
.type = AVMEDIA_TYPE_VIDEO,
- .id = CODEC_ID_INTERPLAY_VIDEO,
+ .id = AV_CODEC_ID_INTERPLAY_VIDEO,
.priv_data_size = sizeof(IpvideoContext),
.init = ipvideo_decode_init,
.close = ipvideo_decode_end,
.decode = ipvideo_decode_frame,
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_PARAM_CHANGE,
- .long_name = NULL_IF_CONFIG_SMALL("Interplay MVE video"),
};
projects / ffmpeg / blobdiff