annotate huffyuv.c @ 11678:e1dd1ff1ab27 libavcodec

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