annotate lcl.c @ 2418:82af834636c2 libavcodec

Check pointers before writing to memory, fix possible integer overflows Force alignement for mszh and zlib decoders
author rtognimp
date Sun, 09 Jan 2005 23:39:32 +0000
parents 582e635cfa08
children 4b350cc506a7
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 *
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
5 * This library is free software; you can redistribute it and/or
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
6 * modify it under the terms of the GNU Lesser General Public
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
7 * License as published by the Free Software Foundation; either
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
8 * version 2 of the License, or (at your option) any later version.
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
9 *
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
10 * This library is distributed in the hope that it will be useful,
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
13 * Lesser General Public License for more details.
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
14 *
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
16 * License along with this library; if not, write to the Free Software
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
18 *
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
19 */
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 * @file lcl.c
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
23 * LCL (LossLess Codec Library) Video Codec
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
24 * Decoder for MSZH and ZLIB codecs
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
25 * Experimental encoder for ZLIB RGB24
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
26 *
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
27 * Fourcc: MSZH, ZLIB
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
28 *
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
29 * Original Win32 dll:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
30 * Ver2.23 By Kenji Oshima 2000.09.20
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
31 * avimszh.dll, avizlib.dll
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
32 *
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
33 * A description of the decoding algorithm can be found here:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
34 * http://www.pcisys.net/~melanson/codecs
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
35 *
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
36 * Supports: BGR24 (RGB 24bpp)
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
37 *
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 #include <stdio.h>
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
41 #include <stdlib.h>
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
42
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
43 #include "common.h"
2398
582e635cfa08 common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents: 2250
diff changeset
44 #include "bitstream.h"
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
45 #include "avcodec.h"
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
46
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
47 #ifdef CONFIG_ZLIB
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
48 #include <zlib.h>
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
49 #endif
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
50
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
51
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
52 #define BMPTYPE_YUV 1
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
53 #define BMPTYPE_RGB 2
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
54
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
55 #define IMGTYPE_YUV111 0
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
56 #define IMGTYPE_YUV422 1
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
57 #define IMGTYPE_RGB24 2
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
58 #define IMGTYPE_YUV411 3
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
59 #define IMGTYPE_YUV211 4
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
60 #define IMGTYPE_YUV420 5
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
61
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
62 #define COMP_MSZH 0
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
63 #define COMP_MSZH_NOCOMP 1
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
64 #define COMP_ZLIB_HISPEED 1
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
65 #define COMP_ZLIB_HICOMP 9
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
66 #define COMP_ZLIB_NORMAL -1
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
67
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
68 #define FLAG_MULTITHREAD 1
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
69 #define FLAG_NULLFRAME 2
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
70 #define FLAG_PNGFILTER 4
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
71 #define FLAGMASK_UNUSED 0xf8
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
72
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
73 #define CODEC_MSZH 1
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
74 #define CODEC_ZLIB 3
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
75
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
76 #define FOURCC_MSZH mmioFOURCC('M','S','Z','H')
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
77 #define FOURCC_ZLIB mmioFOURCC('Z','L','I','B')
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
78
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
79 /*
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
80 * Decoder context
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
81 */
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
82 typedef struct LclContext {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
83
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
84 AVCodecContext *avctx;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
85 AVFrame pic;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
86 PutBitContext pb;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
87
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
88 // Image type
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
89 int imgtype;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
90 // Compression type
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
91 int compression;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
92 // Flags
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
93 int flags;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
94 // Decompressed data size
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
95 unsigned int decomp_size;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
96 // Decompression buffer
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
97 unsigned char* decomp_buf;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
98 // Maximum compressed data size
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
99 unsigned int max_comp_size;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
100 // Compression buffer
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
101 unsigned char* comp_buf;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
102 #ifdef CONFIG_ZLIB
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
103 z_stream zstream;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
104 #endif
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
105 } LclContext;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
106
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
107
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 * Helper functions
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
111 *
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
112 */
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
113 static inline unsigned char fix (int pix14)
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
114 {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
115 int tmp;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
116
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
117 tmp = (pix14 + 0x80000) >> 20;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
118 if (tmp < 0)
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
119 return 0;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
120 if (tmp > 255)
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
121 return 255;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
122 return tmp;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
123 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
124
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
125
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
126
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
127 static inline unsigned char get_b (unsigned char yq, signed char bq)
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
128 {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
129 return fix((yq << 20) + bq * 1858076);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
130 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
131
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
132
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
133
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
134 static inline unsigned char get_g (unsigned char yq, signed char bq, signed char rq)
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
135 {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
136 return fix((yq << 20) - bq * 360857 - rq * 748830);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
137 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
138
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
139
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
140
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
141 static inline unsigned char get_r (unsigned char yq, signed char rq)
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
142 {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
143 return fix((yq << 20) + rq * 1470103);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
144 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
145
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
146
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
147
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
148 static unsigned int mszh_decomp(unsigned char * srcptr, int srclen, unsigned char * destptr, unsigned int destsize)
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
149 {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
150 unsigned char *destptr_bak = destptr;
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
151 unsigned char *destptr_end = destptr + destsize;
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
152 unsigned char mask = 0;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
153 unsigned char maskbit = 0;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
154 unsigned int ofs, cnt;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
155
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
156 while ((srclen > 0) && (destptr < destptr_end)) {
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
157 if (maskbit == 0) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
158 mask = *(srcptr++);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
159 maskbit = 8;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
160 srclen--;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
161 continue;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
162 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
163 if ((mask & (1 << (--maskbit))) == 0) {
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
164 if (destptr + 4 > destptr_end)
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
165 break;
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
166 *(int*)destptr = *(int*)srcptr;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
167 srclen -= 4;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
168 destptr += 4;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
169 srcptr += 4;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
170 } else {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
171 ofs = *(srcptr++);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
172 cnt = *(srcptr++);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
173 ofs += cnt * 256;;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
174 cnt = ((cnt >> 3) & 0x1f) + 1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
175 ofs &= 0x7ff;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
176 srclen -= 2;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
177 cnt *= 4;
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
178 if (destptr + cnt > destptr_end) {
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
179 cnt = destptr_end - destptr;
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
180 }
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
181 for (; cnt > 0; cnt--) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
182 *(destptr) = *(destptr - ofs);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
183 destptr++;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
184 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
185 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
186 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
187
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
188 return (destptr - destptr_bak);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
189 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
190
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
191
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
192
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
193
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
194 /*
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
195 *
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
196 * Decode a frame
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
197 *
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
198 */
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
199 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size)
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
200 {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
201 LclContext * const c = (LclContext *)avctx->priv_data;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
202 unsigned char *encoded = (unsigned char *)buf;
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
203 unsigned int pixel_ptr;
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
204 int row, col;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
205 unsigned char *outptr;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
206 unsigned int width = avctx->width; // Real image width
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
207 unsigned int height = avctx->height; // Real image height
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
208 unsigned int mszh_dlen;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
209 unsigned char yq, y1q, uq, vq;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
210 int uqvq;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
211 unsigned int mthread_inlen, mthread_outlen;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
212 #ifdef CONFIG_ZLIB
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
213 int zret; // Zlib return code
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
214 #endif
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
215 unsigned int len = buf_size;
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
216
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
217 /* no supplementary picture */
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
218 if (buf_size == 0)
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
219 return 0;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
220
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
221 if(c->pic.data[0])
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
222 avctx->release_buffer(avctx, &c->pic);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
223
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
224 c->pic.reference = 0;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
225 c->pic.buffer_hints = FF_BUFFER_HINTS_VALID;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
226 if(avctx->get_buffer(avctx, &c->pic) < 0){
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
227 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
228 return -1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
229 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
230
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
231 outptr = c->pic.data[0]; // Output image pointer
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
232
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
233 /* Decompress frame */
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
234 switch (avctx->codec_id) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
235 case CODEC_ID_MSZH:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
236 switch (c->compression) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
237 case COMP_MSZH:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
238 if (c->flags & FLAG_MULTITHREAD) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
239 mthread_inlen = *((unsigned int*)encoded);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
240 mthread_outlen = *((unsigned int*)(encoded+4));
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
241 if (mthread_outlen > c->decomp_size) // this should not happen
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
242 mthread_outlen = c->decomp_size;
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
243 mszh_dlen = mszh_decomp(encoded + 8, mthread_inlen, c->decomp_buf, c->decomp_size);
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
244 if (mthread_outlen != mszh_dlen) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
245 av_log(avctx, AV_LOG_ERROR, "Mthread1 decoded size differs (%d != %d)\n",
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
246 mthread_outlen, mszh_dlen);
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
247 return -1;
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
248 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
249 mszh_dlen = mszh_decomp(encoded + 8 + mthread_inlen, len - mthread_inlen,
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
250 c->decomp_buf + mthread_outlen, c->decomp_size - mthread_outlen);
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
251 if (mthread_outlen != mszh_dlen) {
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
252 av_log(avctx, AV_LOG_ERROR, "Mthread2 decoded size differs (%d != %d)\n",
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
253 mthread_outlen, mszh_dlen);
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
254 return -1;
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
255 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
256 encoded = c->decomp_buf;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
257 len = c->decomp_size;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
258 } else {
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
259 mszh_dlen = mszh_decomp(encoded, len, c->decomp_buf, c->decomp_size);
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
260 if (c->decomp_size != mszh_dlen) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
261 av_log(avctx, AV_LOG_ERROR, "Decoded size differs (%d != %d)\n",
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
262 c->decomp_size, mszh_dlen);
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
263 return -1;
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
264 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
265 encoded = c->decomp_buf;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
266 len = mszh_dlen;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
267 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
268 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
269 case COMP_MSZH_NOCOMP:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
270 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
271 default:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
272 av_log(avctx, AV_LOG_ERROR, "BUG! Unknown MSZH compression in frame decoder.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
273 return -1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
274 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
275 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
276 case CODEC_ID_ZLIB:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
277 #ifdef CONFIG_ZLIB
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
278 /* Using the original dll with normal compression (-1) and RGB format
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
279 * gives a file with ZLIB fourcc, but frame is really uncompressed.
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
280 * To be sure that's true check also frame size */
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
281 if ((c->compression == COMP_ZLIB_NORMAL) && (c->imgtype == IMGTYPE_RGB24) &&
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
282 (len == width * height * 3))
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
283 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
284 zret = inflateReset(&(c->zstream));
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
285 if (zret != Z_OK) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
286 av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
287 return -1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
288 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
289 if (c->flags & FLAG_MULTITHREAD) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
290 mthread_inlen = *((unsigned int*)encoded);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
291 mthread_outlen = *((unsigned int*)(encoded+4));
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
292 if (mthread_outlen > c->decomp_size)
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
293 mthread_outlen = c->decomp_size;
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
294 c->zstream.next_in = encoded + 8;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
295 c->zstream.avail_in = mthread_inlen;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
296 c->zstream.next_out = c->decomp_buf;
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
297 c->zstream.avail_out = c->decomp_size;
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
298 zret = inflate(&(c->zstream), Z_FINISH);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
299 if ((zret != Z_OK) && (zret != Z_STREAM_END)) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
300 av_log(avctx, AV_LOG_ERROR, "Mthread1 inflate error: %d\n", zret);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
301 return -1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
302 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
303 if (mthread_outlen != (unsigned int)(c->zstream.total_out)) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
304 av_log(avctx, AV_LOG_ERROR, "Mthread1 decoded size differs (%u != %lu)\n",
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
305 mthread_outlen, c->zstream.total_out);
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
306 return -1;
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
307 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
308 zret = inflateReset(&(c->zstream));
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
309 if (zret != Z_OK) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
310 av_log(avctx, AV_LOG_ERROR, "Mthread2 inflate reset error: %d\n", zret);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
311 return -1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
312 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
313 c->zstream.next_in = encoded + 8 + mthread_inlen;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
314 c->zstream.avail_in = len - mthread_inlen;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
315 c->zstream.next_out = c->decomp_buf + mthread_outlen;
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
316 c->zstream.avail_out = c->decomp_size - mthread_outlen;
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
317 zret = inflate(&(c->zstream), Z_FINISH);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
318 if ((zret != Z_OK) && (zret != Z_STREAM_END)) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
319 av_log(avctx, AV_LOG_ERROR, "Mthread2 inflate error: %d\n", zret);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
320 return -1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
321 }
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
322 if (mthread_outlen != (unsigned int)(c->zstream.total_out)) {
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
323 av_log(avctx, AV_LOG_ERROR, "Mthread2 decoded size differs (%d != %lu)\n",
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
324 mthread_outlen, c->zstream.total_out);
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
325 return -1;
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
326 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
327 } else {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
328 c->zstream.next_in = encoded;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
329 c->zstream.avail_in = len;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
330 c->zstream.next_out = c->decomp_buf;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
331 c->zstream.avail_out = c->decomp_size;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
332 zret = inflate(&(c->zstream), Z_FINISH);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
333 if ((zret != Z_OK) && (zret != Z_STREAM_END)) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
334 av_log(avctx, AV_LOG_ERROR, "Inflate error: %d\n", zret);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
335 return -1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
336 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
337 if (c->decomp_size != (unsigned int)(c->zstream.total_out)) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
338 av_log(avctx, AV_LOG_ERROR, "Decoded size differs (%d != %lu)\n",
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
339 c->decomp_size, c->zstream.total_out);
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
340 return -1;
1743
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 encoded = c->decomp_buf;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
344 len = c->decomp_size;;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
345 #else
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
346 av_log(avctx, AV_LOG_ERROR, "BUG! Zlib support not compiled in frame decoder.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
347 return -1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
348 #endif
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
349 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
350 default:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
351 av_log(avctx, AV_LOG_ERROR, "BUG! Unknown codec in frame decoder compression switch.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
352 return -1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
353 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
354
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
355
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
356 /* Apply PNG filter */
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
357 if ((avctx->codec_id == CODEC_ID_ZLIB) && (c->flags & FLAG_PNGFILTER)) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
358 switch (c->imgtype) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
359 case IMGTYPE_YUV111:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
360 case IMGTYPE_RGB24:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
361 for (row = 0; row < height; row++) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
362 pixel_ptr = row * width * 3;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
363 yq = encoded[pixel_ptr++];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
364 uqvq = encoded[pixel_ptr++];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
365 uqvq+=(encoded[pixel_ptr++] << 8);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
366 for (col = 1; col < width; col++) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
367 encoded[pixel_ptr] = yq -= encoded[pixel_ptr];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
368 uqvq -= (encoded[pixel_ptr+1] | (encoded[pixel_ptr+2]<<8));
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
369 encoded[pixel_ptr+1] = (uqvq) & 0xff;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
370 encoded[pixel_ptr+2] = ((uqvq)>>8) & 0xff;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
371 pixel_ptr += 3;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
372 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
373 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
374 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
375 case IMGTYPE_YUV422:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
376 for (row = 0; row < height; row++) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
377 pixel_ptr = row * width * 2;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
378 yq = uq = vq =0;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
379 for (col = 0; col < width/4; col++) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
380 encoded[pixel_ptr] = yq -= encoded[pixel_ptr];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
381 encoded[pixel_ptr+1] = yq -= encoded[pixel_ptr+1];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
382 encoded[pixel_ptr+2] = yq -= encoded[pixel_ptr+2];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
383 encoded[pixel_ptr+3] = yq -= encoded[pixel_ptr+3];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
384 encoded[pixel_ptr+4] = uq -= encoded[pixel_ptr+4];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
385 encoded[pixel_ptr+5] = uq -= encoded[pixel_ptr+5];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
386 encoded[pixel_ptr+6] = vq -= encoded[pixel_ptr+6];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
387 encoded[pixel_ptr+7] = vq -= encoded[pixel_ptr+7];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
388 pixel_ptr += 8;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
389 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
390 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
391 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
392 case IMGTYPE_YUV411:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
393 for (row = 0; row < height; row++) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
394 pixel_ptr = row * width / 2 * 3;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
395 yq = uq = vq =0;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
396 for (col = 0; col < width/4; col++) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
397 encoded[pixel_ptr] = yq -= encoded[pixel_ptr];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
398 encoded[pixel_ptr+1] = yq -= encoded[pixel_ptr+1];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
399 encoded[pixel_ptr+2] = yq -= encoded[pixel_ptr+2];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
400 encoded[pixel_ptr+3] = yq -= encoded[pixel_ptr+3];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
401 encoded[pixel_ptr+4] = uq -= encoded[pixel_ptr+4];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
402 encoded[pixel_ptr+5] = vq -= encoded[pixel_ptr+5];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
403 pixel_ptr += 6;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
404 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
405 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
406 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
407 case IMGTYPE_YUV211:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
408 for (row = 0; row < height; row++) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
409 pixel_ptr = row * width * 2;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
410 yq = uq = vq =0;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
411 for (col = 0; col < width/2; col++) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
412 encoded[pixel_ptr] = yq -= encoded[pixel_ptr];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
413 encoded[pixel_ptr+1] = yq -= encoded[pixel_ptr+1];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
414 encoded[pixel_ptr+2] = uq -= encoded[pixel_ptr+2];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
415 encoded[pixel_ptr+3] = vq -= encoded[pixel_ptr+3];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
416 pixel_ptr += 4;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
417 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
418 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
419 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
420 case IMGTYPE_YUV420:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
421 for (row = 0; row < height/2; row++) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
422 pixel_ptr = row * width * 3;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
423 yq = y1q = uq = vq =0;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
424 for (col = 0; col < width/2; col++) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
425 encoded[pixel_ptr] = yq -= encoded[pixel_ptr];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
426 encoded[pixel_ptr+1] = yq -= encoded[pixel_ptr+1];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
427 encoded[pixel_ptr+2] = y1q -= encoded[pixel_ptr+2];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
428 encoded[pixel_ptr+3] = y1q -= encoded[pixel_ptr+3];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
429 encoded[pixel_ptr+4] = uq -= encoded[pixel_ptr+4];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
430 encoded[pixel_ptr+5] = vq -= encoded[pixel_ptr+5];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
431 pixel_ptr += 6;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
432 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
433 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
434 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
435 default:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
436 av_log(avctx, AV_LOG_ERROR, "BUG! Unknown imagetype in pngfilter switch.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
437 return -1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
438 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
439 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
440
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
441 /* Convert colorspace */
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
442 switch (c->imgtype) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
443 case IMGTYPE_YUV111:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
444 for (row = height - 1; row >= 0; row--) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
445 pixel_ptr = row * c->pic.linesize[0];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
446 for (col = 0; col < width; col++) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
447 outptr[pixel_ptr++] = get_b(encoded[0], encoded[1]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
448 outptr[pixel_ptr++] = get_g(encoded[0], encoded[1], encoded[2]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
449 outptr[pixel_ptr++] = get_r(encoded[0], encoded[2]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
450 encoded += 3;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
451 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
452 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
453 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
454 case IMGTYPE_YUV422:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
455 for (row = height - 1; row >= 0; row--) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
456 pixel_ptr = row * c->pic.linesize[0];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
457 for (col = 0; col < width/4; col++) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
458 outptr[pixel_ptr++] = get_b(encoded[0], encoded[4]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
459 outptr[pixel_ptr++] = get_g(encoded[0], encoded[4], encoded[6]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
460 outptr[pixel_ptr++] = get_r(encoded[0], encoded[6]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
461 outptr[pixel_ptr++] = get_b(encoded[1], encoded[4]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
462 outptr[pixel_ptr++] = get_g(encoded[1], encoded[4], encoded[6]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
463 outptr[pixel_ptr++] = get_r(encoded[1], encoded[6]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
464 outptr[pixel_ptr++] = get_b(encoded[2], encoded[5]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
465 outptr[pixel_ptr++] = get_g(encoded[2], encoded[5], encoded[7]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
466 outptr[pixel_ptr++] = get_r(encoded[2], encoded[7]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
467 outptr[pixel_ptr++] = get_b(encoded[3], encoded[5]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
468 outptr[pixel_ptr++] = get_g(encoded[3], encoded[5], encoded[7]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
469 outptr[pixel_ptr++] = get_r(encoded[3], encoded[7]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
470 encoded += 8;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
471 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
472 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
473 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
474 case IMGTYPE_RGB24:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
475 for (row = height - 1; row >= 0; row--) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
476 pixel_ptr = row * c->pic.linesize[0];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
477 for (col = 0; col < width; col++) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
478 outptr[pixel_ptr++] = encoded[0];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
479 outptr[pixel_ptr++] = encoded[1];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
480 outptr[pixel_ptr++] = encoded[2];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
481 encoded += 3;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
482 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
483 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
484 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
485 case IMGTYPE_YUV411:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
486 for (row = height - 1; row >= 0; row--) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
487 pixel_ptr = row * c->pic.linesize[0];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
488 for (col = 0; col < width/4; col++) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
489 outptr[pixel_ptr++] = get_b(encoded[0], encoded[4]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
490 outptr[pixel_ptr++] = get_g(encoded[0], encoded[4], encoded[5]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
491 outptr[pixel_ptr++] = get_r(encoded[0], encoded[5]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
492 outptr[pixel_ptr++] = get_b(encoded[1], encoded[4]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
493 outptr[pixel_ptr++] = get_g(encoded[1], encoded[4], encoded[5]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
494 outptr[pixel_ptr++] = get_r(encoded[1], encoded[5]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
495 outptr[pixel_ptr++] = get_b(encoded[2], encoded[4]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
496 outptr[pixel_ptr++] = get_g(encoded[2], encoded[4], encoded[5]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
497 outptr[pixel_ptr++] = get_r(encoded[2], encoded[5]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
498 outptr[pixel_ptr++] = get_b(encoded[3], encoded[4]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
499 outptr[pixel_ptr++] = get_g(encoded[3], encoded[4], encoded[5]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
500 outptr[pixel_ptr++] = get_r(encoded[3], encoded[5]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
501 encoded += 6;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
502 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
503 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
504 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
505 case IMGTYPE_YUV211:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
506 for (row = height - 1; row >= 0; row--) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
507 pixel_ptr = row * c->pic.linesize[0];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
508 for (col = 0; col < width/2; col++) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
509 outptr[pixel_ptr++] = get_b(encoded[0], encoded[2]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
510 outptr[pixel_ptr++] = get_g(encoded[0], encoded[2], encoded[3]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
511 outptr[pixel_ptr++] = get_r(encoded[0], encoded[3]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
512 outptr[pixel_ptr++] = get_b(encoded[1], encoded[2]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
513 outptr[pixel_ptr++] = get_g(encoded[1], encoded[2], encoded[3]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
514 outptr[pixel_ptr++] = get_r(encoded[1], encoded[3]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
515 encoded += 4;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
516 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
517 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
518 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
519 case IMGTYPE_YUV420:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
520 for (row = height / 2 - 1; row >= 0; row--) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
521 pixel_ptr = 2 * row * c->pic.linesize[0];
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
522 for (col = 0; col < width/2; col++) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
523 outptr[pixel_ptr] = get_b(encoded[0], encoded[4]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
524 outptr[pixel_ptr+1] = get_g(encoded[0], encoded[4], encoded[5]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
525 outptr[pixel_ptr+2] = get_r(encoded[0], encoded[5]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
526 outptr[pixel_ptr+3] = get_b(encoded[1], encoded[4]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
527 outptr[pixel_ptr+4] = get_g(encoded[1], encoded[4], encoded[5]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
528 outptr[pixel_ptr+5] = get_r(encoded[1], encoded[5]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
529 outptr[pixel_ptr-c->pic.linesize[0]] = get_b(encoded[2], encoded[4]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
530 outptr[pixel_ptr-c->pic.linesize[0]+1] = get_g(encoded[2], encoded[4], encoded[5]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
531 outptr[pixel_ptr-c->pic.linesize[0]+2] = get_r(encoded[2], encoded[5]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
532 outptr[pixel_ptr-c->pic.linesize[0]+3] = get_b(encoded[3], encoded[4]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
533 outptr[pixel_ptr-c->pic.linesize[0]+4] = get_g(encoded[3], encoded[4], encoded[5]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
534 outptr[pixel_ptr-c->pic.linesize[0]+5] = get_r(encoded[3], encoded[5]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
535 pixel_ptr += 6;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
536 encoded += 6;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
537 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
538 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
539 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
540 default:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
541 av_log(avctx, AV_LOG_ERROR, "BUG! Unknown imagetype in image decoder.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
542 return -1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
543 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
544
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
545 *data_size = sizeof(AVFrame);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
546 *(AVFrame*)data = c->pic;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
547
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
548 /* always report that the buffer was completely consumed */
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
549 return buf_size;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
550 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
551
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
552
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
553
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
554 /*
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
555 *
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
556 * Encode a frame
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
557 *
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
558 */
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
559 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
560 LclContext *c = avctx->priv_data;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
561 AVFrame *pict = data;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
562 AVFrame * const p = &c->pic;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
563 int i;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
564 int zret; // Zlib return code
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
565
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
566 #ifndef CONFIG_ZLIB
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
567 av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled in.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
568 return -1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
569 #else
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
570
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
571 init_put_bits(&c->pb, buf, buf_size);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
572
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
573 *p = *pict;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
574 p->pict_type= FF_I_TYPE;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
575 p->key_frame= 1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
576
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
577 if(avctx->pix_fmt != PIX_FMT_BGR24){
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
578 av_log(avctx, AV_LOG_ERROR, "Format not supported!\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
579 return -1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
580 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
581
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
582 zret = deflateReset(&(c->zstream));
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
583 if (zret != Z_OK) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
584 av_log(avctx, AV_LOG_ERROR, "Deflate reset error: %d\n", zret);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
585 return -1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
586 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
587 c->zstream.next_out = c->comp_buf;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
588 c->zstream.avail_out = c->max_comp_size;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
589
2250
902caf560c43 Zlib encoder: fix image orientation (was flipped), 100l in deflate error
rtognimp
parents: 2248
diff changeset
590 for(i = avctx->height - 1; i >= 0; i--) {
902caf560c43 Zlib encoder: fix image orientation (was flipped), 100l in deflate error
rtognimp
parents: 2248
diff changeset
591 c->zstream.next_in = p->data[0]+p->linesize[0]*i;
902caf560c43 Zlib encoder: fix image orientation (was flipped), 100l in deflate error
rtognimp
parents: 2248
diff changeset
592 c->zstream.avail_in = avctx->width*3;
902caf560c43 Zlib encoder: fix image orientation (was flipped), 100l in deflate error
rtognimp
parents: 2248
diff changeset
593 zret = deflate(&(c->zstream), Z_NO_FLUSH);
902caf560c43 Zlib encoder: fix image orientation (was flipped), 100l in deflate error
rtognimp
parents: 2248
diff changeset
594 if (zret != Z_OK) {
902caf560c43 Zlib encoder: fix image orientation (was flipped), 100l in deflate error
rtognimp
parents: 2248
diff changeset
595 av_log(avctx, AV_LOG_ERROR, "Deflate error: %d\n", zret);
902caf560c43 Zlib encoder: fix image orientation (was flipped), 100l in deflate error
rtognimp
parents: 2248
diff changeset
596 return -1;
902caf560c43 Zlib encoder: fix image orientation (was flipped), 100l in deflate error
rtognimp
parents: 2248
diff changeset
597 }
902caf560c43 Zlib encoder: fix image orientation (was flipped), 100l in deflate error
rtognimp
parents: 2248
diff changeset
598 }
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
599 zret = deflate(&(c->zstream), Z_FINISH);
2250
902caf560c43 Zlib encoder: fix image orientation (was flipped), 100l in deflate error
rtognimp
parents: 2248
diff changeset
600 if (zret != Z_STREAM_END) {
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
601 av_log(avctx, AV_LOG_ERROR, "Deflate error: %d\n", zret);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
602 return -1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
603 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
604
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
605 for (i = 0; i < c->zstream.total_out; i++)
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
606 put_bits(&c->pb, 8, c->comp_buf[i]);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
607 flush_put_bits(&c->pb);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
608
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
609 return c->zstream.total_out;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
610 #endif
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
611 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
612
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
613
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
614
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
615 /*
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
616 *
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
617 * Init lcl decoder
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
618 *
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
619 */
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
620 static int decode_init(AVCodecContext *avctx)
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
621 {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
622 LclContext * const c = (LclContext *)avctx->priv_data;
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
623 unsigned int basesize = avctx->width * avctx->height;
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
624 unsigned int max_basesize = ((avctx->width + 3) & ~3) * ((avctx->height + 3) & ~3);
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
625 unsigned int max_decomp_size;
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
626 int zret; // Zlib return code
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
627
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
628 c->avctx = avctx;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
629 avctx->has_b_frames = 0;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
630
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
631 c->pic.data[0] = NULL;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
632
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
633 #ifdef CONFIG_ZLIB
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
634 // Needed if zlib unused or init aborted before inflateInit
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
635 memset(&(c->zstream), 0, sizeof(z_stream));
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
636 #endif
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
637
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
638 if (avctx->extradata_size < 8) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
639 av_log(avctx, AV_LOG_ERROR, "Extradata size too small.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
640 return 1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
641 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
642
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
643 // FIXME: find a better way to prevent integer overflow
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
644 if (((unsigned int)avctx->width > 32000) || ((unsigned int)avctx->height > 32000)) {
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
645 av_log(avctx, AV_LOG_ERROR, "Bad image size (w = %d, h = %d).\n", avctx->width, avctx->height);
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
646 return 1;
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
647 }
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
648
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
649 /* Check codec type */
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
650 if (((avctx->codec_id == CODEC_ID_MSZH) && (*((char *)avctx->extradata + 7) != CODEC_MSZH)) ||
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
651 ((avctx->codec_id == CODEC_ID_ZLIB) && (*((char *)avctx->extradata + 7) != CODEC_ZLIB))) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
652 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
653 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
654
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
655 /* Detect image type */
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
656 switch (c->imgtype = *((char *)avctx->extradata + 4)) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
657 case IMGTYPE_YUV111:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
658 c->decomp_size = basesize * 3;
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
659 max_decomp_size = max_basesize * 3;
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
660 av_log(avctx, AV_LOG_INFO, "Image type is YUV 1:1:1.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
661 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
662 case IMGTYPE_YUV422:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
663 c->decomp_size = basesize * 2;
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
664 max_decomp_size = max_basesize * 2;
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
665 av_log(avctx, AV_LOG_INFO, "Image type is YUV 4:2:2.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
666 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
667 case IMGTYPE_RGB24:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
668 c->decomp_size = basesize * 3;
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
669 max_decomp_size = max_basesize * 3;
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
670 av_log(avctx, AV_LOG_INFO, "Image type is RGB 24.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
671 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
672 case IMGTYPE_YUV411:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
673 c->decomp_size = basesize / 2 * 3;
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
674 max_decomp_size = max_basesize / 2 * 3;
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
675 av_log(avctx, AV_LOG_INFO, "Image type is YUV 4:1:1.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
676 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
677 case IMGTYPE_YUV211:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
678 c->decomp_size = basesize * 2;
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
679 max_decomp_size = max_basesize * 2;
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
680 av_log(avctx, AV_LOG_INFO, "Image type is YUV 2:1:1.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
681 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
682 case IMGTYPE_YUV420:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
683 c->decomp_size = basesize / 2 * 3;
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
684 max_decomp_size = max_basesize / 2 * 3;
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
685 av_log(avctx, AV_LOG_INFO, "Image type is YUV 4:2:0.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
686 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
687 default:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
688 av_log(avctx, AV_LOG_ERROR, "Unsupported image format %d.\n", c->imgtype);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
689 return 1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
690 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
691
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
692 /* Detect compression method */
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
693 c->compression = *((char *)avctx->extradata + 5);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
694 switch (avctx->codec_id) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
695 case CODEC_ID_MSZH:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
696 switch (c->compression) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
697 case COMP_MSZH:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
698 av_log(avctx, AV_LOG_INFO, "Compression enabled.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
699 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
700 case COMP_MSZH_NOCOMP:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
701 c->decomp_size = 0;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
702 av_log(avctx, AV_LOG_INFO, "No compression.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
703 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
704 default:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
705 av_log(avctx, AV_LOG_ERROR, "Unsupported compression format for MSZH (%d).\n", c->compression);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
706 return 1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
707 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
708 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
709 case CODEC_ID_ZLIB:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
710 #ifdef CONFIG_ZLIB
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
711 switch (c->compression) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
712 case COMP_ZLIB_HISPEED:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
713 av_log(avctx, AV_LOG_INFO, "High speed compression.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
714 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
715 case COMP_ZLIB_HICOMP:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
716 av_log(avctx, AV_LOG_INFO, "High compression.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
717 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
718 case COMP_ZLIB_NORMAL:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
719 av_log(avctx, AV_LOG_INFO, "Normal compression.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
720 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
721 default:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
722 if ((c->compression < Z_NO_COMPRESSION) || (c->compression > Z_BEST_COMPRESSION)) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
723 av_log(avctx, AV_LOG_ERROR, "Unusupported compression level for ZLIB: (%d).\n", c->compression);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
724 return 1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
725 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
726 av_log(avctx, AV_LOG_INFO, "Compression level for ZLIB: (%d).\n", c->compression);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
727 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
728 #else
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
729 av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
730 return 1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
731 #endif
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
732 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
733 default:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
734 av_log(avctx, AV_LOG_ERROR, "BUG! Unknown codec in compression switch.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
735 return 1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
736 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
737
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
738 /* Allocate decompression buffer */
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
739 if (c->decomp_size) {
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
740 if ((c->decomp_buf = av_malloc(max_decomp_size)) == NULL) {
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
741 av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
742 return 1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
743 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
744 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
745
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
746 /* Detect flags */
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
747 c->flags = *((char *)avctx->extradata + 6);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
748 if (c->flags & FLAG_MULTITHREAD)
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
749 av_log(avctx, AV_LOG_INFO, "Multithread encoder flag set.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
750 if (c->flags & FLAG_NULLFRAME)
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
751 av_log(avctx, AV_LOG_INFO, "Nullframe insertion flag set.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
752 if ((avctx->codec_id == CODEC_ID_ZLIB) && (c->flags & FLAG_PNGFILTER))
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
753 av_log(avctx, AV_LOG_INFO, "PNG filter flag set.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
754 if (c->flags & FLAGMASK_UNUSED)
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
755 av_log(avctx, AV_LOG_ERROR, "Unknown flag set (%d).\n", c->flags);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
756
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
757 /* If needed init zlib */
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
758 if (avctx->codec_id == CODEC_ID_ZLIB) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
759 #ifdef CONFIG_ZLIB
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
760 c->zstream.zalloc = Z_NULL;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
761 c->zstream.zfree = Z_NULL;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
762 c->zstream.opaque = Z_NULL;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
763 zret = inflateInit(&(c->zstream));
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
764 if (zret != Z_OK) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
765 av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
766 return 1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
767 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
768 #else
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
769 av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
770 return 1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
771 #endif
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
772 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
773
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
774 avctx->pix_fmt = PIX_FMT_BGR24;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
775
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
776 return 0;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
777 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
778
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
779
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
780
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
781 /*
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
782 *
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
783 * Init lcl encoder
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
784 *
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
785 */
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
786 static int encode_init(AVCodecContext *avctx)
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
787 {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
788 LclContext *c = avctx->priv_data;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
789 int zret; // Zlib return code
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
790
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
791 #ifndef CONFIG_ZLIB
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
792 av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
793 return 1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
794 #else
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
795
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
796 c->avctx= avctx;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
797
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
798 assert(avctx->width && avctx->height);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
799
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
800 avctx->extradata= av_mallocz(8);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
801 avctx->coded_frame= &c->pic;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
802
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
803 // Will be user settable someday
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
804 c->compression = 6;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
805 c->flags = 0;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
806
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
807 switch(avctx->pix_fmt){
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
808 case PIX_FMT_BGR24:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
809 c->imgtype = IMGTYPE_RGB24;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
810 c->decomp_size = avctx->width * avctx->height * 3;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
811 avctx->bits_per_sample= 24;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
812 break;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
813 default:
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
814 av_log(avctx, AV_LOG_ERROR, "Format %d not supported\n", avctx->pix_fmt);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
815 return -1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
816 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
817
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
818 ((uint8_t*)avctx->extradata)[0]= 4;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
819 ((uint8_t*)avctx->extradata)[1]= 0;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
820 ((uint8_t*)avctx->extradata)[2]= 0;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
821 ((uint8_t*)avctx->extradata)[3]= 0;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
822 ((uint8_t*)avctx->extradata)[4]= c->imgtype;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
823 ((uint8_t*)avctx->extradata)[5]= c->compression;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
824 ((uint8_t*)avctx->extradata)[6]= c->flags;
2250
902caf560c43 Zlib encoder: fix image orientation (was flipped), 100l in deflate error
rtognimp
parents: 2248
diff changeset
825 ((uint8_t*)avctx->extradata)[7]= CODEC_ZLIB;
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
826 c->avctx->extradata_size= 8;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
827
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
828 c->zstream.zalloc = Z_NULL;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
829 c->zstream.zfree = Z_NULL;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
830 c->zstream.opaque = Z_NULL;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
831 zret = deflateInit(&(c->zstream), c->compression);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
832 if (zret != Z_OK) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
833 av_log(avctx, AV_LOG_ERROR, "Deflate init error: %d\n", zret);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
834 return 1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
835 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
836
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
837 /* Conservative upper bound taken from zlib v1.2.1 source */
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
838 c->max_comp_size = c->decomp_size + ((c->decomp_size + 7) >> 3) +
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
839 ((c->decomp_size + 63) >> 6) + 11;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
840 if ((c->comp_buf = av_malloc(c->max_comp_size)) == NULL) {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
841 av_log(avctx, AV_LOG_ERROR, "Can't allocate compression buffer.\n");
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
842 return 1;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
843 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
844
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
845 return 0;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
846 #endif
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
847 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
848
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
849
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
850
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
851
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
852
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
853 /*
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
854 *
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
855 * Uninit lcl decoder
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
856 *
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
857 */
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
858 static int decode_end(AVCodecContext *avctx)
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
859 {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
860 LclContext * const c = (LclContext *)avctx->priv_data;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
861
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
862 if (c->pic.data[0])
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
863 avctx->release_buffer(avctx, &c->pic);
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
864 #ifdef CONFIG_ZLIB
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
865 inflateEnd(&(c->zstream));
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
866 #endif
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
867
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
868 return 0;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
869 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
870
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
871
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
872
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
873 /*
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
874 *
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
875 * Uninit lcl encoder
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
876 *
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
877 */
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
878 static int encode_end(AVCodecContext *avctx)
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
879 {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
880 LclContext *c = avctx->priv_data;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
881
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
882 av_freep(&avctx->extradata);
2248
e4e1b4f31db6 segfault fix by (Kostya <cannonball at bw-team dot com>)
michael
parents: 1744
diff changeset
883 av_freep(&c->comp_buf);
1743
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
884 #ifdef CONFIG_ZLIB
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
885 deflateEnd(&(c->zstream));
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
886 #endif
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
887
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
888 return 0;
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
889 }
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
890
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
891 AVCodec mszh_decoder = {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
892 "mszh",
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
893 CODEC_TYPE_VIDEO,
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
894 CODEC_ID_MSZH,
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
895 sizeof(LclContext),
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
896 decode_init,
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
897 NULL,
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
898 decode_end,
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
899 decode_frame,
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
900 CODEC_CAP_DR1,
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
901 };
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
902
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
903
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
904 AVCodec zlib_decoder = {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
905 "zlib",
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
906 CODEC_TYPE_VIDEO,
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
907 CODEC_ID_ZLIB,
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
908 sizeof(LclContext),
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
909 decode_init,
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
910 NULL,
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
911 decode_end,
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
912 decode_frame,
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
913 CODEC_CAP_DR1,
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
914 };
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
915
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
916 #ifdef CONFIG_ENCODERS
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
917
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
918 AVCodec zlib_encoder = {
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
919 "zlib",
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
920 CODEC_TYPE_VIDEO,
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
921 CODEC_ID_ZLIB,
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
922 sizeof(LclContext),
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
923 encode_init,
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
924 encode_frame,
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
925 encode_end,
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
926 // .options = lcl_options,
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
927 };
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
928
fa06a4a448f7 Fix for older version of zlib
rtognimp
parents:
diff changeset
929 #endif //CONFIG_ENCODERS