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