annotate flicvideo.c @ 4333:018b316baca7 libavcodec

maybe fixing a segfault
author michael
date Wed, 03 Jan 2007 11:32:02 +0000
parents 92bf2ce5794a
children 05e932ddaaa9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
1 /*
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
2 * FLI/FLC Animation Video Decoder
1759
e73a3b86565f Use reget buffer instead of copying from prev frame
rtognimp
parents: 1624
diff changeset
3 * Copyright (C) 2003, 2004 the ffmpeg project
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
4 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3071
diff changeset
5 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3071
diff changeset
6 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3071
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3071
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
11 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3071
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
15 * Lesser General Public License for more details.
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
16 *
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3071
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 2967
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
20 *
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
21 */
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
22
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
23 /**
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
24 * @file flic.c
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
25 * Autodesk Animator FLI/FLC Video Decoder
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
26 * by Mike Melanson (melanson@pcisys.net)
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
27 * for more information on the .fli/.flc file format and all of its many
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
28 * variations, visit:
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
29 * http://www.compuphase.com/flic.htm
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
30 *
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
31 * This decoder outputs PAL8/RGB555/RGB565 and maybe one day RGB24
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
32 * colorspace data, depending on the FLC. To use this decoder, be
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
33 * sure that your demuxer sends the FLI file header to the decoder via
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
34 * the extradata chunk in AVCodecContext. The chunk should be 128 bytes
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
35 * large. The only exception is for FLI files from the game "Magic Carpet",
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
36 * in which the header is only 12 bytes.
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
37 */
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
38
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
39 #include <stdio.h>
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
40 #include <stdlib.h>
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
41 #include <string.h>
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
42 #include <unistd.h>
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
43
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
44 #include "common.h"
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
45 #include "avcodec.h"
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
46 #include "bswap.h"
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
47
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
48 #define FLI_256_COLOR 4
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
49 #define FLI_DELTA 7
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
50 #define FLI_COLOR 11
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
51 #define FLI_LC 12
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
52 #define FLI_BLACK 13
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
53 #define FLI_BRUN 15
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
54 #define FLI_COPY 16
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
55 #define FLI_MINI 18
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
56 #define FLI_DTA_BRUN 25
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
57 #define FLI_DTA_COPY 26
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
58 #define FLI_DTA_LC 27
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
59
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
60 #define FLI_TYPE_CODE (0xAF11)
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
61 #define FLC_FLX_TYPE_CODE (0xAF12)
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
62 #define FLC_DTA_TYPE_CODE (0xAF44) /* Marks an "Extended FLC" comes from Dave's Targa Animator (DTA) */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
63 #define FLC_MAGIC_CARPET_SYNTHETIC_TYPE_CODE (0xAF13)
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
64
2825
faa53103dde0 tinfoil patch: make sure that pixel pointer does not go out of bounds
melanson
parents: 2422
diff changeset
65 #define CHECK_PIXEL_PTR(n) \
faa53103dde0 tinfoil patch: make sure that pixel pointer does not go out of bounds
melanson
parents: 2422
diff changeset
66 if (pixel_ptr + n > pixel_limit) { \
faa53103dde0 tinfoil patch: make sure that pixel pointer does not go out of bounds
melanson
parents: 2422
diff changeset
67 av_log (s->avctx, AV_LOG_INFO, "Problem: pixel_ptr >= pixel_limit (%d >= %d)\n", \
faa53103dde0 tinfoil patch: make sure that pixel pointer does not go out of bounds
melanson
parents: 2422
diff changeset
68 pixel_ptr + n, pixel_limit); \
faa53103dde0 tinfoil patch: make sure that pixel pointer does not go out of bounds
melanson
parents: 2422
diff changeset
69 return -1; \
faa53103dde0 tinfoil patch: make sure that pixel pointer does not go out of bounds
melanson
parents: 2422
diff changeset
70 } \
faa53103dde0 tinfoil patch: make sure that pixel pointer does not go out of bounds
melanson
parents: 2422
diff changeset
71
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
72 typedef struct FlicDecodeContext {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
73 AVCodecContext *avctx;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
74 AVFrame frame;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
75
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
76 unsigned int palette[256];
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
77 int new_palette;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
78 int fli_type; /* either 0xAF11 or 0xAF12, affects palette resolution */
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
79 } FlicDecodeContext;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
80
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
81 static int flic_decode_init(AVCodecContext *avctx)
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
82 {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
83 FlicDecodeContext *s = (FlicDecodeContext *)avctx->priv_data;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
84 unsigned char *fli_header = (unsigned char *)avctx->extradata;
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
85 int depth;
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
86
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
87 s->avctx = avctx;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
88 avctx->has_b_frames = 0;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
89
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
90 s->fli_type = LE_16(&fli_header[4]); /* Might be overridden if a Magic Carpet FLC */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
91 depth = LE_16(&fli_header[12]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2907
diff changeset
92
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
93 if (depth == 0) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
94 depth = 8; /* Some FLC generators set depth to zero, when they mean 8Bpp. Fix up here */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
95 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
96
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
97 if (s->avctx->extradata_size == 12) {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
98 /* special case for magic carpet FLIs */
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
99 s->fli_type = FLC_MAGIC_CARPET_SYNTHETIC_TYPE_CODE;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
100 } else if (s->avctx->extradata_size != 128) {
1759
e73a3b86565f Use reget buffer instead of copying from prev frame
rtognimp
parents: 1624
diff changeset
101 av_log(avctx, AV_LOG_ERROR, "Expected extradata of 12 or 128 bytes\n");
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
102 return -1;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
103 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
104
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
105 if ((s->fli_type == FLC_FLX_TYPE_CODE) && (depth == 16)) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
106 depth = 15; /* Original Autodesk FLX's say the depth is 16Bpp when it is really 15Bpp */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
107 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
108
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
109 switch (depth) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
110 case 8 : avctx->pix_fmt = PIX_FMT_PAL8; break;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
111 case 15 : avctx->pix_fmt = PIX_FMT_RGB555; break;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
112 case 16 : avctx->pix_fmt = PIX_FMT_RGB565; break;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
113 case 24 : avctx->pix_fmt = PIX_FMT_BGR24; /* Supposedly BGR, but havent any files to test with */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
114 av_log(avctx, AV_LOG_ERROR, "24Bpp FLC/FLX is unsupported due to no test files.\n");
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
115 return -1;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
116 break;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
117 default :
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
118 av_log(avctx, AV_LOG_ERROR, "Unkown FLC/FLX depth of %d Bpp is unsupported.\n",depth);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
119 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2907
diff changeset
120 }
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
121
1759
e73a3b86565f Use reget buffer instead of copying from prev frame
rtognimp
parents: 1624
diff changeset
122 s->frame.data[0] = NULL;
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
123 s->new_palette = 0;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
124
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
125 return 0;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
126 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
127
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
128 static int flic_decode_frame_8BPP(AVCodecContext *avctx,
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
129 void *data, int *data_size,
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
130 uint8_t *buf, int buf_size)
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
131 {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
132 FlicDecodeContext *s = (FlicDecodeContext *)avctx->priv_data;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
133
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
134 int stream_ptr = 0;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
135 int stream_ptr_after_color_chunk;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
136 int pixel_ptr;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
137 int palette_ptr;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
138 unsigned char palette_idx1;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
139 unsigned char palette_idx2;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
140
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
141 unsigned int frame_size;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
142 int num_chunks;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
143
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
144 unsigned int chunk_size;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
145 int chunk_type;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
146
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
147 int i, j;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
148
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
149 int color_packets;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
150 int color_changes;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
151 int color_shift;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
152 unsigned char r, g, b;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
153
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
154 int lines;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
155 int compressed_lines;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
156 int starting_line;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
157 signed short line_packets;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
158 int y_ptr;
4199
214d3d9b69dc Fix possible overflows. Found by Steven Johnson
alex
parents: 4045
diff changeset
159 int byte_run;
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
160 int pixel_skip;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
161 int pixel_countdown;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
162 unsigned char *pixels;
2825
faa53103dde0 tinfoil patch: make sure that pixel pointer does not go out of bounds
melanson
parents: 2422
diff changeset
163 int pixel_limit;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2907
diff changeset
164
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
165 s->frame.reference = 1;
1759
e73a3b86565f Use reget buffer instead of copying from prev frame
rtognimp
parents: 1624
diff changeset
166 s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
e73a3b86565f Use reget buffer instead of copying from prev frame
rtognimp
parents: 1624
diff changeset
167 if (avctx->reget_buffer(avctx, &s->frame) < 0) {
e73a3b86565f Use reget buffer instead of copying from prev frame
rtognimp
parents: 1624
diff changeset
168 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
169 return -1;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
170 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
171
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
172 pixels = s->frame.data[0];
2825
faa53103dde0 tinfoil patch: make sure that pixel pointer does not go out of bounds
melanson
parents: 2422
diff changeset
173 pixel_limit = s->avctx->height * s->frame.linesize[0];
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
174
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
175 frame_size = LE_32(&buf[stream_ptr]);
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
176 stream_ptr += 6; /* skip the magic number */
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
177 num_chunks = LE_16(&buf[stream_ptr]);
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
178 stream_ptr += 10; /* skip padding */
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
179
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
180 frame_size -= 16;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
181
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
182 /* iterate through the chunks */
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
183 while ((frame_size > 0) && (num_chunks > 0)) {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
184 chunk_size = LE_32(&buf[stream_ptr]);
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
185 stream_ptr += 4;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
186 chunk_type = LE_16(&buf[stream_ptr]);
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
187 stream_ptr += 2;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
188
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
189 switch (chunk_type) {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
190 case FLI_256_COLOR:
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
191 case FLI_COLOR:
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
192 stream_ptr_after_color_chunk = stream_ptr + chunk_size - 6;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
193
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2907
diff changeset
194 /* check special case: If this file is from the Magic Carpet
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2907
diff changeset
195 * game and uses 6-bit colors even though it reports 256-color
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
196 * chunks in a 0xAF12-type file (fli_type is set to 0xAF13 during
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
197 * initialization) */
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
198 if ((chunk_type == FLI_256_COLOR) && (s->fli_type != FLC_MAGIC_CARPET_SYNTHETIC_TYPE_CODE))
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
199 color_shift = 0;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
200 else
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
201 color_shift = 2;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
202 /* set up the palette */
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
203 color_packets = LE_16(&buf[stream_ptr]);
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
204 stream_ptr += 2;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
205 palette_ptr = 0;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
206 for (i = 0; i < color_packets; i++) {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
207 /* first byte is how many colors to skip */
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
208 palette_ptr += buf[stream_ptr++];
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
209
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
210 /* next byte indicates how many entries to change */
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
211 color_changes = buf[stream_ptr++];
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
212
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
213 /* if there are 0 color changes, there are actually 256 */
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
214 if (color_changes == 0)
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
215 color_changes = 256;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
216
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
217 for (j = 0; j < color_changes; j++) {
4045
1bf7bc44430f correct signaling of palette change
alex
parents: 3947
diff changeset
218 unsigned int entry;
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
219
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
220 /* wrap around, for good measure */
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 1881
diff changeset
221 if ((unsigned)palette_ptr >= 256)
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
222 palette_ptr = 0;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
223
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
224 r = buf[stream_ptr++] << color_shift;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
225 g = buf[stream_ptr++] << color_shift;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
226 b = buf[stream_ptr++] << color_shift;
4045
1bf7bc44430f correct signaling of palette change
alex
parents: 3947
diff changeset
227 entry = (r << 16) | (g << 8) | b;
1bf7bc44430f correct signaling of palette change
alex
parents: 3947
diff changeset
228 if (s->palette[palette_ptr] != entry)
1bf7bc44430f correct signaling of palette change
alex
parents: 3947
diff changeset
229 s->new_palette = 1;
1bf7bc44430f correct signaling of palette change
alex
parents: 3947
diff changeset
230 s->palette[palette_ptr++] = entry;
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
231 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
232 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
233
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
234 /* color chunks sometimes have weird 16-bit alignment issues;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
235 * therefore, take the hardline approach and set the stream_ptr
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
236 * to the value calculated w.r.t. the size specified by the color
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
237 * chunk header */
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
238 stream_ptr = stream_ptr_after_color_chunk;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
239
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
240 break;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
241
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
242 case FLI_DELTA:
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
243 y_ptr = 0;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
244 compressed_lines = LE_16(&buf[stream_ptr]);
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
245 stream_ptr += 2;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
246 while (compressed_lines > 0) {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
247 line_packets = LE_16(&buf[stream_ptr]);
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
248 stream_ptr += 2;
4234
e560d163e7a8 Implement DELTA_FLI opcodes correctly. Patch by Steven Johnson
alex
parents: 4233
diff changeset
249 if ((line_packets & 0xC000) == 0xC000) {
e560d163e7a8 Implement DELTA_FLI opcodes correctly. Patch by Steven Johnson
alex
parents: 4233
diff changeset
250 // line skip opcode
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
251 line_packets = -line_packets;
1759
e73a3b86565f Use reget buffer instead of copying from prev frame
rtognimp
parents: 1624
diff changeset
252 y_ptr += line_packets * s->frame.linesize[0];
4234
e560d163e7a8 Implement DELTA_FLI opcodes correctly. Patch by Steven Johnson
alex
parents: 4233
diff changeset
253 } else if ((line_packets & 0xC000) == 0x4000) {
e560d163e7a8 Implement DELTA_FLI opcodes correctly. Patch by Steven Johnson
alex
parents: 4233
diff changeset
254 av_log(avctx, AV_LOG_ERROR, "Undefined opcode (%x) in DELTA_FLI\n", line_packets);
e560d163e7a8 Implement DELTA_FLI opcodes correctly. Patch by Steven Johnson
alex
parents: 4233
diff changeset
255 } else if ((line_packets & 0xC000) == 0x8000) {
e560d163e7a8 Implement DELTA_FLI opcodes correctly. Patch by Steven Johnson
alex
parents: 4233
diff changeset
256 // "last byte" opcode
e560d163e7a8 Implement DELTA_FLI opcodes correctly. Patch by Steven Johnson
alex
parents: 4233
diff changeset
257 pixels[y_ptr + s->frame.linesize[0] - 1] = line_packets & 0xff;
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
258 } else {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
259 compressed_lines--;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
260 pixel_ptr = y_ptr;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
261 pixel_countdown = s->avctx->width;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
262 for (i = 0; i < line_packets; i++) {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
263 /* account for the skip bytes */
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
264 pixel_skip = buf[stream_ptr++];
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
265 pixel_ptr += pixel_skip;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
266 pixel_countdown -= pixel_skip;
4199
214d3d9b69dc Fix possible overflows. Found by Steven Johnson
alex
parents: 4045
diff changeset
267 byte_run = (signed char)(buf[stream_ptr++]);
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
268 if (byte_run < 0) {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
269 byte_run = -byte_run;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
270 palette_idx1 = buf[stream_ptr++];
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
271 palette_idx2 = buf[stream_ptr++];
2825
faa53103dde0 tinfoil patch: make sure that pixel pointer does not go out of bounds
melanson
parents: 2422
diff changeset
272 CHECK_PIXEL_PTR(byte_run);
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
273 for (j = 0; j < byte_run; j++, pixel_countdown -= 2) {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
274 pixels[pixel_ptr++] = palette_idx1;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
275 pixels[pixel_ptr++] = palette_idx2;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
276 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
277 } else {
2825
faa53103dde0 tinfoil patch: make sure that pixel pointer does not go out of bounds
melanson
parents: 2422
diff changeset
278 CHECK_PIXEL_PTR(byte_run * 2);
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
279 for (j = 0; j < byte_run * 2; j++, pixel_countdown--) {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
280 palette_idx1 = buf[stream_ptr++];
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
281 pixels[pixel_ptr++] = palette_idx1;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
282 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
283 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
284 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
285
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
286 y_ptr += s->frame.linesize[0];
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
287 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
288 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
289 break;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
290
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
291 case FLI_LC:
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
292 /* line compressed */
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
293 starting_line = LE_16(&buf[stream_ptr]);
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
294 stream_ptr += 2;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
295 y_ptr = 0;
1759
e73a3b86565f Use reget buffer instead of copying from prev frame
rtognimp
parents: 1624
diff changeset
296 y_ptr += starting_line * s->frame.linesize[0];
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
297
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
298 compressed_lines = LE_16(&buf[stream_ptr]);
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
299 stream_ptr += 2;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
300 while (compressed_lines > 0) {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
301 pixel_ptr = y_ptr;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
302 pixel_countdown = s->avctx->width;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
303 line_packets = buf[stream_ptr++];
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
304 if (line_packets > 0) {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
305 for (i = 0; i < line_packets; i++) {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
306 /* account for the skip bytes */
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
307 pixel_skip = buf[stream_ptr++];
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
308 pixel_ptr += pixel_skip;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
309 pixel_countdown -= pixel_skip;
4199
214d3d9b69dc Fix possible overflows. Found by Steven Johnson
alex
parents: 4045
diff changeset
310 byte_run = (signed char)(buf[stream_ptr++]);
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
311 if (byte_run > 0) {
2825
faa53103dde0 tinfoil patch: make sure that pixel pointer does not go out of bounds
melanson
parents: 2422
diff changeset
312 CHECK_PIXEL_PTR(byte_run);
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
313 for (j = 0; j < byte_run; j++, pixel_countdown--) {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
314 palette_idx1 = buf[stream_ptr++];
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
315 pixels[pixel_ptr++] = palette_idx1;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
316 }
4233
5e05fadc93d1 support byte_run=0 case in DELTA_FLI (this case means only skip pixels)
alex
parents: 4232
diff changeset
317 } else if (byte_run < 0) {
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
318 byte_run = -byte_run;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
319 palette_idx1 = buf[stream_ptr++];
2825
faa53103dde0 tinfoil patch: make sure that pixel pointer does not go out of bounds
melanson
parents: 2422
diff changeset
320 CHECK_PIXEL_PTR(byte_run);
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
321 for (j = 0; j < byte_run; j++, pixel_countdown--) {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
322 pixels[pixel_ptr++] = palette_idx1;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
323 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
324 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
325 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
326 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
327
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
328 y_ptr += s->frame.linesize[0];
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
329 compressed_lines--;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
330 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
331 break;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
332
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
333 case FLI_BLACK:
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
334 /* set the whole frame to color 0 (which is usually black) */
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
335 memset(pixels, 0,
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
336 s->frame.linesize[0] * s->avctx->height);
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
337 break;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
338
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
339 case FLI_BRUN:
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
340 /* Byte run compression: This chunk type only occurs in the first
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
341 * FLI frame and it will update the entire frame. */
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
342 y_ptr = 0;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
343 for (lines = 0; lines < s->avctx->height; lines++) {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
344 pixel_ptr = y_ptr;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
345 /* disregard the line packets; instead, iterate through all
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
346 * pixels on a row */
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
347 stream_ptr++;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
348 pixel_countdown = s->avctx->width;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
349 while (pixel_countdown > 0) {
4199
214d3d9b69dc Fix possible overflows. Found by Steven Johnson
alex
parents: 4045
diff changeset
350 byte_run = (signed char)(buf[stream_ptr++]);
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
351 if (byte_run > 0) {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
352 palette_idx1 = buf[stream_ptr++];
2825
faa53103dde0 tinfoil patch: make sure that pixel pointer does not go out of bounds
melanson
parents: 2422
diff changeset
353 CHECK_PIXEL_PTR(byte_run);
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
354 for (j = 0; j < byte_run; j++) {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
355 pixels[pixel_ptr++] = palette_idx1;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
356 pixel_countdown--;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
357 if (pixel_countdown < 0)
1759
e73a3b86565f Use reget buffer instead of copying from prev frame
rtognimp
parents: 1624
diff changeset
358 av_log(avctx, AV_LOG_ERROR, "pixel_countdown < 0 (%d)\n",
e73a3b86565f Use reget buffer instead of copying from prev frame
rtognimp
parents: 1624
diff changeset
359 pixel_countdown);
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
360 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
361 } else { /* copy bytes if byte_run < 0 */
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
362 byte_run = -byte_run;
2825
faa53103dde0 tinfoil patch: make sure that pixel pointer does not go out of bounds
melanson
parents: 2422
diff changeset
363 CHECK_PIXEL_PTR(byte_run);
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
364 for (j = 0; j < byte_run; j++) {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
365 palette_idx1 = buf[stream_ptr++];
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
366 pixels[pixel_ptr++] = palette_idx1;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
367 pixel_countdown--;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
368 if (pixel_countdown < 0)
1759
e73a3b86565f Use reget buffer instead of copying from prev frame
rtognimp
parents: 1624
diff changeset
369 av_log(avctx, AV_LOG_ERROR, "pixel_countdown < 0 (%d)\n",
e73a3b86565f Use reget buffer instead of copying from prev frame
rtognimp
parents: 1624
diff changeset
370 pixel_countdown);
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
371 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
372 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
373 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
374
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
375 y_ptr += s->frame.linesize[0];
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
376 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
377 break;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
378
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
379 case FLI_COPY:
1759
e73a3b86565f Use reget buffer instead of copying from prev frame
rtognimp
parents: 1624
diff changeset
380 /* copy the chunk (uncompressed frame) */
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
381 if (chunk_size - 6 > s->avctx->width * s->avctx->height) {
1759
e73a3b86565f Use reget buffer instead of copying from prev frame
rtognimp
parents: 1624
diff changeset
382 av_log(avctx, AV_LOG_ERROR, "In chunk FLI_COPY : source data (%d bytes) " \
e73a3b86565f Use reget buffer instead of copying from prev frame
rtognimp
parents: 1624
diff changeset
383 "bigger than image, skipping chunk\n", chunk_size - 6);
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
384 stream_ptr += chunk_size - 6;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
385 } else {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
386 for (y_ptr = 0; y_ptr < s->frame.linesize[0] * s->avctx->height;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
387 y_ptr += s->frame.linesize[0]) {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
388 memcpy(&pixels[y_ptr], &buf[stream_ptr],
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
389 s->avctx->width);
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
390 stream_ptr += s->avctx->width;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
391 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
392 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
393 break;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
394
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
395 case FLI_MINI:
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
396 /* some sort of a thumbnail? disregard this chunk... */
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
397 stream_ptr += chunk_size - 6;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
398 break;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
399
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
400 default:
1759
e73a3b86565f Use reget buffer instead of copying from prev frame
rtognimp
parents: 1624
diff changeset
401 av_log(avctx, AV_LOG_ERROR, "Unrecognized chunk type: %d\n", chunk_type);
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
402 break;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
403 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
404
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
405 frame_size -= chunk_size;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
406 num_chunks--;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
407 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
408
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
409 /* by the end of the chunk, the stream ptr should equal the frame
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
410 * size (minus 1, possibly); if it doesn't, issue a warning */
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
411 if ((stream_ptr != buf_size) && (stream_ptr != buf_size - 1))
1759
e73a3b86565f Use reget buffer instead of copying from prev frame
rtognimp
parents: 1624
diff changeset
412 av_log(avctx, AV_LOG_ERROR, "Processed FLI chunk where chunk size = %d " \
e73a3b86565f Use reget buffer instead of copying from prev frame
rtognimp
parents: 1624
diff changeset
413 "and final chunk ptr = %d\n", buf_size, stream_ptr);
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
414
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
415 /* make the palette available on the way out */
4045
1bf7bc44430f correct signaling of palette change
alex
parents: 3947
diff changeset
416 memcpy(s->frame.data[1], s->palette, AVPALETTE_SIZE);
1bf7bc44430f correct signaling of palette change
alex
parents: 3947
diff changeset
417 if (s->new_palette) {
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
418 s->frame.palette_has_changed = 1;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
419 s->new_palette = 0;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
420 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
421
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
422 *data_size=sizeof(AVFrame);
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
423 *(AVFrame*)data = s->frame;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
424
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
425 return buf_size;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
426 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
427
3071
cc0357a90e8f make some functions static (patch by Dieter < freebsd at sopwith.solgatos.com >)
aurel
parents: 3036
diff changeset
428 static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
429 void *data, int *data_size,
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
430 uint8_t *buf, int buf_size)
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
431 {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
432 /* Note, the only difference between the 15Bpp and 16Bpp */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
433 /* Format is the pixel format, the packets are processed the same. */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
434 FlicDecodeContext *s = (FlicDecodeContext *)avctx->priv_data;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
435
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
436 int stream_ptr = 0;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
437 int pixel_ptr;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
438 unsigned char palette_idx1;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
439
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
440 unsigned int frame_size;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
441 int num_chunks;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
442
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
443 unsigned int chunk_size;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
444 int chunk_type;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
445
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
446 int i, j;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
447
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
448 int lines;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
449 int compressed_lines;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
450 signed short line_packets;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
451 int y_ptr;
4199
214d3d9b69dc Fix possible overflows. Found by Steven Johnson
alex
parents: 4045
diff changeset
452 int byte_run;
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
453 int pixel_skip;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
454 int pixel_countdown;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
455 unsigned char *pixels;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
456 int pixel;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
457 int pixel_limit;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
458
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
459 s->frame.reference = 1;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
460 s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
461 if (avctx->reget_buffer(avctx, &s->frame) < 0) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
462 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
463 return -1;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
464 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
465
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
466 pixels = s->frame.data[0];
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
467 pixel_limit = s->avctx->height * s->frame.linesize[0];
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
468
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
469 frame_size = LE_32(&buf[stream_ptr]);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
470 stream_ptr += 6; /* skip the magic number */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
471 num_chunks = LE_16(&buf[stream_ptr]);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
472 stream_ptr += 10; /* skip padding */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
473
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
474 frame_size -= 16;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
475
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
476 /* iterate through the chunks */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
477 while ((frame_size > 0) && (num_chunks > 0)) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
478 chunk_size = LE_32(&buf[stream_ptr]);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
479 stream_ptr += 4;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
480 chunk_type = LE_16(&buf[stream_ptr]);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
481 stream_ptr += 2;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
482
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
483 switch (chunk_type) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
484 case FLI_256_COLOR:
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
485 case FLI_COLOR:
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
486 /* For some reason, it seems that non-paletised flics do include one of these */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
487 /* chunks in their first frame. Why i do not know, it seems rather extraneous */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
488 /* av_log(avctx, AV_LOG_ERROR, "Unexpected Palette chunk %d in non-paletised FLC\n",chunk_type);*/
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
489 stream_ptr = stream_ptr + chunk_size - 6;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
490 break;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
491
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
492 case FLI_DELTA:
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
493 case FLI_DTA_LC:
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
494 y_ptr = 0;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
495 compressed_lines = LE_16(&buf[stream_ptr]);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
496 stream_ptr += 2;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
497 while (compressed_lines > 0) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
498 line_packets = LE_16(&buf[stream_ptr]);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
499 stream_ptr += 2;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
500 if (line_packets < 0) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
501 line_packets = -line_packets;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
502 y_ptr += line_packets * s->frame.linesize[0];
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
503 } else {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
504 compressed_lines--;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
505 pixel_ptr = y_ptr;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
506 pixel_countdown = s->avctx->width;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
507 for (i = 0; i < line_packets; i++) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
508 /* account for the skip bytes */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
509 pixel_skip = buf[stream_ptr++];
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
510 pixel_ptr += (pixel_skip*2); /* Pixel is 2 bytes wide */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
511 pixel_countdown -= pixel_skip;
4199
214d3d9b69dc Fix possible overflows. Found by Steven Johnson
alex
parents: 4045
diff changeset
512 byte_run = (signed char)(buf[stream_ptr++]);
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
513 if (byte_run < 0) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
514 byte_run = -byte_run;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
515 pixel = LE_16(&buf[stream_ptr]);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
516 stream_ptr += 2;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
517 CHECK_PIXEL_PTR(byte_run);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
518 for (j = 0; j < byte_run; j++, pixel_countdown -= 2) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
519 *((signed short*)(&pixels[pixel_ptr])) = pixel;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
520 pixel_ptr += 2;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
521 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
522 } else {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
523 CHECK_PIXEL_PTR(byte_run);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
524 for (j = 0; j < byte_run; j++, pixel_countdown--) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
525 *((signed short*)(&pixels[pixel_ptr])) = LE_16(&buf[stream_ptr]);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
526 stream_ptr += 2;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
527 pixel_ptr += 2;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
528 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
529 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
530 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
531
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
532 y_ptr += s->frame.linesize[0];
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
533 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
534 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
535 break;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
536
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
537 case FLI_LC:
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
538 av_log(avctx, AV_LOG_ERROR, "Unexpected FLI_LC chunk in non-paletised FLC\n");
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
539 stream_ptr = stream_ptr + chunk_size - 6;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
540 break;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
541
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
542 case FLI_BLACK:
4235
lu_zero
parents: 4234
diff changeset
543 /* set the whole frame to 0x0000 which is black in both 15Bpp and 16Bpp modes. */
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
544 memset(pixels, 0x0000,
4232
cb5e46ee0495 10l memory corruption bug found by Steven Johnson
alex
parents: 4199
diff changeset
545 s->frame.linesize[0] * s->avctx->height);
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
546 break;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
547
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
548 case FLI_BRUN:
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
549 y_ptr = 0;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
550 for (lines = 0; lines < s->avctx->height; lines++) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
551 pixel_ptr = y_ptr;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
552 /* disregard the line packets; instead, iterate through all
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
553 * pixels on a row */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
554 stream_ptr++;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
555 pixel_countdown = (s->avctx->width * 2);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2907
diff changeset
556
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
557 while (pixel_countdown > 0) {
4199
214d3d9b69dc Fix possible overflows. Found by Steven Johnson
alex
parents: 4045
diff changeset
558 byte_run = (signed char)(buf[stream_ptr++]);
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
559 if (byte_run > 0) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
560 palette_idx1 = buf[stream_ptr++];
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
561 CHECK_PIXEL_PTR(byte_run);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
562 for (j = 0; j < byte_run; j++) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
563 pixels[pixel_ptr++] = palette_idx1;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
564 pixel_countdown--;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
565 if (pixel_countdown < 0)
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
566 av_log(avctx, AV_LOG_ERROR, "pixel_countdown < 0 (%d)\n",
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
567 pixel_countdown);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
568 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
569 } else { /* copy bytes if byte_run < 0 */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
570 byte_run = -byte_run;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
571 CHECK_PIXEL_PTR(byte_run);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
572 for (j = 0; j < byte_run; j++) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
573 palette_idx1 = buf[stream_ptr++];
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
574 pixels[pixel_ptr++] = palette_idx1;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
575 pixel_countdown--;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
576 if (pixel_countdown < 0)
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
577 av_log(avctx, AV_LOG_ERROR, "pixel_countdown < 0 (%d)\n",
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
578 pixel_countdown);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
579 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
580 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
581 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
582
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
583 /* Now FLX is strange, in that it is "byte" as opposed to "pixel" run length compressed.
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
584 * This doesnt give us any good oportunity to perform word endian conversion
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2907
diff changeset
585 * during decompression. So if its requried (ie, this isnt a LE target, we do
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
586 * a second pass over the line here, swapping the bytes.
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
587 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2907
diff changeset
588 pixel = 0xFF00;
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
589 if (0xFF00 != LE_16(&pixel)) /* Check if its not an LE Target */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
590 {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
591 pixel_ptr = y_ptr;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
592 pixel_countdown = s->avctx->width;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
593 while (pixel_countdown > 0) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
594 *((signed short*)(&pixels[pixel_ptr])) = LE_16(&buf[pixel_ptr]);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
595 pixel_ptr += 2;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
596 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2907
diff changeset
597 }
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
598 y_ptr += s->frame.linesize[0];
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
599 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
600 break;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
601
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
602 case FLI_DTA_BRUN:
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
603 y_ptr = 0;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
604 for (lines = 0; lines < s->avctx->height; lines++) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
605 pixel_ptr = y_ptr;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
606 /* disregard the line packets; instead, iterate through all
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
607 * pixels on a row */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
608 stream_ptr++;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
609 pixel_countdown = s->avctx->width; /* Width is in pixels, not bytes */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2907
diff changeset
610
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
611 while (pixel_countdown > 0) {
4199
214d3d9b69dc Fix possible overflows. Found by Steven Johnson
alex
parents: 4045
diff changeset
612 byte_run = (signed char)(buf[stream_ptr++]);
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
613 if (byte_run > 0) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
614 pixel = LE_16(&buf[stream_ptr]);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
615 stream_ptr += 2;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
616 CHECK_PIXEL_PTR(byte_run);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
617 for (j = 0; j < byte_run; j++) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
618 *((signed short*)(&pixels[pixel_ptr])) = pixel;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2907
diff changeset
619 pixel_ptr += 2;
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
620 pixel_countdown--;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
621 if (pixel_countdown < 0)
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
622 av_log(avctx, AV_LOG_ERROR, "pixel_countdown < 0 (%d)\n",
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
623 pixel_countdown);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
624 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
625 } else { /* copy pixels if byte_run < 0 */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
626 byte_run = -byte_run;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
627 CHECK_PIXEL_PTR(byte_run);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
628 for (j = 0; j < byte_run; j++) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
629 *((signed short*)(&pixels[pixel_ptr])) = LE_16(&buf[stream_ptr]);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
630 stream_ptr += 2;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
631 pixel_ptr += 2;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
632 pixel_countdown--;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
633 if (pixel_countdown < 0)
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
634 av_log(avctx, AV_LOG_ERROR, "pixel_countdown < 0 (%d)\n",
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
635 pixel_countdown);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
636 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
637 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
638 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
639
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
640 y_ptr += s->frame.linesize[0];
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
641 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
642 break;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
643
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
644 case FLI_COPY:
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
645 case FLI_DTA_COPY:
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
646 /* copy the chunk (uncompressed frame) */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
647 if (chunk_size - 6 > (unsigned int)(s->avctx->width * s->avctx->height)*2) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
648 av_log(avctx, AV_LOG_ERROR, "In chunk FLI_COPY : source data (%d bytes) " \
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
649 "bigger than image, skipping chunk\n", chunk_size - 6);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
650 stream_ptr += chunk_size - 6;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
651 } else {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2907
diff changeset
652
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
653 for (y_ptr = 0; y_ptr < s->frame.linesize[0] * s->avctx->height;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
654 y_ptr += s->frame.linesize[0]) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
655
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
656 pixel_countdown = s->avctx->width;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
657 pixel_ptr = 0;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
658 while (pixel_countdown > 0) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
659 *((signed short*)(&pixels[y_ptr + pixel_ptr])) = LE_16(&buf[stream_ptr+pixel_ptr]);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
660 pixel_ptr += 2;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
661 pixel_countdown--;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2907
diff changeset
662 }
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
663 stream_ptr += s->avctx->width*2;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
664 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
665 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
666 break;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
667
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
668 case FLI_MINI:
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
669 /* some sort of a thumbnail? disregard this chunk... */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
670 stream_ptr += chunk_size - 6;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
671 break;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
672
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
673 default:
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
674 av_log(avctx, AV_LOG_ERROR, "Unrecognized chunk type: %d\n", chunk_type);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
675 break;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
676 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
677
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
678 frame_size -= chunk_size;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
679 num_chunks--;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
680 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
681
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
682 /* by the end of the chunk, the stream ptr should equal the frame
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
683 * size (minus 1, possibly); if it doesn't, issue a warning */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
684 if ((stream_ptr != buf_size) && (stream_ptr != buf_size - 1))
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
685 av_log(avctx, AV_LOG_ERROR, "Processed FLI chunk where chunk size = %d " \
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
686 "and final chunk ptr = %d\n", buf_size, stream_ptr);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
687
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
688
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
689 *data_size=sizeof(AVFrame);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
690 *(AVFrame*)data = s->frame;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
691
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
692 return buf_size;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
693 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
694
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
695 static int flic_decode_frame_24BPP(AVCodecContext *avctx,
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
696 void *data, int *data_size,
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
697 uint8_t *buf, int buf_size)
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
698 {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
699 av_log(avctx, AV_LOG_ERROR, "24Bpp FLC Unsupported due to lack of test files.\n");
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
700 return -1;
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
701 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
702
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
703 static int flic_decode_frame(AVCodecContext *avctx,
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
704 void *data, int *data_size,
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
705 uint8_t *buf, int buf_size)
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
706 {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
707 if (avctx->pix_fmt == PIX_FMT_PAL8) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
708 return flic_decode_frame_8BPP(avctx, data, data_size,
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
709 buf, buf_size);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
710 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
711 else if ((avctx->pix_fmt == PIX_FMT_RGB555) ||
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
712 (avctx->pix_fmt == PIX_FMT_RGB565)) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
713 return flic_decode_frame_15_16BPP(avctx, data, data_size,
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
714 buf, buf_size);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2907
diff changeset
715 }
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
716 else if (avctx->pix_fmt == PIX_FMT_BGR24) {
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
717 return flic_decode_frame_24BPP(avctx, data, data_size,
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
718 buf, buf_size);
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
719 }
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
720
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
721 /* Shouldnt get here, ever as the pix_fmt is processed */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
722 /* in flic_decode_init and the above if should deal with */
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
723 /* the finite set of possibilites allowable by here. */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2907
diff changeset
724 /* but in case we do, just error out. */
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
725 av_log(avctx, AV_LOG_ERROR, "Unknown Format of FLC. My Science cant explain how this happened\n");
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
726 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2907
diff changeset
727 }
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
728
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
729
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
730 static int flic_decode_end(AVCodecContext *avctx)
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
731 {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
732 FlicDecodeContext *s = avctx->priv_data;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
733
1759
e73a3b86565f Use reget buffer instead of copying from prev frame
rtognimp
parents: 1624
diff changeset
734 if (s->frame.data[0])
e73a3b86565f Use reget buffer instead of copying from prev frame
rtognimp
parents: 1624
diff changeset
735 avctx->release_buffer(avctx, &s->frame);
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
736
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
737 return 0;
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
738 }
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
739
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
740 AVCodec flic_decoder = {
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
741 "flic",
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
742 CODEC_TYPE_VIDEO,
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
743 CODEC_ID_FLIC,
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
744 sizeof(FlicDecodeContext),
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
745 flic_decode_init,
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
746 NULL,
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
747 flic_decode_end,
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
748 flic_decode_frame,
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
749 CODEC_CAP_DR1,
2907
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
750 NULL,
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
751 NULL,
f7114e03d8dd support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 2825
diff changeset
752 NULL,
1624
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
753 NULL
46dee16488ae yep, FLI support
melanson
parents:
diff changeset
754 };