X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Finterplayvideo.c;h=a2cf2e42da5225d04ec3fd94668647abfa7ae2bc;hb=e4e3230ea54ab7c66588d713b13a81fd59e10dcc;hp=372ec0357a0fb8695f4921c51f6c934c9badb5dc;hpb=186447f8fee7f6a0fb58ec243cd0990289d1d8f7;p=ffmpeg diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c index 372ec0357a0..a2cf2e42da5 100644 --- a/libavcodec/interplayvideo.c +++ b/libavcodec/interplayvideo.c @@ -2,20 +2,21 @@ * Interplay MVE Video Decoder * Copyright (C) 2003 the ffmpeg project * - * This library is free software; you can redistribute it and/or + * This file is part of FFmpeg. + * + * FFmpeg 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 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * FFmpeg 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 this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** @@ -38,8 +39,8 @@ #include #include -#include "common.h" #include "avcodec.h" +#include "bytestream.h" #include "dsputil.h" #define PALETTE_COUNT 256 @@ -47,7 +48,7 @@ /* debugging support */ #define DEBUG_INTERPLAY 0 #if DEBUG_INTERPLAY -#define debug_interplay printf +#define debug_interplay(x,...) av_log(NULL, AV_LOG_DEBUG, x, __VA_ARGS__) #else static inline void debug_interplay(const char *format, ...) { } #endif @@ -56,123 +57,114 @@ typedef struct IpvideoContext { AVCodecContext *avctx; DSPContext dsp; + AVFrame second_last_frame; AVFrame last_frame; AVFrame current_frame; - int first_frame; - unsigned char *decoding_map; + const unsigned char *decoding_map; int decoding_map_size; - unsigned char *buf; + const unsigned char *buf; int size; - unsigned char palette[PALETTE_COUNT * 4]; + const unsigned char *stream_ptr; + const unsigned char *stream_end; + unsigned char *pixel_ptr; + int line_inc; + int stride; + int upper_motion_limit_offset; } IpvideoContext; #define CHECK_STREAM_PTR(n) \ - if ((sg_stream_ptr + n) > sg_stream_end) { \ - printf ("Interplay video warning: stream_ptr out of bounds (%p >= %p)\n", \ - sg_stream_ptr + n, sg_stream_end); \ + if ((s->stream_ptr + n) > s->stream_end) { \ + 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); \ return -1; \ } -static void ipvideo_new_palette(IpvideoContext *s, unsigned char *palette) { - - int i; - unsigned char r, g, b; - unsigned int *palette32; - - switch (s->avctx->pix_fmt) { - - case PIX_FMT_PAL8: - palette32 = (unsigned int *)s->palette; - for (i = 0; i < PALETTE_COUNT; i++) { - r = *palette++; - g = *palette++; - b = *palette++; - palette32[i] = (r << 16) | (g << 8) | (b); - } - break; - - default: - printf ("Interplay video: Unhandled video format\n"); - break; - } -} - -static unsigned char *sg_stream_ptr; -static unsigned char *sg_stream_end; -static unsigned char *sg_current_plane; -static unsigned char *sg_output_plane; -static unsigned char *sg_last_plane; -static int sg_line_inc; -static int sg_stride; -static int sg_upper_motion_limit_offset; -static DSPContext sg_dsp; - -static int ipvideo_decode_block_opcode_0x0_0x1(void) -{ - int x, y; - unsigned char *src_block; - - /* skip block, which actually means to copy from previous frame */ - src_block = sg_last_plane + (sg_output_plane - sg_current_plane); - for (y = 0; y < 8; y++) { - for (x = 0; x < 8; x++) { - *sg_output_plane++ = *src_block++; - } - sg_output_plane += sg_line_inc; - src_block += sg_line_inc; - } - - /* report success */ - return 0; -} - #define COPY_FROM_CURRENT() \ motion_offset = current_offset; \ - motion_offset += y * sg_stride; \ + motion_offset += y * s->stride; \ motion_offset += x; \ if (motion_offset < 0) { \ - printf (" Interplay video: motion offset < 0 (%d)\n", motion_offset); \ + av_log(s->avctx, AV_LOG_ERROR, " Interplay video: motion offset < 0 (%d)\n", motion_offset); \ return -1; \ - } else if (motion_offset > sg_upper_motion_limit_offset) { \ - printf (" Interplay video: motion offset above limit (%d >= %d)\n", \ - motion_offset, sg_upper_motion_limit_offset); \ + } 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; \ } \ - sg_dsp.put_pixels_tab[0][0](sg_output_plane, \ - sg_current_plane + motion_offset, sg_stride, 8); + s->dsp.put_pixels_tab[0][0](s->pixel_ptr, \ + s->current_frame.data[0] + motion_offset, s->stride, 8); #define COPY_FROM_PREVIOUS() \ motion_offset = current_offset; \ - motion_offset += y * sg_stride; \ + motion_offset += y * s->stride; \ + motion_offset += x; \ + if (motion_offset < 0) { \ + av_log(s->avctx, AV_LOG_ERROR, " Interplay video: motion offset < 0 (%d)\n", motion_offset); \ + return -1; \ + } 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; \ + } \ + s->dsp.put_pixels_tab[0][0](s->pixel_ptr, \ + s->last_frame.data[0] + motion_offset, s->stride, 8); + +#define COPY_FROM_SECOND_LAST() \ + motion_offset = current_offset; \ + motion_offset += y * s->stride; \ motion_offset += x; \ if (motion_offset < 0) { \ - printf (" Interplay video: motion offset < 0 (%d)\n", motion_offset); \ + av_log(s->avctx, AV_LOG_ERROR, " Interplay video: motion offset < 0 (%d)\n", motion_offset); \ return -1; \ - } else if (motion_offset > sg_upper_motion_limit_offset) { \ - printf (" Interplay video: motion offset above limit (%d >= %d)\n", \ - motion_offset, sg_upper_motion_limit_offset); \ + } 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; \ } \ - sg_dsp.put_pixels_tab[0][0](sg_output_plane, \ - sg_last_plane + motion_offset, sg_stride, 8); + s->dsp.put_pixels_tab[0][0](s->pixel_ptr, \ + s->second_last_frame.data[0] + motion_offset, s->stride, 8); -static int ipvideo_decode_block_opcode_0x2(void) +static int ipvideo_decode_block_opcode_0x0(IpvideoContext *s) { - unsigned char B; int x, y; int motion_offset; - int current_offset = sg_output_plane - sg_current_plane; + int current_offset = s->pixel_ptr - s->current_frame.data[0]; - /* This is the opcode which claims to copy data from within the same - * frame at a coordinate which has not been rendered yet. Assume that - * it is supposed to be copied from the previous frame. */ + /* copy a block from the previous frame */ + x = y = 0; + COPY_FROM_PREVIOUS(); - /* need 1 more byte for motion */ + /* report success */ + return 0; +} + +static int ipvideo_decode_block_opcode_0x1(IpvideoContext *s) +{ + int x, y; + int motion_offset; + int current_offset = s->pixel_ptr - s->current_frame.data[0]; + + /* copy block from 2 frames ago */ + x = y = 0; + COPY_FROM_SECOND_LAST(); + + /* report success */ + return 0; +} + +static int ipvideo_decode_block_opcode_0x2(IpvideoContext *s) +{ + unsigned char B; + int x, y; + int motion_offset; + int current_offset = s->pixel_ptr - s->current_frame.data[0]; + + /* copy block from 2 frames ago using a motion vector; need 1 more byte */ CHECK_STREAM_PTR(1); - B = *sg_stream_ptr++; + B = *s->stream_ptr++; if (B < 56) { x = 8 + (B % 7); @@ -183,24 +175,24 @@ static int ipvideo_decode_block_opcode_0x2(void) } debug_interplay (" motion byte = %d, (x, y) = (%d, %d)\n", B, x, y); - COPY_FROM_PREVIOUS(); + COPY_FROM_SECOND_LAST(); /* report success */ return 0; } -static int ipvideo_decode_block_opcode_0x3(void) +static int ipvideo_decode_block_opcode_0x3(IpvideoContext *s) { unsigned char B; int x, y; int motion_offset; - int current_offset = sg_output_plane - sg_current_plane; + int current_offset = s->pixel_ptr - s->current_frame.data[0]; /* copy 8x8 block from current frame from an up/left block */ /* need 1 more byte for motion */ CHECK_STREAM_PTR(1); - B = *sg_stream_ptr++; + B = *s->stream_ptr++; if (B < 56) { x = -(8 + (B % 7)); @@ -217,17 +209,17 @@ static int ipvideo_decode_block_opcode_0x3(void) return 0; } -static int ipvideo_decode_block_opcode_0x4(void) +static int ipvideo_decode_block_opcode_0x4(IpvideoContext *s) { int x, y; unsigned char B, BL, BH; int motion_offset; - int current_offset = sg_output_plane - sg_current_plane; + int current_offset = s->pixel_ptr - s->current_frame.data[0]; /* copy a block from the previous frame; need 1 more byte */ CHECK_STREAM_PTR(1); - B = *sg_stream_ptr++; + B = *s->stream_ptr++; BL = B & 0x0F; BH = (B >> 4) & 0x0F; x = -8 + BL; @@ -240,18 +232,18 @@ static int ipvideo_decode_block_opcode_0x4(void) return 0; } -static int ipvideo_decode_block_opcode_0x5(void) +static int ipvideo_decode_block_opcode_0x5(IpvideoContext *s) { signed char x, y; int motion_offset; - int current_offset = sg_output_plane - sg_current_plane; + int current_offset = s->pixel_ptr - s->current_frame.data[0]; /* copy a block from the previous frame using an expanded range; * need 2 more bytes */ CHECK_STREAM_PTR(2); - x = *sg_stream_ptr++; - y = *sg_stream_ptr++; + x = *s->stream_ptr++; + y = *s->stream_ptr++; debug_interplay (" motion bytes = %d, %d\n", x, y); COPY_FROM_PREVIOUS(); @@ -260,16 +252,16 @@ static int ipvideo_decode_block_opcode_0x5(void) return 0; } -static int ipvideo_decode_block_opcode_0x6(void) +static int ipvideo_decode_block_opcode_0x6(IpvideoContext *s) { /* mystery opcode? skip multiple blocks? */ - printf (" Interplay video: Help! Mystery opcode 0x6 seen\n"); + av_log(s->avctx, AV_LOG_ERROR, " Interplay video: Help! Mystery opcode 0x6 seen\n"); /* report success */ return 0; } -static int ipvideo_decode_block_opcode_0x7(void) +static int ipvideo_decode_block_opcode_0x7(IpvideoContext *s) { int x, y; unsigned char P0, P1; @@ -280,51 +272,49 @@ static int ipvideo_decode_block_opcode_0x7(void) /* 2-color encoding */ CHECK_STREAM_PTR(2); - P0 = *sg_stream_ptr++; - P1 = *sg_stream_ptr++; + P0 = *s->stream_ptr++; + P1 = *s->stream_ptr++; if (P0 <= P1) { /* need 8 more bytes from the stream */ CHECK_STREAM_PTR(8); for (y = 0; y < 8; y++) - B[y] = *sg_stream_ptr++; + B[y] = *s->stream_ptr++; for (y = 0; y < 8; y++) { flags = B[y]; - for (x = 0x80; x != 0; x >>= 1) { + for (x = 0x01; x <= 0x80; x <<= 1) { if (flags & x) - *sg_output_plane++ = P1; + *s->pixel_ptr++ = P1; else - *sg_output_plane++ = P0; + *s->pixel_ptr++ = P0; } - sg_output_plane += sg_line_inc; + s->pixel_ptr += s->line_inc; } } else { /* need 2 more bytes from the stream */ CHECK_STREAM_PTR(2); - B[0] = *sg_stream_ptr++; - B[1] = *sg_stream_ptr++; - flags = (B[0] << 8) | B[1]; - bitmask = 0x8000; + flags = bytestream_get_le16(&s->stream_ptr); + bitmask = 0x0001; for (y = 0; y < 8; y += 2) { - for (x = 0; x < 8; x += 2, bitmask >>= 1) { + for (x = 0; x < 8; x += 2, bitmask <<= 1) { if (flags & bitmask) { - *(sg_output_plane + x) = P0; - *(sg_output_plane + x + 1) = P0; - *(sg_output_plane + sg_stride + x) = P0; - *(sg_output_plane + sg_stride + x + 1) = P0; + *(s->pixel_ptr + x) = P1; + *(s->pixel_ptr + x + 1) = P1; + *(s->pixel_ptr + s->stride + x) = P1; + *(s->pixel_ptr + s->stride + x + 1) = P1; } else { - *(sg_output_plane + x) = P1; - *(sg_output_plane + x + 1) = P1; - *(sg_output_plane + sg_stride + x) = P1; - *(sg_output_plane + sg_stride + x + 1) = P1; + *(s->pixel_ptr + x) = P0; + *(s->pixel_ptr + x + 1) = P0; + *(s->pixel_ptr + s->stride + x) = P0; + *(s->pixel_ptr + s->stride + x + 1) = P0; } } - sg_output_plane += sg_stride * 2; + s->pixel_ptr += s->stride * 2; } } @@ -332,7 +322,7 @@ static int ipvideo_decode_block_opcode_0x7(void) return 0; } -static int ipvideo_decode_block_opcode_0x8(void) +static int ipvideo_decode_block_opcode_0x8(IpvideoContext *s) { int x, y; unsigned char P[8]; @@ -346,69 +336,69 @@ static int ipvideo_decode_block_opcode_0x8(void) * either top and bottom or left and right halves */ CHECK_STREAM_PTR(2); - P[0] = *sg_stream_ptr++; - P[1] = *sg_stream_ptr++; + P[0] = *s->stream_ptr++; + P[1] = *s->stream_ptr++; if (P[0] <= P[1]) { /* need 12 more bytes */ CHECK_STREAM_PTR(12); - B[0] = *sg_stream_ptr++; B[1] = *sg_stream_ptr++; - P[2] = *sg_stream_ptr++; P[3] = *sg_stream_ptr++; - B[2] = *sg_stream_ptr++; B[3] = *sg_stream_ptr++; - P[4] = *sg_stream_ptr++; P[5] = *sg_stream_ptr++; - B[4] = *sg_stream_ptr++; B[5] = *sg_stream_ptr++; - P[6] = *sg_stream_ptr++; P[7] = *sg_stream_ptr++; - B[6] = *sg_stream_ptr++; B[7] = *sg_stream_ptr++; + B[0] = *s->stream_ptr++; B[1] = *s->stream_ptr++; + P[2] = *s->stream_ptr++; P[3] = *s->stream_ptr++; + B[2] = *s->stream_ptr++; B[3] = *s->stream_ptr++; + P[4] = *s->stream_ptr++; P[5] = *s->stream_ptr++; + B[4] = *s->stream_ptr++; B[5] = *s->stream_ptr++; + P[6] = *s->stream_ptr++; P[7] = *s->stream_ptr++; + B[6] = *s->stream_ptr++; B[7] = *s->stream_ptr++; for (y = 0; y < 8; y++) { /* time to reload flags? */ if (y == 0) { flags = - ((B[0] & 0xF0) << 24) | ((B[4] & 0xF0) << 20) | - ((B[0] & 0x0F) << 20) | ((B[4] & 0x0F) << 16) | - ((B[1] & 0xF0) << 8) | ((B[5] & 0xF0) << 4) | - ((B[1] & 0x0F) << 4) | ((B[5] & 0x0F) << 0); - bitmask = 0x80000000; + ((B[0] & 0xF0) << 4) | ((B[4] & 0xF0) << 8) | + ((B[0] & 0x0F) ) | ((B[4] & 0x0F) << 4) | + ((B[1] & 0xF0) << 20) | ((B[5] & 0xF0) << 24) | + ((B[1] & 0x0F) << 16) | ((B[5] & 0x0F) << 20); + bitmask = 0x00000001; lower_half = 0; /* still on top half */ } else if (y == 4) { flags = - ((B[2] & 0xF0) << 24) | ((B[6] & 0xF0) << 20) | - ((B[2] & 0x0F) << 20) | ((B[6] & 0x0F) << 16) | - ((B[3] & 0xF0) << 8) | ((B[7] & 0xF0) << 4) | - ((B[3] & 0x0F) << 4) | ((B[7] & 0x0F) << 0); - bitmask = 0x80000000; - lower_half = 4; + ((B[2] & 0xF0) << 4) | ((B[6] & 0xF0) << 8) | + ((B[2] & 0x0F) ) | ((B[6] & 0x0F) << 4) | + ((B[3] & 0xF0) << 20) | ((B[7] & 0xF0) << 24) | + ((B[3] & 0x0F) << 16) | ((B[7] & 0x0F) << 20); + bitmask = 0x00000001; + lower_half = 2; } - for (x = 0; x < 8; x++, bitmask >>= 1) { + for (x = 0; x < 8; x++, bitmask <<= 1) { /* get the pixel values ready for this quadrant */ if (x == 0) { P0 = P[lower_half + 0]; P1 = P[lower_half + 1]; } else if (x == 4) { - P0 = P[lower_half + 2]; - P1 = P[lower_half + 3]; + P0 = P[lower_half + 4]; + P1 = P[lower_half + 5]; } if (flags & bitmask) - *sg_output_plane++ = P1; + *s->pixel_ptr++ = P1; else - *sg_output_plane++ = P0; + *s->pixel_ptr++ = P0; } - sg_output_plane += sg_line_inc; + s->pixel_ptr += s->line_inc; } } else { /* need 10 more bytes */ CHECK_STREAM_PTR(10); - B[0] = *sg_stream_ptr++; B[1] = *sg_stream_ptr++; - B[2] = *sg_stream_ptr++; B[3] = *sg_stream_ptr++; - P[2] = *sg_stream_ptr++; P[3] = *sg_stream_ptr++; - B[4] = *sg_stream_ptr++; B[5] = *sg_stream_ptr++; - B[6] = *sg_stream_ptr++; B[7] = *sg_stream_ptr++; + B[0] = *s->stream_ptr++; B[1] = *s->stream_ptr++; + B[2] = *s->stream_ptr++; B[3] = *s->stream_ptr++; + P[2] = *s->stream_ptr++; P[3] = *s->stream_ptr++; + B[4] = *s->stream_ptr++; B[5] = *s->stream_ptr++; + B[6] = *s->stream_ptr++; B[7] = *s->stream_ptr++; if (P[2] <= P[3]) { @@ -419,21 +409,21 @@ static int ipvideo_decode_block_opcode_0x8(void) /* time to reload flags? */ if (y == 0) { flags = - ((B[0] & 0xF0) << 24) | ((B[4] & 0xF0) << 20) | - ((B[0] & 0x0F) << 20) | ((B[4] & 0x0F) << 16) | - ((B[1] & 0xF0) << 8) | ((B[5] & 0xF0) << 4) | - ((B[1] & 0x0F) << 4) | ((B[5] & 0x0F) << 0); - bitmask = 0x80000000; + ((B[0] & 0xF0) << 4) | ((B[4] & 0xF0) << 8) | + ((B[0] & 0x0F) ) | ((B[4] & 0x0F) << 4) | + ((B[1] & 0xF0) << 20) | ((B[5] & 0xF0) << 24) | + ((B[1] & 0x0F) << 16) | ((B[5] & 0x0F) << 20); + bitmask = 0x00000001; } else if (y == 4) { flags = - ((B[2] & 0xF0) << 24) | ((B[6] & 0xF0) << 20) | - ((B[2] & 0x0F) << 20) | ((B[6] & 0x0F) << 16) | - ((B[3] & 0xF0) << 8) | ((B[7] & 0xF0) << 4) | - ((B[3] & 0x0F) << 4) | ((B[7] & 0x0F) << 0); - bitmask = 0x80000000; + ((B[2] & 0xF0) << 4) | ((B[6] & 0xF0) << 8) | + ((B[2] & 0x0F) ) | ((B[6] & 0x0F) << 4) | + ((B[3] & 0xF0) << 20) | ((B[7] & 0xF0) << 24) | + ((B[3] & 0x0F) << 16) | ((B[7] & 0x0F) << 20); + bitmask = 0x00000001; } - for (x = 0; x < 8; x++, bitmask >>= 1) { + for (x = 0; x < 8; x++, bitmask <<= 1) { /* get the pixel values ready for this half */ if (x == 0) { P0 = P[0]; @@ -444,11 +434,11 @@ static int ipvideo_decode_block_opcode_0x8(void) } if (flags & bitmask) - *sg_output_plane++ = P0; + *s->pixel_ptr++ = P1; else - *sg_output_plane++ = P1; + *s->pixel_ptr++ = P0; } - sg_output_plane += sg_line_inc; + s->pixel_ptr += s->line_inc; } } else { @@ -466,14 +456,14 @@ static int ipvideo_decode_block_opcode_0x8(void) P1 = P[3]; } - for (bitmask = 0x80; bitmask != 0; bitmask >>= 1) { + for (bitmask = 0x01; bitmask <= 0x80; bitmask <<= 1) { if (flags & bitmask) - *sg_output_plane++ = P0; + *s->pixel_ptr++ = P1; else - *sg_output_plane++ = P1; + *s->pixel_ptr++ = P0; } - sg_output_plane += sg_line_inc; + s->pixel_ptr += s->line_inc; } } } @@ -482,7 +472,7 @@ static int ipvideo_decode_block_opcode_0x8(void) return 0; } -static int ipvideo_decode_block_opcode_0x9(void) +static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s) { int x, y; unsigned char P[4]; @@ -494,7 +484,7 @@ static int ipvideo_decode_block_opcode_0x9(void) CHECK_STREAM_PTR(4); for (y = 0; y < 4; y++) - P[y] = *sg_stream_ptr++; + P[y] = *s->stream_ptr++; if ((P[0] <= P[1]) && (P[2] <= P[3])) { @@ -503,12 +493,11 @@ static int ipvideo_decode_block_opcode_0x9(void) for (y = 0; y < 8; y++) { /* get the next set of 8 2-bit flags */ - flags = (sg_stream_ptr[0] << 8) | sg_stream_ptr[1]; - sg_stream_ptr += 2; - for (x = 0, shifter = 14; x < 8; x++, shifter -= 2) { - *sg_output_plane++ = P[(flags >> shifter) & 0x03]; + flags = bytestream_get_le16(&s->stream_ptr); + for (x = 0, shifter = 0; x < 8; x++, shifter += 2) { + *s->pixel_ptr++ = P[(flags >> shifter) & 0x03]; } - sg_output_plane += sg_line_inc; + s->pixel_ptr += s->line_inc; } } else if ((P[0] <= P[1]) && (P[2] > P[3])) { @@ -516,22 +505,18 @@ static int ipvideo_decode_block_opcode_0x9(void) /* 1 of 4 colors for each 2x2 block, need 4 more bytes */ CHECK_STREAM_PTR(4); - flags = 0; - flags = (flags << 8) | *sg_stream_ptr++; - flags = (flags << 8) | *sg_stream_ptr++; - flags = (flags << 8) | *sg_stream_ptr++; - flags = (flags << 8) | *sg_stream_ptr++; - shifter = 30; + flags = bytestream_get_le32(&s->stream_ptr); + shifter = 0; for (y = 0; y < 8; y += 2) { - for (x = 0; x < 8; x += 2, shifter -= 2) { + for (x = 0; x < 8; x += 2, shifter += 2) { pix = P[(flags >> shifter) & 0x03]; - *(sg_output_plane + x) = pix; - *(sg_output_plane + x + 1) = pix; - *(sg_output_plane + sg_stride + x) = pix; - *(sg_output_plane + sg_stride + x + 1) = pix; + *(s->pixel_ptr + x) = pix; + *(s->pixel_ptr + x + 1) = pix; + *(s->pixel_ptr + s->stride + x) = pix; + *(s->pixel_ptr + s->stride + x + 1) = pix; } - sg_output_plane += sg_stride * 2; + s->pixel_ptr += s->stride * 2; } } else if ((P[0] > P[1]) && (P[2] <= P[3])) { @@ -542,19 +527,15 @@ static int ipvideo_decode_block_opcode_0x9(void) for (y = 0; y < 8; y++) { /* time to reload flags? */ if ((y == 0) || (y == 4)) { - flags = 0; - flags = (flags << 8) | *sg_stream_ptr++; - flags = (flags << 8) | *sg_stream_ptr++; - flags = (flags << 8) | *sg_stream_ptr++; - flags = (flags << 8) | *sg_stream_ptr++; - shifter = 30; + flags = bytestream_get_le32(&s->stream_ptr); + shifter = 0; } - for (x = 0; x < 8; x += 2, shifter -= 2) { + for (x = 0; x < 8; x += 2, shifter += 2) { pix = P[(flags >> shifter) & 0x03]; - *(sg_output_plane + x) = pix; - *(sg_output_plane + x + 1) = pix; + *(s->pixel_ptr + x) = pix; + *(s->pixel_ptr + x + 1) = pix; } - sg_output_plane += sg_stride; + s->pixel_ptr += s->stride; } } else { @@ -565,19 +546,15 @@ static int ipvideo_decode_block_opcode_0x9(void) for (y = 0; y < 8; y += 2) { /* time to reload flags? */ if ((y == 0) || (y == 4)) { - flags = 0; - flags = (flags << 8) | *sg_stream_ptr++; - flags = (flags << 8) | *sg_stream_ptr++; - flags = (flags << 8) | *sg_stream_ptr++; - flags = (flags << 8) | *sg_stream_ptr++; - shifter = 30; + flags = bytestream_get_le32(&s->stream_ptr); + shifter = 0; } - for (x = 0; x < 8; x++, shifter -= 2) { + for (x = 0; x < 8; x++, shifter += 2) { pix = P[(flags >> shifter) & 0x03]; - *(sg_output_plane + x) = pix; - *(sg_output_plane + sg_stride + x) = pix; + *(s->pixel_ptr + x) = pix; + *(s->pixel_ptr + s->stride + x) = pix; } - sg_output_plane += sg_stride * 2; + s->pixel_ptr += s->stride * 2; } } @@ -585,7 +562,7 @@ static int ipvideo_decode_block_opcode_0x9(void) return 0; } -static int ipvideo_decode_block_opcode_0xA(void) +static int ipvideo_decode_block_opcode_0xA(IpvideoContext *s) { int x, y; unsigned char P[16]; @@ -601,7 +578,7 @@ static int ipvideo_decode_block_opcode_0xA(void) CHECK_STREAM_PTR(4); for (y = 0; y < 4; y++) - P[y] = *sg_stream_ptr++; + P[y] = *s->stream_ptr++; if (P[0] <= P[1]) { @@ -609,26 +586,26 @@ static int ipvideo_decode_block_opcode_0xA(void) CHECK_STREAM_PTR(28); for (y = 0; y < 4; y++) - B[y] = *sg_stream_ptr++; + B[y] = *s->stream_ptr++; for (y = 4; y < 16; y += 4) { for (x = y; x < y + 4; x++) - P[x] = *sg_stream_ptr++; + P[x] = *s->stream_ptr++; for (x = y; x < y + 4; x++) - B[x] = *sg_stream_ptr++; + B[x] = *s->stream_ptr++; } for (y = 0; y < 8; y++) { lower_half = (y >= 4) ? 4 : 0; - flags = (B[y] << 8) | B[y + 8]; + flags = (B[y + 8] << 8) | B[y]; - for (x = 0, shifter = 14; x < 8; x++, shifter -= 2) { + for (x = 0, shifter = 0; x < 8; x++, shifter += 2) { split = (x >= 4) ? 8 : 0; index = split + lower_half + ((flags >> shifter) & 0x03); - *sg_output_plane++ = P[index]; + *s->pixel_ptr++ = P[index]; } - sg_output_plane += sg_line_inc; + s->pixel_ptr += s->line_inc; } } else { @@ -638,27 +615,27 @@ static int ipvideo_decode_block_opcode_0xA(void) CHECK_STREAM_PTR(20); for (y = 0; y < 8; y++) - B[y] = *sg_stream_ptr++; + B[y] = *s->stream_ptr++; for (y = 4; y < 8; y++) - P[y] = *sg_stream_ptr++; + P[y] = *s->stream_ptr++; for (y = 8; y < 16; y++) - B[y] = *sg_stream_ptr++; + B[y] = *s->stream_ptr++; if (P[4] <= P[5]) { /* block is divided into left and right halves */ for (y = 0; y < 8; y++) { - flags = (B[y] << 8) | B[y + 8]; + flags = (B[y + 8] << 8) | B[y]; split = 0; - for (x = 0, shifter = 14; x < 8; x++, shifter -= 2) { + for (x = 0, shifter = 0; x < 8; x++, shifter += 2) { if (x == 4) split = 4; - *sg_output_plane++ = P[split + ((flags >> shifter) & 0x03)]; + *s->pixel_ptr++ = P[split + ((flags >> shifter) & 0x03)]; } - sg_output_plane += sg_line_inc; + s->pixel_ptr += s->line_inc; } } else { @@ -667,14 +644,14 @@ static int ipvideo_decode_block_opcode_0xA(void) split = 0; for (y = 0; y < 8; y++) { - flags = (B[y * 2] << 8) | B[y * 2 + 1]; + flags = (B[y * 2 + 1] << 8) | B[y * 2]; if (y == 4) split = 4; - for (x = 0, shifter = 14; x < 8; x++, shifter -= 2) - *sg_output_plane++ = P[split + ((flags >> shifter) & 0x03)]; + for (x = 0, shifter = 0; x < 8; x++, shifter += 2) + *s->pixel_ptr++ = P[split + ((flags >> shifter) & 0x03)]; - sg_output_plane += sg_line_inc; + s->pixel_ptr += s->line_inc; } } } @@ -683,7 +660,7 @@ static int ipvideo_decode_block_opcode_0xA(void) return 0; } -static int ipvideo_decode_block_opcode_0xB(void) +static int ipvideo_decode_block_opcode_0xB(IpvideoContext *s) { int x, y; @@ -692,16 +669,16 @@ static int ipvideo_decode_block_opcode_0xB(void) for (y = 0; y < 8; y++) { for (x = 0; x < 8; x++) { - *sg_output_plane++ = *sg_stream_ptr++; + *s->pixel_ptr++ = *s->stream_ptr++; } - sg_output_plane += sg_line_inc; + s->pixel_ptr += s->line_inc; } /* report success */ return 0; } -static int ipvideo_decode_block_opcode_0xC(void) +static int ipvideo_decode_block_opcode_0xC(IpvideoContext *s) { int x, y; unsigned char pix; @@ -711,20 +688,20 @@ static int ipvideo_decode_block_opcode_0xC(void) for (y = 0; y < 8; y += 2) { for (x = 0; x < 8; x += 2) { - pix = *sg_stream_ptr++; - *(sg_output_plane + x) = pix; - *(sg_output_plane + x + 1) = pix; - *(sg_output_plane + sg_stride + x) = pix; - *(sg_output_plane + sg_stride + x + 1) = pix; + pix = *s->stream_ptr++; + *(s->pixel_ptr + x) = pix; + *(s->pixel_ptr + x + 1) = pix; + *(s->pixel_ptr + s->stride + x) = pix; + *(s->pixel_ptr + s->stride + x + 1) = pix; } - sg_output_plane += sg_stride * 2; + s->pixel_ptr += s->stride * 2; } /* report success */ return 0; } -static int ipvideo_decode_block_opcode_0xD(void) +static int ipvideo_decode_block_opcode_0xD(IpvideoContext *s) { int x, y; unsigned char P[4]; @@ -734,7 +711,7 @@ static int ipvideo_decode_block_opcode_0xD(void) CHECK_STREAM_PTR(4); for (y = 0; y < 4; y++) - P[y] = *sg_stream_ptr++; + P[y] = *s->stream_ptr++; for (y = 0; y < 8; y++) { if (y < 4) @@ -745,63 +722,63 @@ static int ipvideo_decode_block_opcode_0xD(void) for (x = 0; x < 8; x++) { if (x == 4) index++; - *sg_output_plane++ = P[index]; + *s->pixel_ptr++ = P[index]; } - sg_output_plane += sg_line_inc; + s->pixel_ptr += s->line_inc; } /* report success */ return 0; } -static int ipvideo_decode_block_opcode_0xE(void) +static int ipvideo_decode_block_opcode_0xE(IpvideoContext *s) { int x, y; unsigned char pix; /* 1-color encoding: the whole block is 1 solid color */ CHECK_STREAM_PTR(1); - pix = *sg_stream_ptr++; + pix = *s->stream_ptr++; for (y = 0; y < 8; y++) { for (x = 0; x < 8; x++) { - *sg_output_plane++ = pix; + *s->pixel_ptr++ = pix; } - sg_output_plane += sg_line_inc; + s->pixel_ptr += s->line_inc; } /* report success */ return 0; } -static int ipvideo_decode_block_opcode_0xF(void) +static int ipvideo_decode_block_opcode_0xF(IpvideoContext *s) { int x, y; unsigned char sample0, sample1; /* dithered encoding */ CHECK_STREAM_PTR(2); - sample0 = *sg_stream_ptr++; - sample1 = *sg_stream_ptr++; + sample0 = *s->stream_ptr++; + sample1 = *s->stream_ptr++; for (y = 0; y < 8; y++) { for (x = 0; x < 8; x += 2) { if (y & 1) { - *sg_output_plane++ = sample1; - *sg_output_plane++ = sample0; + *s->pixel_ptr++ = sample1; + *s->pixel_ptr++ = sample0; } else { - *sg_output_plane++ = sample0; - *sg_output_plane++ = sample1; + *s->pixel_ptr++ = sample0; + *s->pixel_ptr++ = sample1; } } - sg_output_plane += sg_line_inc; + s->pixel_ptr += s->line_inc; } /* report success */ return 0; } -static int (*ipvideo_decode_block[16])(void); +static int (*ipvideo_decode_block[16])(IpvideoContext *s); static void ipvideo_decode_opcodes(IpvideoContext *s) { @@ -819,83 +796,65 @@ static void ipvideo_decode_opcodes(IpvideoContext *s) code_counts[x] = 0; /* this is PAL8, so make the palette available */ - if (s->avctx->pix_fmt == PIX_FMT_PAL8) - memcpy(s->current_frame.data[1], s->palette, PALETTE_COUNT * 4); - - switch (s->avctx->pix_fmt) { - - case PIX_FMT_PAL8: - sg_stride = s->current_frame.linesize[0]; - sg_stream_ptr = s->buf + 14; /* data starts 14 bytes in */ - sg_stream_end = s->buf + s->size; - sg_line_inc = sg_stride - 8; - sg_current_plane = s->current_frame.data[0]; - sg_last_plane = s->last_frame.data[0]; - sg_upper_motion_limit_offset = (s->avctx->height - 8) * sg_stride - + s->avctx->width - 8; - sg_dsp = s->dsp; - - for (y = 0; y < (sg_stride * s->avctx->height); y += sg_stride * 8) { - for (x = y; x < y + s->avctx->width; x += 8) { - /* bottom nibble first, then top nibble (which makes it - * hard to use a GetBitcontext) */ - if (index & 1) - opcode = s->decoding_map[index >> 1] >> 4; - else - opcode = s->decoding_map[index >> 1] & 0xF; - index++; - - debug_interplay(" block @ (%3d, %3d): encoding 0x%X, data ptr @ %p\n", - x - y, y / sg_stride, opcode, sg_stream_ptr); - code_counts[opcode]++; - - sg_output_plane = sg_current_plane + x; - ret = ipvideo_decode_block[opcode](); - if (ret != 0) { - printf(" Interplay video: decode problem on frame %d, @ block (%d, %d)\n", - frame, x - y, y / sg_stride); - return; - } + 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->line_inc = s->stride - 8; + s->upper_motion_limit_offset = (s->avctx->height - 8) * s->stride + + s->avctx->width - 8; + + for (y = 0; y < (s->stride * s->avctx->height); y += s->stride * 8) { + for (x = y; x < y + s->avctx->width; x += 8) { + /* bottom nibble first, then top nibble (which makes it + * hard to use a GetBitcontext) */ + if (index & 1) + opcode = s->decoding_map[index >> 1] >> 4; + else + opcode = s->decoding_map[index >> 1] & 0xF; + index++; + + debug_interplay(" block @ (%3d, %3d): encoding 0x%X, data ptr @ %p\n", + x - y, y / s->stride, opcode, s->stream_ptr); + code_counts[opcode]++; + + s->pixel_ptr = s->current_frame.data[0] + x; + ret = ipvideo_decode_block[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, y / s->stride); + return; } } - if ((sg_stream_ptr != sg_stream_end) && - (sg_stream_ptr + 1 != sg_stream_end)) { - printf (" Interplay video: decode finished with %d bytes left over\n", - sg_stream_end - sg_stream_ptr); - } - break; - - default: - printf ("Interplay video: Unhandled video format\n"); - break; } - + if ((s->stream_ptr != s->stream_end) && + (s->stream_ptr + 1 != s->stream_end)) { + av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode finished with %td bytes left over\n", + s->stream_end - s->stream_ptr); + } } -static int ipvideo_decode_init(AVCodecContext *avctx) +static av_cold int ipvideo_decode_init(AVCodecContext *avctx) { IpvideoContext *s = avctx->priv_data; s->avctx = avctx; - if (s->avctx->extradata_size != sizeof(AVPaletteControl)) { - printf (" Interplay video: expected extradata_size of %d\n", - sizeof(AVPaletteControl)); + if (s->avctx->palctrl == NULL) { + av_log(avctx, AV_LOG_ERROR, " Interplay video: palette expected.\n"); return -1; } avctx->pix_fmt = PIX_FMT_PAL8; - avctx->has_b_frames = 0; dsputil_init(&s->dsp, avctx); - s->first_frame = 1; - /* decoding map contains 4 bits of information per 8x8 block */ s->decoding_map_size = avctx->width * avctx->height / (8 * 8 * 2); /* assign block decode functions */ - ipvideo_decode_block[0x0] = ipvideo_decode_block_opcode_0x0_0x1; - ipvideo_decode_block[0x1] = ipvideo_decode_block_opcode_0x0_0x1; + ipvideo_decode_block[0x0] = ipvideo_decode_block_opcode_0x0; + ipvideo_decode_block[0x1] = ipvideo_decode_block_opcode_0x1; ipvideo_decode_block[0x2] = ipvideo_decode_block_opcode_0x2; ipvideo_decode_block[0x3] = ipvideo_decode_block_opcode_0x3; ipvideo_decode_block[0x4] = ipvideo_decode_block_opcode_0x4; @@ -911,55 +870,64 @@ static int ipvideo_decode_init(AVCodecContext *avctx) ipvideo_decode_block[0xE] = ipvideo_decode_block_opcode_0xE; ipvideo_decode_block[0xF] = ipvideo_decode_block_opcode_0xF; + s->current_frame.data[0] = s->last_frame.data[0] = + s->second_last_frame.data[0] = NULL; + return 0; } static int ipvideo_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - uint8_t *buf, int buf_size) + const uint8_t *buf, int buf_size) { IpvideoContext *s = avctx->priv_data; - AVPaletteControl *palette_control = (AVPaletteControl *)avctx->extradata; + AVPaletteControl *palette_control = avctx->palctrl; - if (palette_control->palette_changed) { - /* load the new palette and reset the palette control */ - ipvideo_new_palette(s, palette_control->palette); - palette_control->palette_changed = 0; - } + /* compressed buffer needs to be large enough to at least hold an entire + * decoding map */ + if (buf_size < s->decoding_map_size) + return buf_size; s->decoding_map = buf; s->buf = buf + s->decoding_map_size; s->size = buf_size - s->decoding_map_size; + s->current_frame.reference = 3; if (avctx->get_buffer(avctx, &s->current_frame)) { - printf (" Interplay Video: get_buffer() failed\n"); + av_log(avctx, AV_LOG_ERROR, " Interplay Video: get_buffer() failed\n"); return -1; } ipvideo_decode_opcodes(s); - /* release the last frame if it is allocated */ - if (s->first_frame) - s->first_frame = 0; - else - avctx->release_buffer(avctx, &s->last_frame); - - /* shuffle frames */ - s->last_frame = s->current_frame; + if (palette_control->palette_changed) { + palette_control->palette_changed = 0; + s->current_frame.palette_has_changed = 1; + } *data_size = sizeof(AVFrame); *(AVFrame*)data = s->current_frame; + /* 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 */ + /* report that the buffer was completely consumed */ return buf_size; } -static int ipvideo_decode_end(AVCodecContext *avctx) +static av_cold int ipvideo_decode_end(AVCodecContext *avctx) { IpvideoContext *s = avctx->priv_data; /* release the last frame */ - avctx->release_buffer(avctx, &s->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); return 0; } @@ -974,4 +942,5 @@ AVCodec interplay_video_decoder = { ipvideo_decode_end, ipvideo_decode_frame, CODEC_CAP_DR1, + .long_name = "Interplay MVE Video", };