Mercurial > libavcodec.hg
annotate huffyuv.c @ 8134:10541875e559 libavcodec
add a line break in error message text
author | jbr |
---|---|
date | Thu, 13 Nov 2008 03:18:01 +0000 |
parents | 4525dcd81357 |
children | 61cfb1dcfae5 |
rev | line source |
---|---|
866 | 1 /* |
2 * huffyuv codec for libavcodec | |
3 * | |
1006 | 4 * Copyright (c) 2002-2003 Michael Niedermayer <michaelni@gmx.at> |
866 | 5 * |
5214 | 6 * see http://www.pcisys.net/~melanson/codecs/huffyuv.txt for a description of |
7 * the algorithm used | |
8 * | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3777
diff
changeset
|
9 * This file is part of FFmpeg. |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3777
diff
changeset
|
10 * |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3777
diff
changeset
|
11 * FFmpeg is free software; you can redistribute it and/or |
866 | 12 * modify it under the terms of the GNU Lesser General Public |
13 * License as published by the Free Software Foundation; either | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3777
diff
changeset
|
14 * version 2.1 of the License, or (at your option) any later version. |
866 | 15 * |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3777
diff
changeset
|
16 * FFmpeg is distributed in the hope that it will be useful, |
866 | 17 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
19 * Lesser General Public License for more details. | |
20 * | |
21 * You should have received a copy of the GNU Lesser General Public | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3777
diff
changeset
|
22 * License along with FFmpeg; if not, write to the Free Software |
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
2967
diff
changeset
|
23 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
866 | 24 */ |
2967 | 25 |
1106 | 26 /** |
27 * @file huffyuv.c | |
28 * huffyuv codec for libavcodec. | |
29 */ | |
866 | 30 |
4962
f99e40a7155b
Remove redundant #inclusion of common.h, avcodec.h already #includes it.
diego
parents:
4691
diff
changeset
|
31 #include "avcodec.h" |
2398
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2374
diff
changeset
|
32 #include "bitstream.h" |
866 | 33 #include "dsputil.h" |
34 | |
35 #define VLC_BITS 11 | |
903 | 36 |
2176 | 37 #ifdef WORDS_BIGENDIAN |
38 #define B 3 | |
39 #define G 2 | |
40 #define R 1 | |
41 #else | |
42 #define B 0 | |
43 #define G 1 | |
44 #define R 2 | |
45 #endif | |
46 | |
866 | 47 typedef enum Predictor{ |
48 LEFT= 0, | |
49 PLANE, | |
50 MEDIAN, | |
51 } Predictor; | |
2967 | 52 |
866 | 53 typedef struct HYuvContext{ |
54 AVCodecContext *avctx; | |
55 Predictor predictor; | |
56 GetBitContext gb; | |
57 PutBitContext pb; | |
58 int interlaced; | |
59 int decorrelate; | |
60 int bitstream_bpp; | |
61 int version; | |
62 int yuy2; //use yuy2 instead of 422P | |
63 int bgr32; //use bgr32 instead of bgr24 | |
64 int width, height; | |
65 int flags; | |
2369 | 66 int context; |
866 | 67 int picture_number; |
871 | 68 int last_slice_end; |
2422 | 69 uint8_t *temp[3]; |
866 | 70 uint64_t stats[3][256]; |
71 uint8_t len[3][256]; | |
72 uint32_t bits[3][256]; | |
5074 | 73 uint32_t pix_bgr_map[1<<VLC_BITS]; |
5063
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
74 VLC vlc[6]; //Y,U,V,YY,YU,YV |
925 | 75 AVFrame picture; |
2422 | 76 uint8_t *bitstream_buffer; |
3066
04b924f8f5a5
warning fixes by Luca Abeni, lucabe72 ##@## email ##.## it
diego
parents:
3036
diff
changeset
|
77 unsigned int bitstream_buffer_size; |
2967 | 78 DSPContext dsp; |
866 | 79 }HYuvContext; |
80 | |
1082 | 81 static const unsigned char classic_shift_luma[] = { |
1080
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
82 34,36,35,69,135,232,9,16,10,24,11,23,12,16,13,10,14,8,15,8, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
83 16,8,17,20,16,10,207,206,205,236,11,8,10,21,9,23,8,8,199,70, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
84 69,68, 0 |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
85 }; |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
86 |
1082 | 87 static const unsigned char classic_shift_chroma[] = { |
1080
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
88 66,36,37,38,39,40,41,75,76,77,110,239,144,81,82,83,84,85,118,183, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
89 56,57,88,89,56,89,154,57,58,57,26,141,57,56,58,57,58,57,184,119, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
90 214,245,116,83,82,49,80,79,78,77,44,75,41,40,39,38,37,36,34, 0 |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
91 }; |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
92 |
1082 | 93 static const unsigned char classic_add_luma[256] = { |
1080
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
94 3, 9, 5, 12, 10, 35, 32, 29, 27, 50, 48, 45, 44, 41, 39, 37, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
95 73, 70, 68, 65, 64, 61, 58, 56, 53, 50, 49, 46, 44, 41, 38, 36, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
96 68, 65, 63, 61, 58, 55, 53, 51, 48, 46, 45, 43, 41, 39, 38, 36, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
97 35, 33, 32, 30, 29, 27, 26, 25, 48, 47, 46, 44, 43, 41, 40, 39, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
98 37, 36, 35, 34, 32, 31, 30, 28, 27, 26, 24, 23, 22, 20, 19, 37, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
99 35, 34, 33, 31, 30, 29, 27, 26, 24, 23, 21, 20, 18, 17, 15, 29, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
100 27, 26, 24, 22, 21, 19, 17, 16, 14, 26, 25, 23, 21, 19, 18, 16, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
101 15, 27, 25, 23, 21, 19, 17, 16, 14, 26, 25, 23, 21, 18, 17, 14, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
102 12, 17, 19, 13, 4, 9, 2, 11, 1, 7, 8, 0, 16, 3, 14, 6, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
103 12, 10, 5, 15, 18, 11, 10, 13, 15, 16, 19, 20, 22, 24, 27, 15, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
104 18, 20, 22, 24, 26, 14, 17, 20, 22, 24, 27, 15, 18, 20, 23, 25, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
105 28, 16, 19, 22, 25, 28, 32, 36, 21, 25, 29, 33, 38, 42, 45, 49, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
106 28, 31, 34, 37, 40, 42, 44, 47, 49, 50, 52, 54, 56, 57, 59, 60, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
107 62, 64, 66, 67, 69, 35, 37, 39, 40, 42, 43, 45, 47, 48, 51, 52, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
108 54, 55, 57, 59, 60, 62, 63, 66, 67, 69, 71, 72, 38, 40, 42, 43, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
109 46, 47, 49, 51, 26, 28, 30, 31, 33, 34, 18, 19, 11, 13, 7, 8, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
110 }; |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
111 |
1082 | 112 static const unsigned char classic_add_chroma[256] = { |
1080
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
113 3, 1, 2, 2, 2, 2, 3, 3, 7, 5, 7, 5, 8, 6, 11, 9, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
114 7, 13, 11, 10, 9, 8, 7, 5, 9, 7, 6, 4, 7, 5, 8, 7, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
115 11, 8, 13, 11, 19, 15, 22, 23, 20, 33, 32, 28, 27, 29, 51, 77, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
116 43, 45, 76, 81, 46, 82, 75, 55, 56,144, 58, 80, 60, 74,147, 63, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
117 143, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
118 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 27, 30, 21, 22, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
119 17, 14, 5, 6,100, 54, 47, 50, 51, 53,106,107,108,109,110,111, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
120 112,113,114,115, 4,117,118, 92, 94,121,122, 3,124,103, 2, 1, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
121 0,129,130,131,120,119,126,125,136,137,138,139,140,141,142,134, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
122 135,132,133,104, 64,101, 62, 57,102, 95, 93, 59, 61, 28, 97, 96, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
123 52, 49, 48, 29, 32, 25, 24, 46, 23, 98, 45, 44, 43, 20, 42, 41, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
124 19, 18, 99, 40, 15, 39, 38, 16, 13, 12, 11, 37, 10, 9, 8, 36, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
125 7,128,127,105,123,116, 35, 34, 33,145, 31, 79, 42,146, 78, 26, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
126 83, 48, 49, 50, 44, 47, 26, 31, 30, 18, 17, 19, 21, 24, 25, 13, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
127 14, 16, 17, 18, 20, 21, 12, 14, 15, 9, 10, 6, 9, 6, 5, 8, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
128 6, 12, 8, 10, 7, 9, 6, 4, 6, 2, 2, 3, 3, 3, 3, 2, |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
129 }; |
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
130 |
866 | 131 static inline int add_left_prediction(uint8_t *dst, uint8_t *src, int w, int acc){ |
132 int i; | |
133 | |
134 for(i=0; i<w-1; i++){ | |
135 acc+= src[i]; | |
136 dst[i]= acc; | |
137 i++; | |
138 acc+= src[i]; | |
139 dst[i]= acc; | |
140 } | |
141 | |
142 for(; i<w; i++){ | |
143 acc+= src[i]; | |
144 dst[i]= acc; | |
145 } | |
146 | |
147 return acc; | |
148 } | |
149 | |
150 static inline void add_median_prediction(uint8_t *dst, uint8_t *src1, uint8_t *diff, int w, int *left, int *left_top){ | |
151 int i; | |
152 uint8_t l, lt; | |
153 | |
154 l= *left; | |
155 lt= *left_top; | |
156 | |
157 for(i=0; i<w; i++){ | |
158 l= mid_pred(l, src1[i], (l + src1[i] - lt)&0xFF) + diff[i]; | |
159 lt= src1[i]; | |
160 dst[i]= l; | |
2967 | 161 } |
866 | 162 |
163 *left= l; | |
164 *left_top= lt; | |
165 } | |
1232
e88d3b1fb2a1
more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents:
1228
diff
changeset
|
166 |
866 | 167 static inline void add_left_prediction_bgr32(uint8_t *dst, uint8_t *src, int w, int *red, int *green, int *blue){ |
168 int i; | |
169 int r,g,b; | |
170 r= *red; | |
171 g= *green; | |
172 b= *blue; | |
173 | |
174 for(i=0; i<w; i++){ | |
2176 | 175 b+= src[4*i+B]; |
176 g+= src[4*i+G]; | |
177 r+= src[4*i+R]; | |
2967 | 178 |
2176 | 179 dst[4*i+B]= b; |
180 dst[4*i+G]= g; | |
181 dst[4*i+R]= r; | |
866 | 182 } |
183 | |
184 *red= r; | |
185 *green= g; | |
186 *blue= b; | |
187 } | |
188 | |
871 | 189 static inline int sub_left_prediction(HYuvContext *s, uint8_t *dst, uint8_t *src, int w, int left){ |
866 | 190 int i; |
871 | 191 if(w<32){ |
192 for(i=0; i<w; i++){ | |
193 const int temp= src[i]; | |
194 dst[i]= temp - left; | |
195 left= temp; | |
196 } | |
197 return left; | |
198 }else{ | |
199 for(i=0; i<16; i++){ | |
200 const int temp= src[i]; | |
201 dst[i]= temp - left; | |
202 left= temp; | |
203 } | |
204 s->dsp.diff_bytes(dst+16, src+16, src+15, w-16); | |
205 return src[w-1]; | |
866 | 206 } |
207 } | |
1325 | 208 |
4682 | 209 static inline void sub_left_prediction_bgr32(HYuvContext *s, uint8_t *dst, uint8_t *src, int w, int *red, int *green, int *blue){ |
210 int i; | |
211 int r,g,b; | |
212 r= *red; | |
213 g= *green; | |
214 b= *blue; | |
215 for(i=0; i<FFMIN(w,4); i++){ | |
216 const int rt= src[i*4+R]; | |
217 const int gt= src[i*4+G]; | |
218 const int bt= src[i*4+B]; | |
219 dst[i*4+R]= rt - r; | |
220 dst[i*4+G]= gt - g; | |
221 dst[i*4+B]= bt - b; | |
222 r = rt; | |
223 g = gt; | |
224 b = bt; | |
225 } | |
226 s->dsp.diff_bytes(dst+16, src+16, src+12, w*4-16); | |
227 *red= src[(w-1)*4+R]; | |
228 *green= src[(w-1)*4+G]; | |
229 *blue= src[(w-1)*4+B]; | |
230 } | |
231 | |
866 | 232 static void read_len_table(uint8_t *dst, GetBitContext *gb){ |
233 int i, val, repeat; | |
2967 | 234 |
866 | 235 for(i=0; i<256;){ |
236 repeat= get_bits(gb, 3); | |
237 val = get_bits(gb, 5); | |
238 if(repeat==0) | |
239 repeat= get_bits(gb, 8); | |
240 //printf("%d %d\n", val, repeat); | |
241 while (repeat--) | |
242 dst[i++] = val; | |
243 } | |
244 } | |
245 | |
246 static int generate_bits_table(uint32_t *dst, uint8_t *len_table){ | |
247 int len, index; | |
248 uint32_t bits=0; | |
249 | |
250 for(len=32; len>0; len--){ | |
251 for(index=0; index<256; index++){ | |
1279 | 252 if(len_table[index]==len) |
253 dst[index]= bits++; | |
866 | 254 } |
1279 | 255 if(bits & 1){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1529
diff
changeset
|
256 av_log(NULL, AV_LOG_ERROR, "Error generating huffman table\n"); |
1279 | 257 return -1; |
258 } | |
259 bits >>= 1; | |
866 | 260 } |
261 return 0; | |
262 } | |
263 | |
7782
6efb15a24e91
Replace generic CONFIG_ENCODERS preprocessor conditionals by more specific
diego
parents:
7776
diff
changeset
|
264 #if defined(CONFIG_HUFFYUV_ENCODER) || defined(CONFIG_FFVHUFF_ENCODER) |
5040
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
265 typedef struct { |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
266 uint64_t val; |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
267 int name; |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
268 } heap_elem_t; |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
269 |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
270 static void heap_sift(heap_elem_t *h, int root, int size) |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
271 { |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
272 while(root*2+1 < size) { |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
273 int child = root*2+1; |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
274 if(child < size-1 && h[child].val > h[child+1].val) |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
275 child++; |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
276 if(h[root].val > h[child].val) { |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
277 FFSWAP(heap_elem_t, h[root], h[child]); |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
278 root = child; |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
279 } else |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
280 break; |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
281 } |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
282 } |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
283 |
866 | 284 static void generate_len_table(uint8_t *dst, uint64_t *stats, int size){ |
5040
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
285 heap_elem_t h[size]; |
866 | 286 int up[2*size]; |
5040
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
287 int len[2*size]; |
866 | 288 int offset, i, next; |
2967 | 289 |
866 | 290 for(offset=1; ; offset<<=1){ |
291 for(i=0; i<size; i++){ | |
5040
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
292 h[i].name = i; |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
293 h[i].val = (stats[i] << 8) + offset; |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
294 } |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
295 for(i=size/2-1; i>=0; i--) |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
296 heap_sift(h, i, size); |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
297 |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
298 for(next=size; next<size*2-1; next++){ |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
299 // merge the two smallest entries, and put it back in the heap |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
300 uint64_t min1v = h[0].val; |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
301 up[h[0].name] = next; |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
302 h[0].val = INT64_MAX; |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
303 heap_sift(h, 0, size); |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
304 up[h[0].name] = next; |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
305 h[0].name = next; |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
306 h[0].val += min1v; |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
307 heap_sift(h, 0, size); |
866 | 308 } |
2967 | 309 |
5040
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
310 len[2*size-2] = 0; |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
311 for(i=2*size-3; i>=size; i--) |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
312 len[i] = len[up[i]] + 1; |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
313 for(i=0; i<size; i++) { |
5c6cd6601371
change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding.
lorenm
parents:
5026
diff
changeset
|
314 dst[i] = len[up[i]] + 1; |
5481
defae3a747d9
prevent huffyuv from generating codewords of length 32. (regression in r9069)
lorenm
parents:
5221
diff
changeset
|
315 if(dst[i] >= 32) break; |
866 | 316 } |
317 if(i==size) break; | |
318 } | |
319 } | |
7782
6efb15a24e91
Replace generic CONFIG_ENCODERS preprocessor conditionals by more specific
diego
parents:
7776
diff
changeset
|
320 #endif /* defined(CONFIG_HUFFYUV_ENCODER) || defined(CONFIG_FFVHUFF_ENCODER) */ |
866 | 321 |
5063
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
322 static void generate_joint_tables(HYuvContext *s){ |
5074 | 323 uint16_t symbols[1<<VLC_BITS]; |
324 uint16_t bits[1<<VLC_BITS]; | |
325 uint8_t len[1<<VLC_BITS]; | |
5063
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
326 if(s->bitstream_bpp < 24){ |
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
327 int p, i, y, u; |
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
328 for(p=0; p<3; p++){ |
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
329 for(i=y=0; y<256; y++){ |
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
330 int len0 = s->len[0][y]; |
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
331 int limit = VLC_BITS - len0; |
5073 | 332 if(limit <= 0) |
333 continue; | |
334 for(u=0; u<256; u++){ | |
335 int len1 = s->len[p][u]; | |
336 if(len1 > limit) | |
337 continue; | |
338 len[i] = len0 + len1; | |
339 bits[i] = (s->bits[0][y] << len1) + s->bits[p][u]; | |
340 symbols[i] = (y<<8) + u; | |
341 if(symbols[i] != 0xffff) // reserved to mean "invalid" | |
342 i++; | |
5063
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
343 } |
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
344 } |
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
345 free_vlc(&s->vlc[3+p]); |
5072
1aec7fab94c4
use sparse huffman tables. 1.5% faster huffyuv decoding.
lorenm
parents:
5063
diff
changeset
|
346 init_vlc_sparse(&s->vlc[3+p], VLC_BITS, i, len, 1, 1, bits, 2, 2, symbols, 2, 2, 0); |
5063
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
347 } |
5074 | 348 }else{ |
349 uint8_t (*map)[4] = (uint8_t(*)[4])s->pix_bgr_map; | |
350 int i, b, g, r, code; | |
351 int p0 = s->decorrelate; | |
352 int p1 = !s->decorrelate; | |
353 // restrict the range to +/-16 becaues that's pretty much guaranteed to | |
354 // cover all the combinations that fit in 11 bits total, and it doesn't | |
355 // matter if we miss a few rare codes. | |
356 for(i=0, g=-16; g<16; g++){ | |
357 int len0 = s->len[p0][g&255]; | |
358 int limit0 = VLC_BITS - len0; | |
359 if(limit0 < 2) | |
360 continue; | |
361 for(b=-16; b<16; b++){ | |
362 int len1 = s->len[p1][b&255]; | |
363 int limit1 = limit0 - len1; | |
364 if(limit1 < 1) | |
365 continue; | |
366 code = (s->bits[p0][g&255] << len1) + s->bits[p1][b&255]; | |
367 for(r=-16; r<16; r++){ | |
368 int len2 = s->len[2][r&255]; | |
369 if(len2 > limit1) | |
370 continue; | |
371 len[i] = len0 + len1 + len2; | |
372 bits[i] = (code << len2) + s->bits[2][r&255]; | |
373 if(s->decorrelate){ | |
374 map[i][G] = g; | |
375 map[i][B] = g+b; | |
376 map[i][R] = g+r; | |
377 }else{ | |
378 map[i][B] = g; | |
379 map[i][G] = b; | |
380 map[i][R] = r; | |
381 } | |
382 i++; | |
383 } | |
384 } | |
385 } | |
386 free_vlc(&s->vlc[3]); | |
387 init_vlc(&s->vlc[3], VLC_BITS, i, len, 1, 1, bits, 2, 2, 0); | |
5063
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
388 } |
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
389 } |
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
390 |
866 | 391 static int read_huffman_tables(HYuvContext *s, uint8_t *src, int length){ |
392 GetBitContext gb; | |
393 int i; | |
2967 | 394 |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
1006
diff
changeset
|
395 init_get_bits(&gb, src, length*8); |
2967 | 396 |
866 | 397 for(i=0; i<3; i++){ |
398 read_len_table(s->len[i], &gb); | |
2967 | 399 |
866 | 400 if(generate_bits_table(s->bits[i], s->len[i])<0){ |
401 return -1; | |
402 } | |
403 #if 0 | |
404 for(j=0; j<256; j++){ | |
405 printf("%6X, %2d, %3d\n", s->bits[i][j], s->len[i][j], j); | |
406 } | |
407 #endif | |
2369 | 408 free_vlc(&s->vlc[i]); |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2369
diff
changeset
|
409 init_vlc(&s->vlc[i], VLC_BITS, 256, s->len[i], 1, 1, s->bits[i], 4, 4, 0); |
866 | 410 } |
2967 | 411 |
5063
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
412 generate_joint_tables(s); |
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
413 |
2369 | 414 return (get_bits_count(&gb)+7)/8; |
866 | 415 } |
416 | |
417 static int read_old_huffman_tables(HYuvContext *s){ | |
1080
a150aba978de
huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents:
1078
diff
changeset
|
418 #if 1 |
866 | 419 GetBitContext gb; |
420 int i; | |
421 | |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
1006
diff
changeset
|
422 init_get_bits(&gb, classic_shift_luma, sizeof(classic_shift_luma)*8); |
866 | 423 read_len_table(s->len[0], &gb); |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
1006
diff
changeset
|
424 init_get_bits(&gb, classic_shift_chroma, sizeof(classic_shift_chroma)*8); |
866 | 425 read_len_table(s->len[1], &gb); |
2967 | 426 |
866 | 427 for(i=0; i<256; i++) s->bits[0][i] = classic_add_luma [i]; |
428 for(i=0; i<256; i++) s->bits[1][i] = classic_add_chroma[i]; | |
429 | |
430 if(s->bitstream_bpp >= 24){ | |
431 memcpy(s->bits[1], s->bits[0], 256*sizeof(uint32_t)); | |
432 memcpy(s->len[1] , s->len [0], 256*sizeof(uint8_t)); | |
433 } | |
434 memcpy(s->bits[2], s->bits[1], 256*sizeof(uint32_t)); | |
435 memcpy(s->len[2] , s->len [1], 256*sizeof(uint8_t)); | |
2967 | 436 |
2369 | 437 for(i=0; i<3; i++){ |
438 free_vlc(&s->vlc[i]); | |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2369
diff
changeset
|
439 init_vlc(&s->vlc[i], VLC_BITS, 256, s->len[i], 1, 1, s->bits[i], 4, 4, 0); |
2369 | 440 } |
2967 | 441 |
5063
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
442 generate_joint_tables(s); |
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
443 |
866 | 444 return 0; |
445 #else | |
3177 | 446 av_log(s->avctx, AV_LOG_DEBUG, "v1 huffyuv is not supported \n"); |
866 | 447 return -1; |
448 #endif | |
449 } | |
450 | |
2511 | 451 static void alloc_temp(HYuvContext *s){ |
452 int i; | |
2967 | 453 |
2511 | 454 if(s->bitstream_bpp<24){ |
455 for(i=0; i<3; i++){ | |
456 s->temp[i]= av_malloc(s->width + 16); | |
457 } | |
458 }else{ | |
4682 | 459 for(i=0; i<2; i++){ |
460 s->temp[i]= av_malloc(4*s->width + 16); | |
461 } | |
2511 | 462 } |
463 } | |
464 | |
2422 | 465 static int common_init(AVCodecContext *avctx){ |
866 | 466 HYuvContext *s = avctx->priv_data; |
467 | |
468 s->avctx= avctx; | |
469 s->flags= avctx->flags; | |
2967 | 470 |
1097 | 471 dsputil_init(&s->dsp, avctx); |
2967 | 472 |
2422 | 473 s->width= avctx->width; |
474 s->height= avctx->height; | |
475 assert(s->width>0 && s->height>0); | |
2967 | 476 |
2422 | 477 return 0; |
478 } | |
479 | |
7776
dbcdd0165e55
Replace generic CONFIG_DECODERS preprocessor conditionals by more specific
diego
parents:
7040
diff
changeset
|
480 #if defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER) |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6234
diff
changeset
|
481 static av_cold int decode_init(AVCodecContext *avctx) |
2422 | 482 { |
483 HYuvContext *s = avctx->priv_data; | |
484 | |
485 common_init(avctx); | |
2369 | 486 memset(s->vlc, 0, 3*sizeof(VLC)); |
2967 | 487 |
925 | 488 avctx->coded_frame= &s->picture; |
2422 | 489 s->interlaced= s->height > 288; |
903 | 490 |
866 | 491 s->bgr32=1; |
492 //if(avctx->extradata) | |
493 // printf("extradata:%X, extradata_size:%d\n", *(uint32_t*)avctx->extradata, avctx->extradata_size); | |
494 if(avctx->extradata_size){ | |
7823
4525dcd81357
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
7782
diff
changeset
|
495 if((avctx->bits_per_coded_sample&7) && avctx->bits_per_coded_sample != 12) |
866 | 496 s->version=1; // do such files exist at all? |
497 else | |
498 s->version=2; | |
499 }else | |
500 s->version=0; | |
2967 | 501 |
866 | 502 if(s->version==2){ |
2374 | 503 int method, interlace; |
866 | 504 |
505 method= ((uint8_t*)avctx->extradata)[0]; | |
506 s->decorrelate= method&64 ? 1 : 0; | |
507 s->predictor= method&63; | |
508 s->bitstream_bpp= ((uint8_t*)avctx->extradata)[1]; | |
2967 | 509 if(s->bitstream_bpp==0) |
7823
4525dcd81357
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
7782
diff
changeset
|
510 s->bitstream_bpp= avctx->bits_per_coded_sample&~7; |
2374 | 511 interlace= (((uint8_t*)avctx->extradata)[2] & 0x30) >> 4; |
512 s->interlaced= (interlace==1) ? 1 : (interlace==2) ? 0 : s->interlaced; | |
2369 | 513 s->context= ((uint8_t*)avctx->extradata)[2] & 0x40 ? 1 : 0; |
2967 | 514 |
866 | 515 if(read_huffman_tables(s, ((uint8_t*)avctx->extradata)+4, avctx->extradata_size) < 0) |
516 return -1; | |
517 }else{ | |
7823
4525dcd81357
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
7782
diff
changeset
|
518 switch(avctx->bits_per_coded_sample&7){ |
866 | 519 case 1: |
520 s->predictor= LEFT; | |
521 s->decorrelate= 0; | |
522 break; | |
523 case 2: | |
524 s->predictor= LEFT; | |
525 s->decorrelate= 1; | |
526 break; | |
527 case 3: | |
528 s->predictor= PLANE; | |
7823
4525dcd81357
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
7782
diff
changeset
|
529 s->decorrelate= avctx->bits_per_coded_sample >= 24; |
866 | 530 break; |
531 case 4: | |
532 s->predictor= MEDIAN; | |
533 s->decorrelate= 0; | |
534 break; | |
535 default: | |
536 s->predictor= LEFT; //OLD | |
537 s->decorrelate= 0; | |
538 break; | |
539 } | |
7823
4525dcd81357
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
7782
diff
changeset
|
540 s->bitstream_bpp= avctx->bits_per_coded_sample & ~7; |
2369 | 541 s->context= 0; |
2967 | 542 |
866 | 543 if(read_old_huffman_tables(s) < 0) |
544 return -1; | |
545 } | |
2967 | 546 |
866 | 547 switch(s->bitstream_bpp){ |
548 case 12: | |
549 avctx->pix_fmt = PIX_FMT_YUV420P; | |
550 break; | |
551 case 16: | |
552 if(s->yuy2){ | |
4494
ce643a22f049
Replace deprecated PIX_FMT names by the newer variants.
diego
parents:
3947
diff
changeset
|
553 avctx->pix_fmt = PIX_FMT_YUYV422; |
866 | 554 }else{ |
555 avctx->pix_fmt = PIX_FMT_YUV422P; | |
556 } | |
557 break; | |
558 case 24: | |
559 case 32: | |
560 if(s->bgr32){ | |
4494
ce643a22f049
Replace deprecated PIX_FMT names by the newer variants.
diego
parents:
3947
diff
changeset
|
561 avctx->pix_fmt = PIX_FMT_RGB32; |
866 | 562 }else{ |
563 avctx->pix_fmt = PIX_FMT_BGR24; | |
564 } | |
565 break; | |
566 default: | |
567 assert(0); | |
568 } | |
2967 | 569 |
2511 | 570 alloc_temp(s); |
2967 | 571 |
7823
4525dcd81357
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
7782
diff
changeset
|
572 // av_log(NULL, AV_LOG_DEBUG, "pred:%d bpp:%d hbpp:%d il:%d\n", s->predictor, s->bitstream_bpp, avctx->bits_per_coded_sample, s->interlaced); |
2190 | 573 |
866 | 574 return 0; |
575 } | |
7776
dbcdd0165e55
Replace generic CONFIG_DECODERS preprocessor conditionals by more specific
diego
parents:
7040
diff
changeset
|
576 #endif /* defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER) */ |
866 | 577 |
7782
6efb15a24e91
Replace generic CONFIG_ENCODERS preprocessor conditionals by more specific
diego
parents:
7776
diff
changeset
|
578 #if defined(CONFIG_HUFFYUV_ENCODER) || defined(CONFIG_FFVHUFF_ENCODER) |
2369 | 579 static int store_table(HYuvContext *s, uint8_t *len, uint8_t *buf){ |
866 | 580 int i; |
2369 | 581 int index= 0; |
866 | 582 |
583 for(i=0; i<256;){ | |
584 int val= len[i]; | |
1529
cb523a2ca00f
fix the case where all vlc codes are 8 bits long (repeat=256)
michael
parents:
1528
diff
changeset
|
585 int repeat=0; |
2967 | 586 |
1529
cb523a2ca00f
fix the case where all vlc codes are 8 bits long (repeat=256)
michael
parents:
1528
diff
changeset
|
587 for(; i<256 && len[i]==val && repeat<255; i++) |
cb523a2ca00f
fix the case where all vlc codes are 8 bits long (repeat=256)
michael
parents:
1528
diff
changeset
|
588 repeat++; |
2967 | 589 |
1529
cb523a2ca00f
fix the case where all vlc codes are 8 bits long (repeat=256)
michael
parents:
1528
diff
changeset
|
590 assert(val < 32 && val >0 && repeat<256 && repeat>0); |
866 | 591 if(repeat>7){ |
2369 | 592 buf[index++]= val; |
593 buf[index++]= repeat; | |
866 | 594 }else{ |
2369 | 595 buf[index++]= val | (repeat<<5); |
866 | 596 } |
597 } | |
2967 | 598 |
2369 | 599 return index; |
866 | 600 } |
601 | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6234
diff
changeset
|
602 static av_cold int encode_init(AVCodecContext *avctx) |
866 | 603 { |
604 HYuvContext *s = avctx->priv_data; | |
2422 | 605 int i, j; |
866 | 606 |
2422 | 607 common_init(avctx); |
2967 | 608 |
2422 | 609 avctx->extradata= av_mallocz(1024*30); // 256*3+4 == 772 |
610 avctx->stats_out= av_mallocz(1024*30); // 21*256*3(%llu ) + 3(\n) + 1(0) = 16132 | |
866 | 611 s->version=2; |
2967 | 612 |
925 | 613 avctx->coded_frame= &s->picture; |
2967 | 614 |
866 | 615 switch(avctx->pix_fmt){ |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
616 case PIX_FMT_YUV420P: |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
617 s->bitstream_bpp= 12; |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
618 break; |
866 | 619 case PIX_FMT_YUV422P: |
620 s->bitstream_bpp= 16; | |
621 break; | |
4682 | 622 case PIX_FMT_RGB32: |
623 s->bitstream_bpp= 24; | |
624 break; | |
866 | 625 default: |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1529
diff
changeset
|
626 av_log(avctx, AV_LOG_ERROR, "format not supported\n"); |
866 | 627 return -1; |
628 } | |
7823
4525dcd81357
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
7782
diff
changeset
|
629 avctx->bits_per_coded_sample= s->bitstream_bpp; |
866 | 630 s->decorrelate= s->bitstream_bpp >= 24; |
631 s->predictor= avctx->prediction_method; | |
2237
d43321e67acd
(non)interlaced huffyuv patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2233
diff
changeset
|
632 s->interlaced= avctx->flags&CODEC_FLAG_INTERLACED_ME ? 1 : 0; |
2369 | 633 if(avctx->context_model==1){ |
634 s->context= avctx->context_model; | |
635 if(s->flags & (CODEC_FLAG_PASS1|CODEC_FLAG_PASS2)){ | |
636 av_log(avctx, AV_LOG_ERROR, "context=1 is not compatible with 2 pass huffyuv encoding\n"); | |
637 return -1; | |
638 } | |
639 }else s->context= 0; | |
2967 | 640 |
2373 | 641 if(avctx->codec->id==CODEC_ID_HUFFYUV){ |
642 if(avctx->pix_fmt==PIX_FMT_YUV420P){ | |
643 av_log(avctx, AV_LOG_ERROR, "Error: YV12 is not supported by huffyuv; use vcodec=ffvhuff or format=422p\n"); | |
644 return -1; | |
645 } | |
646 if(avctx->context_model){ | |
647 av_log(avctx, AV_LOG_ERROR, "Error: per-frame huffman tables are not supported by huffyuv; use vcodec=ffvhuff\n"); | |
648 return -1; | |
649 } | |
2422 | 650 if(s->interlaced != ( s->height > 288 )) |
2373 | 651 av_log(avctx, AV_LOG_INFO, "using huffyuv 2.2.0 or newer interlacing flag\n"); |
652 } | |
2967 | 653 |
4682 | 654 if(s->bitstream_bpp>=24 && s->predictor==MEDIAN){ |
655 av_log(avctx, AV_LOG_ERROR, "Error: RGB is incompatible with median predictor\n"); | |
656 return -1; | |
657 } | |
658 | |
659 ((uint8_t*)avctx->extradata)[0]= s->predictor | (s->decorrelate << 6); | |
866 | 660 ((uint8_t*)avctx->extradata)[1]= s->bitstream_bpp; |
2374 | 661 ((uint8_t*)avctx->extradata)[2]= s->interlaced ? 0x10 : 0x20; |
2369 | 662 if(s->context) |
663 ((uint8_t*)avctx->extradata)[2]|= 0x40; | |
866 | 664 ((uint8_t*)avctx->extradata)[3]= 0; |
665 s->avctx->extradata_size= 4; | |
2967 | 666 |
866 | 667 if(avctx->stats_in){ |
668 char *p= avctx->stats_in; | |
2967 | 669 |
866 | 670 for(i=0; i<3; i++) |
671 for(j=0; j<256; j++) | |
672 s->stats[i][j]= 1; | |
673 | |
674 for(;;){ | |
675 for(i=0; i<3; i++){ | |
676 char *next; | |
677 | |
678 for(j=0; j<256; j++){ | |
679 s->stats[i][j]+= strtol(p, &next, 0); | |
680 if(next==p) return -1; | |
681 p=next; | |
2967 | 682 } |
866 | 683 } |
684 if(p[0]==0 || p[1]==0 || p[2]==0) break; | |
685 } | |
686 }else{ | |
687 for(i=0; i<3; i++) | |
688 for(j=0; j<256; j++){ | |
689 int d= FFMIN(j, 256-j); | |
2967 | 690 |
866 | 691 s->stats[i][j]= 100000000/(d+1); |
692 } | |
693 } | |
2967 | 694 |
866 | 695 for(i=0; i<3; i++){ |
696 generate_len_table(s->len[i], s->stats[i], 256); | |
697 | |
698 if(generate_bits_table(s->bits[i], s->len[i])<0){ | |
699 return -1; | |
700 } | |
2967 | 701 |
2369 | 702 s->avctx->extradata_size+= |
703 store_table(s, s->len[i], &((uint8_t*)s->avctx->extradata)[s->avctx->extradata_size]); | |
866 | 704 } |
705 | |
2369 | 706 if(s->context){ |
707 for(i=0; i<3; i++){ | |
2422 | 708 int pels = s->width*s->height / (i?40:10); |
2369 | 709 for(j=0; j<256; j++){ |
710 int d= FFMIN(j, 256-j); | |
711 s->stats[i][j]= pels/(d+1); | |
712 } | |
713 } | |
714 }else{ | |
715 for(i=0; i<3; i++) | |
716 for(j=0; j<256; j++) | |
717 s->stats[i][j]= 0; | |
718 } | |
2967 | 719 |
7823
4525dcd81357
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
7782
diff
changeset
|
720 // printf("pred:%d bpp:%d hbpp:%d il:%d\n", s->predictor, s->bitstream_bpp, avctx->bits_per_coded_sample, s->interlaced); |
1232
e88d3b1fb2a1
more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents:
1228
diff
changeset
|
721 |
2511 | 722 alloc_temp(s); |
723 | |
866 | 724 s->picture_number=0; |
1232
e88d3b1fb2a1
more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents:
1228
diff
changeset
|
725 |
866 | 726 return 0; |
727 } | |
7782
6efb15a24e91
Replace generic CONFIG_ENCODERS preprocessor conditionals by more specific
diego
parents:
7776
diff
changeset
|
728 #endif /* defined(CONFIG_HUFFYUV_ENCODER) || defined(CONFIG_FFVHUFF_ENCODER) */ |
866 | 729 |
5063
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
730 /* TODO instead of restarting the read when the code isn't in the first level |
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
731 * of the joint table, jump into the 2nd level of the individual table. */ |
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
732 #define READ_2PIX(dst0, dst1, plane1){\ |
5072
1aec7fab94c4
use sparse huffman tables. 1.5% faster huffyuv decoding.
lorenm
parents:
5063
diff
changeset
|
733 uint16_t code = get_vlc2(&s->gb, s->vlc[3+plane1].table, VLC_BITS, 1);\ |
1aec7fab94c4
use sparse huffman tables. 1.5% faster huffyuv decoding.
lorenm
parents:
5063
diff
changeset
|
734 if(code != 0xffff){\ |
1aec7fab94c4
use sparse huffman tables. 1.5% faster huffyuv decoding.
lorenm
parents:
5063
diff
changeset
|
735 dst0 = code>>8;\ |
1aec7fab94c4
use sparse huffman tables. 1.5% faster huffyuv decoding.
lorenm
parents:
5063
diff
changeset
|
736 dst1 = code;\ |
5063
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
737 }else{\ |
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
738 dst0 = get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3);\ |
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
739 dst1 = get_vlc2(&s->gb, s->vlc[plane1].table, VLC_BITS, 3);\ |
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
740 }\ |
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
741 } |
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
742 |
866 | 743 static void decode_422_bitstream(HYuvContext *s, int count){ |
744 int i; | |
1232
e88d3b1fb2a1
more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents:
1228
diff
changeset
|
745 |
866 | 746 count/=2; |
2967 | 747 |
866 | 748 for(i=0; i<count; i++){ |
5063
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
749 READ_2PIX(s->temp[0][2*i ], s->temp[1][i], 1); |
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
750 READ_2PIX(s->temp[0][2*i+1], s->temp[2][i], 2); |
866 | 751 } |
752 } | |
753 | |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
754 static void decode_gray_bitstream(HYuvContext *s, int count){ |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
755 int i; |
2967 | 756 |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
757 count/=2; |
2967 | 758 |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
759 for(i=0; i<count; i++){ |
5063
d5640ea6d4a6
merge huffman tables so that we read 2 symbols at a time. 30% faster huffyuv decoding.
lorenm
parents:
5040
diff
changeset
|
760 READ_2PIX(s->temp[0][2*i ], s->temp[0][2*i+1], 0); |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
761 } |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
762 } |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
763 |
7782
6efb15a24e91
Replace generic CONFIG_ENCODERS preprocessor conditionals by more specific
diego
parents:
7776
diff
changeset
|
764 #if defined(CONFIG_HUFFYUV_ENCODER) || defined(CONFIG_FFVHUFF_ENCODER) |
2422 | 765 static int encode_422_bitstream(HYuvContext *s, int count){ |
866 | 766 int i; |
2967 | 767 |
2422 | 768 if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < 2*4*count){ |
769 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n"); | |
770 return -1; | |
771 } | |
2967 | 772 |
5026 | 773 #define LOAD4\ |
774 int y0 = s->temp[0][2*i];\ | |
775 int y1 = s->temp[0][2*i+1];\ | |
776 int u0 = s->temp[1][i];\ | |
777 int v0 = s->temp[2][i]; | |
778 | |
866 | 779 count/=2; |
780 if(s->flags&CODEC_FLAG_PASS1){ | |
781 for(i=0; i<count; i++){ | |
5026 | 782 LOAD4; |
783 s->stats[0][y0]++; | |
784 s->stats[1][u0]++; | |
785 s->stats[0][y1]++; | |
786 s->stats[2][v0]++; | |
866 | 787 } |
2501 | 788 } |
789 if(s->avctx->flags2&CODEC_FLAG2_NO_OUTPUT) | |
790 return 0; | |
791 if(s->context){ | |
2369 | 792 for(i=0; i<count; i++){ |
5026 | 793 LOAD4; |
794 s->stats[0][y0]++; | |
795 put_bits(&s->pb, s->len[0][y0], s->bits[0][y0]); | |
796 s->stats[1][u0]++; | |
797 put_bits(&s->pb, s->len[1][u0], s->bits[1][u0]); | |
798 s->stats[0][y1]++; | |
799 put_bits(&s->pb, s->len[0][y1], s->bits[0][y1]); | |
800 s->stats[2][v0]++; | |
801 put_bits(&s->pb, s->len[2][v0], s->bits[2][v0]); | |
2369 | 802 } |
866 | 803 }else{ |
804 for(i=0; i<count; i++){ | |
5026 | 805 LOAD4; |
806 put_bits(&s->pb, s->len[0][y0], s->bits[0][y0]); | |
807 put_bits(&s->pb, s->len[1][u0], s->bits[1][u0]); | |
808 put_bits(&s->pb, s->len[0][y1], s->bits[0][y1]); | |
809 put_bits(&s->pb, s->len[2][v0], s->bits[2][v0]); | |
866 | 810 } |
811 } | |
2422 | 812 return 0; |
866 | 813 } |
814 | |
2422 | 815 static int encode_gray_bitstream(HYuvContext *s, int count){ |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
816 int i; |
2967 | 817 |
2422 | 818 if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < 4*count){ |
819 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n"); | |
820 return -1; | |
821 } | |
822 | |
5026 | 823 #define LOAD2\ |
824 int y0 = s->temp[0][2*i];\ | |
825 int y1 = s->temp[0][2*i+1]; | |
826 #define STAT2\ | |
827 s->stats[0][y0]++;\ | |
828 s->stats[0][y1]++; | |
829 #define WRITE2\ | |
830 put_bits(&s->pb, s->len[0][y0], s->bits[0][y0]);\ | |
831 put_bits(&s->pb, s->len[0][y1], s->bits[0][y1]); | |
832 | |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
833 count/=2; |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
834 if(s->flags&CODEC_FLAG_PASS1){ |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
835 for(i=0; i<count; i++){ |
5026 | 836 LOAD2; |
837 STAT2; | |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
838 } |
2501 | 839 } |
840 if(s->avctx->flags2&CODEC_FLAG2_NO_OUTPUT) | |
841 return 0; | |
2967 | 842 |
2501 | 843 if(s->context){ |
2369 | 844 for(i=0; i<count; i++){ |
5026 | 845 LOAD2; |
846 STAT2; | |
847 WRITE2; | |
2369 | 848 } |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
849 }else{ |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
850 for(i=0; i<count; i++){ |
5026 | 851 LOAD2; |
852 WRITE2; | |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
853 } |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
854 } |
2422 | 855 return 0; |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
856 } |
7782
6efb15a24e91
Replace generic CONFIG_ENCODERS preprocessor conditionals by more specific
diego
parents:
7776
diff
changeset
|
857 #endif /* defined(CONFIG_HUFFYUV_ENCODER) || defined(CONFIG_FFVHUFF_ENCODER) */ |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
858 |
5074 | 859 static av_always_inline void decode_bgr_1(HYuvContext *s, int count, int decorrelate, int alpha){ |
866 | 860 int i; |
5074 | 861 for(i=0; i<count; i++){ |
862 int code = get_vlc2(&s->gb, s->vlc[3].table, VLC_BITS, 1); | |
863 if(code != -1){ | |
864 *(uint32_t*)&s->temp[0][4*i] = s->pix_bgr_map[code]; | |
865 }else if(decorrelate){ | |
866 s->temp[0][4*i+G] = get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3); | |
867 s->temp[0][4*i+B] = get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3) + s->temp[0][4*i+G]; | |
868 s->temp[0][4*i+R] = get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3) + s->temp[0][4*i+G]; | |
866 | 869 }else{ |
5074 | 870 s->temp[0][4*i+B] = get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3); |
871 s->temp[0][4*i+G] = get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3); | |
872 s->temp[0][4*i+R] = get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3); | |
866 | 873 } |
5074 | 874 if(alpha) |
875 get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3); //?! | |
876 } | |
877 } | |
878 | |
879 static void decode_bgr_bitstream(HYuvContext *s, int count){ | |
880 if(s->decorrelate){ | |
881 if(s->bitstream_bpp==24) | |
882 decode_bgr_1(s, count, 1, 0); | |
883 else | |
884 decode_bgr_1(s, count, 1, 1); | |
866 | 885 }else{ |
5074 | 886 if(s->bitstream_bpp==24) |
887 decode_bgr_1(s, count, 0, 0); | |
888 else | |
889 decode_bgr_1(s, count, 0, 1); | |
866 | 890 } |
891 } | |
892 | |
4682 | 893 static int encode_bgr_bitstream(HYuvContext *s, int count){ |
894 int i; | |
895 | |
896 if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < 3*4*count){ | |
897 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n"); | |
898 return -1; | |
899 } | |
900 | |
5026 | 901 #define LOAD3\ |
902 int g= s->temp[0][4*i+G];\ | |
903 int b= (s->temp[0][4*i+B] - g) & 0xff;\ | |
904 int r= (s->temp[0][4*i+R] - g) & 0xff; | |
905 #define STAT3\ | |
906 s->stats[0][b]++;\ | |
907 s->stats[1][g]++;\ | |
908 s->stats[2][r]++; | |
909 #define WRITE3\ | |
910 put_bits(&s->pb, s->len[1][g], s->bits[1][g]);\ | |
911 put_bits(&s->pb, s->len[0][b], s->bits[0][b]);\ | |
912 put_bits(&s->pb, s->len[2][r], s->bits[2][r]); | |
913 | |
4682 | 914 if((s->flags&CODEC_FLAG_PASS1) && (s->avctx->flags2&CODEC_FLAG2_NO_OUTPUT)){ |
915 for(i=0; i<count; i++){ | |
5026 | 916 LOAD3; |
917 STAT3; | |
4682 | 918 } |
919 }else if(s->context || (s->flags&CODEC_FLAG_PASS1)){ | |
920 for(i=0; i<count; i++){ | |
5026 | 921 LOAD3; |
922 STAT3; | |
923 WRITE3; | |
4682 | 924 } |
925 }else{ | |
926 for(i=0; i<count; i++){ | |
5026 | 927 LOAD3; |
928 WRITE3; | |
4682 | 929 } |
930 } | |
931 return 0; | |
932 } | |
933 | |
7776
dbcdd0165e55
Replace generic CONFIG_DECODERS preprocessor conditionals by more specific
diego
parents:
7040
diff
changeset
|
934 #if defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER) |
871 | 935 static void draw_slice(HYuvContext *s, int y){ |
936 int h, cy; | |
1368 | 937 int offset[4]; |
2967 | 938 |
939 if(s->avctx->draw_horiz_band==NULL) | |
871 | 940 return; |
2967 | 941 |
871 | 942 h= y - s->last_slice_end; |
943 y -= h; | |
2967 | 944 |
871 | 945 if(s->bitstream_bpp==12){ |
946 cy= y>>1; | |
947 }else{ | |
948 cy= y; | |
949 } | |
1368 | 950 |
951 offset[0] = s->picture.linesize[0]*y; | |
952 offset[1] = s->picture.linesize[1]*cy; | |
953 offset[2] = s->picture.linesize[2]*cy; | |
954 offset[3] = 0; | |
871 | 955 emms_c(); |
956 | |
1370 | 957 s->avctx->draw_horiz_band(s->avctx, &s->picture, offset, y, 3, h); |
2967 | 958 |
871 | 959 s->last_slice_end= y + h; |
960 } | |
961 | |
6234 | 962 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size){ |
866 | 963 HYuvContext *s = avctx->priv_data; |
964 const int width= s->width; | |
965 const int width2= s->width>>1; | |
966 const int height= s->height; | |
870 | 967 int fake_ystride, fake_ustride, fake_vstride; |
925 | 968 AVFrame * const p= &s->picture; |
2369 | 969 int table_size= 0; |
866 | 970 |
925 | 971 AVFrame *picture = data; |
866 | 972 |
2422 | 973 s->bitstream_buffer= av_fast_realloc(s->bitstream_buffer, &s->bitstream_buffer_size, buf_size + FF_INPUT_BUFFER_PADDING_SIZE); |
866 | 974 |
6234 | 975 s->dsp.bswap_buf((uint32_t*)s->bitstream_buffer, (const uint32_t*)buf, buf_size/4); |
2967 | 976 |
1228 | 977 if(p->data[0]) |
978 avctx->release_buffer(avctx, p); | |
979 | |
903 | 980 p->reference= 0; |
981 if(avctx->get_buffer(avctx, p) < 0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1529
diff
changeset
|
982 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); |
903 | 983 return -1; |
984 } | |
2967 | 985 |
2369 | 986 if(s->context){ |
987 table_size = read_huffman_tables(s, s->bitstream_buffer, buf_size); | |
988 if(table_size < 0) | |
989 return -1; | |
990 } | |
991 | |
3201 | 992 if((unsigned)(buf_size-table_size) >= INT_MAX/8) |
993 return -1; | |
994 | |
2369 | 995 init_get_bits(&s->gb, s->bitstream_buffer+table_size, (buf_size-table_size)*8); |
870 | 996 |
903 | 997 fake_ystride= s->interlaced ? p->linesize[0]*2 : p->linesize[0]; |
998 fake_ustride= s->interlaced ? p->linesize[1]*2 : p->linesize[1]; | |
999 fake_vstride= s->interlaced ? p->linesize[2]*2 : p->linesize[2]; | |
2967 | 1000 |
871 | 1001 s->last_slice_end= 0; |
2967 | 1002 |
866 | 1003 if(s->bitstream_bpp<24){ |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1004 int y, cy; |
866 | 1005 int lefty, leftu, leftv; |
1006 int lefttopy, lefttopu, lefttopv; | |
2967 | 1007 |
866 | 1008 if(s->yuy2){ |
903 | 1009 p->data[0][3]= get_bits(&s->gb, 8); |
1010 p->data[0][2]= get_bits(&s->gb, 8); | |
1011 p->data[0][1]= get_bits(&s->gb, 8); | |
1012 p->data[0][0]= get_bits(&s->gb, 8); | |
2967 | 1013 |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2552
diff
changeset
|
1014 av_log(avctx, AV_LOG_ERROR, "YUY2 output is not implemented yet\n"); |
866 | 1015 return -1; |
1016 }else{ | |
2967 | 1017 |
903 | 1018 leftv= p->data[2][0]= get_bits(&s->gb, 8); |
1019 lefty= p->data[0][1]= get_bits(&s->gb, 8); | |
1020 leftu= p->data[1][0]= get_bits(&s->gb, 8); | |
1021 p->data[0][0]= get_bits(&s->gb, 8); | |
2967 | 1022 |
866 | 1023 switch(s->predictor){ |
1024 case LEFT: | |
1025 case PLANE: | |
1026 decode_422_bitstream(s, width-2); | |
903 | 1027 lefty= add_left_prediction(p->data[0] + 2, s->temp[0], width-2, lefty); |
866 | 1028 if(!(s->flags&CODEC_FLAG_GRAY)){ |
903 | 1029 leftu= add_left_prediction(p->data[1] + 1, s->temp[1], width2-1, leftu); |
1030 leftv= add_left_prediction(p->data[2] + 1, s->temp[2], width2-1, leftv); | |
866 | 1031 } |
1032 | |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1033 for(cy=y=1; y<s->height; y++,cy++){ |
866 | 1034 uint8_t *ydst, *udst, *vdst; |
2967 | 1035 |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1036 if(s->bitstream_bpp==12){ |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1037 decode_gray_bitstream(s, width); |
2967 | 1038 |
903 | 1039 ydst= p->data[0] + p->linesize[0]*y; |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1040 |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1041 lefty= add_left_prediction(ydst, s->temp[0], width, lefty); |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1042 if(s->predictor == PLANE){ |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1043 if(y>s->interlaced) |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1044 s->dsp.add_bytes(ydst, ydst - fake_ystride, width); |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1045 } |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1046 y++; |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1047 if(y>=s->height) break; |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1048 } |
2967 | 1049 |
871 | 1050 draw_slice(s, y); |
2967 | 1051 |
903 | 1052 ydst= p->data[0] + p->linesize[0]*y; |
1053 udst= p->data[1] + p->linesize[1]*cy; | |
1054 vdst= p->data[2] + p->linesize[2]*cy; | |
2967 | 1055 |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1056 decode_422_bitstream(s, width); |
866 | 1057 lefty= add_left_prediction(ydst, s->temp[0], width, lefty); |
1058 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
1059 leftu= add_left_prediction(udst, s->temp[1], width2, leftu); | |
1060 leftv= add_left_prediction(vdst, s->temp[2], width2, leftv); | |
1061 } | |
1062 if(s->predictor == PLANE){ | |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1063 if(cy>s->interlaced){ |
866 | 1064 s->dsp.add_bytes(ydst, ydst - fake_ystride, width); |
1065 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
1066 s->dsp.add_bytes(udst, udst - fake_ustride, width2); | |
1067 s->dsp.add_bytes(vdst, vdst - fake_vstride, width2); | |
1068 } | |
1069 } | |
1070 } | |
1071 } | |
871 | 1072 draw_slice(s, height); |
2967 | 1073 |
866 | 1074 break; |
1075 case MEDIAN: | |
1076 /* first line except first 2 pixels is left predicted */ | |
1077 decode_422_bitstream(s, width-2); | |
903 | 1078 lefty= add_left_prediction(p->data[0] + 2, s->temp[0], width-2, lefty); |
866 | 1079 if(!(s->flags&CODEC_FLAG_GRAY)){ |
903 | 1080 leftu= add_left_prediction(p->data[1] + 1, s->temp[1], width2-1, leftu); |
1081 leftv= add_left_prediction(p->data[2] + 1, s->temp[2], width2-1, leftv); | |
866 | 1082 } |
2967 | 1083 |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1084 cy=y=1; |
2967 | 1085 |
866 | 1086 /* second line is left predicted for interlaced case */ |
1087 if(s->interlaced){ | |
1088 decode_422_bitstream(s, width); | |
903 | 1089 lefty= add_left_prediction(p->data[0] + p->linesize[0], s->temp[0], width, lefty); |
866 | 1090 if(!(s->flags&CODEC_FLAG_GRAY)){ |
903 | 1091 leftu= add_left_prediction(p->data[1] + p->linesize[2], s->temp[1], width2, leftu); |
1092 leftv= add_left_prediction(p->data[2] + p->linesize[1], s->temp[2], width2, leftv); | |
866 | 1093 } |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1094 y++; cy++; |
866 | 1095 } |
1096 | |
1097 /* next 4 pixels are left predicted too */ | |
1098 decode_422_bitstream(s, 4); | |
903 | 1099 lefty= add_left_prediction(p->data[0] + fake_ystride, s->temp[0], 4, lefty); |
866 | 1100 if(!(s->flags&CODEC_FLAG_GRAY)){ |
903 | 1101 leftu= add_left_prediction(p->data[1] + fake_ustride, s->temp[1], 2, leftu); |
1102 leftv= add_left_prediction(p->data[2] + fake_vstride, s->temp[2], 2, leftv); | |
866 | 1103 } |
1104 | |
1105 /* next line except the first 4 pixels is median predicted */ | |
903 | 1106 lefttopy= p->data[0][3]; |
866 | 1107 decode_422_bitstream(s, width-4); |
903 | 1108 add_median_prediction(p->data[0] + fake_ystride+4, p->data[0]+4, s->temp[0], width-4, &lefty, &lefttopy); |
866 | 1109 if(!(s->flags&CODEC_FLAG_GRAY)){ |
903 | 1110 lefttopu= p->data[1][1]; |
1111 lefttopv= p->data[2][1]; | |
1112 add_median_prediction(p->data[1] + fake_ustride+2, p->data[1]+2, s->temp[1], width2-2, &leftu, &lefttopu); | |
1113 add_median_prediction(p->data[2] + fake_vstride+2, p->data[2]+2, s->temp[2], width2-2, &leftv, &lefttopv); | |
866 | 1114 } |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1115 y++; cy++; |
2967 | 1116 |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1117 for(; y<height; y++,cy++){ |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1118 uint8_t *ydst, *udst, *vdst; |
866 | 1119 |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1120 if(s->bitstream_bpp==12){ |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1121 while(2*cy > y){ |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1122 decode_gray_bitstream(s, width); |
903 | 1123 ydst= p->data[0] + p->linesize[0]*y; |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1124 add_median_prediction(ydst, ydst - fake_ystride, s->temp[0], width, &lefty, &lefttopy); |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1125 y++; |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1126 } |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1127 if(y>=height) break; |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1128 } |
871 | 1129 draw_slice(s, y); |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1130 |
866 | 1131 decode_422_bitstream(s, width); |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1132 |
903 | 1133 ydst= p->data[0] + p->linesize[0]*y; |
1134 udst= p->data[1] + p->linesize[1]*cy; | |
1135 vdst= p->data[2] + p->linesize[2]*cy; | |
866 | 1136 |
1137 add_median_prediction(ydst, ydst - fake_ystride, s->temp[0], width, &lefty, &lefttopy); | |
1138 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
1139 add_median_prediction(udst, udst - fake_ustride, s->temp[1], width2, &leftu, &lefttopu); | |
1140 add_median_prediction(vdst, vdst - fake_vstride, s->temp[2], width2, &leftv, &lefttopv); | |
1141 } | |
1142 } | |
871 | 1143 |
1144 draw_slice(s, height); | |
866 | 1145 break; |
1146 } | |
1147 } | |
1148 }else{ | |
1149 int y; | |
1150 int leftr, leftg, leftb; | |
903 | 1151 const int last_line= (height-1)*p->linesize[0]; |
2967 | 1152 |
866 | 1153 if(s->bitstream_bpp==32){ |
2177 | 1154 skip_bits(&s->gb, 8); |
1155 leftr= p->data[0][last_line+R]= get_bits(&s->gb, 8); | |
1156 leftg= p->data[0][last_line+G]= get_bits(&s->gb, 8); | |
1157 leftb= p->data[0][last_line+B]= get_bits(&s->gb, 8); | |
866 | 1158 }else{ |
2177 | 1159 leftr= p->data[0][last_line+R]= get_bits(&s->gb, 8); |
1160 leftg= p->data[0][last_line+G]= get_bits(&s->gb, 8); | |
1161 leftb= p->data[0][last_line+B]= get_bits(&s->gb, 8); | |
866 | 1162 skip_bits(&s->gb, 8); |
1163 } | |
2967 | 1164 |
866 | 1165 if(s->bgr32){ |
1166 switch(s->predictor){ | |
1167 case LEFT: | |
1168 case PLANE: | |
1169 decode_bgr_bitstream(s, width-1); | |
903 | 1170 add_left_prediction_bgr32(p->data[0] + last_line+4, s->temp[0], width-1, &leftr, &leftg, &leftb); |
866 | 1171 |
5129 | 1172 for(y=s->height-2; y>=0; y--){ //Yes it is stored upside down. |
866 | 1173 decode_bgr_bitstream(s, width); |
2967 | 1174 |
903 | 1175 add_left_prediction_bgr32(p->data[0] + p->linesize[0]*y, s->temp[0], width, &leftr, &leftg, &leftb); |
866 | 1176 if(s->predictor == PLANE){ |
2351 | 1177 if((y&s->interlaced)==0 && y<s->height-1-s->interlaced){ |
2967 | 1178 s->dsp.add_bytes(p->data[0] + p->linesize[0]*y, |
903 | 1179 p->data[0] + p->linesize[0]*y + fake_ystride, fake_ystride); |
866 | 1180 } |
1181 } | |
1182 } | |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2552
diff
changeset
|
1183 draw_slice(s, height); // just 1 large slice as this is not possible in reverse order |
866 | 1184 break; |
1185 default: | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1529
diff
changeset
|
1186 av_log(avctx, AV_LOG_ERROR, "prediction type not supported!\n"); |
866 | 1187 } |
1188 }else{ | |
1189 | |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2552
diff
changeset
|
1190 av_log(avctx, AV_LOG_ERROR, "BGR24 output is not implemented yet\n"); |
866 | 1191 return -1; |
1192 } | |
1193 } | |
1194 emms_c(); | |
2967 | 1195 |
903 | 1196 *picture= *p; |
925 | 1197 *data_size = sizeof(AVFrame); |
2967 | 1198 |
3234
823272bdb4f7
dont forget table_size in the decode_frame return value
michael
parents:
3201
diff
changeset
|
1199 return (get_bits_count(&s->gb)+31)/32*4 + table_size; |
866 | 1200 } |
7776
dbcdd0165e55
Replace generic CONFIG_DECODERS preprocessor conditionals by more specific
diego
parents:
7040
diff
changeset
|
1201 #endif /* defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER) */ |
866 | 1202 |
2422 | 1203 static int common_end(HYuvContext *s){ |
1204 int i; | |
2967 | 1205 |
2422 | 1206 for(i=0; i<3; i++){ |
1207 av_freep(&s->temp[i]); | |
1208 } | |
1209 return 0; | |
1210 } | |
1211 | |
7776
dbcdd0165e55
Replace generic CONFIG_DECODERS preprocessor conditionals by more specific
diego
parents:
7040
diff
changeset
|
1212 #if defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER) |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6234
diff
changeset
|
1213 static av_cold int decode_end(AVCodecContext *avctx) |
866 | 1214 { |
1215 HYuvContext *s = avctx->priv_data; | |
1216 int i; | |
2967 | 1217 |
2422 | 1218 common_end(s); |
1219 av_freep(&s->bitstream_buffer); | |
2967 | 1220 |
5221 | 1221 for(i=0; i<6; i++){ |
903 | 1222 free_vlc(&s->vlc[i]); |
1223 } | |
866 | 1224 |
1225 return 0; | |
1226 } | |
7776
dbcdd0165e55
Replace generic CONFIG_DECODERS preprocessor conditionals by more specific
diego
parents:
7040
diff
changeset
|
1227 #endif /* defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER) */ |
866 | 1228 |
7782
6efb15a24e91
Replace generic CONFIG_ENCODERS preprocessor conditionals by more specific
diego
parents:
7776
diff
changeset
|
1229 #if defined(CONFIG_HUFFYUV_ENCODER) || defined(CONFIG_FFVHUFF_ENCODER) |
866 | 1230 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){ |
1231 HYuvContext *s = avctx->priv_data; | |
925 | 1232 AVFrame *pict = data; |
866 | 1233 const int width= s->width; |
1234 const int width2= s->width>>1; | |
1235 const int height= s->height; | |
1236 const int fake_ystride= s->interlaced ? pict->linesize[0]*2 : pict->linesize[0]; | |
1237 const int fake_ustride= s->interlaced ? pict->linesize[1]*2 : pict->linesize[1]; | |
1238 const int fake_vstride= s->interlaced ? pict->linesize[2]*2 : pict->linesize[2]; | |
925 | 1239 AVFrame * const p= &s->picture; |
2369 | 1240 int i, j, size=0; |
866 | 1241 |
903 | 1242 *p = *pict; |
1006 | 1243 p->pict_type= FF_I_TYPE; |
1244 p->key_frame= 1; | |
2967 | 1245 |
2369 | 1246 if(s->context){ |
1247 for(i=0; i<3; i++){ | |
1248 generate_len_table(s->len[i], s->stats[i], 256); | |
1249 if(generate_bits_table(s->bits[i], s->len[i])<0) | |
1250 return -1; | |
1251 size+= store_table(s, s->len[i], &buf[size]); | |
1252 } | |
1253 | |
1254 for(i=0; i<3; i++) | |
1255 for(j=0; j<256; j++) | |
1256 s->stats[i][j] >>= 1; | |
1257 } | |
1258 | |
1259 init_put_bits(&s->pb, buf+size, buf_size-size); | |
1260 | |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1261 if(avctx->pix_fmt == PIX_FMT_YUV422P || avctx->pix_fmt == PIX_FMT_YUV420P){ |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1262 int lefty, leftu, leftv, y, cy; |
866 | 1263 |
903 | 1264 put_bits(&s->pb, 8, leftv= p->data[2][0]); |
1265 put_bits(&s->pb, 8, lefty= p->data[0][1]); | |
1266 put_bits(&s->pb, 8, leftu= p->data[1][0]); | |
1267 put_bits(&s->pb, 8, p->data[0][0]); | |
2967 | 1268 |
903 | 1269 lefty= sub_left_prediction(s, s->temp[0], p->data[0]+2, width-2 , lefty); |
1270 leftu= sub_left_prediction(s, s->temp[1], p->data[1]+1, width2-1, leftu); | |
1271 leftv= sub_left_prediction(s, s->temp[2], p->data[2]+1, width2-1, leftv); | |
2967 | 1272 |
866 | 1273 encode_422_bitstream(s, width-2); |
2967 | 1274 |
866 | 1275 if(s->predictor==MEDIAN){ |
1276 int lefttopy, lefttopu, lefttopv; | |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1277 cy=y=1; |
866 | 1278 if(s->interlaced){ |
903 | 1279 lefty= sub_left_prediction(s, s->temp[0], p->data[0]+p->linesize[0], width , lefty); |
1280 leftu= sub_left_prediction(s, s->temp[1], p->data[1]+p->linesize[1], width2, leftu); | |
1281 leftv= sub_left_prediction(s, s->temp[2], p->data[2]+p->linesize[2], width2, leftv); | |
2967 | 1282 |
866 | 1283 encode_422_bitstream(s, width); |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1284 y++; cy++; |
866 | 1285 } |
2967 | 1286 |
903 | 1287 lefty= sub_left_prediction(s, s->temp[0], p->data[0]+fake_ystride, 4, lefty); |
2190 | 1288 leftu= sub_left_prediction(s, s->temp[1], p->data[1]+fake_ustride, 2, leftu); |
1289 leftv= sub_left_prediction(s, s->temp[2], p->data[2]+fake_vstride, 2, leftv); | |
2967 | 1290 |
866 | 1291 encode_422_bitstream(s, 4); |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1292 |
903 | 1293 lefttopy= p->data[0][3]; |
1294 lefttopu= p->data[1][1]; | |
1295 lefttopv= p->data[2][1]; | |
1527 | 1296 s->dsp.sub_hfyu_median_prediction(s->temp[0], p->data[0]+4, p->data[0] + fake_ystride+4, width-4 , &lefty, &lefttopy); |
1297 s->dsp.sub_hfyu_median_prediction(s->temp[1], p->data[1]+2, p->data[1] + fake_ustride+2, width2-2, &leftu, &lefttopu); | |
1298 s->dsp.sub_hfyu_median_prediction(s->temp[2], p->data[2]+2, p->data[2] + fake_vstride+2, width2-2, &leftv, &lefttopv); | |
866 | 1299 encode_422_bitstream(s, width-4); |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1300 y++; cy++; |
866 | 1301 |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1302 for(; y<height; y++,cy++){ |
866 | 1303 uint8_t *ydst, *udst, *vdst; |
2967 | 1304 |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1305 if(s->bitstream_bpp==12){ |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1306 while(2*cy > y){ |
903 | 1307 ydst= p->data[0] + p->linesize[0]*y; |
1527 | 1308 s->dsp.sub_hfyu_median_prediction(s->temp[0], ydst - fake_ystride, ydst, width , &lefty, &lefttopy); |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1309 encode_gray_bitstream(s, width); |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1310 y++; |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1311 } |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1312 if(y>=height) break; |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1313 } |
903 | 1314 ydst= p->data[0] + p->linesize[0]*y; |
1315 udst= p->data[1] + p->linesize[1]*cy; | |
1316 vdst= p->data[2] + p->linesize[2]*cy; | |
866 | 1317 |
1527 | 1318 s->dsp.sub_hfyu_median_prediction(s->temp[0], ydst - fake_ystride, ydst, width , &lefty, &lefttopy); |
1319 s->dsp.sub_hfyu_median_prediction(s->temp[1], udst - fake_ustride, udst, width2, &leftu, &lefttopu); | |
1320 s->dsp.sub_hfyu_median_prediction(s->temp[2], vdst - fake_vstride, vdst, width2, &leftv, &lefttopv); | |
866 | 1321 |
1322 encode_422_bitstream(s, width); | |
1323 } | |
1324 }else{ | |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1325 for(cy=y=1; y<height; y++,cy++){ |
866 | 1326 uint8_t *ydst, *udst, *vdst; |
2967 | 1327 |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1328 /* encode a luma only line & y++ */ |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1329 if(s->bitstream_bpp==12){ |
903 | 1330 ydst= p->data[0] + p->linesize[0]*y; |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1331 |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1332 if(s->predictor == PLANE && s->interlaced < y){ |
871 | 1333 s->dsp.diff_bytes(s->temp[1], ydst, ydst - fake_ystride, width); |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1334 |
871 | 1335 lefty= sub_left_prediction(s, s->temp[0], s->temp[1], width , lefty); |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1336 }else{ |
871 | 1337 lefty= sub_left_prediction(s, s->temp[0], ydst, width , lefty); |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1338 } |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1339 encode_gray_bitstream(s, width); |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1340 y++; |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1341 if(y>=height) break; |
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1342 } |
2967 | 1343 |
903 | 1344 ydst= p->data[0] + p->linesize[0]*y; |
1345 udst= p->data[1] + p->linesize[1]*cy; | |
1346 vdst= p->data[2] + p->linesize[2]*cy; | |
866 | 1347 |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1348 if(s->predictor == PLANE && s->interlaced < cy){ |
871 | 1349 s->dsp.diff_bytes(s->temp[1], ydst, ydst - fake_ystride, width); |
1350 s->dsp.diff_bytes(s->temp[2], udst, udst - fake_ustride, width2); | |
2511 | 1351 s->dsp.diff_bytes(s->temp[2] + width2, vdst, vdst - fake_vstride, width2); |
866 | 1352 |
871 | 1353 lefty= sub_left_prediction(s, s->temp[0], s->temp[1], width , lefty); |
1354 leftu= sub_left_prediction(s, s->temp[1], s->temp[2], width2, leftu); | |
2511 | 1355 leftv= sub_left_prediction(s, s->temp[2], s->temp[2] + width2, width2, leftv); |
866 | 1356 }else{ |
871 | 1357 lefty= sub_left_prediction(s, s->temp[0], ydst, width , lefty); |
1358 leftu= sub_left_prediction(s, s->temp[1], udst, width2, leftu); | |
1359 leftv= sub_left_prediction(s, s->temp[2], vdst, width2, leftv); | |
866 | 1360 } |
1361 | |
1362 encode_422_bitstream(s, width); | |
1363 } | |
2967 | 1364 } |
4682 | 1365 }else if(avctx->pix_fmt == PIX_FMT_RGB32){ |
1366 uint8_t *data = p->data[0] + (height-1)*p->linesize[0]; | |
1367 const int stride = -p->linesize[0]; | |
1368 const int fake_stride = -fake_ystride; | |
1369 int y; | |
1370 int leftr, leftg, leftb; | |
1371 | |
1372 put_bits(&s->pb, 8, leftr= data[R]); | |
1373 put_bits(&s->pb, 8, leftg= data[G]); | |
1374 put_bits(&s->pb, 8, leftb= data[B]); | |
1375 put_bits(&s->pb, 8, 0); | |
1376 | |
1377 sub_left_prediction_bgr32(s, s->temp[0], data+4, width-1, &leftr, &leftg, &leftb); | |
1378 encode_bgr_bitstream(s, width-1); | |
1379 | |
1380 for(y=1; y<s->height; y++){ | |
1381 uint8_t *dst = data + y*stride; | |
1382 if(s->predictor == PLANE && s->interlaced < y){ | |
1383 s->dsp.diff_bytes(s->temp[1], dst, dst - fake_stride, width*4); | |
1384 sub_left_prediction_bgr32(s, s->temp[0], s->temp[1], width, &leftr, &leftg, &leftb); | |
1385 }else{ | |
1386 sub_left_prediction_bgr32(s, s->temp[0], dst, width, &leftr, &leftg, &leftb); | |
1387 } | |
1388 encode_bgr_bitstream(s, width); | |
1389 } | |
866 | 1390 }else{ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1529
diff
changeset
|
1391 av_log(avctx, AV_LOG_ERROR, "Format not supported!\n"); |
866 | 1392 } |
1393 emms_c(); | |
2967 | 1394 |
2369 | 1395 size+= (put_bits_count(&s->pb)+31)/8; |
1396 size/= 4; | |
2967 | 1397 |
866 | 1398 if((s->flags&CODEC_FLAG_PASS1) && (s->picture_number&31)==0){ |
1399 int j; | |
1400 char *p= avctx->stats_out; | |
2423 | 1401 char *end= p + 1024*30; |
866 | 1402 for(i=0; i<3; i++){ |
1403 for(j=0; j<256; j++){ | |
2962 | 1404 snprintf(p, end-p, "%"PRIu64" ", s->stats[i][j]); |
866 | 1405 p+= strlen(p); |
1406 s->stats[i][j]= 0; | |
1407 } | |
2423 | 1408 snprintf(p, end-p, "\n"); |
866 | 1409 p++; |
1410 } | |
5025
65dd8127ca46
r3938 broke 2pass huffyuv (not that anyone uses it)
lorenm
parents:
4962
diff
changeset
|
1411 } else |
65dd8127ca46
r3938 broke 2pass huffyuv (not that anyone uses it)
lorenm
parents:
4962
diff
changeset
|
1412 avctx->stats_out[0] = '\0'; |
2501 | 1413 if(!(s->avctx->flags2 & CODEC_FLAG2_NO_OUTPUT)){ |
868
dfe7d66da6f0
YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents:
866
diff
changeset
|
1414 flush_put_bits(&s->pb); |
1273 | 1415 s->dsp.bswap_buf((uint32_t*)buf, (uint32_t*)buf, size); |
866 | 1416 } |
2967 | 1417 |
866 | 1418 s->picture_number++; |
903 | 1419 |
866 | 1420 return size*4; |
1421 } | |
1422 | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6234
diff
changeset
|
1423 static av_cold int encode_end(AVCodecContext *avctx) |
866 | 1424 { |
2422 | 1425 HYuvContext *s = avctx->priv_data; |
2967 | 1426 |
2422 | 1427 common_end(s); |
866 | 1428 |
1429 av_freep(&avctx->extradata); | |
1430 av_freep(&avctx->stats_out); | |
2967 | 1431 |
866 | 1432 return 0; |
1433 } | |
7782
6efb15a24e91
Replace generic CONFIG_ENCODERS preprocessor conditionals by more specific
diego
parents:
7776
diff
changeset
|
1434 #endif /* defined(CONFIG_HUFFYUV_ENCODER) || defined(CONFIG_FFVHUFF_ENCODER) */ |
866 | 1435 |
7776
dbcdd0165e55
Replace generic CONFIG_DECODERS preprocessor conditionals by more specific
diego
parents:
7040
diff
changeset
|
1436 #ifdef CONFIG_HUFFYUV_DECODER |
866 | 1437 AVCodec huffyuv_decoder = { |
1438 "huffyuv", | |
1439 CODEC_TYPE_VIDEO, | |
1440 CODEC_ID_HUFFYUV, | |
1441 sizeof(HYuvContext), | |
1442 decode_init, | |
1443 NULL, | |
1444 decode_end, | |
1445 decode_frame, | |
871 | 1446 CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND, |
6722 | 1447 NULL, |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6788
diff
changeset
|
1448 .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), |
866 | 1449 }; |
7776
dbcdd0165e55
Replace generic CONFIG_DECODERS preprocessor conditionals by more specific
diego
parents:
7040
diff
changeset
|
1450 #endif |
866 | 1451 |
7776
dbcdd0165e55
Replace generic CONFIG_DECODERS preprocessor conditionals by more specific
diego
parents:
7040
diff
changeset
|
1452 #ifdef CONFIG_FFVHUFF_DECODER |
2373 | 1453 AVCodec ffvhuff_decoder = { |
1454 "ffvhuff", | |
1455 CODEC_TYPE_VIDEO, | |
1456 CODEC_ID_FFVHUFF, | |
1457 sizeof(HYuvContext), | |
1458 decode_init, | |
1459 NULL, | |
1460 decode_end, | |
1461 decode_frame, | |
1462 CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND, | |
6722 | 1463 NULL, |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6788
diff
changeset
|
1464 .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"), |
2373 | 1465 }; |
3777 | 1466 #endif |
2373 | 1467 |
7782
6efb15a24e91
Replace generic CONFIG_ENCODERS preprocessor conditionals by more specific
diego
parents:
7776
diff
changeset
|
1468 #ifdef CONFIG_HUFFYUV_ENCODER |
866 | 1469 AVCodec huffyuv_encoder = { |
1470 "huffyuv", | |
1471 CODEC_TYPE_VIDEO, | |
1472 CODEC_ID_HUFFYUV, | |
1473 sizeof(HYuvContext), | |
1474 encode_init, | |
1475 encode_frame, | |
1476 encode_end, | |
6788 | 1477 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV422P, PIX_FMT_RGB32, PIX_FMT_NONE}, |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6788
diff
changeset
|
1478 .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), |
866 | 1479 }; |
7782
6efb15a24e91
Replace generic CONFIG_ENCODERS preprocessor conditionals by more specific
diego
parents:
7776
diff
changeset
|
1480 #endif |
1232
e88d3b1fb2a1
more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents:
1228
diff
changeset
|
1481 |
7782
6efb15a24e91
Replace generic CONFIG_ENCODERS preprocessor conditionals by more specific
diego
parents:
7776
diff
changeset
|
1482 #ifdef CONFIG_FFVHUFF_ENCODER |
2373 | 1483 AVCodec ffvhuff_encoder = { |
1484 "ffvhuff", | |
1485 CODEC_TYPE_VIDEO, | |
1486 CODEC_ID_FFVHUFF, | |
1487 sizeof(HYuvContext), | |
1488 encode_init, | |
1489 encode_frame, | |
1490 encode_end, | |
6788 | 1491 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_RGB32, PIX_FMT_NONE}, |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6788
diff
changeset
|
1492 .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"), |
2373 | 1493 }; |
7782
6efb15a24e91
Replace generic CONFIG_ENCODERS preprocessor conditionals by more specific
diego
parents:
7776
diff
changeset
|
1494 #endif |