annotate huffyuv.c @ 3234:823272bdb4f7 libavcodec

dont forget table_size in the decode_frame return value
author michael
date Thu, 30 Mar 2006 14:13:03 +0000
parents 35f5c9a8bc83
children 6baa0bfee0b8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1 /*
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
2 * huffyuv codec for libavcodec
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
3 *
1006
michaelni
parents: 990
diff changeset
4 * Copyright (c) 2002-2003 Michael Niedermayer <michaelni@gmx.at>
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
5 *
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
6 * This library is free software; you can redistribute it and/or
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
7 * modify it under the terms of the GNU Lesser General Public
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
8 * License as published by the Free Software Foundation; either
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
9 * version 2 of the License, or (at your option) any later version.
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
10 *
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
11 * This library is distributed in the hope that it will be useful,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
14 * Lesser General Public License for more details.
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
15 *
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
16 * You should have received a copy of the GNU Lesser General Public
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
17 * License along with this library; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 2967
diff changeset
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
19 *
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
20 * see http://www.pcisys.net/~melanson/codecs/huffyuv.txt for a description of
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
21 * the algorithm used
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
22 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
23
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1097
diff changeset
24 /**
1e39f273ecd6 per file doxy
michaelni
parents: 1097
diff changeset
25 * @file huffyuv.c
1e39f273ecd6 per file doxy
michaelni
parents: 1097
diff changeset
26 * huffyuv codec for libavcodec.
1e39f273ecd6 per file doxy
michaelni
parents: 1097
diff changeset
27 */
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
28
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
29 #include "common.h"
2398
582e635cfa08 common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents: 2374
diff changeset
30 #include "bitstream.h"
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
31 #include "avcodec.h"
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
32 #include "dsputil.h"
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
33
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
34 #define VLC_BITS 11
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
35
2176
ab4ee35c4137 big endian fix (untested)
michael
parents: 2051
diff changeset
36 #ifdef WORDS_BIGENDIAN
ab4ee35c4137 big endian fix (untested)
michael
parents: 2051
diff changeset
37 #define B 3
ab4ee35c4137 big endian fix (untested)
michael
parents: 2051
diff changeset
38 #define G 2
ab4ee35c4137 big endian fix (untested)
michael
parents: 2051
diff changeset
39 #define R 1
ab4ee35c4137 big endian fix (untested)
michael
parents: 2051
diff changeset
40 #else
ab4ee35c4137 big endian fix (untested)
michael
parents: 2051
diff changeset
41 #define B 0
ab4ee35c4137 big endian fix (untested)
michael
parents: 2051
diff changeset
42 #define G 1
ab4ee35c4137 big endian fix (untested)
michael
parents: 2051
diff changeset
43 #define R 2
ab4ee35c4137 big endian fix (untested)
michael
parents: 2051
diff changeset
44 #endif
ab4ee35c4137 big endian fix (untested)
michael
parents: 2051
diff changeset
45
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
46 typedef enum Predictor{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
47 LEFT= 0,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
48 PLANE,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
49 MEDIAN,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
50 } Predictor;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
51
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
52 typedef struct HYuvContext{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
53 AVCodecContext *avctx;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
54 Predictor predictor;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
55 GetBitContext gb;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
56 PutBitContext pb;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
57 int interlaced;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
58 int decorrelate;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
59 int bitstream_bpp;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
60 int version;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
61 int yuy2; //use yuy2 instead of 422P
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
62 int bgr32; //use bgr32 instead of bgr24
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
63 int width, height;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
64 int flags;
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
65 int context;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
66 int picture_number;
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
67 int last_slice_end;
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
68 uint8_t *temp[3];
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
69 uint64_t stats[3][256];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
70 uint8_t len[3][256];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
71 uint32_t bits[3][256];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
72 VLC vlc[3];
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 909
diff changeset
73 AVFrame picture;
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
74 uint8_t *bitstream_buffer;
3066
04b924f8f5a5 warning fixes by Luca Abeni, lucabe72 ##@## email ##.## it
diego
parents: 3036
diff changeset
75 unsigned int bitstream_buffer_size;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
76 DSPContext dsp;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
77 }HYuvContext;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
78
1082
82c3ba139e51 * const arrays
kabi
parents: 1080
diff changeset
79 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
80 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
81 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
82 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
83 };
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
1082
82c3ba139e51 * const arrays
kabi
parents: 1080
diff changeset
85 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
86 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
87 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
88 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
89 };
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
1082
82c3ba139e51 * const arrays
kabi
parents: 1080
diff changeset
91 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
92 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
93 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
94 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
95 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
96 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
97 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
98 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
99 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
100 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
101 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
102 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
103 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
104 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
105 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
106 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
107 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
108 };
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
1082
82c3ba139e51 * const arrays
kabi
parents: 1080
diff changeset
110 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
111 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
112 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
113 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
114 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
115 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
116 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
117 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
118 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
119 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
120 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
121 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
122 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
123 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
124 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
125 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
126 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
127 };
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
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
129 static inline int add_left_prediction(uint8_t *dst, uint8_t *src, int w, int acc){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
130 int i;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
131
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
132 for(i=0; i<w-1; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
133 acc+= src[i];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
134 dst[i]= acc;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
135 i++;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
136 acc+= src[i];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
137 dst[i]= acc;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
138 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
139
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
140 for(; i<w; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
141 acc+= src[i];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
142 dst[i]= acc;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
143 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
144
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
145 return acc;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
146 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
147
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
148 static inline void add_median_prediction(uint8_t *dst, uint8_t *src1, uint8_t *diff, int w, int *left, int *left_top){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
149 int i;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
150 uint8_t l, lt;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
151
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
152 l= *left;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
153 lt= *left_top;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
154
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
155 for(i=0; i<w; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
156 l= mid_pred(l, src1[i], (l + src1[i] - lt)&0xFF) + diff[i];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
157 lt= src1[i];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
158 dst[i]= l;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
159 }
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
160
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
161 *left= l;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
162 *left_top= lt;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
163 }
1232
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1228
diff changeset
164
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
165 static inline void add_left_prediction_bgr32(uint8_t *dst, uint8_t *src, int w, int *red, int *green, int *blue){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
166 int i;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
167 int r,g,b;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
168 r= *red;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
169 g= *green;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
170 b= *blue;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
171
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
172 for(i=0; i<w; i++){
2176
ab4ee35c4137 big endian fix (untested)
michael
parents: 2051
diff changeset
173 b+= src[4*i+B];
ab4ee35c4137 big endian fix (untested)
michael
parents: 2051
diff changeset
174 g+= src[4*i+G];
ab4ee35c4137 big endian fix (untested)
michael
parents: 2051
diff changeset
175 r+= src[4*i+R];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
176
2176
ab4ee35c4137 big endian fix (untested)
michael
parents: 2051
diff changeset
177 dst[4*i+B]= b;
ab4ee35c4137 big endian fix (untested)
michael
parents: 2051
diff changeset
178 dst[4*i+G]= g;
ab4ee35c4137 big endian fix (untested)
michael
parents: 2051
diff changeset
179 dst[4*i+R]= r;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
180 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
181
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
182 *red= r;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
183 *green= g;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
184 *blue= b;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
185 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
186
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
187 static inline int sub_left_prediction(HYuvContext *s, uint8_t *dst, uint8_t *src, int w, int left){
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
188 int i;
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
189 if(w<32){
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
190 for(i=0; i<w; i++){
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
191 const int temp= src[i];
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
192 dst[i]= temp - left;
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
193 left= temp;
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
194 }
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
195 return left;
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
196 }else{
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
197 for(i=0; i<16; i++){
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
198 const int temp= src[i];
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
199 dst[i]= temp - left;
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
200 left= temp;
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
201 }
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
202 s->dsp.diff_bytes(dst+16, src+16, src+15, w-16);
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
203 return src[w-1];
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
204 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
205 }
1325
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1309
diff changeset
206
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
207 static void read_len_table(uint8_t *dst, GetBitContext *gb){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
208 int i, val, repeat;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
209
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
210 for(i=0; i<256;){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
211 repeat= get_bits(gb, 3);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
212 val = get_bits(gb, 5);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
213 if(repeat==0)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
214 repeat= get_bits(gb, 8);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
215 //printf("%d %d\n", val, repeat);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
216 while (repeat--)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
217 dst[i++] = val;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
218 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
219 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
220
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
221 static int generate_bits_table(uint32_t *dst, uint8_t *len_table){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
222 int len, index;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
223 uint32_t bits=0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
224
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
225 for(len=32; len>0; len--){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
226 for(index=0; index<256; index++){
1279
77aafc141a39 cleanup
michaelni
parents: 1273
diff changeset
227 if(len_table[index]==len)
77aafc141a39 cleanup
michaelni
parents: 1273
diff changeset
228 dst[index]= bits++;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
229 }
1279
77aafc141a39 cleanup
michaelni
parents: 1273
diff changeset
230 if(bits & 1){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1529
diff changeset
231 av_log(NULL, AV_LOG_ERROR, "Error generating huffman table\n");
1279
77aafc141a39 cleanup
michaelni
parents: 1273
diff changeset
232 return -1;
77aafc141a39 cleanup
michaelni
parents: 1273
diff changeset
233 }
77aafc141a39 cleanup
michaelni
parents: 1273
diff changeset
234 bits >>= 1;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
235 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
236 return 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
237 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
238
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
239 static void generate_len_table(uint8_t *dst, uint64_t *stats, int size){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
240 uint64_t counts[2*size];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
241 int up[2*size];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
242 int offset, i, next;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
243
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
244 for(offset=1; ; offset<<=1){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
245 for(i=0; i<size; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
246 counts[i]= stats[i] + offset - 1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
247 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
248
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
249 for(next=size; next<size*2; next++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
250 uint64_t min1, min2;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
251 int min1_i, min2_i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
252
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
253 min1=min2= INT64_MAX;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
254 min1_i= min2_i=-1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
255
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
256 for(i=0; i<next; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
257 if(min2 > counts[i]){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
258 if(min1 > counts[i]){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
259 min2= min1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
260 min2_i= min1_i;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
261 min1= counts[i];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
262 min1_i= i;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
263 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
264 min2= counts[i];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
265 min2_i= i;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
266 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
267 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
268 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
269
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
270 if(min2==INT64_MAX) break;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
271
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
272 counts[next]= min1 + min2;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
273 counts[min1_i]=
869
michaelni
parents: 868
diff changeset
274 counts[min2_i]= INT64_MAX;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
275 up[min1_i]=
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
276 up[min2_i]= next;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
277 up[next]= -1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
278 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
279
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
280 for(i=0; i<size; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
281 int len;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
282 int index=i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
283
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
284 for(len=0; up[index] != -1; len++)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
285 index= up[index];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
286
2233
michael
parents: 2190
diff changeset
287 if(len >= 32) break;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
288
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
289 dst[i]= len;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
290 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
291 if(i==size) break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
292 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
293 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
294
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
295 static int read_huffman_tables(HYuvContext *s, uint8_t *src, int length){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
296 GetBitContext gb;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
297 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
298
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
299 init_get_bits(&gb, src, length*8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
300
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
301 for(i=0; i<3; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
302 read_len_table(s->len[i], &gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
303
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
304 if(generate_bits_table(s->bits[i], s->len[i])<0){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
305 return -1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
306 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
307 #if 0
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
308 for(j=0; j<256; j++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
309 printf("%6X, %2d, %3d\n", s->bits[i][j], s->len[i][j], j);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
310 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
311 #endif
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
312 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
313 init_vlc(&s->vlc[i], VLC_BITS, 256, s->len[i], 1, 1, s->bits[i], 4, 4, 0);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
314 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
315
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
316 return (get_bits_count(&gb)+7)/8;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
317 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
318
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
319 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
320 #if 1
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
321 GetBitContext gb;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
322 int i;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
323
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
324 init_get_bits(&gb, classic_shift_luma, sizeof(classic_shift_luma)*8);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
325 read_len_table(s->len[0], &gb);
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 1006
diff changeset
326 init_get_bits(&gb, classic_shift_chroma, sizeof(classic_shift_chroma)*8);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
327 read_len_table(s->len[1], &gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
328
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
329 for(i=0; i<256; i++) s->bits[0][i] = classic_add_luma [i];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
330 for(i=0; i<256; i++) s->bits[1][i] = classic_add_chroma[i];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
331
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
332 if(s->bitstream_bpp >= 24){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
333 memcpy(s->bits[1], s->bits[0], 256*sizeof(uint32_t));
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
334 memcpy(s->len[1] , s->len [0], 256*sizeof(uint8_t));
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
335 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
336 memcpy(s->bits[2], s->bits[1], 256*sizeof(uint32_t));
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
337 memcpy(s->len[2] , s->len [1], 256*sizeof(uint8_t));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
338
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
339 for(i=0; i<3; i++){
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
340 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
341 init_vlc(&s->vlc[i], VLC_BITS, 256, s->len[i], 1, 1, s->bits[i], 4, 4, 0);
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
342 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
343
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
344 return 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
345 #else
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3066
diff changeset
346 av_log(s->avctx, AV_LOG_DEBUG, "v1 huffyuv is not supported \n");
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
347 return -1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
348 #endif
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
349 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
350
2511
366e8a09eb6e buffer overflows
michael
parents: 2501
diff changeset
351 static void alloc_temp(HYuvContext *s){
366e8a09eb6e buffer overflows
michael
parents: 2501
diff changeset
352 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
353
2511
366e8a09eb6e buffer overflows
michael
parents: 2501
diff changeset
354 if(s->bitstream_bpp<24){
366e8a09eb6e buffer overflows
michael
parents: 2501
diff changeset
355 for(i=0; i<3; i++){
366e8a09eb6e buffer overflows
michael
parents: 2501
diff changeset
356 s->temp[i]= av_malloc(s->width + 16);
366e8a09eb6e buffer overflows
michael
parents: 2501
diff changeset
357 }
366e8a09eb6e buffer overflows
michael
parents: 2501
diff changeset
358 }else{
366e8a09eb6e buffer overflows
michael
parents: 2501
diff changeset
359 s->temp[0]= av_malloc(4*s->width + 16);
366e8a09eb6e buffer overflows
michael
parents: 2501
diff changeset
360 }
366e8a09eb6e buffer overflows
michael
parents: 2501
diff changeset
361 }
366e8a09eb6e buffer overflows
michael
parents: 2501
diff changeset
362
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
363 static int common_init(AVCodecContext *avctx){
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
364 HYuvContext *s = avctx->priv_data;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
365
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
366 s->avctx= avctx;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
367 s->flags= avctx->flags;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
368
1097
michaelni
parents: 1082
diff changeset
369 dsputil_init(&s->dsp, avctx);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
370
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
371 s->width= avctx->width;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
372 s->height= avctx->height;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
373 assert(s->width>0 && s->height>0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
374
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
375 return 0;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
376 }
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
377
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
378 static int decode_init(AVCodecContext *avctx)
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
379 {
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
380 HYuvContext *s = avctx->priv_data;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
381
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
382 common_init(avctx);
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
383 memset(s->vlc, 0, 3*sizeof(VLC));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
384
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 909
diff changeset
385 avctx->coded_frame= &s->picture;
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
386 s->interlaced= s->height > 288;
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
387
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
388 s->bgr32=1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
389 //if(avctx->extradata)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
390 // printf("extradata:%X, extradata_size:%d\n", *(uint32_t*)avctx->extradata, avctx->extradata_size);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
391 if(avctx->extradata_size){
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
392 if((avctx->bits_per_sample&7) && avctx->bits_per_sample != 12)
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
393 s->version=1; // do such files exist at all?
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
394 else
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
395 s->version=2;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
396 }else
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
397 s->version=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
398
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
399 if(s->version==2){
2374
b36811e1386a fix interlacing check in v1 huffyuv.
lorenm
parents: 2373
diff changeset
400 int method, interlace;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
401
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
402 method= ((uint8_t*)avctx->extradata)[0];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
403 s->decorrelate= method&64 ? 1 : 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
404 s->predictor= method&63;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
405 s->bitstream_bpp= ((uint8_t*)avctx->extradata)[1];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
406 if(s->bitstream_bpp==0)
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
407 s->bitstream_bpp= avctx->bits_per_sample&~7;
2374
b36811e1386a fix interlacing check in v1 huffyuv.
lorenm
parents: 2373
diff changeset
408 interlace= (((uint8_t*)avctx->extradata)[2] & 0x30) >> 4;
b36811e1386a fix interlacing check in v1 huffyuv.
lorenm
parents: 2373
diff changeset
409 s->interlaced= (interlace==1) ? 1 : (interlace==2) ? 0 : s->interlaced;
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
410 s->context= ((uint8_t*)avctx->extradata)[2] & 0x40 ? 1 : 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
411
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
412 if(read_huffman_tables(s, ((uint8_t*)avctx->extradata)+4, avctx->extradata_size) < 0)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
413 return -1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
414 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
415 switch(avctx->bits_per_sample&7){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
416 case 1:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
417 s->predictor= LEFT;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
418 s->decorrelate= 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
419 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
420 case 2:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
421 s->predictor= LEFT;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
422 s->decorrelate= 1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
423 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
424 case 3:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
425 s->predictor= PLANE;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
426 s->decorrelate= avctx->bits_per_sample >= 24;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
427 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
428 case 4:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
429 s->predictor= MEDIAN;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
430 s->decorrelate= 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
431 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
432 default:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
433 s->predictor= LEFT; //OLD
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
434 s->decorrelate= 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
435 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
436 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
437 s->bitstream_bpp= avctx->bits_per_sample & ~7;
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
438 s->context= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
439
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
440 if(read_old_huffman_tables(s) < 0)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
441 return -1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
442 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
443
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
444 switch(s->bitstream_bpp){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
445 case 12:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
446 avctx->pix_fmt = PIX_FMT_YUV420P;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
447 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
448 case 16:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
449 if(s->yuy2){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
450 avctx->pix_fmt = PIX_FMT_YUV422;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
451 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
452 avctx->pix_fmt = PIX_FMT_YUV422P;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
453 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
454 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
455 case 24:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
456 case 32:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
457 if(s->bgr32){
990
165064f921ee changed BGRA32 to RGBA32. XXX: clarify expected behaviour on big endian cpu
bellard
parents: 925
diff changeset
458 avctx->pix_fmt = PIX_FMT_RGBA32;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
459 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
460 avctx->pix_fmt = PIX_FMT_BGR24;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
461 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
462 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
463 default:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
464 assert(0);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
465 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
466
2511
366e8a09eb6e buffer overflows
michael
parents: 2501
diff changeset
467 alloc_temp(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
468
2190
303e09116fe7 yuv median encoding 10l fix
michael
parents: 2177
diff changeset
469 // av_log(NULL, AV_LOG_DEBUG, "pred:%d bpp:%d hbpp:%d il:%d\n", s->predictor, s->bitstream_bpp, avctx->bits_per_sample, s->interlaced);
303e09116fe7 yuv median encoding 10l fix
michael
parents: 2177
diff changeset
470
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
471 return 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
472 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
473
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
474 static int store_table(HYuvContext *s, uint8_t *len, uint8_t *buf){
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
475 int i;
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
476 int index= 0;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
477
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
478 for(i=0; i<256;){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
479 int val= len[i];
1529
cb523a2ca00f fix the case where all vlc codes are 8 bits long (repeat=256)
michael
parents: 1528
diff changeset
480 int repeat=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
481
1529
cb523a2ca00f fix the case where all vlc codes are 8 bits long (repeat=256)
michael
parents: 1528
diff changeset
482 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
483 repeat++;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
484
1529
cb523a2ca00f fix the case where all vlc codes are 8 bits long (repeat=256)
michael
parents: 1528
diff changeset
485 assert(val < 32 && val >0 && repeat<256 && repeat>0);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
486 if(repeat>7){
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
487 buf[index++]= val;
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
488 buf[index++]= repeat;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
489 }else{
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
490 buf[index++]= val | (repeat<<5);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
491 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
492 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
493
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
494 return index;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
495 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
496
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
497 static int encode_init(AVCodecContext *avctx)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
498 {
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
499 HYuvContext *s = avctx->priv_data;
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
500 int i, j;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
501
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
502 common_init(avctx);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
503
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
504 avctx->extradata= av_mallocz(1024*30); // 256*3+4 == 772
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
505 avctx->stats_out= av_mallocz(1024*30); // 21*256*3(%llu ) + 3(\n) + 1(0) = 16132
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
506 s->version=2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
507
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 909
diff changeset
508 avctx->coded_frame= &s->picture;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
509
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
510 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
511 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
512 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
513 break;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
514 case PIX_FMT_YUV422P:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
515 s->bitstream_bpp= 16;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
516 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
517 default:
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1529
diff changeset
518 av_log(avctx, AV_LOG_ERROR, "format not supported\n");
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
519 return -1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
520 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
521 avctx->bits_per_sample= s->bitstream_bpp;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
522 s->decorrelate= s->bitstream_bpp >= 24;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
523 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
524 s->interlaced= avctx->flags&CODEC_FLAG_INTERLACED_ME ? 1 : 0;
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
525 if(avctx->context_model==1){
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
526 s->context= avctx->context_model;
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
527 if(s->flags & (CODEC_FLAG_PASS1|CODEC_FLAG_PASS2)){
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
528 av_log(avctx, AV_LOG_ERROR, "context=1 is not compatible with 2 pass huffyuv encoding\n");
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
529 return -1;
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
530 }
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
531 }else s->context= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
532
2373
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
533 if(avctx->codec->id==CODEC_ID_HUFFYUV){
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
534 if(avctx->pix_fmt==PIX_FMT_YUV420P){
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
535 av_log(avctx, AV_LOG_ERROR, "Error: YV12 is not supported by huffyuv; use vcodec=ffvhuff or format=422p\n");
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
536 return -1;
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
537 }
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
538 if(avctx->context_model){
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
539 av_log(avctx, AV_LOG_ERROR, "Error: per-frame huffman tables are not supported by huffyuv; use vcodec=ffvhuff\n");
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
540 return -1;
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
541 }
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
542 if(s->interlaced != ( s->height > 288 ))
2373
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
543 av_log(avctx, AV_LOG_INFO, "using huffyuv 2.2.0 or newer interlacing flag\n");
2658
d1609cfeb1d0 #defines for strict_std_compliance and split between inofficial extensions and non standarized things
michael
parents: 2628
diff changeset
544 }else if(avctx->strict_std_compliance>FF_COMPLIANCE_EXPERIMENTAL){
d1609cfeb1d0 #defines for strict_std_compliance and split between inofficial extensions and non standarized things
michael
parents: 2628
diff changeset
545 av_log(avctx, AV_LOG_ERROR, "This codec is under development; files encoded with it may not be decodable with future versions!!! Set vstrict=-2 / -strict -2 to use it anyway.\n");
2373
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
546 return -1;
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
547 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
548
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
549 ((uint8_t*)avctx->extradata)[0]= s->predictor;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
550 ((uint8_t*)avctx->extradata)[1]= s->bitstream_bpp;
2374
b36811e1386a fix interlacing check in v1 huffyuv.
lorenm
parents: 2373
diff changeset
551 ((uint8_t*)avctx->extradata)[2]= s->interlaced ? 0x10 : 0x20;
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
552 if(s->context)
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
553 ((uint8_t*)avctx->extradata)[2]|= 0x40;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
554 ((uint8_t*)avctx->extradata)[3]= 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
555 s->avctx->extradata_size= 4;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
556
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
557 if(avctx->stats_in){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
558 char *p= avctx->stats_in;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
559
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
560 for(i=0; i<3; i++)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
561 for(j=0; j<256; j++)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
562 s->stats[i][j]= 1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
563
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
564 for(;;){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
565 for(i=0; i<3; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
566 char *next;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
567
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
568 for(j=0; j<256; j++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
569 s->stats[i][j]+= strtol(p, &next, 0);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
570 if(next==p) return -1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
571 p=next;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
572 }
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
573 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
574 if(p[0]==0 || p[1]==0 || p[2]==0) break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
575 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
576 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
577 for(i=0; i<3; i++)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
578 for(j=0; j<256; j++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
579 int d= FFMIN(j, 256-j);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
580
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
581 s->stats[i][j]= 100000000/(d+1);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
582 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
583 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
584
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
585 for(i=0; i<3; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
586 generate_len_table(s->len[i], s->stats[i], 256);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
587
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
588 if(generate_bits_table(s->bits[i], s->len[i])<0){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
589 return -1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
590 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
591
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
592 s->avctx->extradata_size+=
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
593 store_table(s, s->len[i], &((uint8_t*)s->avctx->extradata)[s->avctx->extradata_size]);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
594 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
595
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
596 if(s->context){
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
597 for(i=0; i<3; i++){
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
598 int pels = s->width*s->height / (i?40:10);
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
599 for(j=0; j<256; j++){
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
600 int d= FFMIN(j, 256-j);
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
601 s->stats[i][j]= pels/(d+1);
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
602 }
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
603 }
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
604 }else{
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
605 for(i=0; i<3; i++)
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
606 for(j=0; j<256; j++)
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
607 s->stats[i][j]= 0;
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
608 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
609
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
610 // printf("pred:%d bpp:%d hbpp:%d il:%d\n", s->predictor, s->bitstream_bpp, avctx->bits_per_sample, s->interlaced);
1232
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1228
diff changeset
611
2511
366e8a09eb6e buffer overflows
michael
parents: 2501
diff changeset
612 alloc_temp(s);
366e8a09eb6e buffer overflows
michael
parents: 2501
diff changeset
613
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
614 s->picture_number=0;
1232
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1228
diff changeset
615
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
616 return 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
617 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
618
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
619 static void decode_422_bitstream(HYuvContext *s, int count){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
620 int i;
1232
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1228
diff changeset
621
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
622 count/=2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
623
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
624 for(i=0; i<count; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
625 s->temp[0][2*i ]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3);
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
626 s->temp[1][ i ]= get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3);
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
627 s->temp[0][2*i+1]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3);
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
628 s->temp[2][ i ]= get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
629 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
630 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
631
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
632 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
633 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
634
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
635 count/=2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
636
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
637 for(i=0; i<count; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
638 s->temp[0][2*i ]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3);
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
639 s->temp[0][2*i+1]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3);
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
640 }
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
641 }
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
642
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
643 static int encode_422_bitstream(HYuvContext *s, int count){
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
644 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
645
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
646 if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < 2*4*count){
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
647 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
648 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
649 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
650
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
651 count/=2;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
652 if(s->flags&CODEC_FLAG_PASS1){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
653 for(i=0; i<count; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
654 s->stats[0][ s->temp[0][2*i ] ]++;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
655 s->stats[1][ s->temp[1][ i ] ]++;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
656 s->stats[0][ s->temp[0][2*i+1] ]++;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
657 s->stats[2][ s->temp[2][ i ] ]++;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
658 }
2501
236562127b89 seperate bitstream encoding skip from PASS1 flag
michael
parents: 2453
diff changeset
659 }
236562127b89 seperate bitstream encoding skip from PASS1 flag
michael
parents: 2453
diff changeset
660 if(s->avctx->flags2&CODEC_FLAG2_NO_OUTPUT)
236562127b89 seperate bitstream encoding skip from PASS1 flag
michael
parents: 2453
diff changeset
661 return 0;
236562127b89 seperate bitstream encoding skip from PASS1 flag
michael
parents: 2453
diff changeset
662 if(s->context){
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
663 for(i=0; i<count; i++){
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
664 s->stats[0][ s->temp[0][2*i ] ]++;
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
665 put_bits(&s->pb, s->len[0][ s->temp[0][2*i ] ], s->bits[0][ s->temp[0][2*i ] ]);
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
666 s->stats[1][ s->temp[1][ i ] ]++;
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
667 put_bits(&s->pb, s->len[1][ s->temp[1][ i ] ], s->bits[1][ s->temp[1][ i ] ]);
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
668 s->stats[0][ s->temp[0][2*i+1] ]++;
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
669 put_bits(&s->pb, s->len[0][ s->temp[0][2*i+1] ], s->bits[0][ s->temp[0][2*i+1] ]);
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
670 s->stats[2][ s->temp[2][ i ] ]++;
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
671 put_bits(&s->pb, s->len[2][ s->temp[2][ i ] ], s->bits[2][ s->temp[2][ i ] ]);
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
672 }
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
673 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
674 for(i=0; i<count; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
675 put_bits(&s->pb, s->len[0][ s->temp[0][2*i ] ], s->bits[0][ s->temp[0][2*i ] ]);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
676 put_bits(&s->pb, s->len[1][ s->temp[1][ i ] ], s->bits[1][ s->temp[1][ i ] ]);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
677 put_bits(&s->pb, s->len[0][ s->temp[0][2*i+1] ], s->bits[0][ s->temp[0][2*i+1] ]);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
678 put_bits(&s->pb, s->len[2][ s->temp[2][ i ] ], s->bits[2][ s->temp[2][ i ] ]);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
679 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
680 }
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
681 return 0;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
682 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
683
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
684 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
685 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
686
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
687 if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < 4*count){
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
688 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
689 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
690 }
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
691
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
692 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
693 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
694 for(i=0; i<count; i++){
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
695 s->stats[0][ s->temp[0][2*i ] ]++;
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
696 s->stats[0][ s->temp[0][2*i+1] ]++;
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
697 }
2501
236562127b89 seperate bitstream encoding skip from PASS1 flag
michael
parents: 2453
diff changeset
698 }
236562127b89 seperate bitstream encoding skip from PASS1 flag
michael
parents: 2453
diff changeset
699 if(s->avctx->flags2&CODEC_FLAG2_NO_OUTPUT)
236562127b89 seperate bitstream encoding skip from PASS1 flag
michael
parents: 2453
diff changeset
700 return 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
701
2501
236562127b89 seperate bitstream encoding skip from PASS1 flag
michael
parents: 2453
diff changeset
702 if(s->context){
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
703 for(i=0; i<count; i++){
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
704 s->stats[0][ s->temp[0][2*i ] ]++;
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
705 put_bits(&s->pb, s->len[0][ s->temp[0][2*i ] ], s->bits[0][ s->temp[0][2*i ] ]);
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
706 s->stats[0][ s->temp[0][2*i+1] ]++;
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
707 put_bits(&s->pb, s->len[0][ s->temp[0][2*i+1] ], s->bits[0][ s->temp[0][2*i+1] ]);
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
708 }
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
709 }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
710 for(i=0; i<count; i++){
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
711 put_bits(&s->pb, s->len[0][ s->temp[0][2*i ] ], s->bits[0][ s->temp[0][2*i ] ]);
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
712 put_bits(&s->pb, s->len[0][ s->temp[0][2*i+1] ], s->bits[0][ s->temp[0][2*i+1] ]);
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
713 }
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
714 }
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
715 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
716 }
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
717
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
718 static void decode_bgr_bitstream(HYuvContext *s, int count){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
719 int i;
1232
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1228
diff changeset
720
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
721 if(s->decorrelate){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
722 if(s->bitstream_bpp==24){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
723 for(i=0; i<count; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
724 s->temp[0][4*i+G]= get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3);
2177
d46ca56136d5 more untested bigendian fixes
michael
parents: 2176
diff changeset
725 s->temp[0][4*i+B]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3) + s->temp[0][4*i+G];
d46ca56136d5 more untested bigendian fixes
michael
parents: 2176
diff changeset
726 s->temp[0][4*i+R]= get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3) + s->temp[0][4*i+G];
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
727 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
728 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
729 for(i=0; i<count; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
730 s->temp[0][4*i+G]= get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3);
2176
ab4ee35c4137 big endian fix (untested)
michael
parents: 2051
diff changeset
731 s->temp[0][4*i+B]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3) + s->temp[0][4*i+G];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
732 s->temp[0][4*i+R]= get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3) + s->temp[0][4*i+G];
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
733 get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3); //?!
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
734 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
735 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
736 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
737 if(s->bitstream_bpp==24){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
738 for(i=0; i<count; i++){
2177
d46ca56136d5 more untested bigendian fixes
michael
parents: 2176
diff changeset
739 s->temp[0][4*i+B]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
740 s->temp[0][4*i+G]= get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3);
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
741 s->temp[0][4*i+R]= get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
742 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
743 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
744 for(i=0; i<count; i++){
2176
ab4ee35c4137 big endian fix (untested)
michael
parents: 2051
diff changeset
745 s->temp[0][4*i+B]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
746 s->temp[0][4*i+G]= get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3);
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
747 s->temp[0][4*i+R]= get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
748 get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3); //?!
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
749 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
750 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
751 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
752 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
753
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
754 static void draw_slice(HYuvContext *s, int y){
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
755 int h, cy;
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1325
diff changeset
756 int offset[4];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
757
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
758 if(s->avctx->draw_horiz_band==NULL)
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
759 return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
760
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
761 h= y - s->last_slice_end;
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
762 y -= h;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
763
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
764 if(s->bitstream_bpp==12){
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
765 cy= y>>1;
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
766 }else{
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
767 cy= y;
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
768 }
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1325
diff changeset
769
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1325
diff changeset
770 offset[0] = s->picture.linesize[0]*y;
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1325
diff changeset
771 offset[1] = s->picture.linesize[1]*cy;
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1325
diff changeset
772 offset[2] = s->picture.linesize[2]*cy;
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1325
diff changeset
773 offset[3] = 0;
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
774 emms_c();
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
775
1370
45d761c387cd default for slices is display order again
michaelni
parents: 1368
diff changeset
776 s->avctx->draw_horiz_band(s->avctx, &s->picture, offset, y, 3, h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
777
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
778 s->last_slice_end= y + h;
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
779 }
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
780
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
781 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
782 HYuvContext *s = avctx->priv_data;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
783 const int width= s->width;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
784 const int width2= s->width>>1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
785 const int height= s->height;
870
michaelni
parents: 869
diff changeset
786 int fake_ystride, fake_ustride, fake_vstride;
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 909
diff changeset
787 AVFrame * const p= &s->picture;
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
788 int table_size= 0;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
789
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 909
diff changeset
790 AVFrame *picture = data;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
791
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
792 s->bitstream_buffer= av_fast_realloc(s->bitstream_buffer, &s->bitstream_buffer_size, buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
793
1273
a979fab41ed8 ASV1 codec
michaelni
parents: 1246
diff changeset
794 s->dsp.bswap_buf((uint32_t*)s->bitstream_buffer, (uint32_t*)buf, buf_size/4);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
795
1228
d63e0185a90f release buffer cleanup
michaelni
parents: 1214
diff changeset
796 if(p->data[0])
d63e0185a90f release buffer cleanup
michaelni
parents: 1214
diff changeset
797 avctx->release_buffer(avctx, p);
d63e0185a90f release buffer cleanup
michaelni
parents: 1214
diff changeset
798
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
799 p->reference= 0;
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
800 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
801 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
802 return -1;
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
803 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
804
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
805 if(s->context){
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
806 table_size = read_huffman_tables(s, s->bitstream_buffer, buf_size);
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
807 if(table_size < 0)
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
808 return -1;
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
809 }
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
810
3201
35f5c9a8bc83 segfault fix
michael
parents: 3177
diff changeset
811 if((unsigned)(buf_size-table_size) >= INT_MAX/8)
35f5c9a8bc83 segfault fix
michael
parents: 3177
diff changeset
812 return -1;
35f5c9a8bc83 segfault fix
michael
parents: 3177
diff changeset
813
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
814 init_get_bits(&s->gb, s->bitstream_buffer+table_size, (buf_size-table_size)*8);
870
michaelni
parents: 869
diff changeset
815
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
816 fake_ystride= s->interlaced ? p->linesize[0]*2 : p->linesize[0];
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
817 fake_ustride= s->interlaced ? p->linesize[1]*2 : p->linesize[1];
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
818 fake_vstride= s->interlaced ? p->linesize[2]*2 : p->linesize[2];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
819
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
820 s->last_slice_end= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
821
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
822 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
823 int y, cy;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
824 int lefty, leftu, leftv;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
825 int lefttopy, lefttopu, lefttopv;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
826
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
827 if(s->yuy2){
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
828 p->data[0][3]= get_bits(&s->gb, 8);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
829 p->data[0][2]= get_bits(&s->gb, 8);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
830 p->data[0][1]= get_bits(&s->gb, 8);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
831 p->data[0][0]= get_bits(&s->gb, 8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
832
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
833 av_log(avctx, AV_LOG_ERROR, "YUY2 output is not implemented yet\n");
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
834 return -1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
835 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
836
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
837 leftv= p->data[2][0]= get_bits(&s->gb, 8);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
838 lefty= p->data[0][1]= get_bits(&s->gb, 8);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
839 leftu= p->data[1][0]= get_bits(&s->gb, 8);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
840 p->data[0][0]= get_bits(&s->gb, 8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
841
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
842 switch(s->predictor){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
843 case LEFT:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
844 case PLANE:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
845 decode_422_bitstream(s, width-2);
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
846 lefty= add_left_prediction(p->data[0] + 2, s->temp[0], width-2, lefty);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
847 if(!(s->flags&CODEC_FLAG_GRAY)){
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
848 leftu= add_left_prediction(p->data[1] + 1, s->temp[1], width2-1, leftu);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
849 leftv= add_left_prediction(p->data[2] + 1, s->temp[2], width2-1, leftv);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
850 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
851
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
852 for(cy=y=1; y<s->height; y++,cy++){
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
853 uint8_t *ydst, *udst, *vdst;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
854
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
855 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
856 decode_gray_bitstream(s, width);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
857
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
858 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
859
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 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
861 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
862 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
863 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
864 }
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 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
866 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
867 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
868
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
869 draw_slice(s, y);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
870
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
871 ydst= p->data[0] + p->linesize[0]*y;
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
872 udst= p->data[1] + p->linesize[1]*cy;
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
873 vdst= p->data[2] + p->linesize[2]*cy;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
874
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
875 decode_422_bitstream(s, width);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
876 lefty= add_left_prediction(ydst, s->temp[0], width, lefty);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
877 if(!(s->flags&CODEC_FLAG_GRAY)){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
878 leftu= add_left_prediction(udst, s->temp[1], width2, leftu);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
879 leftv= add_left_prediction(vdst, s->temp[2], width2, leftv);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
880 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
881 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
882 if(cy>s->interlaced){
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
883 s->dsp.add_bytes(ydst, ydst - fake_ystride, width);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
884 if(!(s->flags&CODEC_FLAG_GRAY)){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
885 s->dsp.add_bytes(udst, udst - fake_ustride, width2);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
886 s->dsp.add_bytes(vdst, vdst - fake_vstride, width2);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
887 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
888 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
889 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
890 }
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
891 draw_slice(s, height);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
892
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
893 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
894 case MEDIAN:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
895 /* first line except first 2 pixels is left predicted */
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
896 decode_422_bitstream(s, width-2);
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
897 lefty= add_left_prediction(p->data[0] + 2, s->temp[0], width-2, lefty);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
898 if(!(s->flags&CODEC_FLAG_GRAY)){
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
899 leftu= add_left_prediction(p->data[1] + 1, s->temp[1], width2-1, leftu);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
900 leftv= add_left_prediction(p->data[2] + 1, s->temp[2], width2-1, leftv);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
901 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
902
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
903 cy=y=1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
904
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
905 /* second line is left predicted for interlaced case */
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
906 if(s->interlaced){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
907 decode_422_bitstream(s, width);
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
908 lefty= add_left_prediction(p->data[0] + p->linesize[0], s->temp[0], width, lefty);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
909 if(!(s->flags&CODEC_FLAG_GRAY)){
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
910 leftu= add_left_prediction(p->data[1] + p->linesize[2], s->temp[1], width2, leftu);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
911 leftv= add_left_prediction(p->data[2] + p->linesize[1], s->temp[2], width2, leftv);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
912 }
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
913 y++; cy++;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
914 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
915
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
916 /* next 4 pixels are left predicted too */
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
917 decode_422_bitstream(s, 4);
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
918 lefty= add_left_prediction(p->data[0] + fake_ystride, s->temp[0], 4, lefty);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
919 if(!(s->flags&CODEC_FLAG_GRAY)){
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
920 leftu= add_left_prediction(p->data[1] + fake_ustride, s->temp[1], 2, leftu);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
921 leftv= add_left_prediction(p->data[2] + fake_vstride, s->temp[2], 2, leftv);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
922 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
923
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
924 /* next line except the first 4 pixels is median predicted */
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
925 lefttopy= p->data[0][3];
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
926 decode_422_bitstream(s, width-4);
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
927 add_median_prediction(p->data[0] + fake_ystride+4, p->data[0]+4, s->temp[0], width-4, &lefty, &lefttopy);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
928 if(!(s->flags&CODEC_FLAG_GRAY)){
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
929 lefttopu= p->data[1][1];
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
930 lefttopv= p->data[2][1];
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
931 add_median_prediction(p->data[1] + fake_ustride+2, p->data[1]+2, s->temp[1], width2-2, &leftu, &lefttopu);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
932 add_median_prediction(p->data[2] + fake_vstride+2, p->data[2]+2, s->temp[2], width2-2, &leftv, &lefttopv);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
933 }
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
934 y++; cy++;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
935
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
936 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
937 uint8_t *ydst, *udst, *vdst;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
938
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
939 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
940 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
941 decode_gray_bitstream(s, width);
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
942 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
943 add_median_prediction(ydst, ydst - fake_ystride, s->temp[0], width, &lefty, &lefttopy);
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
944 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
945 }
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
946 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
947 }
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
948 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
949
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
950 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
951
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
952 ydst= p->data[0] + p->linesize[0]*y;
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
953 udst= p->data[1] + p->linesize[1]*cy;
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
954 vdst= p->data[2] + p->linesize[2]*cy;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
955
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
956 add_median_prediction(ydst, ydst - fake_ystride, s->temp[0], width, &lefty, &lefttopy);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
957 if(!(s->flags&CODEC_FLAG_GRAY)){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
958 add_median_prediction(udst, udst - fake_ustride, s->temp[1], width2, &leftu, &lefttopu);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
959 add_median_prediction(vdst, vdst - fake_vstride, s->temp[2], width2, &leftv, &lefttopv);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
960 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
961 }
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
962
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
963 draw_slice(s, height);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
964 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
965 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
966 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
967 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
968 int y;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
969 int leftr, leftg, leftb;
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
970 const int last_line= (height-1)*p->linesize[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
971
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
972 if(s->bitstream_bpp==32){
2177
d46ca56136d5 more untested bigendian fixes
michael
parents: 2176
diff changeset
973 skip_bits(&s->gb, 8);
d46ca56136d5 more untested bigendian fixes
michael
parents: 2176
diff changeset
974 leftr= p->data[0][last_line+R]= get_bits(&s->gb, 8);
d46ca56136d5 more untested bigendian fixes
michael
parents: 2176
diff changeset
975 leftg= p->data[0][last_line+G]= get_bits(&s->gb, 8);
d46ca56136d5 more untested bigendian fixes
michael
parents: 2176
diff changeset
976 leftb= p->data[0][last_line+B]= get_bits(&s->gb, 8);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
977 }else{
2177
d46ca56136d5 more untested bigendian fixes
michael
parents: 2176
diff changeset
978 leftr= p->data[0][last_line+R]= get_bits(&s->gb, 8);
d46ca56136d5 more untested bigendian fixes
michael
parents: 2176
diff changeset
979 leftg= p->data[0][last_line+G]= get_bits(&s->gb, 8);
d46ca56136d5 more untested bigendian fixes
michael
parents: 2176
diff changeset
980 leftb= p->data[0][last_line+B]= get_bits(&s->gb, 8);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
981 skip_bits(&s->gb, 8);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
982 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
983
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
984 if(s->bgr32){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
985 switch(s->predictor){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
986 case LEFT:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
987 case PLANE:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
988 decode_bgr_bitstream(s, width-1);
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
989 add_left_prediction_bgr32(p->data[0] + last_line+4, s->temp[0], width-1, &leftr, &leftg, &leftb);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
990
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
991 for(y=s->height-2; y>=0; y--){ //yes its stored upside down
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
992 decode_bgr_bitstream(s, width);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
993
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
994 add_left_prediction_bgr32(p->data[0] + p->linesize[0]*y, s->temp[0], width, &leftr, &leftg, &leftb);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
995 if(s->predictor == PLANE){
2351
35b1d0c69edd plane predicted non-interlacd rgb decodeing fix
michael
parents: 2239
diff changeset
996 if((y&s->interlaced)==0 && y<s->height-1-s->interlaced){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
997 s->dsp.add_bytes(p->data[0] + p->linesize[0]*y,
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
998 p->data[0] + p->linesize[0]*y + fake_ystride, fake_ystride);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
999 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1000 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1001 }
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
1002 draw_slice(s, height); // just 1 large slice as this is not possible in reverse order
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1003 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1004 default:
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1529
diff changeset
1005 av_log(avctx, AV_LOG_ERROR, "prediction type not supported!\n");
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1006 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1007 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1008
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
1009 av_log(avctx, AV_LOG_ERROR, "BGR24 output is not implemented yet\n");
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1010 return -1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1011 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1012 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1013 emms_c();
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1014
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1015 *picture= *p;
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 909
diff changeset
1016 *data_size = sizeof(AVFrame);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1017
3234
823272bdb4f7 dont forget table_size in the decode_frame return value
michael
parents: 3201
diff changeset
1018 return (get_bits_count(&s->gb)+31)/32*4 + table_size;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1019 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1020
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
1021 static int common_end(HYuvContext *s){
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
1022 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1023
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
1024 for(i=0; i<3; i++){
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
1025 av_freep(&s->temp[i]);
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
1026 }
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
1027 return 0;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
1028 }
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
1029
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1030 static int decode_end(AVCodecContext *avctx)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1031 {
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1032 HYuvContext *s = avctx->priv_data;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1033 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1034
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
1035 common_end(s);
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
1036 av_freep(&s->bitstream_buffer);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1037
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1038 for(i=0; i<3; i++){
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1039 free_vlc(&s->vlc[i]);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1040 }
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1041
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1042 return 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1043 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1044
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1045 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1046 HYuvContext *s = avctx->priv_data;
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 909
diff changeset
1047 AVFrame *pict = data;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1048 const int width= s->width;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1049 const int width2= s->width>>1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1050 const int height= s->height;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1051 const int fake_ystride= s->interlaced ? pict->linesize[0]*2 : pict->linesize[0];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1052 const int fake_ustride= s->interlaced ? pict->linesize[1]*2 : pict->linesize[1];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1053 const int fake_vstride= s->interlaced ? pict->linesize[2]*2 : pict->linesize[2];
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 909
diff changeset
1054 AVFrame * const p= &s->picture;
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
1055 int i, j, size=0;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1056
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1057 *p = *pict;
1006
michaelni
parents: 990
diff changeset
1058 p->pict_type= FF_I_TYPE;
michaelni
parents: 990
diff changeset
1059 p->key_frame= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1060
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
1061 if(s->context){
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
1062 for(i=0; i<3; i++){
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
1063 generate_len_table(s->len[i], s->stats[i], 256);
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
1064 if(generate_bits_table(s->bits[i], s->len[i])<0)
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
1065 return -1;
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
1066 size+= store_table(s, s->len[i], &buf[size]);
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
1067 }
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
1068
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
1069 for(i=0; i<3; i++)
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
1070 for(j=0; j<256; j++)
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
1071 s->stats[i][j] >>= 1;
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
1072 }
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
1073
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
1074 init_put_bits(&s->pb, buf+size, buf_size-size);
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
1075
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
1076 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
1077 int lefty, leftu, leftv, y, cy;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1078
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1079 put_bits(&s->pb, 8, leftv= p->data[2][0]);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1080 put_bits(&s->pb, 8, lefty= p->data[0][1]);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1081 put_bits(&s->pb, 8, leftu= p->data[1][0]);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1082 put_bits(&s->pb, 8, p->data[0][0]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1083
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1084 lefty= sub_left_prediction(s, s->temp[0], p->data[0]+2, width-2 , lefty);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1085 leftu= sub_left_prediction(s, s->temp[1], p->data[1]+1, width2-1, leftu);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1086 leftv= sub_left_prediction(s, s->temp[2], p->data[2]+1, width2-1, leftv);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1087
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1088 encode_422_bitstream(s, width-2);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1089
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1090 if(s->predictor==MEDIAN){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1091 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
1092 cy=y=1;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1093 if(s->interlaced){
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1094 lefty= sub_left_prediction(s, s->temp[0], p->data[0]+p->linesize[0], width , lefty);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1095 leftu= sub_left_prediction(s, s->temp[1], p->data[1]+p->linesize[1], width2, leftu);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1096 leftv= sub_left_prediction(s, s->temp[2], p->data[2]+p->linesize[2], width2, leftv);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1097
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1098 encode_422_bitstream(s, width);
868
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
1099 y++; cy++;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1100 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1101
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1102 lefty= sub_left_prediction(s, s->temp[0], p->data[0]+fake_ystride, 4, lefty);
2190
303e09116fe7 yuv median encoding 10l fix
michael
parents: 2177
diff changeset
1103 leftu= sub_left_prediction(s, s->temp[1], p->data[1]+fake_ustride, 2, leftu);
303e09116fe7 yuv median encoding 10l fix
michael
parents: 2177
diff changeset
1104 leftv= sub_left_prediction(s, s->temp[2], p->data[2]+fake_vstride, 2, leftv);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1105
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1106 encode_422_bitstream(s, 4);
868
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
1107
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1108 lefttopy= p->data[0][3];
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1109 lefttopu= p->data[1][1];
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1110 lefttopv= p->data[2][1];
1527
8ffd0c00e6df mmx2 optimization of huffyuv median encoding
michael
parents: 1526
diff changeset
1111 s->dsp.sub_hfyu_median_prediction(s->temp[0], p->data[0]+4, p->data[0] + fake_ystride+4, width-4 , &lefty, &lefttopy);
8ffd0c00e6df mmx2 optimization of huffyuv median encoding
michael
parents: 1526
diff changeset
1112 s->dsp.sub_hfyu_median_prediction(s->temp[1], p->data[1]+2, p->data[1] + fake_ustride+2, width2-2, &leftu, &lefttopu);
8ffd0c00e6df mmx2 optimization of huffyuv median encoding
michael
parents: 1526
diff changeset
1113 s->dsp.sub_hfyu_median_prediction(s->temp[2], p->data[2]+2, p->data[2] + fake_vstride+2, width2-2, &leftv, &lefttopv);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1114 encode_422_bitstream(s, width-4);
868
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
1115 y++; cy++;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1116
868
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
1117 for(; y<height; y++,cy++){
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1118 uint8_t *ydst, *udst, *vdst;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1119
868
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
1120 if(s->bitstream_bpp==12){
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
1121 while(2*cy > y){
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1122 ydst= p->data[0] + p->linesize[0]*y;
1527
8ffd0c00e6df mmx2 optimization of huffyuv median encoding
michael
parents: 1526
diff changeset
1123 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
1124 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
1125 y++;
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
1126 }
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
1127 if(y>=height) break;
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
1128 }
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1129 ydst= p->data[0] + p->linesize[0]*y;
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1130 udst= p->data[1] + p->linesize[1]*cy;
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1131 vdst= p->data[2] + p->linesize[2]*cy;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1132
1527
8ffd0c00e6df mmx2 optimization of huffyuv median encoding
michael
parents: 1526
diff changeset
1133 s->dsp.sub_hfyu_median_prediction(s->temp[0], ydst - fake_ystride, ydst, width , &lefty, &lefttopy);
8ffd0c00e6df mmx2 optimization of huffyuv median encoding
michael
parents: 1526
diff changeset
1134 s->dsp.sub_hfyu_median_prediction(s->temp[1], udst - fake_ustride, udst, width2, &leftu, &lefttopu);
8ffd0c00e6df mmx2 optimization of huffyuv median encoding
michael
parents: 1526
diff changeset
1135 s->dsp.sub_hfyu_median_prediction(s->temp[2], vdst - fake_vstride, vdst, width2, &leftv, &lefttopv);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1136
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1137 encode_422_bitstream(s, width);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1138 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1139 }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
1140 for(cy=y=1; y<height; y++,cy++){
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1141 uint8_t *ydst, *udst, *vdst;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1142
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 /* 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
1144 if(s->bitstream_bpp==12){
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1145 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
1146
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
1147 if(s->predictor == PLANE && s->interlaced < y){
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1148 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
1149
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1150 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
1151 }else{
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1152 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
1153 }
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
1154 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
1155 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
1156 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
1157 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1158
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1159 ydst= p->data[0] + p->linesize[0]*y;
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1160 udst= p->data[1] + p->linesize[1]*cy;
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1161 vdst= p->data[2] + p->linesize[2]*cy;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1162
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
1163 if(s->predictor == PLANE && s->interlaced < cy){
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1164 s->dsp.diff_bytes(s->temp[1], ydst, ydst - fake_ystride, width);
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1165 s->dsp.diff_bytes(s->temp[2], udst, udst - fake_ustride, width2);
2511
366e8a09eb6e buffer overflows
michael
parents: 2501
diff changeset
1166 s->dsp.diff_bytes(s->temp[2] + width2, vdst, vdst - fake_vstride, width2);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1167
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1168 lefty= sub_left_prediction(s, s->temp[0], s->temp[1], width , lefty);
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1169 leftu= sub_left_prediction(s, s->temp[1], s->temp[2], width2, leftu);
2511
366e8a09eb6e buffer overflows
michael
parents: 2501
diff changeset
1170 leftv= sub_left_prediction(s, s->temp[2], s->temp[2] + width2, width2, leftv);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1171 }else{
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1172 lefty= sub_left_prediction(s, s->temp[0], ydst, width , lefty);
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1173 leftu= sub_left_prediction(s, s->temp[1], udst, width2, leftu);
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1174 leftv= sub_left_prediction(s, s->temp[2], vdst, width2, leftv);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1175 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1176
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1177 encode_422_bitstream(s, width);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1178 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1179 }
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1180 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1529
diff changeset
1181 av_log(avctx, AV_LOG_ERROR, "Format not supported!\n");
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1182 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1183 emms_c();
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1184
2369
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
1185 size+= (put_bits_count(&s->pb)+31)/8;
ce47b1d51cb1 new option: context_model
lorenm
parents: 2351
diff changeset
1186 size/= 4;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1187
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1188 if((s->flags&CODEC_FLAG_PASS1) && (s->picture_number&31)==0){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1189 int j;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1190 char *p= avctx->stats_out;
2423
87b7fbed8609 dissallow sprintf
michael
parents: 2422
diff changeset
1191 char *end= p + 1024*30;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1192 for(i=0; i<3; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1193 for(j=0; j<256; j++){
2962
fde28cb7e3d5 use PRIxN, %zd, %td formats where needed
mru
parents: 2658
diff changeset
1194 snprintf(p, end-p, "%"PRIu64" ", s->stats[i][j]);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1195 p+= strlen(p);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1196 s->stats[i][j]= 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1197 }
2423
87b7fbed8609 dissallow sprintf
michael
parents: 2422
diff changeset
1198 snprintf(p, end-p, "\n");
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1199 p++;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1200 }
2501
236562127b89 seperate bitstream encoding skip from PASS1 flag
michael
parents: 2453
diff changeset
1201 }
236562127b89 seperate bitstream encoding skip from PASS1 flag
michael
parents: 2453
diff changeset
1202 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
1203 flush_put_bits(&s->pb);
1273
a979fab41ed8 ASV1 codec
michaelni
parents: 1246
diff changeset
1204 s->dsp.bswap_buf((uint32_t*)buf, (uint32_t*)buf, size);
2239
506fdbb9d19c huffyuv writes to AVCodecContext.stats_out only once every 32 frames,
michael
parents: 2238
diff changeset
1205 avctx->stats_out[0] = '\0';
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1206 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1207
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1208 s->picture_number++;
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1209
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1210 return size*4;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1211 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1212
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1213 static int encode_end(AVCodecContext *avctx)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1214 {
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
1215 HYuvContext *s = avctx->priv_data;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1216
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2398
diff changeset
1217 common_end(s);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1218
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1219 av_freep(&avctx->extradata);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1220 av_freep(&avctx->stats_out);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1221
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1222 return 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1223 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1224
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1225 AVCodec huffyuv_decoder = {
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1226 "huffyuv",
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1227 CODEC_TYPE_VIDEO,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1228 CODEC_ID_HUFFYUV,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1229 sizeof(HYuvContext),
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1230 decode_init,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1231 NULL,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1232 decode_end,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1233 decode_frame,
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1234 CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND,
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1235 NULL
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1236 };
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1237
2373
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
1238 AVCodec ffvhuff_decoder = {
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
1239 "ffvhuff",
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
1240 CODEC_TYPE_VIDEO,
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
1241 CODEC_ID_FFVHUFF,
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
1242 sizeof(HYuvContext),
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
1243 decode_init,
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
1244 NULL,
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
1245 decode_end,
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
1246 decode_frame,
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
1247 CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND,
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
1248 NULL
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
1249 };
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
1250
1232
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1228
diff changeset
1251 #ifdef CONFIG_ENCODERS
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1228
diff changeset
1252
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1253 AVCodec huffyuv_encoder = {
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1254 "huffyuv",
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1255 CODEC_TYPE_VIDEO,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1256 CODEC_ID_HUFFYUV,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1257 sizeof(HYuvContext),
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1258 encode_init,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1259 encode_frame,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1260 encode_end,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1261 };
1232
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1228
diff changeset
1262
2373
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
1263 AVCodec ffvhuff_encoder = {
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
1264 "ffvhuff",
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
1265 CODEC_TYPE_VIDEO,
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
1266 CODEC_ID_FFVHUFF,
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
1267 sizeof(HYuvContext),
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
1268 encode_init,
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
1269 encode_frame,
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
1270 encode_end,
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
1271 };
f977a8871c2c split ffhuffyuv into 2 codecs:
lorenm
parents: 2370
diff changeset
1272
1246
5adfc8044c64 * quiet missing EOF \n warning
kabi
parents: 1232
diff changeset
1273 #endif //CONFIG_ENCODERS