X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fmsvideo1.c;h=854f36fb562ab34a5698ac7c6e34ab73cb78fbe1;hb=ae52bbe5de5c36a56f5e80076ae383203366664c;hp=3a51ebe2fcb26e6f57f95015e61a90822f3f78a7;hpb=875efafac8afe22971c87fc7dfee83d27364ab50;p=ffmpeg diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c index 3a51ebe2fcb..854f36fb562 100644 --- a/libavcodec/msvideo1.c +++ b/libavcodec/msvideo1.c @@ -2,20 +2,21 @@ * Microsoft Video-1 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 */ /** @@ -34,44 +35,31 @@ #include #include -#include "common.h" #include "avcodec.h" -#include "dsputil.h" #define PALETTE_COUNT 256 -#define LE_16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0]) #define CHECK_STREAM_PTR(n) \ if ((stream_ptr + n) > s->size ) { \ - printf (" MS Video-1 warning: stream_ptr out of bounds (%d >= %d)\n", \ + av_log(s->avctx, AV_LOG_ERROR, " MS Video-1 warning: stream_ptr out of bounds (%d >= %d)\n", \ stream_ptr + n, s->size); \ return; \ } -#define COPY_PREV_BLOCK() \ - pixel_ptr = block_ptr; \ - for (pixel_y = 0; pixel_y < 4; pixel_y++) { \ - for (pixel_x = 0; pixel_x < 4; pixel_x++, pixel_ptr++) \ - pixels[pixel_ptr] = prev_pixels[pixel_ptr]; \ - pixel_ptr -= row_dec; \ - } - typedef struct Msvideo1Context { AVCodecContext *avctx; - DSPContext dsp; AVFrame frame; - AVFrame prev_frame; - unsigned char *buf; + const unsigned char *buf; int size; int mode_8bit; /* if it's not 8-bit, it's 16-bit */ } Msvideo1Context; -static int msvideo1_decode_init(AVCodecContext *avctx) +static av_cold int msvideo1_decode_init(AVCodecContext *avctx) { - Msvideo1Context *s = (Msvideo1Context *)avctx->priv_data; + Msvideo1Context *s = avctx->priv_data; s->avctx = avctx; @@ -84,10 +72,7 @@ static int msvideo1_decode_init(AVCodecContext *avctx) avctx->pix_fmt = PIX_FMT_RGB555; } - avctx->has_b_frames = 0; - dsputil_init(&s->dsp, avctx); - - s->frame.data[0] = s->prev_frame.data[0] = NULL; + s->frame.data[0] = NULL; return 0; } @@ -109,7 +94,6 @@ static void msvideo1_decode_8bit(Msvideo1Context *s) int skip_blocks; unsigned char colors[8]; unsigned char *pixels = s->frame.data[0]; - unsigned char *prev_pixels = s->prev_frame.data[0]; int stride = s->frame.linesize[0]; stream_ptr = 0; @@ -125,7 +109,6 @@ static void msvideo1_decode_8bit(Msvideo1Context *s) for (block_x = blocks_wide; block_x > 0; block_x--) { /* check if this block should be skipped */ if (skip_blocks) { - COPY_PREV_BLOCK(); block_ptr += block_inc; skip_blocks--; total_blocks--; @@ -145,7 +128,6 @@ static void msvideo1_decode_8bit(Msvideo1Context *s) else if ((byte_b & 0xFC) == 0x84) { /* skip code, but don't count the current block */ skip_blocks = ((byte_b - 0x84) << 8) + byte_a - 1; - COPY_PREV_BLOCK(); } else if (byte_b < 0x80) { /* 2-color encoding */ flags = (byte_b << 8) | byte_a; @@ -169,8 +151,8 @@ static void msvideo1_decode_8bit(Msvideo1Context *s) for (pixel_y = 0; pixel_y < 4; pixel_y++) { for (pixel_x = 0; pixel_x < 4; pixel_x++, flags >>= 1) - pixels[pixel_ptr++] = - colors[((pixel_y & 0x2) << 1) + + pixels[pixel_ptr++] = + colors[((pixel_y & 0x2) << 1) + (pixel_x & 0x2) + ((flags & 0x1) ^ 1)]; pixel_ptr -= row_dec; } @@ -217,7 +199,6 @@ static void msvideo1_decode_16bit(Msvideo1Context *s) int skip_blocks; unsigned short colors[8]; unsigned short *pixels = (unsigned short *)s->frame.data[0]; - unsigned short *prev_pixels = (unsigned short *)s->prev_frame.data[0]; int stride = s->frame.linesize[0] / 2; stream_ptr = 0; @@ -233,7 +214,6 @@ static void msvideo1_decode_16bit(Msvideo1Context *s) for (block_x = blocks_wide; block_x > 0; block_x--) { /* check if this block should be skipped */ if (skip_blocks) { - COPY_PREV_BLOCK(); block_ptr += block_inc; skip_blocks--; total_blocks--; @@ -253,37 +233,36 @@ static void msvideo1_decode_16bit(Msvideo1Context *s) } else if ((byte_b & 0xFC) == 0x84) { /* skip code, but don't count the current block */ skip_blocks = ((byte_b - 0x84) << 8) + byte_a - 1; - COPY_PREV_BLOCK(); } else if (byte_b < 0x80) { /* 2- or 8-color encoding modes */ flags = (byte_b << 8) | byte_a; CHECK_STREAM_PTR(4); - colors[0] = LE_16(&s->buf[stream_ptr]); + colors[0] = AV_RL16(&s->buf[stream_ptr]); stream_ptr += 2; - colors[1] = LE_16(&s->buf[stream_ptr]); + colors[1] = AV_RL16(&s->buf[stream_ptr]); stream_ptr += 2; if (colors[0] & 0x8000) { /* 8-color encoding */ CHECK_STREAM_PTR(12); - colors[2] = LE_16(&s->buf[stream_ptr]); + colors[2] = AV_RL16(&s->buf[stream_ptr]); stream_ptr += 2; - colors[3] = LE_16(&s->buf[stream_ptr]); + colors[3] = AV_RL16(&s->buf[stream_ptr]); stream_ptr += 2; - colors[4] = LE_16(&s->buf[stream_ptr]); + colors[4] = AV_RL16(&s->buf[stream_ptr]); stream_ptr += 2; - colors[5] = LE_16(&s->buf[stream_ptr]); + colors[5] = AV_RL16(&s->buf[stream_ptr]); stream_ptr += 2; - colors[6] = LE_16(&s->buf[stream_ptr]); + colors[6] = AV_RL16(&s->buf[stream_ptr]); stream_ptr += 2; - colors[7] = LE_16(&s->buf[stream_ptr]); + colors[7] = AV_RL16(&s->buf[stream_ptr]); stream_ptr += 2; for (pixel_y = 0; pixel_y < 4; pixel_y++) { for (pixel_x = 0; pixel_x < 4; pixel_x++, flags >>= 1) - pixels[pixel_ptr++] = - colors[((pixel_y & 0x2) << 1) + + pixels[pixel_ptr++] = + colors[((pixel_y & 0x2) << 1) + (pixel_x & 0x2) + ((flags & 0x1) ^ 1)]; pixel_ptr -= row_dec; } @@ -314,34 +293,25 @@ static void msvideo1_decode_16bit(Msvideo1Context *s) static int msvideo1_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - uint8_t *buf, int buf_size) + const uint8_t *buf, int buf_size) { - Msvideo1Context *s = (Msvideo1Context *)avctx->priv_data; + Msvideo1Context *s = avctx->priv_data; s->buf = buf; s->size = buf_size; - if (avctx->get_buffer(avctx, &s->frame)) { - printf (" MS Video-1 Video: get_buffer() failed\n"); + s->frame.reference = 1; + s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; + if (avctx->reget_buffer(avctx, &s->frame)) { + av_log(s->avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); return -1; } - if (s->prev_frame.data[0] &&(s->frame.linesize[0] != s->prev_frame.linesize[0])) - printf (" MS Video-1: Buffer linesize changed: current %u, previous %u.\n" - " Expect wrong image and/or crash!\n", - s->frame.linesize[0], s->prev_frame.linesize[0]); - if (s->mode_8bit) msvideo1_decode_8bit(s); else msvideo1_decode_16bit(s); - if (s->prev_frame.data[0]) - avctx->release_buffer(avctx, &s->prev_frame); - - /* shuffle frames */ - s->prev_frame = s->frame; - *data_size = sizeof(AVFrame); *(AVFrame*)data = s->frame; @@ -349,12 +319,12 @@ static int msvideo1_decode_frame(AVCodecContext *avctx, return buf_size; } -static int msvideo1_decode_end(AVCodecContext *avctx) +static av_cold int msvideo1_decode_end(AVCodecContext *avctx) { - Msvideo1Context *s = (Msvideo1Context *)avctx->priv_data; + Msvideo1Context *s = avctx->priv_data; - if (s->prev_frame.data[0]) - avctx->release_buffer(avctx, &s->prev_frame); + if (s->frame.data[0]) + avctx->release_buffer(avctx, &s->frame); return 0; } @@ -369,4 +339,5 @@ AVCodec msvideo1_decoder = { msvideo1_decode_end, msvideo1_decode_frame, CODEC_CAP_DR1, + .long_name= "Microsoft Video 1", };