October 2005 - ffmpeg-cvslog - lists.ffmpeg.org

CVS: ffmpeg/libavcodec truemotion2.c,1.3,1.4
by melanson＠mplayerhq.hu 16 Oct '05

16 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv30614/libavcodec Modified Files: truemotion2.c Log Message: chroma decoding fix by Kostya Index: truemotion2.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/truemotion2.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- truemotion2.c 15 Oct 2005 14:33:11 -0000 1.3 +++ truemotion2.c 16 Oct 2005 13:56:52 -0000 1.4 @@ -413,7 +413,7 @@ else prev = 0; t = (CD[0] + CD[1]) >> 1; - l = (prev - CD[0] - CD[1] + clast[1] + 1) >> 1; + l = (prev - CD[0] - CD[1] + clast[1]) >> 1; CD[1] = CD[0] + CD[1] - t; CD[0] = t; clast[0] = l;

1 0

CVS: ffmpeg/libavcodec mpegaudiodec.c,1.60,1.61
by rtognimp＠mplayerhq.hu 15 Oct '05

15 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv14692 Modified Files: mpegaudiodec.c Log Message: Reverse patch 1.59->1.60, it break mp3 in ffplay and ffmpeg Reversing approved by patch author Index: mpegaudiodec.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpegaudiodec.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- mpegaudiodec.c 12 Oct 2005 22:37:42 -0000 1.60 +++ mpegaudiodec.c 15 Oct 2005 16:29:58 -0000 1.61 @@ -48,7 +48,7 @@ #define WFRAC_BITS 14 /* fractional bits for window */ #endif -#if defined(USE_HIGHPRECISION) +#if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT) typedef int32_t OUT_INT; #define OUT_MAX INT32_MAX #define OUT_MIN INT32_MIN @@ -329,7 +329,7 @@ static int init=0; int i, j, k; -#if defined(USE_HIGHPRECISION) +#if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT) avctx->sample_fmt= SAMPLE_FMT_S32; #else avctx->sample_fmt= SAMPLE_FMT_S16;

1 0

CVS: ffmpeg/libavcodec mpegaudiodec.c,1.59,1.60
by alex＠mplayerhq.hu 15 Oct '05

15 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv7044 Modified Files: mpegaudiodec.c Log Message: removed unused CONFIG_AUDIO_NONSHORT Index: mpegaudiodec.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpegaudiodec.c,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- mpegaudiodec.c 1 Jun 2005 21:19:00 -0000 1.59 +++ mpegaudiodec.c 12 Oct 2005 22:37:42 -0000 1.60 @@ -48,7 +48,7 @@ #define WFRAC_BITS 14 /* fractional bits for window */ #endif -#if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT) +#if defined(USE_HIGHPRECISION) typedef int32_t OUT_INT; #define OUT_MAX INT32_MAX #define OUT_MIN INT32_MIN @@ -329,7 +329,7 @@ static int init=0; int i, j, k; -#if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT) +#if defined(USE_HIGHPRECISION) avctx->sample_fmt= SAMPLE_FMT_S32; #else avctx->sample_fmt= SAMPLE_FMT_S16;

3 2

CVS: ffmpeg/libavcodec truemotion2.c,1.2,1.3
by melanson＠mplayerhq.hu 15 Oct '05

