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