annotate huffyuv.c @ 8383:4be7fab48777 libavcodec

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