annotate lcldec.c @ 9772:2771fff83016 libavcodec

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