annotate huffyuv.c @ 1371:a0c0bee12abf libavcodec

bitstream changes to match JM7.2
author michaelni
date Wed, 23 Jul 2003 00:32:50 +0000
parents 45d761c387cd
children 79dddc5cd990
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1 /*
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
2 * huffyuv codec for libavcodec
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
3 *
1006
michaelni
parents: 990
diff changeset
4 * Copyright (c) 2002-2003 Michael Niedermayer <michaelni@gmx.at>
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
5 *
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
6 * This library is free software; you can redistribute it and/or
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
7 * modify it under the terms of the GNU Lesser General Public
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
8 * License as published by the Free Software Foundation; either
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
9 * version 2 of the License, or (at your option) any later version.
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
10 *
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
11 * This library is distributed in the hope that it will be useful,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
14 * Lesser General Public License for more details.
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
15 *
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
16 * You should have received a copy of the GNU Lesser General Public
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
17 * License along with this library; if not, write to the Free Software
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
19 *
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
20 * see http://www.pcisys.net/~melanson/codecs/huffyuv.txt for a description of
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
21 * the algorithm used
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
22 */
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1097
diff changeset
23
1e39f273ecd6 per file doxy
michaelni
parents: 1097
diff changeset
24 /**
1e39f273ecd6 per file doxy
michaelni
parents: 1097
diff changeset
25 * @file huffyuv.c
1e39f273ecd6 per file doxy
michaelni
parents: 1097
diff changeset
26 * huffyuv codec for libavcodec.
1e39f273ecd6 per file doxy
michaelni
parents: 1097
diff changeset
27 */
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
28
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
29 #include "common.h"
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
30 #include "avcodec.h"
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
31 #include "dsputil.h"
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
32
869
michaelni
parents: 868
diff changeset
33 #ifndef INT64_MAX
michaelni
parents: 868
diff changeset
34 #define INT64_MAX 9223372036854775807LL
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
35 #endif
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
36
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
37 #define VLC_BITS 11
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
38
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
39 typedef enum Predictor{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
40 LEFT= 0,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
41 PLANE,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
42 MEDIAN,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
43 } Predictor;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
44
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
45 typedef struct HYuvContext{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
46 AVCodecContext *avctx;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
47 Predictor predictor;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
48 GetBitContext gb;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
49 PutBitContext pb;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
50 int interlaced;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
51 int decorrelate;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
52 int bitstream_bpp;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
53 int version;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
54 int yuy2; //use yuy2 instead of 422P
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
55 int bgr32; //use bgr32 instead of bgr24
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
56 int width, height;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
57 int flags;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
58 int picture_number;
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
59 int last_slice_end;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
60 uint8_t __align8 temp[3][2500];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
61 uint64_t stats[3][256];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
62 uint8_t len[3][256];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
63 uint32_t bits[3][256];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
64 VLC vlc[3];
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 909
diff changeset
65 AVFrame picture;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
66 uint8_t __align8 bitstream_buffer[1024*1024*3]; //FIXME dynamic alloc or some other solution
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
67 DSPContext dsp;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
68 }HYuvContext;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
69
1082
82c3ba139e51 * const arrays
kabi
parents: 1080
diff changeset
70 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
71 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
72 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
73 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
74 };
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
75
1082
82c3ba139e51 * const arrays
kabi
parents: 1080
diff changeset
76 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
77 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
78 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
79 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
80 };
a150aba978de huffyuv v1 tables, as they are essential and the only possible way for decding of v1 files they very likely cant be copyrighted ...
michaelni
parents: 1078
diff changeset
81
1082
82c3ba139e51 * const arrays
kabi
parents: 1080
diff changeset
82 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
83 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
84 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
85 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
86 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
87 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
88 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
89 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
90 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
91 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
92 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
93 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
94 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
95 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
96 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
97 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
98 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
99 };
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
1082
82c3ba139e51 * const arrays
kabi
parents: 1080
diff changeset
101 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
102 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
103 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
104 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
105 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
106 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
107 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
108 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
109 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
110 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
111 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
112 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
113 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
114 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
115 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
116 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
117 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
118 };
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
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
120 static inline int add_left_prediction(uint8_t *dst, uint8_t *src, int w, int acc){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
121 int i;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
122
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
123 for(i=0; i<w-1; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
124 acc+= src[i];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
125 dst[i]= acc;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
126 i++;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
127 acc+= src[i];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
128 dst[i]= acc;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
129 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
130
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
131 for(; i<w; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
132 acc+= src[i];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
133 dst[i]= acc;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
134 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
135
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
136 return acc;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
137 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
138
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
139 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
140 int i;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
141 uint8_t l, lt;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
142
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
143 l= *left;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
144 lt= *left_top;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
145
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
146 for(i=0; i<w; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
147 l= mid_pred(l, src1[i], (l + src1[i] - lt)&0xFF) + diff[i];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
148 lt= src1[i];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
149 dst[i]= l;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
150 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
151
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
152 *left= l;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
153 *left_top= lt;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
154 }
1232
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1228
diff changeset
155
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
156 //FIXME optimize
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
157 static inline void sub_median_prediction(uint8_t *dst, uint8_t *src1, uint8_t *src2, int w, int *left, int *left_top){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
158 int i;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
159 uint8_t l, lt;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
160
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
161 l= *left;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
162 lt= *left_top;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
163
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
164 for(i=0; i<w; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
165 const int pred= mid_pred(l, src1[i], (l + src1[i] - lt)&0xFF);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
166 lt= src1[i];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
167 l= src2[i];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
168 dst[i]= l - pred;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
169 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
170
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
171 *left= l;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
172 *left_top= lt;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
173 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
174
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
175 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
176 int i;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
177 int r,g,b;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
178 r= *red;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
179 g= *green;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
180 b= *blue;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
181
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
182 for(i=0; i<w; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
183 b+= src[4*i+0];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
184 g+= src[4*i+1];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
185 r+= src[4*i+2];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
186
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
187 dst[4*i+0]= b;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
188 dst[4*i+1]= g;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
189 dst[4*i+2]= r;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
190 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
191
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
192 *red= r;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
193 *green= g;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
194 *blue= b;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
195 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
196
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
197 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
198 int i;
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
199 if(w<32){
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
200 for(i=0; i<w; i++){
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
201 const int temp= src[i];
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
202 dst[i]= temp - left;
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
203 left= temp;
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
204 }
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
205 return left;
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
206 }else{
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
207 for(i=0; i<16; i++){
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
208 const int temp= src[i];
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
209 dst[i]= temp - left;
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
210 left= temp;
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
211 }
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
212 s->dsp.diff_bytes(dst+16, src+16, src+15, w-16);
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
213 return src[w-1];
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
214 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
215 }
1325
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1309
diff changeset
216
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
217 static void read_len_table(uint8_t *dst, GetBitContext *gb){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
218 int i, val, repeat;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
219
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
220 for(i=0; i<256;){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
221 repeat= get_bits(gb, 3);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
222 val = get_bits(gb, 5);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
223 if(repeat==0)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
224 repeat= get_bits(gb, 8);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
225 //printf("%d %d\n", val, repeat);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
226 while (repeat--)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
227 dst[i++] = val;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
228 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
229 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
230
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
231 static int generate_bits_table(uint32_t *dst, uint8_t *len_table){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
232 int len, index;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
233 uint32_t bits=0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
234
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
235 for(len=32; len>0; len--){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
236 for(index=0; index<256; index++){
1279
77aafc141a39 cleanup
michaelni
parents: 1273
diff changeset
237 if(len_table[index]==len)
77aafc141a39 cleanup
michaelni
parents: 1273
diff changeset
238 dst[index]= bits++;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
239 }
1279
77aafc141a39 cleanup
michaelni
parents: 1273
diff changeset
240 if(bits & 1){
77aafc141a39 cleanup
michaelni
parents: 1273
diff changeset
241 fprintf(stderr, "Error generating huffman table\n");
77aafc141a39 cleanup
michaelni
parents: 1273
diff changeset
242 return -1;
77aafc141a39 cleanup
michaelni
parents: 1273
diff changeset
243 }
77aafc141a39 cleanup
michaelni
parents: 1273
diff changeset
244 bits >>= 1;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
245 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
246 return 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
247 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
248
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
249 static void generate_len_table(uint8_t *dst, uint64_t *stats, int size){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
250 uint64_t counts[2*size];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
251 int up[2*size];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
252 int offset, i, next;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
253
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
254 for(offset=1; ; offset<<=1){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
255 for(i=0; i<size; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
256 counts[i]= stats[i] + offset - 1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
257 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
258
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
259 for(next=size; next<size*2; next++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
260 uint64_t min1, min2;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
261 int min1_i, min2_i;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
262
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
263 min1=min2= INT64_MAX;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
264 min1_i= min2_i=-1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
265
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
266 for(i=0; i<next; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
267 if(min2 > counts[i]){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
268 if(min1 > counts[i]){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
269 min2= min1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
270 min2_i= min1_i;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
271 min1= counts[i];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
272 min1_i= i;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
273 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
274 min2= counts[i];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
275 min2_i= i;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
276 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
277 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
278 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
279
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
280 if(min2==INT64_MAX) break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
281
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
282 counts[next]= min1 + min2;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
283 counts[min1_i]=
869
michaelni
parents: 868
diff changeset
284 counts[min2_i]= INT64_MAX;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
285 up[min1_i]=
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
286 up[min2_i]= next;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
287 up[next]= -1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
288 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
289
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
290 for(i=0; i<size; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
291 int len;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
292 int index=i;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
293
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
294 for(len=0; up[index] != -1; len++)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
295 index= up[index];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
296
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
297 if(len > 32) break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
298
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
299 dst[i]= len;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
300 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
301 if(i==size) break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
302 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
303 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
304
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
305 static int read_huffman_tables(HYuvContext *s, uint8_t *src, int length){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
306 GetBitContext gb;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
307 int i;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
308
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
309 init_get_bits(&gb, src, length*8);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
310
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
311 for(i=0; i<3; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
312 read_len_table(s->len[i], &gb);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
313
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
314 if(generate_bits_table(s->bits[i], s->len[i])<0){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
315 return -1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
316 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
317 #if 0
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
318 for(j=0; j<256; j++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
319 printf("%6X, %2d, %3d\n", s->bits[i][j], s->len[i][j], j);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
320 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
321 #endif
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
322 init_vlc(&s->vlc[i], VLC_BITS, 256, s->len[i], 1, 1, s->bits[i], 4, 4);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
323 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
324
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
325 return 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
326 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
327
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
328 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
329 #if 1
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
330 GetBitContext gb;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
331 int i;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
332
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
333 init_get_bits(&gb, classic_shift_luma, sizeof(classic_shift_luma)*8);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
334 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
335 init_get_bits(&gb, classic_shift_chroma, sizeof(classic_shift_chroma)*8);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
336 read_len_table(s->len[1], &gb);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
337
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
338 for(i=0; i<256; i++) s->bits[0][i] = classic_add_luma [i];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
339 for(i=0; i<256; i++) s->bits[1][i] = classic_add_chroma[i];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
340
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
341 if(s->bitstream_bpp >= 24){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
342 memcpy(s->bits[1], s->bits[0], 256*sizeof(uint32_t));
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
343 memcpy(s->len[1] , s->len [0], 256*sizeof(uint8_t));
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
344 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
345 memcpy(s->bits[2], s->bits[1], 256*sizeof(uint32_t));
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
346 memcpy(s->len[2] , s->len [1], 256*sizeof(uint8_t));
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
347
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
348 for(i=0; i<3; i++)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
349 init_vlc(&s->vlc[i], VLC_BITS, 256, s->len[i], 1, 1, s->bits[i], 4, 4);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
350
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
351 return 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
352 #else
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
353 fprintf(stderr, "v1 huffyuv is not supported \n");
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
354 return -1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
355 #endif
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
356 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
357
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
358 static int decode_init(AVCodecContext *avctx)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
359 {
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
360 HYuvContext *s = avctx->priv_data;
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
361 int width, height;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
362
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
363 s->avctx= avctx;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
364 s->flags= avctx->flags;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
365
1097
michaelni
parents: 1082
diff changeset
366 dsputil_init(&s->dsp, avctx);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
367
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
368 width= s->width= avctx->width;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
369 height= s->height= avctx->height;
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 909
diff changeset
370 avctx->coded_frame= &s->picture;
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
371
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
372 s->bgr32=1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
373 assert(width && height);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
374 //if(avctx->extradata)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
375 // printf("extradata:%X, extradata_size:%d\n", *(uint32_t*)avctx->extradata, avctx->extradata_size);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
376 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
377 if((avctx->bits_per_sample&7) && avctx->bits_per_sample != 12)
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
378 s->version=1; // do such files exist at all?
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
379 else
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
380 s->version=2;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
381 }else
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
382 s->version=0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
383
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
384 if(s->version==2){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
385 int method;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
386
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
387 method= ((uint8_t*)avctx->extradata)[0];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
388 s->decorrelate= method&64 ? 1 : 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
389 s->predictor= method&63;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
390 s->bitstream_bpp= ((uint8_t*)avctx->extradata)[1];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
391 if(s->bitstream_bpp==0)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
392 s->bitstream_bpp= avctx->bits_per_sample&~7;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
393
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
394 if(read_huffman_tables(s, ((uint8_t*)avctx->extradata)+4, avctx->extradata_size) < 0)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
395 return -1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
396 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
397 switch(avctx->bits_per_sample&7){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
398 case 1:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
399 s->predictor= LEFT;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
400 s->decorrelate= 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
401 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
402 case 2:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
403 s->predictor= LEFT;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
404 s->decorrelate= 1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
405 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
406 case 3:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
407 s->predictor= PLANE;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
408 s->decorrelate= avctx->bits_per_sample >= 24;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
409 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
410 case 4:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
411 s->predictor= MEDIAN;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
412 s->decorrelate= 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
413 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
414 default:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
415 s->predictor= LEFT; //OLD
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
416 s->decorrelate= 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
417 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
418 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
419 s->bitstream_bpp= avctx->bits_per_sample & ~7;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
420
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
421 if(read_old_huffman_tables(s) < 0)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
422 return -1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
423 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
424
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
425 s->interlaced= height > 288;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
426
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
427 switch(s->bitstream_bpp){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
428 case 12:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
429 avctx->pix_fmt = PIX_FMT_YUV420P;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
430 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
431 case 16:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
432 if(s->yuy2){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
433 avctx->pix_fmt = PIX_FMT_YUV422;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
434 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
435 avctx->pix_fmt = PIX_FMT_YUV422P;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
436 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
437 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
438 case 24:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
439 case 32:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
440 if(s->bgr32){
990
165064f921ee changed BGRA32 to RGBA32. XXX: clarify expected behaviour on big endian cpu
bellard
parents: 925
diff changeset
441 avctx->pix_fmt = PIX_FMT_RGBA32;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
442 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
443 avctx->pix_fmt = PIX_FMT_BGR24;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
444 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
445 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
446 default:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
447 assert(0);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
448 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
449
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
450 // printf("pred:%d bpp:%d hbpp:%d il:%d\n", s->predictor, s->bitstream_bpp, avctx->bits_per_sample, s->interlaced);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
451
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
452 return 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
453 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
454
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
455 static void store_table(HYuvContext *s, uint8_t *len){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
456 int i;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
457 int index= s->avctx->extradata_size;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
458
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
459 for(i=0; i<256;){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
460 int cur=i;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
461 int val= len[i];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
462 int repeat;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
463
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
464 for(; i<256 && len[i]==val; i++);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
465
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
466 repeat= i - cur;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
467
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
468 if(repeat>7){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
469 ((uint8_t*)s->avctx->extradata)[index++]= val;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
470 ((uint8_t*)s->avctx->extradata)[index++]= repeat;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
471 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
472 ((uint8_t*)s->avctx->extradata)[index++]= val | (repeat<<5);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
473 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
474 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
475
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
476 s->avctx->extradata_size= index;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
477 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
478
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
479 static int encode_init(AVCodecContext *avctx)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
480 {
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
481 HYuvContext *s = avctx->priv_data;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
482 int i, j, width, height;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
483
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
484 s->avctx= avctx;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
485 s->flags= avctx->flags;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
486
1097
michaelni
parents: 1082
diff changeset
487 dsputil_init(&s->dsp, avctx);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
488
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
489 width= s->width= avctx->width;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
490 height= s->height= avctx->height;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
491
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
492 assert(width && height);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
493
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
494 avctx->extradata= av_mallocz(1024*10);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
495 avctx->stats_out= av_mallocz(1024*10);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
496 s->version=2;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
497
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 909
diff changeset
498 avctx->coded_frame= &s->picture;
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
499
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
500 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
501 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
502 if(avctx->strict_std_compliance>=0){
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
503 fprintf(stderr, "YV12-huffyuv is experimental, there WILL be no compatbility! (use (v)strict=-1)\n");
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
504 return -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
505 }
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
506 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
507 break;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
508 case PIX_FMT_YUV422P:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
509 s->bitstream_bpp= 16;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
510 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
511 default:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
512 fprintf(stderr, "format not supported\n");
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
513 return -1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
514 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
515 avctx->bits_per_sample= s->bitstream_bpp;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
516 s->decorrelate= s->bitstream_bpp >= 24;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
517 s->predictor= avctx->prediction_method;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
518
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
519 ((uint8_t*)avctx->extradata)[0]= s->predictor;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
520 ((uint8_t*)avctx->extradata)[1]= s->bitstream_bpp;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
521 ((uint8_t*)avctx->extradata)[2]=
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
522 ((uint8_t*)avctx->extradata)[3]= 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
523 s->avctx->extradata_size= 4;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
524
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
525 if(avctx->stats_in){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
526 char *p= avctx->stats_in;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
527
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
528 for(i=0; i<3; i++)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
529 for(j=0; j<256; j++)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
530 s->stats[i][j]= 1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
531
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
532 for(;;){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
533 for(i=0; i<3; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
534 char *next;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
535
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
536 for(j=0; j<256; j++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
537 s->stats[i][j]+= strtol(p, &next, 0);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
538 if(next==p) return -1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
539 p=next;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
540 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
541 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
542 if(p[0]==0 || p[1]==0 || p[2]==0) break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
543 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
544 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
545 for(i=0; i<3; i++)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
546 for(j=0; j<256; j++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
547 int d= FFMIN(j, 256-j);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
548
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
549 s->stats[i][j]= 100000000/(d+1);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
550 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
551 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
552
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
553 for(i=0; i<3; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
554 generate_len_table(s->len[i], s->stats[i], 256);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
555
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
556 if(generate_bits_table(s->bits[i], s->len[i])<0){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
557 return -1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
558 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
559
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
560 store_table(s, s->len[i]);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
561 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
562
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
563 for(i=0; i<3; i++)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
564 for(j=0; j<256; j++)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
565 s->stats[i][j]= 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
566
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
567 s->interlaced= height > 288;
1232
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1228
diff changeset
568
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
569 // 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
570
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
571 s->picture_number=0;
1232
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1228
diff changeset
572
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
573 return 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
574 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
575
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
576 static void decode_422_bitstream(HYuvContext *s, int count){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
577 int i;
1232
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1228
diff changeset
578
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
579 count/=2;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
580
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
581 for(i=0; i<count; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
582 s->temp[0][2*i ]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
583 s->temp[1][ i ]= get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
584 s->temp[0][2*i+1]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
585 s->temp[2][ i ]= get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
586 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
587 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
588
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
589 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
590 int 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
591
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
592 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
593
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
594 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
595 s->temp[0][2*i ]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3);
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
596 s->temp[0][2*i+1]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3);
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
597 }
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
598 }
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
599
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
600 static void encode_422_bitstream(HYuvContext *s, int count){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
601 int i;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
602
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
603 count/=2;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
604 if(s->flags&CODEC_FLAG_PASS1){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
605 for(i=0; i<count; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
606 s->stats[0][ s->temp[0][2*i ] ]++;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
607 s->stats[1][ s->temp[1][ i ] ]++;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
608 s->stats[0][ s->temp[0][2*i+1] ]++;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
609 s->stats[2][ s->temp[2][ i ] ]++;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
610 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
611 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
612 for(i=0; i<count; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
613 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
614 put_bits(&s->pb, s->len[1][ s->temp[1][ i ] ], s->bits[1][ s->temp[1][ i ] ]);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
615 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
616 put_bits(&s->pb, s->len[2][ s->temp[2][ i ] ], s->bits[2][ s->temp[2][ i ] ]);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
617 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
618 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
619 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
620
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
621 static void encode_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
622 int 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
623
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
624 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
625 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
626 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
627 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
628 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
629 }
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
630 }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
631 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
632 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
633 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
634 }
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
635 }
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
636 }
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
637
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
638 static void decode_bgr_bitstream(HYuvContext *s, int count){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
639 int i;
1232
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1228
diff changeset
640
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
641 if(s->decorrelate){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
642 if(s->bitstream_bpp==24){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
643 for(i=0; i<count; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
644 s->temp[0][4*i+1]= get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
645 s->temp[0][4*i ]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3) + s->temp[0][4*i+1];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
646 s->temp[0][4*i+2]= get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3) + s->temp[0][4*i+1];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
647 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
648 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
649 for(i=0; i<count; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
650 s->temp[0][4*i+1]= get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
651 s->temp[0][4*i ]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3) + s->temp[0][4*i+1];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
652 s->temp[0][4*i+2]= get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3) + s->temp[0][4*i+1];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
653 get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3); //?!
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
654 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
655 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
656 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
657 if(s->bitstream_bpp==24){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
658 for(i=0; i<count; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
659 s->temp[0][4*i ]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
660 s->temp[0][4*i+1]= get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
661 s->temp[0][4*i+2]= get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
662 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
663 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
664 for(i=0; i<count; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
665 s->temp[0][4*i ]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
666 s->temp[0][4*i+1]= get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
667 s->temp[0][4*i+2]= get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
668 get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3); //?!
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
669 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
670 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
671 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
672 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
673
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
674 static void draw_slice(HYuvContext *s, int y){
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
675 int h, cy;
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1325
diff changeset
676 int offset[4];
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
677
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
678 if(s->avctx->draw_horiz_band==NULL)
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
679 return;
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
680
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
681 h= y - s->last_slice_end;
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
682 y -= h;
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
683
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
684 if(s->bitstream_bpp==12){
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
685 cy= y>>1;
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
686 }else{
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
687 cy= y;
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
688 }
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1325
diff changeset
689
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1325
diff changeset
690 offset[0] = s->picture.linesize[0]*y;
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1325
diff changeset
691 offset[1] = s->picture.linesize[1]*cy;
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1325
diff changeset
692 offset[2] = s->picture.linesize[2]*cy;
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1325
diff changeset
693 offset[3] = 0;
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
694 emms_c();
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
695
1370
45d761c387cd default for slices is display order again
michaelni
parents: 1368
diff changeset
696 s->avctx->draw_horiz_band(s->avctx, &s->picture, offset, y, 3, h);
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
697
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
698 s->last_slice_end= y + h;
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
699 }
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
700
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
701 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
702 HYuvContext *s = avctx->priv_data;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
703 const int width= s->width;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
704 const int width2= s->width>>1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
705 const int height= s->height;
870
michaelni
parents: 869
diff changeset
706 int fake_ystride, fake_ustride, fake_vstride;
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 909
diff changeset
707 AVFrame * const p= &s->picture;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
708
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 909
diff changeset
709 AVFrame *picture = data;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
710
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
711 *data_size = 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
712
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
713 /* no supplementary picture */
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
714 if (buf_size == 0)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
715 return 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
716
1273
a979fab41ed8 ASV1 codec
michaelni
parents: 1246
diff changeset
717 s->dsp.bswap_buf((uint32_t*)s->bitstream_buffer, (uint32_t*)buf, buf_size/4);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
718
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
719 init_get_bits(&s->gb, s->bitstream_buffer, buf_size*8);
870
michaelni
parents: 869
diff changeset
720
1228
d63e0185a90f release buffer cleanup
michaelni
parents: 1214
diff changeset
721 if(p->data[0])
d63e0185a90f release buffer cleanup
michaelni
parents: 1214
diff changeset
722 avctx->release_buffer(avctx, p);
d63e0185a90f release buffer cleanup
michaelni
parents: 1214
diff changeset
723
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
724 p->reference= 0;
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
725 if(avctx->get_buffer(avctx, p) < 0){
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
726 fprintf(stderr, "get_buffer() failed\n");
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
727 return -1;
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
728 }
870
michaelni
parents: 869
diff changeset
729
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
730 fake_ystride= s->interlaced ? p->linesize[0]*2 : p->linesize[0];
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
731 fake_ustride= s->interlaced ? p->linesize[1]*2 : p->linesize[1];
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
732 fake_vstride= s->interlaced ? p->linesize[2]*2 : p->linesize[2];
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
733
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
734 s->last_slice_end= 0;
870
michaelni
parents: 869
diff changeset
735
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
736 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
737 int y, cy;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
738 int lefty, leftu, leftv;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
739 int lefttopy, lefttopu, lefttopv;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
740
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
741 if(s->yuy2){
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
742 p->data[0][3]= get_bits(&s->gb, 8);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
743 p->data[0][2]= get_bits(&s->gb, 8);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
744 p->data[0][1]= get_bits(&s->gb, 8);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
745 p->data[0][0]= get_bits(&s->gb, 8);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
746
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
747 fprintf(stderr, "YUY2 output isnt implemenetd yet\n");
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
748 return -1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
749 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
750
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
751 leftv= p->data[2][0]= get_bits(&s->gb, 8);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
752 lefty= p->data[0][1]= get_bits(&s->gb, 8);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
753 leftu= p->data[1][0]= get_bits(&s->gb, 8);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
754 p->data[0][0]= get_bits(&s->gb, 8);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
755
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
756 switch(s->predictor){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
757 case LEFT:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
758 case PLANE:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
759 decode_422_bitstream(s, width-2);
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
760 lefty= add_left_prediction(p->data[0] + 2, s->temp[0], width-2, lefty);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
761 if(!(s->flags&CODEC_FLAG_GRAY)){
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
762 leftu= add_left_prediction(p->data[1] + 1, s->temp[1], width2-1, leftu);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
763 leftv= add_left_prediction(p->data[2] + 1, s->temp[2], width2-1, leftv);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
764 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
765
868
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
766 for(cy=y=1; y<s->height; y++,cy++){
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
767 uint8_t *ydst, *udst, *vdst;
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
768
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
769 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
770 decode_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
771
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
772 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
773
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
774 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
775 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
776 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
777 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
778 }
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
779 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
780 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
781 }
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
782
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
783 draw_slice(s, y);
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
784
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
785 ydst= p->data[0] + p->linesize[0]*y;
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
786 udst= p->data[1] + p->linesize[1]*cy;
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
787 vdst= p->data[2] + p->linesize[2]*cy;
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
788
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
789 decode_422_bitstream(s, width);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
790 lefty= add_left_prediction(ydst, s->temp[0], width, lefty);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
791 if(!(s->flags&CODEC_FLAG_GRAY)){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
792 leftu= add_left_prediction(udst, s->temp[1], width2, leftu);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
793 leftv= add_left_prediction(vdst, s->temp[2], width2, leftv);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
794 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
795 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
796 if(cy>s->interlaced){
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
797 s->dsp.add_bytes(ydst, ydst - fake_ystride, width);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
798 if(!(s->flags&CODEC_FLAG_GRAY)){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
799 s->dsp.add_bytes(udst, udst - fake_ustride, width2);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
800 s->dsp.add_bytes(vdst, vdst - fake_vstride, width2);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
801 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
802 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
803 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
804 }
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
805 draw_slice(s, height);
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
806
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
807 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
808 case MEDIAN:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
809 /* first line except first 2 pixels is left predicted */
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
810 decode_422_bitstream(s, width-2);
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
811 lefty= add_left_prediction(p->data[0] + 2, s->temp[0], width-2, lefty);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
812 if(!(s->flags&CODEC_FLAG_GRAY)){
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
813 leftu= add_left_prediction(p->data[1] + 1, s->temp[1], width2-1, leftu);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
814 leftv= add_left_prediction(p->data[2] + 1, s->temp[2], width2-1, leftv);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
815 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
816
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
817 cy=y=1;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
818
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
819 /* second line is left predicted for interlaced case */
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
820 if(s->interlaced){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
821 decode_422_bitstream(s, width);
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
822 lefty= add_left_prediction(p->data[0] + p->linesize[0], s->temp[0], width, lefty);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
823 if(!(s->flags&CODEC_FLAG_GRAY)){
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
824 leftu= add_left_prediction(p->data[1] + p->linesize[2], s->temp[1], width2, leftu);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
825 leftv= add_left_prediction(p->data[2] + p->linesize[1], s->temp[2], width2, leftv);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
826 }
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
827 y++; cy++;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
828 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
829
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
830 /* next 4 pixels are left predicted too */
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
831 decode_422_bitstream(s, 4);
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
832 lefty= add_left_prediction(p->data[0] + fake_ystride, s->temp[0], 4, lefty);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
833 if(!(s->flags&CODEC_FLAG_GRAY)){
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
834 leftu= add_left_prediction(p->data[1] + fake_ustride, s->temp[1], 2, leftu);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
835 leftv= add_left_prediction(p->data[2] + fake_vstride, s->temp[2], 2, leftv);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
836 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
837
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
838 /* next line except the first 4 pixels is median predicted */
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
839 lefttopy= p->data[0][3];
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
840 decode_422_bitstream(s, width-4);
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
841 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
842 if(!(s->flags&CODEC_FLAG_GRAY)){
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
843 lefttopu= p->data[1][1];
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
844 lefttopv= p->data[2][1];
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
845 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
846 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
847 }
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
848 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
849
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
850 for(; 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
851 uint8_t *ydst, *udst, *vdst;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
852
868
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
853 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
854 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
855 decode_gray_bitstream(s, width);
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
856 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
857 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
858 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
859 }
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
860 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
861 }
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
862 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
863
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
864 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
865
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
866 ydst= p->data[0] + p->linesize[0]*y;
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
867 udst= p->data[1] + p->linesize[1]*cy;
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
868 vdst= p->data[2] + p->linesize[2]*cy;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
869
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
870 add_median_prediction(ydst, ydst - fake_ystride, s->temp[0], width, &lefty, &lefttopy);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
871 if(!(s->flags&CODEC_FLAG_GRAY)){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
872 add_median_prediction(udst, udst - fake_ustride, s->temp[1], width2, &leftu, &lefttopu);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
873 add_median_prediction(vdst, vdst - fake_vstride, s->temp[2], width2, &leftv, &lefttopv);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
874 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
875 }
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
876
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
877 draw_slice(s, height);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
878 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
879 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
880 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
881 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
882 int y;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
883 int leftr, leftg, leftb;
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
884 const int last_line= (height-1)*p->linesize[0];
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
885
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
886 if(s->bitstream_bpp==32){
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
887 p->data[0][last_line+3]= get_bits(&s->gb, 8);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
888 leftr= p->data[0][last_line+2]= get_bits(&s->gb, 8);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
889 leftg= p->data[0][last_line+1]= get_bits(&s->gb, 8);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
890 leftb= p->data[0][last_line+0]= get_bits(&s->gb, 8);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
891 }else{
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
892 leftr= p->data[0][last_line+2]= get_bits(&s->gb, 8);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
893 leftg= p->data[0][last_line+1]= get_bits(&s->gb, 8);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
894 leftb= p->data[0][last_line+0]= get_bits(&s->gb, 8);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
895 skip_bits(&s->gb, 8);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
896 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
897
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
898 if(s->bgr32){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
899 switch(s->predictor){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
900 case LEFT:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
901 case PLANE:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
902 decode_bgr_bitstream(s, width-1);
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
903 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
904
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
905 for(y=s->height-2; y>=0; y--){ //yes its stored upside down
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
906 decode_bgr_bitstream(s, width);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
907
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
908 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
909 if(s->predictor == PLANE){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
910 if((y&s->interlaced)==0){
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
911 s->dsp.add_bytes(p->data[0] + p->linesize[0]*y,
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
912 p->data[0] + p->linesize[0]*y + fake_ystride, fake_ystride);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
913 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
914 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
915 }
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
916 draw_slice(s, height); // just 1 large slice as this isnt possible in reverse order
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
917 break;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
918 default:
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
919 fprintf(stderr, "prediction type not supported!\n");
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
920 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
921 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
922
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
923 fprintf(stderr, "BGR24 output isnt implemenetd yet\n");
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
924 return -1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
925 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
926 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
927 emms_c();
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
928
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
929 *picture= *p;
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 909
diff changeset
930 *data_size = sizeof(AVFrame);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
931
1078
c55bffc3b84e round readed bits up to next 32bits, as orginal huffyuv cant handle less then 32bit blocks
michaelni
parents: 1064
diff changeset
932 return (get_bits_count(&s->gb)+31)/32*4;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
933 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
934
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
935 static int decode_end(AVCodecContext *avctx)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
936 {
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
937 HYuvContext *s = avctx->priv_data;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
938 int i;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
939
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
940 for(i=0; i<3; i++){
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
941 free_vlc(&s->vlc[i]);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
942 }
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1130
diff changeset
943
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1130
diff changeset
944 avcodec_default_free_buffers(avctx);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
945
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
946 return 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
947 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
948
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
949 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
950 HYuvContext *s = avctx->priv_data;
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 909
diff changeset
951 AVFrame *pict = data;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
952 const int width= s->width;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
953 const int width2= s->width>>1;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
954 const int height= s->height;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
955 const int fake_ystride= s->interlaced ? pict->linesize[0]*2 : pict->linesize[0];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
956 const int fake_ustride= s->interlaced ? pict->linesize[1]*2 : pict->linesize[1];
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
957 const int fake_vstride= s->interlaced ? pict->linesize[2]*2 : pict->linesize[2];
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 909
diff changeset
958 AVFrame * const p= &s->picture;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
959 int i, size;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
960
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
961 init_put_bits(&s->pb, buf, buf_size, NULL, NULL);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
962
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
963 *p = *pict;
1006
michaelni
parents: 990
diff changeset
964 p->pict_type= FF_I_TYPE;
michaelni
parents: 990
diff changeset
965 p->key_frame= 1;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
966
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
967 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
968 int lefty, leftu, leftv, y, cy;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
969
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
970 put_bits(&s->pb, 8, leftv= p->data[2][0]);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
971 put_bits(&s->pb, 8, lefty= p->data[0][1]);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
972 put_bits(&s->pb, 8, leftu= p->data[1][0]);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
973 put_bits(&s->pb, 8, p->data[0][0]);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
974
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
975 lefty= sub_left_prediction(s, s->temp[0], p->data[0]+2, width-2 , lefty);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
976 leftu= sub_left_prediction(s, s->temp[1], p->data[1]+1, width2-1, leftu);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
977 leftv= sub_left_prediction(s, s->temp[2], p->data[2]+1, width2-1, leftv);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
978
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
979 encode_422_bitstream(s, width-2);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
980
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
981 if(s->predictor==MEDIAN){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
982 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
983 cy=y=1;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
984 if(s->interlaced){
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
985 lefty= sub_left_prediction(s, s->temp[0], p->data[0]+p->linesize[0], width , lefty);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
986 leftu= sub_left_prediction(s, s->temp[1], p->data[1]+p->linesize[1], width2, leftu);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
987 leftv= sub_left_prediction(s, s->temp[2], p->data[2]+p->linesize[2], width2, leftv);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
988
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
989 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
990 y++; cy++;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
991 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
992
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
993 lefty= sub_left_prediction(s, s->temp[0], p->data[0]+fake_ystride, 4, lefty);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
994 leftu= sub_left_prediction(s, s->temp[1], p->data[1]+fake_ystride, 2, leftu);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
995 leftv= sub_left_prediction(s, s->temp[2], p->data[2]+fake_ystride, 2, leftv);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
996
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
997 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
998
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
999 lefttopy= p->data[0][3];
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1000 lefttopu= p->data[1][1];
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1001 lefttopv= p->data[2][1];
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1002 sub_median_prediction(s->temp[0], p->data[0]+4, p->data[0] + fake_ystride+4, width-4 , &lefty, &lefttopy);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1003 sub_median_prediction(s->temp[1], p->data[1]+2, p->data[1] + fake_ustride+2, width2-2, &leftu, &lefttopu);
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1004 sub_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
1005 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
1006 y++; cy++;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1007
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
1008 for(; y<height; y++,cy++){
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1009 uint8_t *ydst, *udst, *vdst;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1010
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
1011 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
1012 while(2*cy > y){
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1013 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
1014 sub_median_prediction(s->temp[0], ydst - fake_ystride, ydst, 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
1015 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
1016 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
1017 }
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
1018 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
1019 }
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1020 ydst= p->data[0] + p->linesize[0]*y;
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1021 udst= p->data[1] + p->linesize[1]*cy;
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1022 vdst= p->data[2] + p->linesize[2]*cy;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1023
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1024 sub_median_prediction(s->temp[0], ydst - fake_ystride, ydst, width , &lefty, &lefttopy);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1025 sub_median_prediction(s->temp[1], udst - fake_ustride, udst, width2, &leftu, &lefttopu);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1026 sub_median_prediction(s->temp[2], vdst - fake_vstride, vdst, width2, &leftv, &lefttopv);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1027
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1028 encode_422_bitstream(s, width);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1029 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1030 }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
1031 for(cy=y=1; y<height; y++,cy++){
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1032 uint8_t *ydst, *udst, *vdst;
868
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
1033
dfe7d66da6f0 YV12 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 /* 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
1035 if(s->bitstream_bpp==12){
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1036 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
1037
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
1038 if(s->predictor == PLANE && s->interlaced < y){
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1039 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
1040
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1041 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
1042 }else{
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1043 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
1044 }
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
1045 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
1046 y++;
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
1047 if(y>=height) break;
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
1048 }
dfe7d66da6f0 YV12 support (warning this is experimental & wont work with offical huffyuv but there is a approx. 20% speed & compression gain)
michaelni
parents: 866
diff changeset
1049
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1050 ydst= p->data[0] + p->linesize[0]*y;
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1051 udst= p->data[1] + p->linesize[1]*cy;
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1052 vdst= p->data[2] + p->linesize[2]*cy;
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1053
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
1054 if(s->predictor == PLANE && s->interlaced < cy){
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1055 s->dsp.diff_bytes(s->temp[1], ydst, ydst - fake_ystride, width);
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1056 s->dsp.diff_bytes(s->temp[2], udst, udst - fake_ustride, width2);
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1057 s->dsp.diff_bytes(s->temp[3], vdst, vdst - fake_vstride, width2);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1058
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1059 lefty= sub_left_prediction(s, s->temp[0], s->temp[1], width , lefty);
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1060 leftu= sub_left_prediction(s, s->temp[1], s->temp[2], width2, leftu);
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1061 leftv= sub_left_prediction(s, s->temp[2], s->temp[3], width2, leftv);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1062 }else{
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1063 lefty= sub_left_prediction(s, s->temp[0], ydst, width , lefty);
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1064 leftu= sub_left_prediction(s, s->temp[1], udst, width2, leftu);
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1065 leftv= sub_left_prediction(s, s->temp[2], vdst, width2, leftv);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1066 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1067
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1068 encode_422_bitstream(s, width);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1069 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1070 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1071 }else{
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1072 fprintf(stderr, "Format not supported!\n");
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1073 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1074 emms_c();
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1075
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1076 size= (get_bit_count(&s->pb)+31)/32;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1077
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1078 if((s->flags&CODEC_FLAG_PASS1) && (s->picture_number&31)==0){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1079 int j;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1080 char *p= avctx->stats_out;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1081 for(i=0; i<3; i++){
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1082 for(j=0; j<256; j++){
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1279
diff changeset
1083 sprintf(p, "%llu ", s->stats[i][j]);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1084 p+= strlen(p);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1085 s->stats[i][j]= 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1086 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1087 sprintf(p, "\n");
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1088 p++;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1089 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1090 }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
1091 flush_put_bits(&s->pb);
1273
a979fab41ed8 ASV1 codec
michaelni
parents: 1246
diff changeset
1092 s->dsp.bswap_buf((uint32_t*)buf, (uint32_t*)buf, size);
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1093 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1094
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1095 s->picture_number++;
903
22ee74da2cd3 cleanup
michaelni
parents: 871
diff changeset
1096
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1097 return size*4;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1098 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1099
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1100 static int encode_end(AVCodecContext *avctx)
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1101 {
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1102 // HYuvContext *s = avctx->priv_data;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1103
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1104 av_freep(&avctx->extradata);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1105 av_freep(&avctx->stats_out);
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1106
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1107 return 0;
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1108 }
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1109
1130
c8dfb8579606 * added more options
kabi
parents: 1106
diff changeset
1110 static const AVOption huffyuv_options[] =
c8dfb8579606 * added more options
kabi
parents: 1106
diff changeset
1111 {
c8dfb8579606 * added more options
kabi
parents: 1106
diff changeset
1112 AVOPTION_CODEC_INT("prediction_method", "prediction_method", prediction_method, 0, 2, 0),
c8dfb8579606 * added more options
kabi
parents: 1106
diff changeset
1113 AVOPTION_END()
c8dfb8579606 * added more options
kabi
parents: 1106
diff changeset
1114 };
c8dfb8579606 * added more options
kabi
parents: 1106
diff changeset
1115
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1116 AVCodec huffyuv_decoder = {
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1117 "huffyuv",
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1118 CODEC_TYPE_VIDEO,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1119 CODEC_ID_HUFFYUV,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1120 sizeof(HYuvContext),
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1121 decode_init,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1122 NULL,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1123 decode_end,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1124 decode_frame,
871
efe2d41df15e slices & encoding optim
michaelni
parents: 870
diff changeset
1125 CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND,
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1126 NULL
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1127 };
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1128
1232
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1228
diff changeset
1129 #ifdef CONFIG_ENCODERS
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1228
diff changeset
1130
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1131 AVCodec huffyuv_encoder = {
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1132 "huffyuv",
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1133 CODEC_TYPE_VIDEO,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1134 CODEC_ID_HUFFYUV,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1135 sizeof(HYuvContext),
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1136 encode_init,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1137 encode_frame,
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1138 encode_end,
1130
c8dfb8579606 * added more options
kabi
parents: 1106
diff changeset
1139 .options = huffyuv_options,
866
725ef4ea3ecc huffyuv
michaelni
parents:
diff changeset
1140 };
1232
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1228
diff changeset
1141
1246
5adfc8044c64 * quiet missing EOF \n warning
kabi
parents: 1232
diff changeset
1142 #endif //CONFIG_ENCODERS