Mercurial > libavcodec.hg
annotate lcldec.c @ 9781:05b6cba2c95b libavcodec
lcldec: ensure that the offset for av_memcpy_backptr is valid.
author | reimar |
---|---|
date | Sun, 31 May 2009 17:44:35 +0000 |
parents | 9f3ef4eea41a |
children | 66922728d7f7 |
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; |
9781
05b6cba2c95b
lcldec: ensure that the offset for av_memcpy_backptr is valid.
reimar
parents:
9780
diff
changeset
|
96 ofs = FFMIN(ofs, destptr - destptr_bak); |
1743 | 97 cnt *= 4; |
9771 | 98 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
|
99 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
|
100 destptr += cnt; |
1743 | 101 } |
9774 | 102 maskbit >>= 1; |
9775
3fd46320ab12
Take advantage of available input padding to optimize mszh_decomp
reimar
parents:
9774
diff
changeset
|
103 if (!maskbit) { |
3fd46320ab12
Take advantage of available input padding to optimize mszh_decomp
reimar
parents:
9774
diff
changeset
|
104 mask = *srcptr++; |
3fd46320ab12
Take advantage of available input padding to optimize mszh_decomp
reimar
parents:
9774
diff
changeset
|
105 maskbit = 0x80; |
3fd46320ab12
Take advantage of available input padding to optimize mszh_decomp
reimar
parents:
9774
diff
changeset
|
106 } |
1743 | 107 } |
108 | |
9736
405cbc435997
Remove useless () from lcldec for more consistency with "normal" FFmpeg coding style.
reimar
parents:
9730
diff
changeset
|
109 return destptr - destptr_bak; |
1743 | 110 } |
111 | |
112 | |
9756
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
113 /** |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
114 * \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
|
115 * \param src compressed input buffer |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
116 * \param src_len data length in input buffer |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
117 * \param offset offset in decomp_buf |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
118 * \param expected expected decompressed length |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
119 */ |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
120 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
|
121 { |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
122 LclDecContext *c = avctx->priv_data; |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
123 int zret = inflateReset(&c->zstream); |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
124 if (zret != Z_OK) { |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
125 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
|
126 return -1; |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
127 } |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
128 c->zstream.next_in = src; |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
129 c->zstream.avail_in = src_len; |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
130 c->zstream.next_out = c->decomp_buf + offset; |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
131 c->zstream.avail_out = c->decomp_size - offset; |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
132 zret = inflate(&c->zstream, Z_FINISH); |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
133 if (zret != Z_OK && zret != Z_STREAM_END) { |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
134 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
|
135 return -1; |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
136 } |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
137 if (expected != (unsigned int)c->zstream.total_out) { |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
138 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
|
139 expected, c->zstream.total_out); |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
140 return -1; |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
141 } |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
142 return c->zstream.total_out; |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
143 } |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
144 |
1743 | 145 |
146 /* | |
147 * | |
148 * Decode a frame | |
149 * | |
150 */ | |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
8718
diff
changeset
|
151 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) |
1743 | 152 { |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
8718
diff
changeset
|
153 const uint8_t *buf = avpkt->data; |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
8718
diff
changeset
|
154 int buf_size = avpkt->size; |
5297 | 155 LclDecContext * const c = avctx->priv_data; |
156 unsigned char *encoded = (unsigned char *)buf; | |
2418
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
157 unsigned int pixel_ptr; |
1743 | 158 int row, col; |
159 unsigned char *outptr; | |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
160 uint8_t *y_out, *u_out, *v_out; |
1743 | 161 unsigned int width = avctx->width; // Real image width |
162 unsigned int height = avctx->height; // Real image height | |
163 unsigned int mszh_dlen; | |
164 unsigned char yq, y1q, uq, vq; | |
165 int uqvq; | |
166 unsigned int mthread_inlen, mthread_outlen; | |
2418
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
167 unsigned int len = buf_size; |
1743 | 168 |
5297 | 169 if(c->pic.data[0]) |
170 avctx->release_buffer(avctx, &c->pic); | |
1743 | 171 |
5297 | 172 c->pic.reference = 0; |
173 c->pic.buffer_hints = FF_BUFFER_HINTS_VALID; | |
174 if(avctx->get_buffer(avctx, &c->pic) < 0){ | |
175 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); | |
176 return -1; | |
177 } | |
1743 | 178 |
179 outptr = c->pic.data[0]; // Output image pointer | |
180 | |
181 /* Decompress frame */ | |
182 switch (avctx->codec_id) { | |
5297 | 183 case CODEC_ID_MSZH: |
184 switch (c->compression) { | |
185 case COMP_MSZH: | |
1743 | 186 if (c->flags & FLAG_MULTITHREAD) { |
9761
b69de727fd7c
Fix decoding of multithread-encoded lcl files on big-endian.
reimar
parents:
9760
diff
changeset
|
187 mthread_inlen = AV_RL32(encoded); |
9758
8ebcc162db3d
Add sanity check for mthread_inlen, avoids crashes due to invalid reads.
reimar
parents:
9757
diff
changeset
|
188 mthread_inlen = FFMIN(mthread_inlen, len - 8); |
9761
b69de727fd7c
Fix decoding of multithread-encoded lcl files on big-endian.
reimar
parents:
9760
diff
changeset
|
189 mthread_outlen = AV_RL32(encoded+4); |
9757 | 190 mthread_outlen = FFMIN(mthread_outlen, c->decomp_size); |
5297 | 191 mszh_dlen = mszh_decomp(encoded + 8, mthread_inlen, c->decomp_buf, c->decomp_size); |
192 if (mthread_outlen != mszh_dlen) { | |
193 av_log(avctx, AV_LOG_ERROR, "Mthread1 decoded size differs (%d != %d)\n", | |
194 mthread_outlen, mszh_dlen); | |
1743 | 195 return -1; |
196 } | |
9759 | 197 mszh_dlen = mszh_decomp(encoded + 8 + mthread_inlen, len - 8 - mthread_inlen, |
5297 | 198 c->decomp_buf + mthread_outlen, c->decomp_size - mthread_outlen); |
199 if (mthread_outlen != mszh_dlen) { | |
200 av_log(avctx, AV_LOG_ERROR, "Mthread2 decoded size differs (%d != %d)\n", | |
201 mthread_outlen, mszh_dlen); | |
2418
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
202 return -1; |
1743 | 203 } |
5297 | 204 encoded = c->decomp_buf; |
205 len = c->decomp_size; | |
206 } else { | |
207 mszh_dlen = mszh_decomp(encoded, len, c->decomp_buf, c->decomp_size); | |
208 if (c->decomp_size != mszh_dlen) { | |
209 av_log(avctx, AV_LOG_ERROR, "Decoded size differs (%d != %d)\n", | |
210 c->decomp_size, mszh_dlen); | |
1743 | 211 return -1; |
212 } | |
5297 | 213 encoded = c->decomp_buf; |
214 len = mszh_dlen; | |
1743 | 215 } |
5297 | 216 break; |
217 case COMP_MSZH_NOCOMP: | |
1743 | 218 break; |
219 default: | |
5297 | 220 av_log(avctx, AV_LOG_ERROR, "BUG! Unknown MSZH compression in frame decoder.\n"); |
221 return -1; | |
222 } | |
223 break; | |
9752
f52c5d54ede5
Get rid of unreachable code: avctx->codec_id == CODEC_ID_ZLIB is not possible
reimar
parents:
9751
diff
changeset
|
224 #if CONFIG_ZLIB_DECODER |
5297 | 225 case CODEC_ID_ZLIB: |
226 /* Using the original dll with normal compression (-1) and RGB format | |
227 * gives a file with ZLIB fourcc, but frame is really uncompressed. | |
228 * 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
|
229 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
|
230 len == width * height * 3) |
5297 | 231 break; |
232 if (c->flags & FLAG_MULTITHREAD) { | |
9756
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
233 int ret; |
9761
b69de727fd7c
Fix decoding of multithread-encoded lcl files on big-endian.
reimar
parents:
9760
diff
changeset
|
234 mthread_inlen = AV_RL32(encoded); |
9758
8ebcc162db3d
Add sanity check for mthread_inlen, avoids crashes due to invalid reads.
reimar
parents:
9757
diff
changeset
|
235 mthread_inlen = FFMIN(mthread_inlen, len - 8); |
9761
b69de727fd7c
Fix decoding of multithread-encoded lcl files on big-endian.
reimar
parents:
9760
diff
changeset
|
236 mthread_outlen = AV_RL32(encoded+4); |
9757 | 237 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
|
238 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
|
239 if (ret < 0) return ret; |
9759 | 240 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
|
241 mthread_outlen, mthread_outlen); |
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
242 if (ret < 0) return ret; |
5297 | 243 } else { |
9756
ed55b61c8e45
Factor out zlib decompression code to avoid massive code duplication,
reimar
parents:
9755
diff
changeset
|
244 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
|
245 if (ret < 0) return ret; |
5297 | 246 } |
247 encoded = c->decomp_buf; | |
6375 | 248 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
|
249 break; |
5297 | 250 #endif |
251 default: | |
252 av_log(avctx, AV_LOG_ERROR, "BUG! Unknown codec in frame decoder compression switch.\n"); | |
253 return -1; | |
1743 | 254 } |
255 | |
256 | |
257 /* Apply PNG filter */ | |
9736
405cbc435997
Remove useless () from lcldec for more consistency with "normal" FFmpeg coding style.
reimar
parents:
9730
diff
changeset
|
258 if (avctx->codec_id == CODEC_ID_ZLIB && (c->flags & FLAG_PNGFILTER)) { |
1743 | 259 switch (c->imgtype) { |
5297 | 260 case IMGTYPE_YUV111: |
261 case IMGTYPE_RGB24: | |
262 for (row = 0; row < height; row++) { | |
263 pixel_ptr = row * width * 3; | |
264 yq = encoded[pixel_ptr++]; | |
265 uqvq = AV_RL16(encoded+pixel_ptr); | |
266 pixel_ptr += 2; | |
267 for (col = 1; col < width; col++) { | |
268 encoded[pixel_ptr] = yq -= encoded[pixel_ptr]; | |
269 uqvq -= AV_RL16(encoded+pixel_ptr+1); | |
270 AV_WL16(encoded+pixel_ptr+1, uqvq); | |
271 pixel_ptr += 3; | |
1743 | 272 } |
5297 | 273 } |
274 break; | |
275 case IMGTYPE_YUV422: | |
276 for (row = 0; row < height; row++) { | |
277 pixel_ptr = row * width * 2; | |
278 yq = uq = vq =0; | |
279 for (col = 0; col < width/4; col++) { | |
280 encoded[pixel_ptr] = yq -= encoded[pixel_ptr]; | |
281 encoded[pixel_ptr+1] = yq -= encoded[pixel_ptr+1]; | |
282 encoded[pixel_ptr+2] = yq -= encoded[pixel_ptr+2]; | |
283 encoded[pixel_ptr+3] = yq -= encoded[pixel_ptr+3]; | |
284 encoded[pixel_ptr+4] = uq -= encoded[pixel_ptr+4]; | |
285 encoded[pixel_ptr+5] = uq -= encoded[pixel_ptr+5]; | |
286 encoded[pixel_ptr+6] = vq -= encoded[pixel_ptr+6]; | |
287 encoded[pixel_ptr+7] = vq -= encoded[pixel_ptr+7]; | |
288 pixel_ptr += 8; | |
1743 | 289 } |
5297 | 290 } |
291 break; | |
292 case IMGTYPE_YUV411: | |
293 for (row = 0; row < height; row++) { | |
294 pixel_ptr = row * width / 2 * 3; | |
295 yq = uq = vq =0; | |
296 for (col = 0; col < width/4; col++) { | |
297 encoded[pixel_ptr] = yq -= encoded[pixel_ptr]; | |
298 encoded[pixel_ptr+1] = yq -= encoded[pixel_ptr+1]; | |
299 encoded[pixel_ptr+2] = yq -= encoded[pixel_ptr+2]; | |
300 encoded[pixel_ptr+3] = yq -= encoded[pixel_ptr+3]; | |
301 encoded[pixel_ptr+4] = uq -= encoded[pixel_ptr+4]; | |
302 encoded[pixel_ptr+5] = vq -= encoded[pixel_ptr+5]; | |
303 pixel_ptr += 6; | |
1743 | 304 } |
5297 | 305 } |
306 break; | |
307 case IMGTYPE_YUV211: | |
308 for (row = 0; row < height; row++) { | |
309 pixel_ptr = row * width * 2; | |
310 yq = uq = vq =0; | |
311 for (col = 0; col < width/2; col++) { | |
312 encoded[pixel_ptr] = yq -= encoded[pixel_ptr]; | |
313 encoded[pixel_ptr+1] = yq -= encoded[pixel_ptr+1]; | |
314 encoded[pixel_ptr+2] = uq -= encoded[pixel_ptr+2]; | |
315 encoded[pixel_ptr+3] = vq -= encoded[pixel_ptr+3]; | |
316 pixel_ptr += 4; | |
1743 | 317 } |
5297 | 318 } |
319 break; | |
320 case IMGTYPE_YUV420: | |
321 for (row = 0; row < height/2; row++) { | |
322 pixel_ptr = row * width * 3; | |
323 yq = y1q = uq = vq =0; | |
324 for (col = 0; col < width/2; col++) { | |
325 encoded[pixel_ptr] = yq -= encoded[pixel_ptr]; | |
326 encoded[pixel_ptr+1] = yq -= encoded[pixel_ptr+1]; | |
327 encoded[pixel_ptr+2] = y1q -= encoded[pixel_ptr+2]; | |
328 encoded[pixel_ptr+3] = y1q -= encoded[pixel_ptr+3]; | |
329 encoded[pixel_ptr+4] = uq -= encoded[pixel_ptr+4]; | |
330 encoded[pixel_ptr+5] = vq -= encoded[pixel_ptr+5]; | |
331 pixel_ptr += 6; | |
1743 | 332 } |
5297 | 333 } |
334 break; | |
335 default: | |
336 av_log(avctx, AV_LOG_ERROR, "BUG! Unknown imagetype in pngfilter switch.\n"); | |
337 return -1; | |
1743 | 338 } |
339 } | |
340 | |
341 /* Convert colorspace */ | |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
342 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
|
343 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
|
344 v_out = c->pic.data[2] + (height - 1) * c->pic.linesize[2]; |
1743 | 345 switch (c->imgtype) { |
5297 | 346 case IMGTYPE_YUV111: |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
347 for (row = 0; row < height; row++) { |
5297 | 348 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
|
349 y_out[col] = *encoded++; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
350 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
|
351 v_out[col] = *encoded++ + 128; |
1743 | 352 } |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
353 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
|
354 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
|
355 v_out -= c->pic.linesize[2]; |
5297 | 356 } |
357 break; | |
358 case IMGTYPE_YUV422: | |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
359 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
|
360 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
|
361 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
|
362 encoded += 4; |
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 ] = *encoded++ + 128; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
364 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
|
365 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
|
366 v_out[(col >> 1) + 1] = *encoded++ + 128; |
1743 | 367 } |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
368 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
|
369 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
|
370 v_out -= c->pic.linesize[2]; |
5297 | 371 } |
372 break; | |
373 case IMGTYPE_RGB24: | |
374 for (row = height - 1; row >= 0; row--) { | |
375 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
|
376 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
|
377 encoded += 3 * width; |
5297 | 378 } |
379 break; | |
380 case IMGTYPE_YUV411: | |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
381 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
|
382 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
|
383 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
|
384 encoded += 4; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
385 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
|
386 v_out[col >> 2] = *encoded++ + 128; |
1743 | 387 } |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
388 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
|
389 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
|
390 v_out -= c->pic.linesize[2]; |
5297 | 391 } |
392 break; | |
393 case IMGTYPE_YUV211: | |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
394 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
|
395 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
|
396 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
|
397 encoded += 2; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
398 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
|
399 v_out[col >> 1] = *encoded++ + 128; |
1743 | 400 } |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
401 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
|
402 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
|
403 v_out -= c->pic.linesize[2]; |
5297 | 404 } |
405 break; | |
406 case IMGTYPE_YUV420: | |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
407 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
|
408 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
|
409 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
|
410 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
|
411 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
|
412 encoded += 2; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
413 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
|
414 encoded += 2; |
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
415 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
|
416 v_out[col >> 1] = *encoded++ + 128; |
1743 | 417 } |
9749
4a4192578b60
Make lcldec produce YUV output when the input file is coded like that, instead
reimar
parents:
9738
diff
changeset
|
418 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
|
419 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
|
420 v_out -= c->pic.linesize[2]; |
5297 | 421 } |
422 break; | |
423 default: | |
424 av_log(avctx, AV_LOG_ERROR, "BUG! Unknown imagetype in image decoder.\n"); | |
425 return -1; | |
1743 | 426 } |
427 | |
428 *data_size = sizeof(AVFrame); | |
429 *(AVFrame*)data = c->pic; | |
430 | |
431 /* always report that the buffer was completely consumed */ | |
432 return buf_size; | |
433 } | |
434 | |
435 /* | |
436 * | |
437 * Init lcl decoder | |
438 * | |
439 */ | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6375
diff
changeset
|
440 static av_cold int decode_init(AVCodecContext *avctx) |
1743 | 441 { |
5294 | 442 LclDecContext * const c = avctx->priv_data; |
2418
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
443 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
|
444 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
|
445 unsigned int max_decomp_size; |
1743 | 446 |
447 if (avctx->extradata_size < 8) { | |
448 av_log(avctx, AV_LOG_ERROR, "Extradata size too small.\n"); | |
449 return 1; | |
450 } | |
451 | |
2429
4b350cc506a7
Use avcodec_check_dimensions instead of custom hack
rtognimp
parents:
2418
diff
changeset
|
452 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
|
453 return 1; |
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
454 } |
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
455 |
2967 | 456 /* Check codec type */ |
9750
a87706453840
Get rid of extradata casts, it already has the right uint8_t * type
reimar
parents:
9749
diff
changeset
|
457 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
|
458 (avctx->codec_id == CODEC_ID_ZLIB && avctx->extradata[7] != CODEC_ZLIB)) { |
1743 | 459 av_log(avctx, AV_LOG_ERROR, "Codec id and codec type mismatch. This should not happen.\n"); |
460 } | |
461 | |
462 /* Detect image type */ | |
9750
a87706453840
Get rid of extradata casts, it already has the right uint8_t * type
reimar
parents:
9749
diff
changeset
|
463 switch (c->imgtype = avctx->extradata[4]) { |
5297 | 464 case IMGTYPE_YUV111: |
465 c->decomp_size = basesize * 3; | |
466 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
|
467 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
|
468 av_log(avctx, AV_LOG_DEBUG, "Image type is YUV 1:1:1.\n"); |
5297 | 469 break; |
470 case IMGTYPE_YUV422: | |
471 c->decomp_size = basesize * 2; | |
472 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
|
473 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
|
474 av_log(avctx, AV_LOG_DEBUG, "Image type is YUV 4:2:2.\n"); |
5297 | 475 break; |
476 case IMGTYPE_RGB24: | |
477 c->decomp_size = basesize * 3; | |
478 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
|
479 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
|
480 av_log(avctx, AV_LOG_DEBUG, "Image type is RGB 24.\n"); |
5297 | 481 break; |
482 case IMGTYPE_YUV411: | |
483 c->decomp_size = basesize / 2 * 3; | |
484 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
|
485 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
|
486 av_log(avctx, AV_LOG_DEBUG, "Image type is YUV 4:1:1.\n"); |
5297 | 487 break; |
488 case IMGTYPE_YUV211: | |
489 c->decomp_size = basesize * 2; | |
490 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
|
491 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
|
492 av_log(avctx, AV_LOG_DEBUG, "Image type is YUV 2:1:1.\n"); |
5297 | 493 break; |
494 case IMGTYPE_YUV420: | |
495 c->decomp_size = basesize / 2 * 3; | |
496 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
|
497 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
|
498 av_log(avctx, AV_LOG_DEBUG, "Image type is YUV 4:2:0.\n"); |
5297 | 499 break; |
500 default: | |
501 av_log(avctx, AV_LOG_ERROR, "Unsupported image format %d.\n", c->imgtype); | |
502 return 1; | |
1743 | 503 } |
504 | |
505 /* Detect compression method */ | |
9772
2771fff83016
100l, the compression field in lcl extradata must be interpreted as
reimar
parents:
9771
diff
changeset
|
506 c->compression = (int8_t)avctx->extradata[5]; |
1743 | 507 switch (avctx->codec_id) { |
5297 | 508 case CODEC_ID_MSZH: |
509 switch (c->compression) { | |
510 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
|
511 av_log(avctx, AV_LOG_DEBUG, "Compression enabled.\n"); |
1743 | 512 break; |
5297 | 513 case COMP_MSZH_NOCOMP: |
514 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
|
515 av_log(avctx, AV_LOG_DEBUG, "No compression.\n"); |
1743 | 516 break; |
517 default: | |
5297 | 518 av_log(avctx, AV_LOG_ERROR, "Unsupported compression format for MSZH (%d).\n", c->compression); |
1743 | 519 return 1; |
5297 | 520 } |
521 break; | |
9752
f52c5d54ede5
Get rid of unreachable code: avctx->codec_id == CODEC_ID_ZLIB is not possible
reimar
parents:
9751
diff
changeset
|
522 #if CONFIG_ZLIB_DECODER |
5297 | 523 case CODEC_ID_ZLIB: |
524 switch (c->compression) { | |
525 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
|
526 av_log(avctx, AV_LOG_DEBUG, "High speed compression.\n"); |
5297 | 527 break; |
528 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
|
529 av_log(avctx, AV_LOG_DEBUG, "High compression.\n"); |
5297 | 530 break; |
531 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
|
532 av_log(avctx, AV_LOG_DEBUG, "Normal compression.\n"); |
5297 | 533 break; |
534 default: | |
9736
405cbc435997
Remove useless () from lcldec for more consistency with "normal" FFmpeg coding style.
reimar
parents:
9730
diff
changeset
|
535 if (c->compression < Z_NO_COMPRESSION || c->compression > Z_BEST_COMPRESSION) { |
5297 | 536 av_log(avctx, AV_LOG_ERROR, "Unsupported compression level for ZLIB: (%d).\n", c->compression); |
537 return 1; | |
538 } | |
9753
ddd880ab64c6
Make lcldec less annoyingly verbose, move messages from AV_LOG_INFO to AV_LOG_DEBUG.
reimar
parents:
9752
diff
changeset
|
539 av_log(avctx, AV_LOG_DEBUG, "Compression level for ZLIB: (%d).\n", c->compression); |
5297 | 540 } |
9752
f52c5d54ede5
Get rid of unreachable code: avctx->codec_id == CODEC_ID_ZLIB is not possible
reimar
parents:
9751
diff
changeset
|
541 break; |
5297 | 542 #endif |
543 default: | |
544 av_log(avctx, AV_LOG_ERROR, "BUG! Unknown codec in compression switch.\n"); | |
545 return 1; | |
1743 | 546 } |
547 | |
548 /* Allocate decompression buffer */ | |
549 if (c->decomp_size) { | |
2418
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
550 if ((c->decomp_buf = av_malloc(max_decomp_size)) == NULL) { |
1743 | 551 av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n"); |
552 return 1; | |
553 } | |
554 } | |
2967 | 555 |
556 /* Detect flags */ | |
9750
a87706453840
Get rid of extradata casts, it already has the right uint8_t * type
reimar
parents:
9749
diff
changeset
|
557 c->flags = avctx->extradata[6]; |
1743 | 558 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
|
559 av_log(avctx, AV_LOG_DEBUG, "Multithread encoder flag set.\n"); |
1743 | 560 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
|
561 av_log(avctx, AV_LOG_DEBUG, "Nullframe insertion flag set.\n"); |
9760 | 562 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
|
563 av_log(avctx, AV_LOG_DEBUG, "PNG filter flag set.\n"); |
1743 | 564 if (c->flags & FLAGMASK_UNUSED) |
565 av_log(avctx, AV_LOG_ERROR, "Unknown flag set (%d).\n", c->flags); | |
566 | |
567 /* 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
|
568 #if CONFIG_ZLIB_DECODER |
1743 | 569 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
|
570 int zret; |
1743 | 571 c->zstream.zalloc = Z_NULL; |
572 c->zstream.zfree = Z_NULL; | |
573 c->zstream.opaque = Z_NULL; | |
9736
405cbc435997
Remove useless () from lcldec for more consistency with "normal" FFmpeg coding style.
reimar
parents:
9730
diff
changeset
|
574 zret = inflateInit(&c->zstream); |
1743 | 575 if (zret != Z_OK) { |
576 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
|
577 av_freep(&c->decomp_buf); |
1743 | 578 return 1; |
579 } | |
9752
f52c5d54ede5
Get rid of unreachable code: avctx->codec_id == CODEC_ID_ZLIB is not possible
reimar
parents:
9751
diff
changeset
|
580 } |
1743 | 581 #endif |
582 | |
583 return 0; | |
584 } | |
585 | |
586 /* | |
587 * | |
588 * Uninit lcl decoder | |
589 * | |
590 */ | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6375
diff
changeset
|
591 static av_cold int decode_end(AVCodecContext *avctx) |
1743 | 592 { |
5297 | 593 LclDecContext * const c = avctx->priv_data; |
1743 | 594 |
9780
9f3ef4eea41a
Fix memleak due to c->decomp_buf never being freed.
reimar
parents:
9779
diff
changeset
|
595 av_freep(&c->decomp_buf); |
5297 | 596 if (c->pic.data[0]) |
597 avctx->release_buffer(avctx, &c->pic); | |
9751
705efd6ddaab
lcldec.c: change #if CONFIG_ZLIB to #if CONFIG_ZLIB_DECODER.
reimar
parents:
9750
diff
changeset
|
598 #if CONFIG_ZLIB_DECODER |
9779
4605c1f6e877
Only call inflateEnd when we were actually using the zlib code.
reimar
parents:
9778
diff
changeset
|
599 if (avctx->codec_id == CODEC_ID_ZLIB) |
4605c1f6e877
Only call inflateEnd when we were actually using the zlib code.
reimar
parents:
9778
diff
changeset
|
600 inflateEnd(&c->zstream); |
1743 | 601 #endif |
602 | |
5297 | 603 return 0; |
1743 | 604 } |
605 | |
8590 | 606 #if CONFIG_MSZH_DECODER |
1743 | 607 AVCodec mszh_decoder = { |
5297 | 608 "mszh", |
609 CODEC_TYPE_VIDEO, | |
610 CODEC_ID_MSZH, | |
611 sizeof(LclDecContext), | |
612 decode_init, | |
613 NULL, | |
614 decode_end, | |
615 decode_frame, | |
616 CODEC_CAP_DR1, | |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6712
diff
changeset
|
617 .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) MSZH"), |
1743 | 618 }; |
3777 | 619 #endif |
1743 | 620 |
8590 | 621 #if CONFIG_ZLIB_DECODER |
1743 | 622 AVCodec zlib_decoder = { |
5297 | 623 "zlib", |
624 CODEC_TYPE_VIDEO, | |
625 CODEC_ID_ZLIB, | |
626 sizeof(LclDecContext), | |
627 decode_init, | |
628 NULL, | |
629 decode_end, | |
630 decode_frame, | |
631 CODEC_CAP_DR1, | |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6712
diff
changeset
|
632 .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"), |
1743 | 633 }; |
3777 | 634 #endif |