X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Ftruemotion1.c;h=9c219172b89f8d625d47d53503c87ad237459e9b;hb=3d8c80b611aa1e2f800dd9c8d8f350407f95c042;hp=2e8b72080af0318b755def61ba3dae970e4d8795;hpb=72415b2adb2c25f95ceede49001bb97ed9247dbb;p=ffmpeg diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c index 2e8b72080af..9c219172b89 100644 --- a/libavcodec/truemotion1.c +++ b/libavcodec/truemotion1.c @@ -2,25 +2,25 @@ * Duck TrueMotion 1.0 Decoder * Copyright (C) 2003 Alex Beregszaszi & Mike Melanson * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav 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.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav 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 FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file libavcodec/truemotion1.c + * @file * Duck TrueMotion v1 Video Decoder by * Alex Beregszaszi and * Mike Melanson (melanson@pcisys.net) @@ -34,7 +34,11 @@ #include #include "avcodec.h" -#include "dsputil.h" +#include "internal.h" +#include "libavutil/imgutils.h" +#include "libavutil/internal.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/mem.h" #include "truemotion1data.h" @@ -71,6 +75,7 @@ typedef struct TrueMotion1Context { int last_deltaset, last_vectable; unsigned int *vert_pred; + int vert_pred_size; } TrueMotion1Context; @@ -178,11 +183,7 @@ static int make_ydt15_entry(int p1, int p2, int16_t *ydt) return (lo + (hi << 16)) << 1; } -#if HAVE_BIGENDIAN -static int make_cdt15_entry(int p2, int p1, int16_t *cdt) -#else static int make_cdt15_entry(int p1, int p2, int16_t *cdt) -#endif { int r, b, lo; @@ -207,11 +208,7 @@ static int make_ydt16_entry(int p1, int p2, int16_t *ydt) return (lo + (hi << 16)) << 1; } -#if HAVE_BIGENDIAN -static int make_cdt16_entry(int p2, int p1, int16_t *cdt) -#else static int make_cdt16_entry(int p1, int p2, int16_t *cdt) -#endif { int r, b, lo; @@ -221,11 +218,7 @@ static int make_cdt16_entry(int p1, int p2, int16_t *cdt) return (lo + (lo << 16)) << 1; } -#if HAVE_BIGENDIAN -static int make_ydt24_entry(int p2, int p1, int16_t *ydt) -#else static int make_ydt24_entry(int p1, int p2, int16_t *ydt) -#endif { int lo, hi; @@ -234,11 +227,7 @@ static int make_ydt24_entry(int p1, int p2, int16_t *ydt) return (lo + (hi << 8) + (hi << 16)) << 1; } -#if HAVE_BIGENDIAN -static int make_cdt24_entry(int p2, int p1, int16_t *cdt) -#else static int make_cdt24_entry(int p1, int p2, int16_t *cdt) -#endif { int r, b; @@ -320,25 +309,21 @@ static void gen_vector_table24(TrueMotion1Context *s, const uint8_t *sel_vector_ * there was an error while decoding the header */ static int truemotion1_decode_header(TrueMotion1Context *s) { - int i; + int i, ret; + int width_shift = 0; + int new_pix_fmt; struct frame_header header; - uint8_t header_buffer[128]; /* logical maximum size of the header */ + uint8_t header_buffer[128] = { 0 }; /* logical maximum size of the header */ const uint8_t *sel_vector_table; - /* There is 1 change bit per 4 pixels, so each change byte represents - * 32 pixels; divide width by 4 to obtain the number of change bits and - * then round up to the nearest byte. */ - s->mb_change_bits_row_size = ((s->avctx->width >> 2) + 7) >> 3; - header.header_size = ((s->buf[0] >> 5) | (s->buf[0] << 3)) & 0x7f; if (s->buf[0] < 0x10) { av_log(s->avctx, AV_LOG_ERROR, "invalid header size (%d)\n", s->buf[0]); - return -1; + return AVERROR_INVALIDDATA; } /* unscramble the header bytes with a XOR operation */ - memset(header_buffer, 0, 128); for (i = 1; i < header.header_size; i++) header_buffer[i - 1] = s->buf[i] ^ s->buf[i + 1]; @@ -359,7 +344,7 @@ static int truemotion1_decode_header(TrueMotion1Context *s) if (header.header_type > 3) { av_log(s->avctx, AV_LOG_ERROR, "invalid header type (%d)\n", header.header_type); - return -1; + return AVERROR_INVALIDDATA; } else if ((header.header_type == 2) || (header.header_type == 3)) { s->flags = header.flags; if (!(s->flags & FLAG_INTERFRAME)) @@ -370,16 +355,9 @@ static int truemotion1_decode_header(TrueMotion1Context *s) s->flags = FLAG_KEYFRAME; if (s->flags & FLAG_SPRITE) { - av_log(s->avctx, AV_LOG_INFO, "SPRITE frame found, please report the sample to the developers\n"); + avpriv_request_sample(s->avctx, "Frame with sprite"); /* FIXME header.width, height, xoffset and yoffset aren't initialized */ -#if 0 - s->w = header.width; - s->h = header.height; - s->x = header.xoffset; - s->y = header.yoffset; -#else - return -1; -#endif + return AVERROR_PATCHWELCOME; } else { s->w = header.xsize; s->h = header.ysize; @@ -387,14 +365,14 @@ static int truemotion1_decode_header(TrueMotion1Context *s) if ((s->w < 213) && (s->h >= 176)) { s->flags |= FLAG_INTERPOLATED; - av_log(s->avctx, AV_LOG_INFO, "INTERPOLATION selected, please report the sample to the developers\n"); + avpriv_request_sample(s->avctx, "Interpolated frame"); } } } if (header.compression >= 17) { av_log(s->avctx, AV_LOG_ERROR, "invalid compression type (%d)\n", header.compression); - return -1; + return AVERROR_INVALIDDATA; } if ((header.deltaset != s->last_deltaset) || @@ -404,26 +382,44 @@ static int truemotion1_decode_header(TrueMotion1Context *s) if ((header.compression & 1) && header.header_type) sel_vector_table = pc_tbl2; else { - if (header.vectable < 4) + if (header.vectable > 0 && header.vectable < 4) sel_vector_table = tables[header.vectable - 1]; else { av_log(s->avctx, AV_LOG_ERROR, "invalid vector table id (%d)\n", header.vectable); - return -1; + return AVERROR_INVALIDDATA; } } - // FIXME: where to place this ?!?! - if (compression_types[header.compression].algorithm == ALGO_RGB24H) - s->avctx->pix_fmt = PIX_FMT_RGB32; - else - s->avctx->pix_fmt = PIX_FMT_RGB555; // RGB565 is supported as well + if (compression_types[header.compression].algorithm == ALGO_RGB24H) { + new_pix_fmt = AV_PIX_FMT_RGB32; + width_shift = 1; + } else + new_pix_fmt = AV_PIX_FMT_RGB555; // RGB565 is supported as well + + s->w >>= width_shift; + if ((ret = av_image_check_size(s->w, s->h, 0, s->avctx)) < 0) + return ret; + + if (s->w != s->avctx->width || s->h != s->avctx->height || + new_pix_fmt != s->avctx->pix_fmt) { + av_frame_unref(&s->frame); + s->avctx->sample_aspect_ratio = (AVRational){ 1 << width_shift, 1 }; + s->avctx->pix_fmt = new_pix_fmt; + avcodec_set_dimensions(s->avctx, s->w, s->h); + av_fast_malloc(&s->vert_pred, &s->vert_pred_size, s->avctx->width * sizeof(unsigned int)); + } + + /* There is 1 change bit per 4 pixels, so each change byte represents + * 32 pixels; divide width by 4 to obtain the number of change bits and + * then round up to the nearest byte. */ + s->mb_change_bits_row_size = ((s->avctx->width >> (2 - width_shift)) + 7) >> 3; if ((header.deltaset != s->last_deltaset) || (header.vectable != s->last_vectable)) { if (compression_types[header.compression].algorithm == ALGO_RGB24H) gen_vector_table24(s, sel_vector_table); else - if (s->avctx->pix_fmt == PIX_FMT_RGB555) + if (s->avctx->pix_fmt == AV_PIX_FMT_RGB555) gen_vector_table15(s, sel_vector_table); else gen_vector_table16(s, sel_vector_table); @@ -468,16 +464,15 @@ static av_cold int truemotion1_decode_init(AVCodecContext *avctx) // FIXME: it may change ? // if (avctx->bits_per_sample == 24) -// avctx->pix_fmt = PIX_FMT_RGB24; +// avctx->pix_fmt = AV_PIX_FMT_RGB24; // else -// avctx->pix_fmt = PIX_FMT_RGB555; +// avctx->pix_fmt = AV_PIX_FMT_RGB555; - s->frame.data[0] = NULL; + avcodec_get_frame_defaults(&s->frame); /* there is a vertical predictor for each pixel in a line; each vertical * predictor is 0 to start with */ - s->vert_pred = - (unsigned int *)av_malloc(s->avctx->width * sizeof(unsigned int)); + av_fast_malloc(&s->vert_pred, &s->vert_pred_size, s->avctx->width * sizeof(unsigned int)); return 0; } @@ -831,7 +826,7 @@ static void truemotion1_decode_24bit(TrueMotion1Context *s) } } - pixels_left -= 4; + pixels_left -= 2; } /* next change row */ @@ -844,25 +839,22 @@ static void truemotion1_decode_24bit(TrueMotion1Context *s) static int truemotion1_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; + int ret, buf_size = avpkt->size; TrueMotion1Context *s = avctx->priv_data; s->buf = buf; s->size = buf_size; - if (truemotion1_decode_header(s) == -1) - return -1; + if ((ret = truemotion1_decode_header(s)) < 0) + return ret; - 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) < 0) { + if ((ret = ff_reget_buffer(avctx, &s->frame)) < 0) { av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; + return ret; } if (compression_types[s->compression].algorithm == ALGO_RGB24H) { @@ -871,8 +863,10 @@ static int truemotion1_decode_frame(AVCodecContext *avctx, truemotion1_decode_16bit(s); } - *data_size = sizeof(AVFrame); - *(AVFrame*)data = s->frame; + if ((ret = av_frame_ref(data, &s->frame)) < 0) + return ret; + + *got_frame = 1; /* report that the buffer was completely consumed */ return buf_size; @@ -882,23 +876,20 @@ static av_cold int truemotion1_decode_end(AVCodecContext *avctx) { TrueMotion1Context *s = avctx->priv_data; - if (s->frame.data[0]) - avctx->release_buffer(avctx, &s->frame); - + av_frame_unref(&s->frame); av_free(s->vert_pred); return 0; } -AVCodec truemotion1_decoder = { - "truemotion1", - AVMEDIA_TYPE_VIDEO, - CODEC_ID_TRUEMOTION1, - sizeof(TrueMotion1Context), - truemotion1_decode_init, - NULL, - truemotion1_decode_end, - truemotion1_decode_frame, - CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 1.0"), +AVCodec ff_truemotion1_decoder = { + .name = "truemotion1", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_TRUEMOTION1, + .priv_data_size = sizeof(TrueMotion1Context), + .init = truemotion1_decode_init, + .close = truemotion1_decode_end, + .decode = truemotion1_decode_frame, + .capabilities = CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 1.0"), };