Mercurial > libavcodec.hg
annotate lcldec.c @ 9780:9f3ef4eea41a libavcodec
Fix memleak due to c->decomp_buf never being freed.
author | reimar |
---|---|
date | Sun, 31 May 2009 11:47:52 +0000 |
parents | 4605c1f6e877 |
children | 05b6cba2c95b |
rev | line source |
---|---|
1743 | 1 /* |
2 * LCL (LossLess Codec Library) Codec | |
3 * Copyright (c) 2002-2004 Roberto Togni | |
4 * | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3777
diff
changeset
|
5 * This file is part of FFmpeg. |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3777
diff
changeset
|
6 * |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3777
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
1743 | 8 * modify it under the terms of the GNU Lesser General Public |
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:
3777
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
1743 | 11 * |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3777
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
1743 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Lesser General Public License for more details. | |
16 * | |
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:
3777
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:
2979
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1743 | 20 */ |
21 | |
22 /** | |
8718
e9d9d946f213
Use full internal pathname in doxygen @file directives.
diego
parents:
8673
diff
changeset
|
23 * @file libavcodec/lcldec.c |
1743 | 24 * LCL (LossLess Codec Library) Video Codec |
25 * Decoder for MSZH and ZLIB codecs | |
26 * Experimental encoder for ZLIB RGB24 | |
27 * | |
28 * Fourcc: MSZH, ZLIB | |
29 * | |
30 * Original Win32 dll: | |
31 * Ver2.23 By Kenji Oshima 2000.09.20 | |
32 * avimszh.dll, avizlib.dll | |
33 * | |
34 * A description of the decoding algorithm can be found here: | |
35 * http://www.pcisys.net/~melanson/codecs | |
36 * | |
37 * Supports: BGR24 (RGB 24bpp) | |
38 * | |
39 */ | |
40 | |
41 #include <stdio.h> | |
42 #include <stdlib.h> | |
43 | |
4962
f99e40a7155b
Remove redundant #inclusion of common.h, avcodec.h already #includes it.
diego
parents:
4827
diff
changeset
|
44 #include "avcodec.h" |
9767
99d5a25c5895
Use bytestream_get_le16 to simplify offset/count calculation for mszh decompression.
reimar
parents:
9766
diff
changeset
|
45 #include "bytestream.h" |
5294 | 46 #include "lcl.h" |
9770
e883c3dab3ec
Pad the decompression buffer and use av_memcpy_backptr for the mszh decompression.
reimar
parents:
9769
diff
changeset
|
47 #include "libavutil/lzo.h" |
1743 | 48 |
9751
705efd6ddaab
lcldec.c: change #if CONFIG_ZLIB to #if CONFIG_ZLIB_DECODER.
reimar
parents:
9750
diff
changeset
|
49 #if CONFIG_ZLIB_DECODER |
1743 | 50 #include <zlib.h> |
51 #endif | |
52 | |
53 /* | |
54 * Decoder context | |
55 */ | |
5294 | 56 typedef struct LclDecContext { |
5297 | 57 AVFrame pic; |
1743 | 58 |
59 // Image type | |
60 int imgtype; | |
61 // Compression type | |
62 int compression; | |
63 // Flags | |
64 int flags; | |
65 // Decompressed data size | |
66 unsigned int decomp_size; | |
67 // Decompression buffer | |
68 unsigned char* decomp_buf; | |
9751
705efd6ddaab
lcldec.c: change #if CONFIG_ZLIB to #if CONFIG_ZLIB_DECODER.
reimar
parents:
9750
diff
changeset
|
69 #if CONFIG_ZLIB_DECODER |
1743 | 70 z_stream zstream; |
71 #endif | |
5294 | 72 } LclDecContext; |
1743 | 73 |
74 | |
9765
350826aae685
Document padding requirements of mszh_decomp srcptr buffer
reimar
parents:
9764
diff
changeset
|
75 /** |
9775
3fd46320ab12
Take advantage of available input padding to optimize mszh_decomp
reimar
parents:
9774
diff
changeset
|
76 * \param srcptr compressed source buffer, must be padded with at least 5 extra bytes |
9770
e883c3dab3ec
Pad the decompression buffer and use av_memcpy_backptr for the mszh decompression.
reimar
parents:
9769
diff
changeset
|
77 * \param destptr must be padded sufficiently for av_memcpy_backptr |
9765
350826aae685
Document padding requirements of mszh_decomp srcptr buffer
reimar
parents:
9764
diff
changeset
|
78 */ |
9769 | 79 static unsigned int mszh_decomp(const unsigned char * srcptr, int srclen, unsigned char * destptr, unsigned int destsize) |
1743 | 80 { |
81 unsigned char *destptr_bak = destptr; | |
2418
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
82 unsigned char *destptr_end = destptr + destsize; |
9769 | 83 const unsigned char *srcptr_end = srcptr + srclen; |
9776
18d149e8fc7f
Use int-size types instead of char where it makes no difference.
reimar
parents:
9775
diff
changeset
|
84 unsigned mask = *srcptr++; |
18d149e8fc7f
Use int-size types instead of char where it makes no difference.
reimar
parents:
9775
diff
changeset
|
85 unsigned maskbit = 0x80; |
2967 | 86 |
9764
dd6bcbec3c24
Use srcptr_end variable to avoid having to update both srcptr and srclen.
reimar
parents:
9763
diff
changeset
|
87 while (srcptr < srcptr_end && destptr < destptr_end) { |
9774 | 88 if (!(mask & maskbit)) { |
9762
3242ae563430
Simply use memcpy instead of AV_RN32/AV_WN32 combination.
reimar
parents:
9761
diff
changeset
|
89 memcpy(destptr, srcptr, 4); |
1743 | 90 destptr += 4; |
91 srcptr += 4; | |
92 } else { | |
9777 | 93 unsigned ofs = bytestream_get_le16(&srcptr); |
94 unsigned cnt = (ofs >> 11) + 1; | |
1743 | 95 ofs &= 0x7ff; |
96 cnt *= 4; | |
9771 | 97 cnt = FFMIN(cnt, destptr_end - destptr); |
9770
e883c3dab3ec
Pad the decompression buffer and use av_memcpy_backptr for the mszh decompression.
reimar
parents:
9769
diff
changeset
|
98 av_memcpy_backptr(destptr, ofs, cnt); |
e883c3dab3ec
Pad the decompression buffer and use av_memcpy_backptr for the mszh decompression.
reimar
parents:
9769
diff
changeset
|
99 destptr += cnt; |
1743 | 100 } |
9774 | 101 maskbit >>= 1; |
9775
3fd46320ab12
Take advantage of available input padding to optimize mszh_decomp
reimar
parents:
9774
diff
changeset
|
102 if (!maskbit) { |
3fd46320ab12
Take advantage of available input padding to optimize mszh_decomp
reimar
parents:
9774
diff
changeset
|
103 mask = *srcptr++; |
3fd46320ab12
Take advantage of available input padding to optimize mszh_decomp
reimar
parents:
9774
diff
changeset
|
104 maskbit = 0x80; |
3fd46320ab12
Take advantage of available input padding to optimize mszh_decomp
reimar
parents:
9774
diff
changeset
|
105 } |
1743 | 106 } |
107 | |
9736
405cbc435997
Remove useless () from lcldec for more consistency with "normal" FFmpeg coding style.
reimar
parents:
9730
diff
changeset
|
108 return destptr - destptr_bak; |
1743 | 109 } |
110 | |
111 | |
9756
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
112 /** |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
113 * \brief decompress a zlib-compressed data block into decomp_buf |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
114 * \param src compressed input buffer |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
115 * \param src_len data length in input buffer |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
116 * \param offset offset in decomp_buf |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
117 * \param expected expected decompressed length |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
118 */ |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
119 static int zlib_decomp(AVCodecContext *avctx, const uint8_t *src, int src_len, int offset, int expected) |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
120 { |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
121 LclDecContext *c = avctx->priv_data; |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
122 int zret = inflateReset(&c->zstream); |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
123 if (zret != Z_OK) { |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
124 av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret); |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
125 return -1; |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
126 } |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
127 c->zstream.next_in = src; |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
128 c->zstream.avail_in = src_len; |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
129 c->zstream.next_out = c->decomp_buf + offset; |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
130 c->zstream.avail_out = c->decomp_size - offset; |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
131 zret = inflate(&c->zstream, Z_FINISH); |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
132 if (zret != Z_OK && zret != Z_STREAM_END) { |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
133 av_log(avctx, AV_LOG_ERROR, "Inflate error: %d\n", zret); |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
134 return -1; |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
135 } |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
136 if (expected != (unsigned int)c->zstream.total_out) { |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
137 av_log(avctx, AV_LOG_ERROR, "Decoded size differs (%d != %lu)\n", |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
138 expected, c->zstream.total_out); |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
139 return -1; |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
140 } |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
141 return c->zstream.total_out; |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
142 } |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
143 |
1743 | 144 |
145 /* | |
146 * | |
147 * Decode a frame | |
148 * | |
149 */ | |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
8718
diff
changeset
|
150 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) |
1743 | 151 { |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
8718
diff
changeset
|
152 const uint8_t *buf = avpkt->data; |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
8718
diff
changeset
|
153 int buf_size = avpkt->size; |
5297 | 154 LclDecContext * const c = avctx->priv_data; |
155 unsigned char *encoded = (unsigned char *)buf; | |
2418
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
156 unsigned int pixel_ptr; |
1743 | 157 int row, col; |
158 unsigned char *outptr; | |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
159 uint8_t *y_out, *u_out, *v_out; |
1743 | 160 unsigned int width = avctx->width; // Real image width |
161 unsigned int height = avctx->height; // Real image height | |
162 unsigned int mszh_dlen; | |
163 unsigned char yq, y1q, uq, vq; | |
164 int uqvq; | |
165 unsigned int mthread_inlen, mthread_outlen; | |
2418
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
166 unsigned int len = buf_size; |
1743 | 167 |
5297 | 168 if(c->pic.data[0]) |
169 avctx->release_buffer(avctx, &c->pic); | |
1743 | 170 |
5297 | 171 c->pic.reference = 0; |
172 c->pic.buffer_hints = FF_BUFFER_HINTS_VALID; | |
173 if(avctx->get_buffer(avctx, &c->pic) < 0){ | |
174 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); | |
175 return -1; | |
176 } | |
1743 | 177 |
178 outptr = c->pic.data[0]; // Output image pointer | |
179 | |
180 /* Decompress frame */ | |
181 switch (avctx->codec_id) { | |
5297 | 182 case CODEC_ID_MSZH: |
183 switch (c->compression) { | |
184 case COMP_MSZH: | |
1743 | 185 if (c->flags & FLAG_MULTITHREAD) { |
9761
b69de727fd7c
Fix decoding of multithread-encoded lcl files on big-endian.
reimar
parents:
9760
diff
changeset
|
186 mthread_inlen = AV_RL32(encoded); |
9758
8ebcc162db3d
Add sanity check for mthread_inlen, avoids crashes due to invalid reads.
reimar
parents:
9757
diff
changeset
|
187 mthread_inlen = FFMIN(mthread_inlen, len - 8); |
9761
b69de727fd7c
Fix decoding of multithread-encoded lcl files on big-endian.
reimar
parents:
9760
diff
changeset
|
188 mthread_outlen = AV_RL32(encoded+4); |
9757 | 189 mthread_outlen = FFMIN(mthread_outlen, c->decomp_size); |
5297 | 190 mszh_dlen = mszh_decomp(encoded + 8, mthread_inlen, c->decomp_buf, c->decomp_size); |
191 if (mthread_outlen != mszh_dlen) { | |
192 av_log(avctx, AV_LOG_ERROR, "Mthread1 decoded size differs (%d != %d)\n", | |
193 mthread_outlen, mszh_dlen); | |
1743 | 194 return -1; |
195 } | |
9759 | 196 mszh_dlen = mszh_decomp(encoded + 8 + mthread_inlen, len - 8 - mthread_inlen, |
5297 | 197 c->decomp_buf + mthread_outlen, c->decomp_size - mthread_outlen); |
198 if (mthread_outlen != mszh_dlen) { | |
199 av_log(avctx, AV_LOG_ERROR, "Mthread2 decoded size differs (%d != %d)\n", | |
200 mthread_outlen, mszh_dlen); | |
2418
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
201 return -1; |
1743 | 202 } |
5297 | 203 encoded = c->decomp_buf; |
204 len = c->decomp_size; | |
205 } else { | |
206 mszh_dlen = mszh_decomp(encoded, len, c->decomp_buf, c->decomp_size); | |
207 if (c->decomp_size != mszh_dlen) { | |
208 av_log(avctx, AV_LOG_ERROR, "Decoded size differs (%d != %d)\n", | |
209 c->decomp_size, mszh_dlen); | |
1743 | 210 return -1; |
211 } | |
5297 | 212 encoded = c->decomp_buf; |
213 len = mszh_dlen; | |
1743 | 214 } |
5297 | 215 break; |
216 case COMP_MSZH_NOCOMP: | |
1743 | 217 break; |
218 default: | |
5297 | 219 av_log(avctx, AV_LOG_ERROR, "BUG! Unknown MSZH compression in frame decoder.\n"); |
220 return -1; | |
221 } | |
222 break; | |
9752
f52c5d54ede5
Get rid of unreachable code: avctx->codec_id == CODEC_ID_ZLIB is not possible
reimar
parents:
9751
diff
changeset
|
223 #if CONFIG_ZLIB_DECODER |
5297 | 224 case CODEC_ID_ZLIB: |
225 /* Using the original dll with normal compression (-1) and RGB format | |
226 * gives a file with ZLIB fourcc, but frame is really uncompressed. | |
227 * To be sure that's true check also frame size */ | |
9736
405cbc435997
Remove useless () from lcldec for more consistency with "normal" FFmpeg coding style.
reimar
parents:
9730
diff
changeset
|
228 if (c->compression == COMP_ZLIB_NORMAL && c->imgtype == IMGTYPE_RGB24 && |
405cbc435997
Remove useless () from lcldec for more consistency with "normal" FFmpeg coding style.
reimar
parents:
9730
diff
changeset
|
229 len == width * height * 3) |
5297 | 230 break; |
231 if (c->flags & FLAG_MULTITHREAD) { | |
9756
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
232 int ret; |
9761
b69de727fd7c
Fix decoding of multithread-encoded lcl files on big-endian.
reimar
parents:
9760
diff
changeset
|
233 mthread_inlen = AV_RL32(encoded); |
9758
8ebcc162db3d
Add sanity check for mthread_inlen, avoids crashes due to invalid reads.
reimar
parents:
9757
diff
changeset
|
234 mthread_inlen = FFMIN(mthread_inlen, len - 8); |
9761
b69de727fd7c
Fix decoding of multithread-encoded lcl files on big-endian.
reimar
parents:
9760
diff
changeset
|
235 mthread_outlen = AV_RL32(encoded+4); |
9757 | 236 mthread_outlen = FFMIN(mthread_outlen, c->decomp_size); |
9756
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
237 ret = zlib_decomp(avctx, encoded + 8, mthread_inlen, 0, mthread_outlen); |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
238 if (ret < 0) return ret; |
9759 | 239 ret = zlib_decomp(avctx, encoded + 8 + mthread_inlen, len - 8 - mthread_inlen, |
9756
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
240 mthread_outlen, mthread_outlen); |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
241 if (ret < 0) return ret; |
5297 | 242 } else { |
9756
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
243 int ret = zlib_decomp(avctx, encoded, len, 0, c->decomp_size); |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
244 if (ret < 0) return ret; |
5297 | 245 } |
246 encoded = c->decomp_buf; | |
6375 | 247 len = c->decomp_size; |
9752
f52c5d54ede5
Get rid of unreachable code: avctx->codec_id == CODEC_ID_ZLIB is not possible
reimar
parents:
9751
diff
changeset
|
248 break; |
5297 | 249 #endif |
250 default: | |
251 av_log(avctx, AV_LOG_ERROR, "BUG! Unknown codec in frame decoder compression switch.\n"); | |
252 return -1; | |
1743 | 253 } |
254 | |
255 | |
256 /* Apply PNG filter */ | |
9736
405cbc435997
Remove useless () from lcldec for more consistency with "normal" FFmpeg coding style.
reimar
parents:
9730
diff
changeset
|
257 if (avctx->codec_id == CODEC_ID_ZLIB && (c->flags & FLAG_PNGFILTER)) { |
1743 | 258 switch (c->imgtype) { |
5297 | 259 case IMGTYPE_YUV111: |
260 case IMGTYPE_RGB24: | |
261 for (row = 0; row < height; row++) { | |
262 pixel_ptr = row * width * 3; | |
263 yq = encoded[pixel_ptr++]; | |
264 uqvq = AV_RL16(encoded+pixel_ptr); | |
265 pixel_ptr += 2; | |
266 for (col = 1; col < width; col++) { | |
267 encoded[pixel_ptr] = yq -= encoded[pixel_ptr]; | |
268 uqvq -= AV_RL16(encoded+pixel_ptr+1); | |
269 AV_WL16(encoded+pixel_ptr+1, uqvq); | |
270 pixel_ptr += 3; | |
1743 | 271 } |
5297 | 272 } |
273 break; | |
274 case IMGTYPE_YUV422: | |
275 for (row = 0; row < height; row++) { | |
276 pixel_ptr = row * width * 2; | |
277 yq = uq = vq =0; | |
278 for (col = 0; col < width/4; col++) { | |
279 encoded[pixel_ptr] = yq -= encoded[pixel_ptr]; | |
280 encoded[pixel_ptr+1] = yq -= encoded[pixel_ptr+1]; | |
281 encoded[pixel_ptr+2] = yq -= encoded[pixel_ptr+2]; | |
282 encoded[pixel_ptr+3] = yq -= encoded[pixel_ptr+3]; | |
283 encoded[pixel_ptr+4] = uq -= encoded[pixel_ptr+4]; | |
284 encoded[pixel_ptr+5] = uq -= encoded[pixel_ptr+5]; | |
285 encoded[pixel_ptr+6] = vq -= encoded[pixel_ptr+6]; | |
286 encoded[pixel_ptr+7] = vq -= encoded[pixel_ptr+7]; | |
287 pixel_ptr += 8; | |
1743 | 288 } |
5297 | 289 } |
290 break; | |
291 case IMGTYPE_YUV411: | |
292 for (row = 0; row < height; row++) { | |
293 pixel_ptr = row * width / 2 * 3; | |
294 yq = uq = vq =0; | |
295 for (col = 0; col < width/4; col++) { | |
296 encoded[pixel_ptr] = yq -= encoded[pixel_ptr]; | |
297 encoded[pixel_ptr+1] = yq -= encoded[pixel_ptr+1]; | |
298 encoded[pixel_ptr+2] = yq -= encoded[pixel_ptr+2]; | |
299 encoded[pixel_ptr+3] = yq -= encoded[pixel_ptr+3]; | |
300 encoded[pixel_ptr+4] = uq -= encoded[pixel_ptr+4]; | |
301 encoded[pixel_ptr+5] = vq -= encoded[pixel_ptr+5]; | |
302 pixel_ptr += 6; | |
1743 | 303 } |
5297 | 304 } |
305 break; | |
306 case IMGTYPE_YUV211: | |
307 for (row = 0; row < height; row++) { | |
308 pixel_ptr = row * width * 2; | |
309 yq = uq = vq =0; | |
310 for (col = 0; col < width/2; col++) { | |
311 encoded[pixel_ptr] = yq -= encoded[pixel_ptr]; | |
312 encoded[pixel_ptr+1] = yq -= encoded[pixel_ptr+1]; | |
313 encoded[pixel_ptr+2] = uq -= encoded[pixel_ptr+2]; | |
314 encoded[pixel_ptr+3] = vq -= encoded[pixel_ptr+3]; | |
315 pixel_ptr += 4; | |
1743 | 316 } |
5297 | 317 } |
318 break; | |
319 case IMGTYPE_YUV420: | |
320 for (row = 0; row < height/2; row++) { | |
321 pixel_ptr = row * width * 3; | |
322 yq = y1q = uq = vq =0; | |
323 for (col = 0; col < width/2; col++) { | |
324 encoded[pixel_ptr] = yq -= encoded[pixel_ptr]; | |
325 encoded[pixel_ptr+1] = yq -= encoded[pixel_ptr+1]; | |
326 encoded[pixel_ptr+2] = y1q -= encoded[pixel_ptr+2]; | |
327 encoded[pixel_ptr+3] = y1q -= encoded[pixel_ptr+3]; | |
328 encoded[pixel_ptr+4] = uq -= encoded[pixel_ptr+4]; | |
329 encoded[pixel_ptr+5] = vq -= encoded[pixel_ptr+5]; | |
330 pixel_ptr += 6; | |
1743 | 331 } |
5297 | 332 } |
333 break; | |
334 default: | |
335 av_log(avctx, AV_LOG_ERROR, "BUG! Unknown imagetype in pngfilter switch.\n"); | |
336 return -1; | |
1743 | 337 } |
338 } | |
339 | |
340 /* Convert colorspace */ | |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
341 y_out = c->pic.data[0] + (height - 1) * c->pic.linesize[0]; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
342 u_out = c->pic.data[1] + (height - 1) * c->pic.linesize[1]; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
343 v_out = c->pic.data[2] + (height - 1) * c->pic.linesize[2]; |
1743 | 344 switch (c->imgtype) { |
5297 | 345 case IMGTYPE_YUV111: |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
346 for (row = 0; row < height; row++) { |
5297 | 347 for (col = 0; col < width; col++) { |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
348 y_out[col] = *encoded++; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
349 u_out[col] = *encoded++ + 128; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
350 v_out[col] = *encoded++ + 128; |
1743 | 351 } |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
352 y_out -= c->pic.linesize[0]; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
353 u_out -= c->pic.linesize[1]; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
354 v_out -= c->pic.linesize[2]; |
5297 | 355 } |
356 break; | |
357 case IMGTYPE_YUV422: | |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
358 for (row = 0; row < height; row++) { |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
359 for (col = 0; col < width - 3; col += 4) { |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
360 memcpy(y_out + col, encoded, 4); |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
361 encoded += 4; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
362 u_out[ col >> 1 ] = *encoded++ + 128; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
363 u_out[(col >> 1) + 1] = *encoded++ + 128; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
364 v_out[ col >> 1 ] = *encoded++ + 128; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
365 v_out[(col >> 1) + 1] = *encoded++ + 128; |
1743 | 366 } |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
367 y_out -= c->pic.linesize[0]; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
368 u_out -= c->pic.linesize[1]; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
369 v_out -= c->pic.linesize[2]; |
5297 | 370 } |
371 break; | |
372 case IMGTYPE_RGB24: | |
373 for (row = height - 1; row >= 0; row--) { | |
374 pixel_ptr = row * c->pic.linesize[0]; | |
9738
d5929e456b07
Use memcpy instead of per-pixel copy loop for rgb lcl format
reimar
parents:
9736
diff
changeset
|
375 memcpy(outptr + pixel_ptr, encoded, 3 * width); |
d5929e456b07
Use memcpy instead of per-pixel copy loop for rgb lcl format
reimar
parents:
9736
diff
changeset
|
376 encoded += 3 * width; |
5297 | 377 } |
378 break; | |
379 case IMGTYPE_YUV411: | |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
380 for (row = 0; row < height; row++) { |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
381 for (col = 0; col < width - 3; col += 4) { |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
382 memcpy(y_out + col, encoded, 4); |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
383 encoded += 4; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
384 u_out[col >> 2] = *encoded++ + 128; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
385 v_out[col >> 2] = *encoded++ + 128; |
1743 | 386 } |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
387 y_out -= c->pic.linesize[0]; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
388 u_out -= c->pic.linesize[1]; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
389 v_out -= c->pic.linesize[2]; |
5297 | 390 } |
391 break; | |
392 case IMGTYPE_YUV211: | |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
393 for (row = 0; row < height; row++) { |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
394 for (col = 0; col < width - 1; col += 2) { |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
395 memcpy(y_out + col, encoded, 2); |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
396 encoded += 2; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
397 u_out[col >> 1] = *encoded++ + 128; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
398 v_out[col >> 1] = *encoded++ + 128; |
1743 | 399 } |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
400 y_out -= c->pic.linesize[0]; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
401 u_out -= c->pic.linesize[1]; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
402 v_out -= c->pic.linesize[2]; |
5297 | 403 } |
404 break; | |
405 case IMGTYPE_YUV420: | |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
406 u_out = c->pic.data[1] + ((height >> 1) - 1) * c->pic.linesize[1]; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
407 v_out = c->pic.data[2] + ((height >> 1) - 1) * c->pic.linesize[2]; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
408 for (row = 0; row < height - 1; row += 2) { |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
409 for (col = 0; col < width - 1; col += 2) { |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
410 memcpy(y_out + col, encoded, 2); |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
411 encoded += 2; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
412 memcpy(y_out + col - c->pic.linesize[0], encoded, 2); |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
413 encoded += 2; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
414 u_out[col >> 1] = *encoded++ + 128; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
415 v_out[col >> 1] = *encoded++ + 128; |
1743 | 416 } |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
417 y_out -= c->pic.linesize[0] << 1; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
418 u_out -= c->pic.linesize[1]; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
419 v_out -= c->pic.linesize[2]; |
5297 | 420 } |
421 break; | |
422 default: | |
423 av_log(avctx, AV_LOG_ERROR, "BUG! Unknown imagetype in image decoder.\n"); | |
424 return -1; | |
1743 | 425 } |
426 | |
427 *data_size = sizeof(AVFrame); | |
428 *(AVFrame*)data = c->pic; | |
429 | |
430 /* always report that the buffer was completely consumed */ | |
431 return buf_size; | |
432 } | |
433 | |
434 /* | |
435 * | |
436 * Init lcl decoder | |
437 * | |
438 */ | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6375
diff
changeset
|
439 static av_cold int decode_init(AVCodecContext *avctx) |
1743 | 440 { |
5294 | 441 LclDecContext * const c = avctx->priv_data; |
2418
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
442 unsigned int basesize = avctx->width * avctx->height; |
9770
e883c3dab3ec
Pad the decompression buffer and use av_memcpy_backptr for the mszh decompression.
reimar
parents:
9769
diff
changeset
|
443 unsigned int max_basesize = FFALIGN(avctx->width, 4) * FFALIGN(avctx->height, 4) + AV_LZO_OUTPUT_PADDING; |
2418
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
444 unsigned int max_decomp_size; |
1743 | 445 |
446 if (avctx->extradata_size < 8) { | |
447 av_log(avctx, AV_LOG_ERROR, "Extradata size too small.\n"); | |
448 return 1; | |
449 } | |
450 | |
2429
4b350cc506a7
Use avcodec_check_dimensions instead of custom hack
rtognimp
parents:
2418
diff
changeset
|
451 if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) { |
2418
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
452 return 1; |
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
453 } |
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
454 |
2967 | 455 /* Check codec type */ |
9750
a87706453840
Get rid of extradata casts, it already has the right uint8_t * type
reimar
parents:
9749
diff
changeset
|
456 if ((avctx->codec_id == CODEC_ID_MSZH && avctx->extradata[7] != CODEC_MSZH) || |
a87706453840
Get rid of extradata casts, it already has the right uint8_t * type
reimar
parents:
9749
diff
changeset
|
457 (avctx->codec_id == CODEC_ID_ZLIB && avctx->extradata[7] != CODEC_ZLIB)) { |
1743 | 458 av_log(avctx, AV_LOG_ERROR, "Codec id and codec type mismatch. This should not happen.\n"); |
459 } | |
460 | |
461 /* Detect image type */ | |
9750
a87706453840
Get rid of extradata casts, it already has the right uint8_t * type
reimar
parents:
9749
diff
changeset
|
462 switch (c->imgtype = avctx->extradata[4]) { |
5297 | 463 case IMGTYPE_YUV111: |
464 c->decomp_size = basesize * 3; | |
465 max_decomp_size = max_basesize * 3; | |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
466 avctx->pix_fmt = PIX_FMT_YUV444P; |
9753
ddd880ab64c6
Make lcldec less annoyingly verbose, move messages from AV_LOG_INFO to AV_LOG_DEBUG.
reimar
parents:
9752
diff
changeset
|
467 av_log(avctx, AV_LOG_DEBUG, "Image type is YUV 1:1:1.\n"); |
5297 | 468 break; |
469 case IMGTYPE_YUV422: | |
470 c->decomp_size = basesize * 2; | |
471 max_decomp_size = max_basesize * 2; | |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
472 avctx->pix_fmt = PIX_FMT_YUV422P; |
9753
ddd880ab64c6
Make lcldec less annoyingly verbose, move messages from AV_LOG_INFO to AV_LOG_DEBUG.
reimar
parents:
9752
diff
changeset
|
473 av_log(avctx, AV_LOG_DEBUG, "Image type is YUV 4:2:2.\n"); |
5297 | 474 break; |
475 case IMGTYPE_RGB24: | |
476 c->decomp_size = basesize * 3; | |
477 max_decomp_size = max_basesize * 3; | |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
478 avctx->pix_fmt = PIX_FMT_BGR24; |
9753
ddd880ab64c6
Make lcldec less annoyingly verbose, move messages from AV_LOG_INFO to AV_LOG_DEBUG.
reimar
parents:
9752
diff
changeset
|
479 av_log(avctx, AV_LOG_DEBUG, "Image type is RGB 24.\n"); |
5297 | 480 break; |
481 case IMGTYPE_YUV411: | |
482 c->decomp_size = basesize / 2 * 3; | |
483 max_decomp_size = max_basesize / 2 * 3; | |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
484 avctx->pix_fmt = PIX_FMT_YUV411P; |
9753
ddd880ab64c6
Make lcldec less annoyingly verbose, move messages from AV_LOG_INFO to AV_LOG_DEBUG.
reimar
parents:
9752
diff
changeset
|
485 av_log(avctx, AV_LOG_DEBUG, "Image type is YUV 4:1:1.\n"); |
5297 | 486 break; |
487 case IMGTYPE_YUV211: | |
488 c->decomp_size = basesize * 2; | |
489 max_decomp_size = max_basesize * 2; | |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
490 avctx->pix_fmt = PIX_FMT_YUV422P; |
9753
ddd880ab64c6
Make lcldec less annoyingly verbose, move messages from AV_LOG_INFO to AV_LOG_DEBUG.
reimar
parents:
9752
diff
changeset
|
491 av_log(avctx, AV_LOG_DEBUG, "Image type is YUV 2:1:1.\n"); |
5297 | 492 break; |
493 case IMGTYPE_YUV420: | |
494 c->decomp_size = basesize / 2 * 3; | |
495 max_decomp_size = max_basesize / 2 * 3; | |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
496 avctx->pix_fmt = PIX_FMT_YUV420P; |
9753
ddd880ab64c6
Make lcldec less annoyingly verbose, move messages from AV_LOG_INFO to AV_LOG_DEBUG.
reimar
parents:
9752
diff
changeset
|
497 av_log(avctx, AV_LOG_DEBUG, "Image type is YUV 4:2:0.\n"); |
5297 | 498 break; |
499 default: | |
500 av_log(avctx, AV_LOG_ERROR, "Unsupported image format %d.\n", c->imgtype); | |
501 return 1; | |
1743 | 502 } |
503 | |
504 /* Detect compression method */ | |
9772
2771fff83016
100l, the compression field in lcl extradata must be interpreted as
reimar
parents:
9771
diff
changeset
|
505 c->compression = (int8_t)avctx->extradata[5]; |
1743 | 506 switch (avctx->codec_id) { |
5297 | 507 case CODEC_ID_MSZH: |
508 switch (c->compression) { | |
509 case COMP_MSZH: | |
9753
ddd880ab64c6
Make lcldec less annoyingly verbose, move messages from AV_LOG_INFO to AV_LOG_DEBUG.
reimar
parents:
9752
diff
changeset
|
510 av_log(avctx, AV_LOG_DEBUG, "Compression enabled.\n"); |
1743 | 511 break; |
5297 | 512 case COMP_MSZH_NOCOMP: |
513 c->decomp_size = 0; | |
9753
ddd880ab64c6
Make lcldec less annoyingly verbose, move messages from AV_LOG_INFO to AV_LOG_DEBUG.
reimar
parents:
9752
diff
changeset
|
514 av_log(avctx, AV_LOG_DEBUG, "No compression.\n"); |
1743 | 515 break; |
516 default: | |
5297 | 517 av_log(avctx, AV_LOG_ERROR, "Unsupported compression format for MSZH (%d).\n", c->compression); |
1743 | 518 return 1; |
5297 | 519 } |
520 break; | |
9752
f52c5d54ede5
Get rid of unreachable code: avctx->codec_id == CODEC_ID_ZLIB is not possible
reimar
parents:
9751
diff
changeset
|
521 #if CONFIG_ZLIB_DECODER |
5297 | 522 case CODEC_ID_ZLIB: |
523 switch (c->compression) { | |
524 case COMP_ZLIB_HISPEED: | |
9753
ddd880ab64c6
Make lcldec less annoyingly verbose, move messages from AV_LOG_INFO to AV_LOG_DEBUG.
reimar
parents:
9752
diff
changeset
|
525 av_log(avctx, AV_LOG_DEBUG, "High speed compression.\n"); |
5297 | 526 break; |
527 case COMP_ZLIB_HICOMP: | |
9753
ddd880ab64c6
Make lcldec less annoyingly verbose, move messages from AV_LOG_INFO to AV_LOG_DEBUG.
reimar
parents:
9752
diff
changeset
|
528 av_log(avctx, AV_LOG_DEBUG, "High compression.\n"); |
5297 | 529 break; |
530 case COMP_ZLIB_NORMAL: | |
9753
ddd880ab64c6
Make lcldec less annoyingly verbose, move messages from AV_LOG_INFO to AV_LOG_DEBUG.
reimar
parents:
9752
diff
changeset
|
531 av_log(avctx, AV_LOG_DEBUG, "Normal compression.\n"); |
5297 | 532 break; |
533 default: | |
9736
405cbc435997
Remove useless () from lcldec for more consistency with "normal" FFmpeg coding style.
reimar
parents:
9730
diff
changeset
|
534 if (c->compression < Z_NO_COMPRESSION || c->compression > Z_BEST_COMPRESSION) { |
5297 | 535 av_log(avctx, AV_LOG_ERROR, "Unsupported compression level for ZLIB: (%d).\n", c->compression); |
536 return 1; | |
537 } | |
9753
ddd880ab64c6
Make lcldec less annoyingly verbose, move messages from AV_LOG_INFO to AV_LOG_DEBUG.
reimar
parents:
9752
diff
changeset
|
538 av_log(avctx, AV_LOG_DEBUG, "Compression level for ZLIB: (%d).\n", c->compression); |
5297 | 539 } |
9752
f52c5d54ede5
Get rid of unreachable code: avctx->codec_id == CODEC_ID_ZLIB is not possible
reimar
parents:
9751
diff
changeset
|
540 break; |
5297 | 541 #endif |
542 default: | |
543 av_log(avctx, AV_LOG_ERROR, "BUG! Unknown codec in compression switch.\n"); | |
544 return 1; | |
1743 | 545 } |
546 | |
547 /* Allocate decompression buffer */ | |
548 if (c->decomp_size) { | |
2418
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
549 if ((c->decomp_buf = av_malloc(max_decomp_size)) == NULL) { |
1743 | 550 av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n"); |
551 return 1; | |
552 } | |
553 } | |
2967 | 554 |
555 /* Detect flags */ | |
9750
a87706453840
Get rid of extradata casts, it already has the right uint8_t * type
reimar
parents:
9749
diff
changeset
|
556 c->flags = avctx->extradata[6]; |
1743 | 557 if (c->flags & FLAG_MULTITHREAD) |
9753
ddd880ab64c6
Make lcldec less annoyingly verbose, move messages from AV_LOG_INFO to AV_LOG_DEBUG.
reimar
parents:
9752
diff
changeset
|
558 av_log(avctx, AV_LOG_DEBUG, "Multithread encoder flag set.\n"); |
1743 | 559 if (c->flags & FLAG_NULLFRAME) |
9753
ddd880ab64c6
Make lcldec less annoyingly verbose, move messages from AV_LOG_INFO to AV_LOG_DEBUG.
reimar
parents:
9752
diff
changeset
|
560 av_log(avctx, AV_LOG_DEBUG, "Nullframe insertion flag set.\n"); |
9760 | 561 if (avctx->codec_id == CODEC_ID_ZLIB && (c->flags & FLAG_PNGFILTER)) |
9753
ddd880ab64c6
Make lcldec less annoyingly verbose, move messages from AV_LOG_INFO to AV_LOG_DEBUG.
reimar
parents:
9752
diff
changeset
|
562 av_log(avctx, AV_LOG_DEBUG, "PNG filter flag set.\n"); |
1743 | 563 if (c->flags & FLAGMASK_UNUSED) |
564 av_log(avctx, AV_LOG_ERROR, "Unknown flag set (%d).\n", c->flags); | |
565 | |
566 /* If needed init zlib */ | |
9752
f52c5d54ede5
Get rid of unreachable code: avctx->codec_id == CODEC_ID_ZLIB is not possible
reimar
parents:
9751
diff
changeset
|
567 #if CONFIG_ZLIB_DECODER |
1743 | 568 if (avctx->codec_id == CODEC_ID_ZLIB) { |
9754
269e16268683
Move variable into block where it is used, avoiding a unused variable
reimar
parents:
9753
diff
changeset
|
569 int zret; |
1743 | 570 c->zstream.zalloc = Z_NULL; |
571 c->zstream.zfree = Z_NULL; | |
572 c->zstream.opaque = Z_NULL; | |
9736
405cbc435997
Remove useless () from lcldec for more consistency with "normal" FFmpeg coding style.
reimar
parents:
9730
diff
changeset
|
573 zret = inflateInit(&c->zstream); |
1743 | 574 if (zret != Z_OK) { |
575 av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret); | |
9780
9f3ef4eea41a
Fix memleak due to c->decomp_buf never being freed.
reimar
parents:
9779
diff
changeset
|
576 av_freep(&c->decomp_buf); |
1743 | 577 return 1; |
578 } | |
9752
f52c5d54ede5
Get rid of unreachable code: avctx->codec_id == CODEC_ID_ZLIB is not possible
reimar
parents:
9751
diff
changeset
|
579 } |
1743 | 580 #endif |
581 | |
582 return 0; | |
583 } | |
584 | |
585 /* | |
586 * | |
587 * Uninit lcl decoder | |
588 * | |
589 */ | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6375
diff
changeset
|
590 static av_cold int decode_end(AVCodecContext *avctx) |
1743 | 591 { |
5297 | 592 LclDecContext * const c = avctx->priv_data; |
1743 | 593 |
9780
9f3ef4eea41a
Fix memleak due to c->decomp_buf never being freed.
reimar
parents:
9779
diff
changeset
|
594 av_freep(&c->decomp_buf); |
5297 | 595 if (c->pic.data[0]) |
596 avctx->release_buffer(avctx, &c->pic); | |
9751
705efd6ddaab
lcldec.c: change #if CONFIG_ZLIB to #if CONFIG_ZLIB_DECODER.
reimar
parents:
9750
diff
changeset
|
597 #if CONFIG_ZLIB_DECODER |
9779
4605c1f6e877
Only call inflateEnd when we were actually using the zlib code.
reimar
parents:
9778
diff
changeset
|
598 if (avctx->codec_id == CODEC_ID_ZLIB) |
4605c1f6e877
Only call inflateEnd when we were actually using the zlib code.
reimar
parents:
9778
diff
changeset
|
599 inflateEnd(&c->zstream); |
1743 | 600 #endif |
601 | |
5297 | 602 return 0; |
1743 | 603 } |
604 | |
8590 | 605 #if CONFIG_MSZH_DECODER |
1743 | 606 AVCodec mszh_decoder = { |
5297 | 607 "mszh", |
608 CODEC_TYPE_VIDEO, | |
609 CODEC_ID_MSZH, | |
610 sizeof(LclDecContext), | |
611 decode_init, | |
612 NULL, | |
613 decode_end, | |
614 decode_frame, | |
615 CODEC_CAP_DR1, | |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6712
diff
changeset
|
616 .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) MSZH"), |
1743 | 617 }; |
3777 | 618 #endif |
1743 | 619 |
8590 | 620 #if CONFIG_ZLIB_DECODER |
1743 | 621 AVCodec zlib_decoder = { |
5297 | 622 "zlib", |
623 CODEC_TYPE_VIDEO, | |
624 CODEC_ID_ZLIB, | |
625 sizeof(LclDecContext), | |
626 decode_init, | |
627 NULL, | |
628 decode_end, | |
629 decode_frame, | |
630 CODEC_CAP_DR1, | |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6712
diff
changeset
|
631 .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"), |
1743 | 632 }; |
3777 | 633 #endif |