X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Ftruemotion1.c;h=b1497d5011977c7d71b6d3dabc0cde5ea3892821;hb=43af264de8606668c6b2fa7f96c946bdc3dbe072;hp=ebd0ad5229b66836b1155de2a090679ce88e3118;hpb=6952f12338a947a048a5cd5ca553aad4269aa7f3;p=ffmpeg diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c index ebd0ad5229b..b1497d50119 100644 --- a/libavcodec/truemotion1.c +++ b/libavcodec/truemotion1.c @@ -2,76 +2,80 @@ * Duck TrueMotion 1.0 Decoder * Copyright (C) 2003 Alex Beregszaszi & Mike Melanson * - * This library is free software; you can redistribute it and/or + * This file is part of Libav. + * + * 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 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, + * 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 this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file truemotion1.c - * Duck TrueMotion v1 Video Decoder by - * Alex Beregszaszi (alex@fsn.hu) and + * @file + * Duck TrueMotion v1 Video Decoder by + * Alex Beregszaszi and * Mike Melanson (melanson@pcisys.net) * * The TrueMotion v1 decoder presently only decodes 16-bit TM1 data and - * outputs RGB555 data. 24-bit TM1 data is not supported yet. + * outputs RGB555 (or RGB565) data. 24-bit TM1 data is not supported yet. */ #include #include #include -#include -#include "common.h" #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" -#define LE_16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0]) - typedef struct TrueMotion1Context { AVCodecContext *avctx; - AVFrame frame; - AVFrame prev_frame; + AVFrame *frame; - unsigned char *buf; + const uint8_t *buf; int size; - unsigned char *mb_change_bits; + const uint8_t *mb_change_bits; int mb_change_bits_row_size; - unsigned char *index_stream; + const uint8_t *index_stream; int index_stream_size; int flags; int x, y, w, h; - + uint32_t y_predictor_table[1024]; uint32_t c_predictor_table[1024]; - + uint32_t fat_y_predictor_table[1024]; + uint32_t fat_c_predictor_table[1024]; + int compression; int block_type; int block_width; int block_height; - int16_t *ydt; - int16_t *cdt; - int16_t *fat_ydt; - int16_t *fat_cdt; - + int16_t ydt[8]; + int16_t cdt[8]; + int16_t fat_ydt[8]; + int16_t fat_cdt[8]; + int last_deltaset, last_vectable; unsigned int *vert_pred; + int vert_pred_size; } TrueMotion1Context; @@ -111,13 +115,13 @@ struct frame_header { typedef struct comp_types { int algorithm; - int block_width; - int block_height; + int block_width; // vres + int block_height; // hres int block_type; } comp_types; -/* { valid for metatype }, algorithm, num of deltas, horiz res, vert res */ -static comp_types compression_types[17] = { +/* { valid for metatype }, algorithm, num of deltas, vert res, horiz res */ +static const comp_types compression_types[17] = { { ALGO_NOP, 0, 0, 0 }, { ALGO_RGB16V, 4, 4, BLOCK_4x4 }, @@ -148,10 +152,10 @@ static void select_delta_tables(TrueMotion1Context *s, int delta_table_index) if (delta_table_index > 3) return; - s->ydt = ydts[delta_table_index]; - s->cdt = cdts[delta_table_index]; - s->fat_ydt = fat_ydts[delta_table_index]; - s->fat_cdt = fat_cdts[delta_table_index]; + memcpy(s->ydt, ydts[delta_table_index], 8 * sizeof(int16_t)); + memcpy(s->cdt, cdts[delta_table_index], 8 * sizeof(int16_t)); + memcpy(s->fat_ydt, fat_ydts[delta_table_index], 8 * sizeof(int16_t)); + memcpy(s->fat_cdt, fat_cdts[delta_table_index], 8 * sizeof(int16_t)); /* Y skinny deltas need to be halved for some reason; maybe the * skinny Y deltas should be modified */ @@ -164,87 +168,171 @@ static void select_delta_tables(TrueMotion1Context *s, int delta_table_index) } } -#ifdef WORDS_BIGENDIAN -static int make_ydt_entry(int p2, int p1, int16_t *ydt) +#if HAVE_BIGENDIAN +static int make_ydt15_entry(int p2, int p1, int16_t *ydt) #else -static int make_ydt_entry(int p1, int p2, int16_t *ydt) +static int make_ydt15_entry(int p1, int p2, int16_t *ydt) #endif { int lo, hi; - + lo = ydt[p1]; lo += (lo << 5) + (lo << 10); hi = ydt[p2]; hi += (hi << 5) + (hi << 10); - return ((lo + (hi << 16)) << 1); + return (lo + (hi << 16)) << 1; } -#ifdef WORDS_BIGENDIAN -static int make_cdt_entry(int p2, int p1, int16_t *cdt) +static int make_cdt15_entry(int p1, int p2, int16_t *cdt) +{ + int r, b, lo; + + b = cdt[p2]; + r = cdt[p1] << 10; + lo = b + r; + return (lo + (lo << 16)) << 1; +} + +#if HAVE_BIGENDIAN +static int make_ydt16_entry(int p2, int p1, int16_t *ydt) #else -static int make_cdt_entry(int p1, int p2, int16_t *cdt) +static int make_ydt16_entry(int p1, int p2, int16_t *ydt) #endif +{ + int lo, hi; + + lo = ydt[p1]; + lo += (lo << 6) + (lo << 11); + hi = ydt[p2]; + hi += (hi << 6) + (hi << 11); + return (lo + (hi << 16)) << 1; +} + +static int make_cdt16_entry(int p1, int p2, int16_t *cdt) { int r, b, lo; - + b = cdt[p2]; - r = cdt[p1] << 10; + r = cdt[p1] << 11; lo = b + r; - return ((lo + (lo << 16)) << 1); + return (lo + (lo << 16)) << 1; +} + +static int make_ydt24_entry(int p1, int p2, int16_t *ydt) +{ + int lo, hi; + + lo = ydt[p1]; + hi = ydt[p2]; + return (lo + (hi << 8) + (hi << 16)) << 1; +} + +static int make_cdt24_entry(int p1, int p2, int16_t *cdt) +{ + int r, b; + + b = cdt[p2]; + r = cdt[p1]<<16; + return (b+r) << 1; } -static void gen_vector_table(TrueMotion1Context *s, uint8_t *sel_vector_table) +static void gen_vector_table15(TrueMotion1Context *s, const uint8_t *sel_vector_table) { int len, i, j; unsigned char delta_pair; - + for (i = 0; i < 1024; i += 4) { len = *sel_vector_table++ / 2; for (j = 0; j < len; j++) { delta_pair = *sel_vector_table++; - s->y_predictor_table[i+j] = 0xfffffffe & - make_ydt_entry(delta_pair >> 4, delta_pair & 0xf, s->ydt); - s->c_predictor_table[i+j] = 0xfffffffe & - make_cdt_entry(delta_pair >> 4, delta_pair & 0xf, s->cdt); + s->y_predictor_table[i+j] = 0xfffffffe & + make_ydt15_entry(delta_pair >> 4, delta_pair & 0xf, s->ydt); + s->c_predictor_table[i+j] = 0xfffffffe & + make_cdt15_entry(delta_pair >> 4, delta_pair & 0xf, s->cdt); } s->y_predictor_table[i+(j-1)] |= 1; s->c_predictor_table[i+(j-1)] |= 1; } } +static void gen_vector_table16(TrueMotion1Context *s, const uint8_t *sel_vector_table) +{ + int len, i, j; + unsigned char delta_pair; + + for (i = 0; i < 1024; i += 4) + { + len = *sel_vector_table++ / 2; + for (j = 0; j < len; j++) + { + delta_pair = *sel_vector_table++; + s->y_predictor_table[i+j] = 0xfffffffe & + make_ydt16_entry(delta_pair >> 4, delta_pair & 0xf, s->ydt); + s->c_predictor_table[i+j] = 0xfffffffe & + make_cdt16_entry(delta_pair >> 4, delta_pair & 0xf, s->cdt); + } + s->y_predictor_table[i+(j-1)] |= 1; + s->c_predictor_table[i+(j-1)] |= 1; + } +} + +static void gen_vector_table24(TrueMotion1Context *s, const uint8_t *sel_vector_table) +{ + int len, i, j; + unsigned char delta_pair; + + for (i = 0; i < 1024; i += 4) + { + len = *sel_vector_table++ / 2; + for (j = 0; j < len; j++) + { + delta_pair = *sel_vector_table++; + s->y_predictor_table[i+j] = 0xfffffffe & + make_ydt24_entry(delta_pair >> 4, delta_pair & 0xf, s->ydt); + s->c_predictor_table[i+j] = 0xfffffffe & + make_cdt24_entry(delta_pair >> 4, delta_pair & 0xf, s->cdt); + s->fat_y_predictor_table[i+j] = 0xfffffffe & + make_ydt24_entry(delta_pair >> 4, delta_pair & 0xf, s->fat_ydt); + s->fat_c_predictor_table[i+j] = 0xfffffffe & + make_cdt24_entry(delta_pair >> 4, delta_pair & 0xf, s->fat_cdt); + } + s->y_predictor_table[i+(j-1)] |= 1; + s->c_predictor_table[i+(j-1)] |= 1; + s->fat_y_predictor_table[i+(j-1)] |= 1; + s->fat_c_predictor_table[i+(j-1)] |= 1; + } +} + /* Returns the number of bytes consumed from the bytestream. Returns -1 if - * there was an error while decoding the header */ + * 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 *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; + uint8_t header_buffer[128] = { 0 }; /* logical maximum size of the header */ + const uint8_t *sel_vector_table; header.header_size = ((s->buf[0] >> 5) | (s->buf[0] << 3)) & 0x7f; if (s->buf[0] < 0x10) { - printf("invalid header size\n"); - return -1; + av_log(s->avctx, AV_LOG_ERROR, "invalid header size (%d)\n", s->buf[0]); + 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]; + header_buffer[i - 1] = s->buf[i] ^ s->buf[i + 1]; + header.compression = header_buffer[0]; header.deltaset = header_buffer[1]; header.vectable = header_buffer[2]; - header.ysize = LE_16(&header_buffer[3]); - header.xsize = LE_16(&header_buffer[5]); - header.checksum = LE_16(&header_buffer[7]); + header.ysize = AV_RL16(&header_buffer[3]); + header.xsize = AV_RL16(&header_buffer[5]); + header.checksum = AV_RL16(&header_buffer[7]); header.version = header_buffer[9]; header.header_type = header_buffer[10]; header.flags = header_buffer[11]; @@ -255,8 +343,8 @@ static int truemotion1_decode_header(TrueMotion1Context *s) { if (header.header_type > 3) { - av_log(s->avctx, AV_LOG_ERROR, "truemotion1: invalid header type\n"); - return -1; + av_log(s->avctx, AV_LOG_ERROR, "invalid header type (%d)\n", header.header_type); + return AVERROR_INVALIDDATA; } else if ((header.header_type == 2) || (header.header_type == 3)) { s->flags = header.flags; if (!(s->flags & FLAG_INTERFRAME)) @@ -265,49 +353,77 @@ static int truemotion1_decode_header(TrueMotion1Context *s) s->flags = FLAG_KEYFRAME; } else /* Version 1 */ s->flags = FLAG_KEYFRAME; - + if (s->flags & FLAG_SPRITE) { - s->w = header.width; - s->h = header.height; - s->x = header.xoffset; - s->y = header.yoffset; + avpriv_request_sample(s->avctx, "Frame with sprite"); + /* FIXME header.width, height, xoffset and yoffset aren't initialized */ + return AVERROR_PATCHWELCOME; } else { s->w = header.xsize; s->h = header.ysize; if (header.header_type < 2) { if ((s->w < 213) && (s->h >= 176)) + { s->flags |= FLAG_INTERPOLATED; + avpriv_request_sample(s->avctx, "Interpolated frame"); + } } } - if (header.compression > 17) { - printf("invalid compression type (%d)\n", header.compression); - return -1; + if (header.compression >= 17) { + av_log(s->avctx, AV_LOG_ERROR, "invalid compression type (%d)\n", header.compression); + return AVERROR_INVALIDDATA; } - - if ((header.deltaset != s->last_deltaset) || + + if ((header.deltaset != s->last_deltaset) || (header.vectable != s->last_vectable)) select_delta_tables(s, header.deltaset); 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 { - printf("invalid vector table id (%d)\n", header.vectable); - return -1; + av_log(s->avctx, AV_LOG_ERROR, "invalid vector table id (%d)\n", header.vectable); + return AVERROR_INVALIDDATA; } } + 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 (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; + + if ((ret = ff_set_dimensions(s->avctx, s->w, s->h)) < 0) + return ret; + + 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) - { - printf("24bit compression not yet supported\n"); - } + gen_vector_table24(s, sel_vector_table); else - gen_vector_table(s, sel_vector_table); + if (s->avctx->pix_fmt == AV_PIX_FMT_RGB555) + gen_vector_table15(s, sel_vector_table); + else + gen_vector_table16(s, sel_vector_table); } /* set up pointers to the other key data chunks */ @@ -317,7 +433,7 @@ static int truemotion1_decode_header(TrueMotion1Context *s) s->index_stream = s->mb_change_bits; } else { /* one change bit per 4x4 block */ - s->index_stream = s->mb_change_bits + + s->index_stream = s->mb_change_bits + (s->mb_change_bits_row_size * (s->avctx->height >> 2)); } s->index_stream_size = s->size - (s->index_stream - s->buf); @@ -329,36 +445,85 @@ static int truemotion1_decode_header(TrueMotion1Context *s) s->block_height = compression_types[header.compression].block_height; s->block_type = compression_types[header.compression].block_type; - return header.header_size; + if (s->avctx->debug & FF_DEBUG_PICT_INFO) + av_log(s->avctx, AV_LOG_INFO, "tables: %d / %d c:%d %dx%d t:%d %s%s%s%s\n", + s->last_deltaset, s->last_vectable, s->compression, s->block_width, + s->block_height, s->block_type, + s->flags & FLAG_KEYFRAME ? " KEY" : "", + s->flags & FLAG_INTERFRAME ? " INTER" : "", + s->flags & FLAG_SPRITE ? " SPRITE" : "", + s->flags & FLAG_INTERPOLATED ? " INTERPOL" : ""); + + return header.header_size; } -static int truemotion1_decode_init(AVCodecContext *avctx) +static av_cold int truemotion1_decode_init(AVCodecContext *avctx) { - TrueMotion1Context *s = (TrueMotion1Context *)avctx->priv_data; + TrueMotion1Context *s = avctx->priv_data; s->avctx = avctx; - avctx->pix_fmt = PIX_FMT_RGB555; - avctx->has_b_frames = 0; - s->frame.data[0] = s->prev_frame.data[0] = NULL; + // FIXME: it may change ? +// if (avctx->bits_per_sample == 24) +// avctx->pix_fmt = AV_PIX_FMT_RGB24; +// else +// avctx->pix_fmt = AV_PIX_FMT_RGB555; + + s->frame = av_frame_alloc(); + if (!s->frame) + return AVERROR(ENOMEM); /* 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 short)); + av_fast_malloc(&s->vert_pred, &s->vert_pred_size, s->avctx->width * sizeof(unsigned int)); return 0; } +/* +Block decoding order: + +dxi: Y-Y +dxic: Y-C-Y +dxic2: Y-C-Y-C + +hres,vres,i,i%vres (0 < i < 4) +2x2 0: 0 dxic2 +2x2 1: 1 dxi +2x2 2: 0 dxic2 +2x2 3: 1 dxi +2x4 0: 0 dxic2 +2x4 1: 1 dxi +2x4 2: 2 dxi +2x4 3: 3 dxi +4x2 0: 0 dxic +4x2 1: 1 dxi +4x2 2: 0 dxic +4x2 3: 1 dxi +4x4 0: 0 dxic +4x4 1: 1 dxi +4x4 2: 2 dxi +4x4 3: 3 dxi +*/ + #define GET_NEXT_INDEX() \ {\ if (index_stream_index >= s->index_stream_size) { \ - printf (" help! truemotion1 decoder went out of bounds\n"); \ + av_log(s->avctx, AV_LOG_INFO, " help! truemotion1 decoder went out of bounds\n"); \ return; \ } \ index = s->index_stream[index_stream_index++] * 4; \ } +#define INC_INDEX \ +do { \ + if (index >= 1023) { \ + av_log(s->avctx, AV_LOG_ERROR, "Invalid index value.\n"); \ + return; \ + } \ + index++; \ +} while (0) + #define APPLY_C_PREDICTOR() \ predictor_pair = s->c_predictor_table[index]; \ horiz_pred += (predictor_pair >> 1); \ @@ -371,10 +536,28 @@ static int truemotion1_decode_init(AVCodecContext *avctx) if (predictor_pair & 1) \ GET_NEXT_INDEX() \ else \ - index++; \ + INC_INDEX; \ + } \ + } else \ + INC_INDEX; + +#define APPLY_C_PREDICTOR_24() \ + predictor_pair = s->c_predictor_table[index]; \ + horiz_pred += (predictor_pair >> 1); \ + if (predictor_pair & 1) { \ + GET_NEXT_INDEX() \ + if (!index) { \ + GET_NEXT_INDEX() \ + predictor_pair = s->fat_c_predictor_table[index]; \ + horiz_pred += (predictor_pair >> 1); \ + if (predictor_pair & 1) \ + GET_NEXT_INDEX() \ + else \ + INC_INDEX; \ } \ } else \ - index++; + INC_INDEX; + #define APPLY_Y_PREDICTOR() \ predictor_pair = s->y_predictor_table[index]; \ @@ -388,15 +571,31 @@ static int truemotion1_decode_init(AVCodecContext *avctx) if (predictor_pair & 1) \ GET_NEXT_INDEX() \ else \ - index++; \ + INC_INDEX; \ + } \ + } else \ + INC_INDEX; + +#define APPLY_Y_PREDICTOR_24() \ + predictor_pair = s->y_predictor_table[index]; \ + horiz_pred += (predictor_pair >> 1); \ + if (predictor_pair & 1) { \ + GET_NEXT_INDEX() \ + if (!index) { \ + GET_NEXT_INDEX() \ + predictor_pair = s->fat_y_predictor_table[index]; \ + horiz_pred += (predictor_pair >> 1); \ + if (predictor_pair & 1) \ + GET_NEXT_INDEX() \ + else \ + INC_INDEX; \ } \ } else \ - index++; + INC_INDEX; #define OUTPUT_PIXEL_PAIR() \ *current_pixel_pair = *vert_pred + horiz_pred; \ - *vert_pred++ = *current_pixel_pair++; \ - prev_pixel_pair++; + *vert_pred++ = *current_pixel_pair++; static void truemotion1_decode_16bit(TrueMotion1Context *s) { @@ -406,13 +605,11 @@ static void truemotion1_decode_16bit(TrueMotion1Context *s) unsigned int horiz_pred; unsigned int *vert_pred; unsigned int *current_pixel_pair; - unsigned int *prev_pixel_pair; - unsigned char *current_line = s->frame.data[0]; - unsigned char *prev_line = s->prev_frame.data[0]; + unsigned char *current_line = s->frame->data[0]; int keyframe = s->flags & FLAG_KEYFRAME; /* these variables are for managing the stream of macroblock change bits */ - unsigned char *mb_change_bits = s->mb_change_bits; + const unsigned char *mb_change_bits = s->mb_change_bits; unsigned char mb_change_byte; unsigned char mb_change_byte_mask; int mb_change_index; @@ -422,7 +619,7 @@ static void truemotion1_decode_16bit(TrueMotion1Context *s) int index; /* clean out the line buffer */ - memset(s->vert_pred, 0, s->avctx->width * sizeof(unsigned short)); + memset(s->vert_pred, 0, s->avctx->width * sizeof(unsigned int)); GET_NEXT_INDEX(); @@ -431,7 +628,6 @@ static void truemotion1_decode_16bit(TrueMotion1Context *s) /* re-init variables for the next line iteration */ horiz_pred = 0; current_pixel_pair = (unsigned int *)current_line; - prev_pixel_pair = (unsigned int *)prev_line; vert_pred = s->vert_pred; mb_change_index = 0; mb_change_byte = mb_change_bits[mb_change_index++]; @@ -444,7 +640,7 @@ static void truemotion1_decode_16bit(TrueMotion1Context *s) switch (y & 3) { case 0: - /* if macroblock width is 2, apply C-Y-C-Y; else + /* if macroblock width is 2, apply C-Y-C-Y; else * apply C-Y-Y */ if (s->block_width == 2) { APPLY_C_PREDICTOR(); @@ -472,7 +668,7 @@ static void truemotion1_decode_16bit(TrueMotion1Context *s) break; case 2: - /* this iteration might be C-Y-C-Y, Y-Y, or C-Y-Y + /* this iteration might be C-Y-C-Y, Y-Y, or C-Y-Y * depending on the macroblock type */ if (s->block_type == BLOCK_2x2) { APPLY_C_PREDICTOR(); @@ -498,14 +694,12 @@ static void truemotion1_decode_16bit(TrueMotion1Context *s) } else { - /* skip (copy) four pixels, but reassign the horizontal + /* skip (copy) four pixels, but reassign the horizontal * predictor */ - *current_pixel_pair = *prev_pixel_pair++; *vert_pred++ = *current_pixel_pair++; - *current_pixel_pair = *prev_pixel_pair++; horiz_pred = *current_pixel_pair - *vert_pred; *vert_pred++ = *current_pixel_pair++; - + } if (!keyframe) { @@ -525,80 +719,189 @@ static void truemotion1_decode_16bit(TrueMotion1Context *s) if (((y + 1) & 3) == 0) mb_change_bits += s->mb_change_bits_row_size; - current_line += s->frame.linesize[0]; - prev_line += s->prev_frame.linesize[0]; + current_line += s->frame->linesize[0]; } } +static void truemotion1_decode_24bit(TrueMotion1Context *s) +{ + int y; + int pixels_left; /* remaining pixels on this line */ + unsigned int predictor_pair; + unsigned int horiz_pred; + unsigned int *vert_pred; + unsigned int *current_pixel_pair; + unsigned char *current_line = s->frame->data[0]; + int keyframe = s->flags & FLAG_KEYFRAME; + + /* these variables are for managing the stream of macroblock change bits */ + const unsigned char *mb_change_bits = s->mb_change_bits; + unsigned char mb_change_byte; + unsigned char mb_change_byte_mask; + int mb_change_index; + + /* these variables are for managing the main index stream */ + int index_stream_index = 0; /* yes, the index into the index stream */ + int index; + + /* clean out the line buffer */ + memset(s->vert_pred, 0, s->avctx->width * sizeof(unsigned int)); + + GET_NEXT_INDEX(); + + for (y = 0; y < s->avctx->height; y++) { + + /* re-init variables for the next line iteration */ + horiz_pred = 0; + current_pixel_pair = (unsigned int *)current_line; + vert_pred = s->vert_pred; + mb_change_index = 0; + mb_change_byte = mb_change_bits[mb_change_index++]; + mb_change_byte_mask = 0x01; + pixels_left = s->avctx->width; + + while (pixels_left > 0) { + + if (keyframe || ((mb_change_byte & mb_change_byte_mask) == 0)) { + + switch (y & 3) { + case 0: + /* if macroblock width is 2, apply C-Y-C-Y; else + * apply C-Y-Y */ + if (s->block_width == 2) { + APPLY_C_PREDICTOR_24(); + APPLY_Y_PREDICTOR_24(); + OUTPUT_PIXEL_PAIR(); + APPLY_C_PREDICTOR_24(); + APPLY_Y_PREDICTOR_24(); + OUTPUT_PIXEL_PAIR(); + } else { + APPLY_C_PREDICTOR_24(); + APPLY_Y_PREDICTOR_24(); + OUTPUT_PIXEL_PAIR(); + APPLY_Y_PREDICTOR_24(); + OUTPUT_PIXEL_PAIR(); + } + break; + + case 1: + case 3: + /* always apply 2 Y predictors on these iterations */ + APPLY_Y_PREDICTOR_24(); + OUTPUT_PIXEL_PAIR(); + APPLY_Y_PREDICTOR_24(); + OUTPUT_PIXEL_PAIR(); + break; + + case 2: + /* this iteration might be C-Y-C-Y, Y-Y, or C-Y-Y + * depending on the macroblock type */ + if (s->block_type == BLOCK_2x2) { + APPLY_C_PREDICTOR_24(); + APPLY_Y_PREDICTOR_24(); + OUTPUT_PIXEL_PAIR(); + APPLY_C_PREDICTOR_24(); + APPLY_Y_PREDICTOR_24(); + OUTPUT_PIXEL_PAIR(); + } else if (s->block_type == BLOCK_4x2) { + APPLY_C_PREDICTOR_24(); + APPLY_Y_PREDICTOR_24(); + OUTPUT_PIXEL_PAIR(); + APPLY_Y_PREDICTOR_24(); + OUTPUT_PIXEL_PAIR(); + } else { + APPLY_Y_PREDICTOR_24(); + OUTPUT_PIXEL_PAIR(); + APPLY_Y_PREDICTOR_24(); + OUTPUT_PIXEL_PAIR(); + } + break; + } + + } else { + + /* skip (copy) four pixels, but reassign the horizontal + * predictor */ + *vert_pred++ = *current_pixel_pair++; + horiz_pred = *current_pixel_pair - *vert_pred; + *vert_pred++ = *current_pixel_pair++; + + } + + if (!keyframe) { + mb_change_byte_mask <<= 1; + + /* next byte */ + if (!mb_change_byte_mask) { + mb_change_byte = mb_change_bits[mb_change_index++]; + mb_change_byte_mask = 0x01; + } + } + + pixels_left -= 2; + } + + /* next change row */ + if (((y + 1) & 3) == 0) + mb_change_bits += s->mb_change_bits_row_size; + + current_line += s->frame->linesize[0]; + } +} + + static int truemotion1_decode_frame(AVCodecContext *avctx, - void *data, int *data_size, - uint8_t *buf, int buf_size) + void *data, int *got_frame, + AVPacket *avpkt) { - TrueMotion1Context *s = (TrueMotion1Context *)avctx->priv_data; + const uint8_t *buf = avpkt->data; + int ret, buf_size = avpkt->size; + TrueMotion1Context *s = avctx->priv_data; s->buf = buf; s->size = buf_size; - s->frame.reference = 1; - if (avctx->get_buffer(avctx, &s->frame) < 0) { - fprintf(stderr, "truemotion1: get_buffer() failed\n"); - return -1; - } - - /* no supplementary picture */ - if (buf_size == 0) - return 0; + if ((ret = truemotion1_decode_header(s)) < 0) + return ret; - *data_size = 0; - - if (truemotion1_decode_header(s) == -1) - return -1; + if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) { + av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + return ret; + } - /* check for a do-nothing frame and copy the previous frame */ - if (compression_types[s->compression].algorithm == ALGO_NOP) - { - memcpy(s->frame.data[0], s->prev_frame.data[0], - s->frame.linesize[0] * s->avctx->height); - } else if (compression_types[s->compression].algorithm == ALGO_RGB24H) { - printf (" 24-bit Duck TrueMotion decoding not yet implemented\n"); - } else { + if (compression_types[s->compression].algorithm == ALGO_RGB24H) { + truemotion1_decode_24bit(s); + } else if (compression_types[s->compression].algorithm != ALGO_NOP) { truemotion1_decode_16bit(s); } - if (s->prev_frame.data[0]) - avctx->release_buffer(avctx, &s->prev_frame); - - /* shuffle frames */ - s->prev_frame = s->frame; + if ((ret = av_frame_ref(data, s->frame)) < 0) + return ret; - *data_size = sizeof(AVFrame); - *(AVFrame*)data = s->frame; + *got_frame = 1; /* report that the buffer was completely consumed */ return buf_size; } -static int truemotion1_decode_end(AVCodecContext *avctx) +static av_cold int truemotion1_decode_end(AVCodecContext *avctx) { - TrueMotion1Context *s = (TrueMotion1Context *)avctx->priv_data; - - /* release the last frame */ - if (s->prev_frame.data[0]) - avctx->release_buffer(avctx, &s->prev_frame); + TrueMotion1Context *s = avctx->priv_data; + av_frame_free(&s->frame); av_free(s->vert_pred); return 0; } -AVCodec truemotion1_decoder = { - "truemotion1", - CODEC_TYPE_VIDEO, - CODEC_ID_TRUEMOTION1, - sizeof(TrueMotion1Context), - truemotion1_decode_init, - NULL, - truemotion1_decode_end, - truemotion1_decode_frame, - CODEC_CAP_DR1, +AVCodec ff_truemotion1_decoder = { + .name = "truemotion1", + .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 1.0"), + .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, };