15 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv723/libavcodec Modified Files: truemotion2.c Log Message: TM2 fixes by Kostya Index: truemotion2.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/truemotion2.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- truemotion2.c 14 Oct 2005 16:17:40 -0000 1.2 +++ truemotion2.c 15 Oct 2005 14:33:11 -0000 1.3 @@ -29,7 +29,7 @@ #include "dsputil.h" #define TM2_ESCAPE 0x80000000 -#define TM2_DELTAS 32 +#define TM2_DELTAS 64 /* Huffman-coded streams of different types of blocks */ enum TM2_STREAMS{ TM2_C_HI = 0, TM2_C_LO, TM2_L_HI, TM2_L_LO, TM2_UPD, TM2_MOT, TM2_TYPE, TM2_NUM_STREAMS}; @@ -218,7 +218,7 @@ length = LE_32(buf); buf += 4; - init_get_bits(&ctx->gb, buf, 32); + init_get_bits(&ctx->gb, buf, 32 * 8); size = get_bits_long(&ctx->gb, 31); h = get_bits(&ctx->gb, 15); w = get_bits(&ctx->gb, 15); @@ -281,7 +281,7 @@ len = BE_32(buf); buf += 4; cur += 4; } if(len > 0) { - init_get_bits(&ctx->gb, buf, skip - cur); + init_get_bits(&ctx->gb, buf, (skip - cur) * 8); if(tm2_read_deltas(ctx, stream_id) == -1) return -1; buf += ((get_bits_count(&ctx->gb) + 31) >> 5) << 2; @@ -295,7 +295,7 @@ buf += 4; cur += 4; buf += 4; cur += 4; /* unused by decoder */ - init_get_bits(&ctx->gb, buf, skip - cur); + init_get_bits(&ctx->gb, buf, (skip - cur) * 8); if(tm2_build_huff_table(ctx, &codes) == -1) return -1; buf += ((get_bits_count(&ctx->gb) + 31) >> 5) << 2; @@ -312,11 +312,12 @@ ctx->tok_lens[stream_id] = toks; len = BE_32(buf); buf += 4; cur += 4; if(len > 0) { - init_get_bits(&ctx->gb, buf, skip - cur); + init_get_bits(&ctx->gb, buf, (skip - cur) * 8); for(i = 0; i < toks; i++) ctx->tokens[stream_id][i] = tm2_get_token(&ctx->gb, &codes); } else { - memset(ctx->tokens[stream_id], 0, toks * sizeof(int)); + for(i = 0; i < toks; i++) + ctx->tokens[stream_id][i] = codes.recode[0]; } tm2_free_codes(&codes); @@ -765,7 +766,8 @@ int skip, t; p->reference = 1; - if(avctx->get_buffer(avctx, p) < 0){ + p->buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; + if(avctx->reget_buffer(avctx, p) < 0){ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return -1; }

1 0

CVS: ffmpeg CREDITS,1.24,1.25
by mru＠mplayerhq.hu 14 Oct '05

14 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv15676 Modified Files: CREDITS Log Message: utf8 Index: CREDITS =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/CREDITS,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- CREDITS 13 Oct 2005 04:37:05 -0000 1.24 +++ CREDITS 14 Oct 2005 17:55:32 -0000 1.25 @@ -28,8 +28,8 @@ Loren Merritt Jeff Muizelaar Michael Niedermayer -Fran?ois Revol -M?ns Rullg?rd +Fran??ois Revol +M??ns Rullg??rd Roman Shaposhnik Dieter Shirley Konstantin Shishkov

1 0

CVS: ffmpeg ffserver.c,1.95,1.96
by alex＠mplayerhq.hu 14 Oct '05

