annotate huffyuv.c @ 4199:214d3d9b69dc libavcodec

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