annotate huffyuv.c @ 4724:ea97803884e1 libavcodec

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