14 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv15201 Modified Files: ffserver.c Log Message: 10l, dont make bandwidth statistics negative when feed stops being sent (it was decreased every time feed sending was aborted) Index: ffserver.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/ffserver.c,v retrieving revision 1.95 retrieving revision 1.96 diff -u -d -r1.95 -r1.96 --- ffserver.c 18 Jul 2005 09:02:56 -0000 1.95 +++ ffserver.c 14 Oct 2005 17:29:00 -0000 1.96 @@ -100,6 +100,7 @@ long timeout; uint8_t *buffer_ptr, *buffer_end; int http_error; + int post; struct HTTPContext *next; int got_key_frame; /* stream 0 => 1, stream 1 => 2, stream 2=> 4 */ int64_t data_count; @@ -767,7 +768,7 @@ for(i=0; i<ctx->nb_streams; i++) av_free(ctx->streams[i]) ; - if (c->stream) + if (c->stream && !c->post && c->stream->stream_type == STREAM_TYPE_LIVE) current_bandwidth -= c->stream->bandwidth; av_freep(&c->pb_buffer); av_freep(&c->packet_buffer); @@ -1170,7 +1171,6 @@ static int http_parse_request(HTTPContext *c) { char *p; - int post; enum RedirType redir_type; char cmd[32]; char info[1024], *filename; @@ -1188,9 +1188,9 @@ pstrcpy(c->method, sizeof(c->method), cmd); if (!strcmp(cmd, "GET")) - post = 0; + c->post = 0; else if (!strcmp(cmd, "POST")) - post = 1; + c->post = 1; else return -1; @@ -1292,11 +1292,11 @@ } } - if (post == 0 && stream->stream_type == STREAM_TYPE_LIVE) { + if (c->post == 0 && stream->stream_type == STREAM_TYPE_LIVE) { current_bandwidth += stream->bandwidth; } - if (post == 0 && max_bandwidth < current_bandwidth) { + if (c->post == 0 && max_bandwidth < current_bandwidth) { c->http_error = 200; q = c->buffer; q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "HTTP/1.0 200 Server too busy\r\n"); @@ -1439,7 +1439,7 @@ /* XXX: add there authenticate and IP match */ - if (post) { + if (c->post) { /* if post, it means a feed is being sent */ if (!stream->is_feed) { /* However it might be a status report from WMP! Lets log the data

1 0

CVS: ffmpeg/libavcodec truemotion2.c,1.1,1.2
by melanson＠mplayerhq.hu 14 Oct '05

14 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv6513/libavcodec Modified Files: truemotion2.c Log Message: gcc 2.95 fix, courtesy of Luca Abeni Index: truemotion2.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/truemotion2.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- truemotion2.c 13 Oct 2005 04:31:55 -0000 1.1 +++ truemotion2.c 14 Oct 2005 16:17:40 -0000 1.2 @@ -336,7 +336,7 @@ /* blocks decoding routines */ /* common Y, U, V pointers initialisation */ -#define TM2_INIT_POINTERS(); \ +#define TM2_INIT_POINTERS() \ int *last, *clast; \ int *Y, *U, *V;\ int Ystride, Ustride, Vstride;\ @@ -350,7 +350,7 @@ last = ctx->last + bx * 4;\ clast = ctx->clast + bx * 4; -#define TM2_INIT_POINTERS_2(); \ +#define TM2_INIT_POINTERS_2() \ int *Yo, *Uo, *Vo;\ int oYstride, oUstride, oVstride;\ \

1 0

CVS: ffmpeg/doc ffmpeg-doc.texi,1.95,1.96
by melanson＠mplayerhq.hu 13 Oct '05

13 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg/doc In directory mail:/var2/tmp/cvs-serv1195/doc Modified Files: ffmpeg-doc.texi Log Message: documentation update Index: ffmpeg-doc.texi =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/doc/ffmpeg-doc.texi,v retrieving revision 1.95 retrieving revision 1.96 diff -u -d -r1.95 -r1.96 --- ffmpeg-doc.texi 29 Sep 2005 08:04:45 -0000 1.95 +++ ffmpeg-doc.texi 13 Oct 2005 04:37:06 -0000 1.96 @@ -771,6 +771,7 @@ @item Planar RGB @tab @tab X @tab fourcc: 8BPS @item FLIC video @tab @tab X @item Duck TrueMotion v1 @tab @tab X @tab fourcc: DUCK + at item Duck TrueMotion v2 @tab @tab X @tab fourcc: TM20 @item VMD Video @tab @tab X @tab Used in Sierra VMD files. @item MSZH @tab @tab X @tab Part of LCL @item ZLIB @tab X @tab X @tab Part of LCL, encoder experimental

1 0

CVS: ffmpeg Changelog,1.51,1.52 CREDITS,1.23,1.24
by melanson＠mplayerhq.hu 13 Oct '05

13 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv1195 Modified Files: Changelog CREDITS Log Message: documentation update Index: Changelog =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/Changelog,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- Changelog 2 Jul 2005 19:14:40 -0000 1.51 +++ Changelog 13 Oct 2005 04:37:05 -0000 1.52 @@ -20,6 +20,8 @@ - Sonic audio encoder/decoder - Vorbis decoder - Macromedia ADPCM decoder +- Duck TrueMotion 2 decoder +- Support for decoding FLX and DTA extensions in FLIC files version 0.4.9-pre1: Index: CREDITS =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/CREDITS,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- CREDITS 17 May 2005 22:47:33 -0000 1.23 +++ CREDITS 13 Oct 2005 04:37:05 -0000 1.24 @@ -18,6 +18,7 @@ David Hammerton Wolfgang Hesseler Falk Hueffner +Steven Johnson Zdenek Kabelac Robin Kay Todd Kirby

1 0

CVS: ffmpeg/libavcodec flicvideo.c,1.5,1.6
by melanson＠mplayerhq.hu 13 Oct '05

13 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv20847/libavcodec Modified Files: flicvideo.c Log Message: support for FLX and DTA extensions in the FLIC format, courtesy of Steven Johnson (mplayer -at- sakuraindustries.com) Index: flicvideo.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/flicvideo.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- flicvideo.c 13 Aug 2005 16:59:01 -0000 1.5 +++ flicvideo.c 13 Oct 2005 04:35:31 -0000 1.6 @@ -26,7 +26,8 @@ * variations, visit: * http://www.compuphase.com/flic.htm * - * This decoder outputs PAL8 colorspace data. To use this decoder, be + * This decoder outputs PAL8/RGB555/RGB565 and maybe one day RGB24 + * colorspace data, depending on the FLC. To use this decoder, be * sure that your demuxer sends the FLI file header to the decoder via * the extradata chunk in AVCodecContext. The chunk should be 128 bytes * large. The only exception is for FLI files from the game "Magic Carpet", @@ -50,6 +51,14 @@ #define FLI_BRUN 15 #define FLI_COPY 16 #define FLI_MINI 18 +#define FLI_DTA_BRUN 25 +#define FLI_DTA_COPY 26 +#define FLI_DTA_LC 27 + +#define FLI_TYPE_CODE (0xAF11) +#define FLC_FLX_TYPE_CODE (0xAF12) +#define FLC_DTA_TYPE_CODE (0xAF44) /* Marks an "Extended FLC" comes from Dave's Targa Animator (DTA) */ +#define FLC_MAGIC_CARPET_SYNTHETIC_TYPE_CODE (0xAF13) #define CHECK_PIXEL_PTR(n) \ if (pixel_ptr + n > pixel_limit) { \ @@ -71,30 +80,52 @@ { FlicDecodeContext *s = (FlicDecodeContext *)avctx->priv_data; unsigned char *fli_header = (unsigned char *)avctx->extradata; + int depth; s->avctx = avctx; - avctx->pix_fmt = PIX_FMT_PAL8; avctx->has_b_frames = 0; + s->fli_type = LE_16(&fli_header[4]); /* Might be overridden if a Magic Carpet FLC */ + depth = LE_16(&fli_header[12]); + + if (depth == 0) { + depth = 8; /* Some FLC generators set depth to zero, when they mean 8Bpp. Fix up here */ + } + if (s->avctx->extradata_size == 12) { /* special case for magic carpet FLIs */ - s->fli_type = 0xAF13; - } else if (s->avctx->extradata_size == 128) { - s->fli_type = LE_16(&fli_header[4]); - } else { + s->fli_type = FLC_MAGIC_CARPET_SYNTHETIC_TYPE_CODE; + } else if (s->avctx->extradata_size != 128) { av_log(avctx, AV_LOG_ERROR, "Expected extradata of 12 or 128 bytes\n"); return -1; } + if ((s->fli_type == FLC_FLX_TYPE_CODE) && (depth == 16)) { + depth = 15; /* Original Autodesk FLX's say the depth is 16Bpp when it is really 15Bpp */ + } + + switch (depth) { + case 8 : avctx->pix_fmt = PIX_FMT_PAL8; break; + case 15 : avctx->pix_fmt = PIX_FMT_RGB555; break; + case 16 : avctx->pix_fmt = PIX_FMT_RGB565; break; + case 24 : avctx->pix_fmt = PIX_FMT_BGR24; /* Supposedly BGR, but havent any files to test with */ + av_log(avctx, AV_LOG_ERROR, "24Bpp FLC/FLX is unsupported due to no test files.\n"); + return -1; + break; + default : + av_log(avctx, AV_LOG_ERROR, "Unkown FLC/FLX depth of %d Bpp is unsupported.\n",depth); + return -1; + } + s->frame.data[0] = NULL; s->new_palette = 0; return 0; } -static int flic_decode_frame(AVCodecContext *avctx, - void *data, int *data_size, - uint8_t *buf, int buf_size) +static int flic_decode_frame_8BPP(AVCodecContext *avctx, + void *data, int *data_size, + uint8_t *buf, int buf_size) { FlicDecodeContext *s = (FlicDecodeContext *)avctx->priv_data; @@ -128,7 +159,7 @@ int pixel_countdown; unsigned char *pixels; int pixel_limit; - + 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) { @@ -163,7 +194,7 @@ * game and uses 6-bit colors even though it reports 256-color * chunks in a 0xAF12-type file (fli_type is set to 0xAF13 during * initialization) */ - if ((chunk_type == FLI_256_COLOR) && (s->fli_type != 0xAF13)) + if ((chunk_type == FLI_256_COLOR) && (s->fli_type != FLC_MAGIC_CARPET_SYNTHETIC_TYPE_CODE)) color_shift = 0; else color_shift = 2; @@ -384,6 +415,308 @@ return buf_size; } +int flic_decode_frame_15_16BPP(AVCodecContext *avctx, + void *data, int *data_size, + uint8_t *buf, int buf_size) +{ + /* Note, the only difference between the 15Bpp and 16Bpp */ + /* Format is the pixel format, the packets are processed the same. */ + FlicDecodeContext *s = (FlicDecodeContext *)avctx->priv_data; + + int stream_ptr = 0; + int pixel_ptr; + unsigned char palette_idx1; + + unsigned int frame_size; + int num_chunks; + + unsigned int chunk_size; + int chunk_type; + + int i, j; + + int lines; + int compressed_lines; + signed short line_packets; + int y_ptr; + signed char byte_run; + int pixel_skip; + int pixel_countdown; + unsigned char *pixels; + int pixel; + int pixel_limit; + + 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) { + av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); + return -1; + } + + pixels = s->frame.data[0]; + pixel_limit = s->avctx->height * s->frame.linesize[0]; + + frame_size = LE_32(&buf[stream_ptr]); + stream_ptr += 6; /* skip the magic number */ + num_chunks = LE_16(&buf[stream_ptr]); + stream_ptr += 10; /* skip padding */ + + frame_size -= 16; + + /* iterate through the chunks */ + while ((frame_size > 0) && (num_chunks > 0)) { + chunk_size = LE_32(&buf[stream_ptr]); + stream_ptr += 4; + chunk_type = LE_16(&buf[stream_ptr]); + stream_ptr += 2; + + switch (chunk_type) { + case FLI_256_COLOR: + case FLI_COLOR: + /* For some reason, it seems that non-paletised flics do include one of these */ + /* chunks in their first frame. Why i do not know, it seems rather extraneous */ +/* av_log(avctx, AV_LOG_ERROR, "Unexpected Palette chunk %d in non-paletised FLC\n",chunk_type);*/ + stream_ptr = stream_ptr + chunk_size - 6; + break; + + case FLI_DELTA: + case FLI_DTA_LC: + y_ptr = 0; + compressed_lines = LE_16(&buf[stream_ptr]); + stream_ptr += 2; + while (compressed_lines > 0) { + line_packets = LE_16(&buf[stream_ptr]); + stream_ptr += 2; + if (line_packets < 0) { + line_packets = -line_packets; + y_ptr += line_packets * s->frame.linesize[0]; + } else { + compressed_lines--; + pixel_ptr = y_ptr; + pixel_countdown = s->avctx->width; + for (i = 0; i < line_packets; i++) { + /* account for the skip bytes */ + pixel_skip = buf[stream_ptr++]; + pixel_ptr += (pixel_skip*2); /* Pixel is 2 bytes wide */ + pixel_countdown -= pixel_skip; + byte_run = buf[stream_ptr++]; + if (byte_run < 0) { + byte_run = -byte_run; + pixel = LE_16(&buf[stream_ptr]); + stream_ptr += 2; + CHECK_PIXEL_PTR(byte_run); + for (j = 0; j < byte_run; j++, pixel_countdown -= 2) { + *((signed short*)(&pixels[pixel_ptr])) = pixel; + pixel_ptr += 2; + } + } else { + CHECK_PIXEL_PTR(byte_run); + for (j = 0; j < byte_run; j++, pixel_countdown--) { + *((signed short*)(&pixels[pixel_ptr])) = LE_16(&buf[stream_ptr]); + stream_ptr += 2; + pixel_ptr += 2; + } + } + } + + y_ptr += s->frame.linesize[0]; + } + } + break; + + case FLI_LC: + av_log(avctx, AV_LOG_ERROR, "Unexpected FLI_LC chunk in non-paletised FLC\n"); + stream_ptr = stream_ptr + chunk_size - 6; + break; + + case FLI_BLACK: + /* set the whole frame to 0x0000 which is balck in both 15Bpp and 16Bpp modes. */ + memset(pixels, 0x0000, + s->frame.linesize[0] * s->avctx->height * 2); + break; + + case FLI_BRUN: + y_ptr = 0; + for (lines = 0; lines < s->avctx->height; lines++) { + pixel_ptr = y_ptr; + /* disregard the line packets; instead, iterate through all + * pixels on a row */ + stream_ptr++; + pixel_countdown = (s->avctx->width * 2); + + while (pixel_countdown > 0) { + byte_run = buf[stream_ptr++]; + if (byte_run > 0) { + palette_idx1 = buf[stream_ptr++]; + CHECK_PIXEL_PTR(byte_run); + for (j = 0; j < byte_run; j++) { + pixels[pixel_ptr++] = palette_idx1; + pixel_countdown--; + if (pixel_countdown < 0) + av_log(avctx, AV_LOG_ERROR, "pixel_countdown < 0 (%d)\n", + pixel_countdown); + } + } else { /* copy bytes if byte_run < 0 */ + byte_run = -byte_run; + CHECK_PIXEL_PTR(byte_run); + for (j = 0; j < byte_run; j++) { + palette_idx1 = buf[stream_ptr++]; + pixels[pixel_ptr++] = palette_idx1; + pixel_countdown--; + if (pixel_countdown < 0) + av_log(avctx, AV_LOG_ERROR, "pixel_countdown < 0 (%d)\n", + pixel_countdown); + } + } + } + + /* Now FLX is strange, in that it is "byte" as opposed to "pixel" run length compressed. + * This doesnt give us any good oportunity to perform word endian conversion + * during decompression. So if its requried (ie, this isnt a LE target, we do + * a second pass over the line here, swapping the bytes. + */ + pixel = 0xFF00; + if (0xFF00 != LE_16(&pixel)) /* Check if its not an LE Target */ + { + pixel_ptr = y_ptr; + pixel_countdown = s->avctx->width; + while (pixel_countdown > 0) { + *((signed short*)(&pixels[pixel_ptr])) = LE_16(&buf[pixel_ptr]); + pixel_ptr += 2; + } + } + y_ptr += s->frame.linesize[0]; + } + break; + + case FLI_DTA_BRUN: + y_ptr = 0; + for (lines = 0; lines < s->avctx->height; lines++) { + pixel_ptr = y_ptr; + /* disregard the line packets; instead, iterate through all + * pixels on a row */ + stream_ptr++; + pixel_countdown = s->avctx->width; /* Width is in pixels, not bytes */ + + while (pixel_countdown > 0) { + byte_run = buf[stream_ptr++]; + if (byte_run > 0) { + pixel = LE_16(&buf[stream_ptr]); + stream_ptr += 2; + CHECK_PIXEL_PTR(byte_run); + for (j = 0; j < byte_run; j++) { + *((signed short*)(&pixels[pixel_ptr])) = pixel; + pixel_ptr += 2; + pixel_countdown--; + if (pixel_countdown < 0) + av_log(avctx, AV_LOG_ERROR, "pixel_countdown < 0 (%d)\n", + pixel_countdown); + } + } else { /* copy pixels if byte_run < 0 */ + byte_run = -byte_run; + CHECK_PIXEL_PTR(byte_run); + for (j = 0; j < byte_run; j++) { + *((signed short*)(&pixels[pixel_ptr])) = LE_16(&buf[stream_ptr]); + stream_ptr += 2; + pixel_ptr += 2; + pixel_countdown--; + if (pixel_countdown < 0) + av_log(avctx, AV_LOG_ERROR, "pixel_countdown < 0 (%d)\n", + pixel_countdown); + } + } + } + + y_ptr += s->frame.linesize[0]; + } + break; + + case FLI_COPY: + case FLI_DTA_COPY: + /* copy the chunk (uncompressed frame) */ + if (chunk_size - 6 > (unsigned int)(s->avctx->width * s->avctx->height)*2) { + av_log(avctx, AV_LOG_ERROR, "In chunk FLI_COPY : source data (%d bytes) " \ + "bigger than image, skipping chunk\n", chunk_size - 6); + stream_ptr += chunk_size - 6; + } else { + + for (y_ptr = 0; y_ptr < s->frame.linesize[0] * s->avctx->height; + y_ptr += s->frame.linesize[0]) { + + pixel_countdown = s->avctx->width; + pixel_ptr = 0; + while (pixel_countdown > 0) { + *((signed short*)(&pixels[y_ptr + pixel_ptr])) = LE_16(&buf[stream_ptr+pixel_ptr]); + pixel_ptr += 2; + pixel_countdown--; + } + stream_ptr += s->avctx->width*2; + } + } + break; + + case FLI_MINI: + /* some sort of a thumbnail? disregard this chunk... */ + stream_ptr += chunk_size - 6; + break; + + default: + av_log(avctx, AV_LOG_ERROR, "Unrecognized chunk type: %d\n", chunk_type); + break; + } + + frame_size -= chunk_size; + num_chunks--; + } + + /* by the end of the chunk, the stream ptr should equal the frame + * size (minus 1, possibly); if it doesn't, issue a warning */ + if ((stream_ptr != buf_size) && (stream_ptr != buf_size - 1)) + av_log(avctx, AV_LOG_ERROR, "Processed FLI chunk where chunk size = %d " \ + "and final chunk ptr = %d\n", buf_size, stream_ptr); + + + *data_size=sizeof(AVFrame); + *(AVFrame*)data = s->frame; + + return buf_size; +} + +static int flic_decode_frame_24BPP(AVCodecContext *avctx, + void *data, int *data_size, + uint8_t *buf, int buf_size) +{ + av_log(avctx, AV_LOG_ERROR, "24Bpp FLC Unsupported due to lack of test files.\n"); + return -1; +} + +static int flic_decode_frame(AVCodecContext *avctx, + void *data, int *data_size, + uint8_t *buf, int buf_size) +{ + if (avctx->pix_fmt == PIX_FMT_PAL8) { + return flic_decode_frame_8BPP(avctx, data, data_size, + buf, buf_size); + } + else if ((avctx->pix_fmt == PIX_FMT_RGB555) || + (avctx->pix_fmt == PIX_FMT_RGB565)) { + return flic_decode_frame_15_16BPP(avctx, data, data_size, + buf, buf_size); + } + else if (avctx->pix_fmt == PIX_FMT_BGR24) { + return flic_decode_frame_24BPP(avctx, data, data_size, + buf, buf_size); + } + + /* Shouldnt get here, ever as the pix_fmt is processed */ + /* in flic_decode_init and the above if should deal with */ + /* the finite set of possibilites allowable by here. */ + /* but in case we do, just error out. */ + av_log(avctx, AV_LOG_ERROR, "Unknown Format of FLC. My Science cant explain how this happened\n"); + return -1; +} + + static int flic_decode_end(AVCodecContext *avctx) { FlicDecodeContext *s = avctx->priv_data; @@ -404,5 +737,8 @@ flic_decode_end, flic_decode_frame, CODEC_CAP_DR1, + NULL, + NULL, + NULL, NULL };

1 0