annotate snow.c @ 2812:18b231c1cb3d libavcodec

check time_base.den for mpeg4 avoid zero time_base.* for h263
author michael
date Sat, 30 Jul 2005 16:15:36 +0000
parents d1609cfeb1d0
children 55b83c229b88
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1 /*
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2 * Copyright (C) 2004 Michael Niedermayer <michaelni@gmx.at>
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3 *
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4 * This library is free software; you can redistribute it and/or
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
5 * modify it under the terms of the GNU Lesser General Public
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
6 * License as published by the Free Software Foundation; either
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
7 * version 2 of the License, or (at your option) any later version.
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
8 *
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
9 * This library is distributed in the hope that it will be useful,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
12 * Lesser General Public License for more details.
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
13 *
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
14 * You should have received a copy of the GNU Lesser General Public
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
15 * License along with this library; if not, write to the Free Software
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
16 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
17 */
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
18
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
19 #include "avcodec.h"
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
20 #include "common.h"
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
21 #include "dsputil.h"
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
22
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
23 #include "rangecoder.h"
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
24 #define MID_STATE 128
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
25
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
26 #include "mpegvideo.h"
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
27
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
28 #undef NDEBUG
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
29 #include <assert.h>
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
30
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
31 #define MAX_DECOMPOSITIONS 8
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
32 #define MAX_PLANES 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
33 #define DWTELEM int
2601
c31a28f27d9a increasing precission of the quantization parameter
michael
parents: 2600
diff changeset
34 #define QSHIFT 5
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
35 #define QROOT (1<<QSHIFT)
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
36 #define LOSSLESS_QLOG -128
2246
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
37 #define FRAC_BITS 8
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
38
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
39 static const int8_t quant3[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
40 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
41 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
42 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
43 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
44 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
45 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
46 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
47 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
48 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
49 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
50 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
51 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
52 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
53 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
54 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
55 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
56 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
57 static const int8_t quant3b[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
58 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
59 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
60 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
61 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
62 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
63 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
64 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
65 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
66 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
67 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
68 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
69 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
70 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
71 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
72 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
73 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
74 };
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
75 static const int8_t quant3bA[256]={
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
76 0, 0, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
77 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
78 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
79 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
80 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
81 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
82 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
83 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
84 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
85 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
86 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
87 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
88 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
89 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
90 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
91 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
92 };
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
93 static const int8_t quant5[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
94 0, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
95 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
96 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
97 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
98 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
99 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
100 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
101 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
102 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
103 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
104 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
105 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
106 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
107 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
108 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
109 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
110 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
111 static const int8_t quant7[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
112 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
113 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
114 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
115 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
116 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
117 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
118 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
119 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
120 -3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
121 -3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
122 -3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
123 -3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
124 -3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
125 -3,-3,-3,-3,-3,-3,-3,-3,-3,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
126 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
127 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
128 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
129 static const int8_t quant9[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
130 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
131 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
132 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
133 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
134 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
135 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
136 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
137 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
138 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
139 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
140 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
141 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
142 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
143 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
144 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-3,-3,-3,-3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
145 -3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-2,-2,-2,-2,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
146 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
147 static const int8_t quant11[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
148 0, 1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
149 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
150 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
151 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
152 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
153 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
154 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
155 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
156 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
157 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
158 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
159 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
160 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
161 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
162 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
163 -4,-4,-4,-4,-4,-3,-3,-3,-3,-3,-3,-3,-2,-2,-2,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
164 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
165 static const int8_t quant13[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
166 0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
167 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
168 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
169 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
170 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
171 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
172 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
173 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
174 -6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
175 -6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
176 -6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
177 -6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
178 -6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
179 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
180 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
181 -4,-4,-4,-4,-4,-4,-4,-4,-4,-3,-3,-3,-3,-2,-2,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
182 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
183
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
184 #define LOG2_OBMC_MAX 6
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
185 #define OBMC_MAX (1<<(LOG2_OBMC_MAX))
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
186 #if 0 //64*cubic
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
187 static const uint8_t obmc32[1024]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
188 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
189 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
190 0, 0, 0, 1, 1, 1, 1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
191 0, 0, 1, 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 7, 8, 8, 8, 8, 7, 7, 6, 6, 5, 4, 4, 3, 2, 2, 1, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
192 0, 0, 1, 2, 2, 3, 4, 6, 7, 8, 9,10,11,12,12,12,12,12,12,11,10, 9, 8, 7, 6, 4, 3, 2, 2, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
193 0, 1, 1, 2, 3, 5, 6, 8,10,11,13,14,15,16,17,18,18,17,16,15,14,13,11,10, 8, 6, 5, 3, 2, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
194 0, 1, 1, 3, 4, 6, 8,10,13,15,17,19,20,22,22,23,23,22,22,20,19,17,15,13,10, 8, 6, 4, 3, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
195 0, 1, 2, 4, 6, 8,10,13,16,19,21,23,25,27,28,29,29,28,27,25,23,21,19,16,13,10, 8, 6, 4, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
196 0, 1, 2, 4, 7,10,13,16,19,22,25,28,31,33,34,35,35,34,33,31,28,25,22,19,16,13,10, 7, 4, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
197 0, 1, 3, 5, 8,11,15,19,22,26,30,33,36,38,40,41,41,40,38,36,33,30,26,22,19,15,11, 8, 5, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
198 0, 1, 3, 6, 9,12,17,21,25,30,34,38,41,44,45,46,46,45,44,41,38,34,30,25,21,17,12, 9, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
199 0, 1, 3, 6,10,14,19,23,28,33,38,42,45,48,51,52,52,51,48,45,42,38,33,28,23,19,14,10, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
200 0, 1, 4, 7,11,15,20,25,31,36,41,45,49,52,55,56,56,55,52,49,45,41,36,31,25,20,15,11, 7, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
201 0, 2, 4, 7,12,16,22,27,33,38,44,48,52,56,58,60,60,58,56,52,48,44,38,33,27,22,16,12, 7, 4, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
202 0, 1, 4, 8,12,17,22,28,34,40,45,51,55,58,61,62,62,61,58,55,51,45,40,34,28,22,17,12, 8, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
203 0, 2, 4, 8,12,18,23,29,35,41,46,52,56,60,62,64,64,62,60,56,52,46,41,35,29,23,18,12, 8, 4, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
204 0, 2, 4, 8,12,18,23,29,35,41,46,52,56,60,62,64,64,62,60,56,52,46,41,35,29,23,18,12, 8, 4, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
205 0, 1, 4, 8,12,17,22,28,34,40,45,51,55,58,61,62,62,61,58,55,51,45,40,34,28,22,17,12, 8, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
206 0, 2, 4, 7,12,16,22,27,33,38,44,48,52,56,58,60,60,58,56,52,48,44,38,33,27,22,16,12, 7, 4, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
207 0, 1, 4, 7,11,15,20,25,31,36,41,45,49,52,55,56,56,55,52,49,45,41,36,31,25,20,15,11, 7, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
208 0, 1, 3, 6,10,14,19,23,28,33,38,42,45,48,51,52,52,51,48,45,42,38,33,28,23,19,14,10, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
209 0, 1, 3, 6, 9,12,17,21,25,30,34,38,41,44,45,46,46,45,44,41,38,34,30,25,21,17,12, 9, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
210 0, 1, 3, 5, 8,11,15,19,22,26,30,33,36,38,40,41,41,40,38,36,33,30,26,22,19,15,11, 8, 5, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
211 0, 1, 2, 4, 7,10,13,16,19,22,25,28,31,33,34,35,35,34,33,31,28,25,22,19,16,13,10, 7, 4, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
212 0, 1, 2, 4, 6, 8,10,13,16,19,21,23,25,27,28,29,29,28,27,25,23,21,19,16,13,10, 8, 6, 4, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
213 0, 1, 1, 3, 4, 6, 8,10,13,15,17,19,20,22,22,23,23,22,22,20,19,17,15,13,10, 8, 6, 4, 3, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
214 0, 1, 1, 2, 3, 5, 6, 8,10,11,13,14,15,16,17,18,18,17,16,15,14,13,11,10, 8, 6, 5, 3, 2, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
215 0, 0, 1, 2, 2, 3, 4, 6, 7, 8, 9,10,11,12,12,12,12,12,12,11,10, 9, 8, 7, 6, 4, 3, 2, 2, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
216 0, 0, 1, 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 7, 8, 8, 8, 8, 7, 7, 6, 6, 5, 4, 4, 3, 2, 2, 1, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
217 0, 0, 0, 1, 1, 1, 1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
218 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
219 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
220 //error:0.000022
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
221 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
222 static const uint8_t obmc16[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
223 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
224 0, 1, 1, 2, 4, 5, 5, 6, 6, 5, 5, 4, 2, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
225 0, 1, 4, 6, 9,11,13,15,15,13,11, 9, 6, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
226 0, 2, 6,11,15,20,24,26,26,24,20,15,11, 6, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
227 0, 4, 9,15,23,29,34,38,38,34,29,23,15, 9, 4, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
228 0, 5,11,20,29,38,45,49,49,45,38,29,20,11, 5, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
229 1, 5,13,24,34,45,53,57,57,53,45,34,24,13, 5, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
230 1, 6,15,26,38,49,57,62,62,57,49,38,26,15, 6, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
231 1, 6,15,26,38,49,57,62,62,57,49,38,26,15, 6, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
232 1, 5,13,24,34,45,53,57,57,53,45,34,24,13, 5, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
233 0, 5,11,20,29,38,45,49,49,45,38,29,20,11, 5, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
234 0, 4, 9,15,23,29,34,38,38,34,29,23,15, 9, 4, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
235 0, 2, 6,11,15,20,24,26,26,24,20,15,11, 6, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
236 0, 1, 4, 6, 9,11,13,15,15,13,11, 9, 6, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
237 0, 1, 1, 2, 4, 5, 5, 6, 6, 5, 5, 4, 2, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
238 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
239 //error:0.000033
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
240 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
241 #elif 1 // 64*linear
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
242 static const uint8_t obmc32[1024]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
243 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
244 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 5, 5, 5, 4, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
245 0, 1, 2, 2, 3, 3, 4, 5, 5, 6, 7, 7, 8, 8, 9,10,10, 9, 8, 8, 7, 7, 6, 5, 5, 4, 3, 3, 2, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
246 0, 1, 2, 3, 4, 5, 6, 7, 7, 8, 9,10,11,12,13,14,14,13,12,11,10, 9, 8, 7, 7, 6, 5, 4, 3, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
247 1, 2, 3, 4, 5, 6, 7, 8,10,11,12,13,14,15,16,17,17,16,15,14,13,12,11,10, 8, 7, 6, 5, 4, 3, 2, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
248 1, 2, 3, 5, 6, 8, 9,10,12,13,14,16,17,19,20,21,21,20,19,17,16,14,13,12,10, 9, 8, 6, 5, 3, 2, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
249 1, 2, 4, 6, 7, 9,11,12,14,15,17,19,20,22,24,25,25,24,22,20,19,17,15,14,12,11, 9, 7, 6, 4, 2, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
250 1, 3, 5, 7, 8,10,12,14,16,18,20,22,23,25,27,29,29,27,25,23,22,20,18,16,14,12,10, 8, 7, 5, 3, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
251 1, 3, 5, 7,10,12,14,16,18,20,22,24,27,29,31,33,33,31,29,27,24,22,20,18,16,14,12,10, 7, 5, 3, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
252 1, 4, 6, 8,11,13,15,18,20,23,25,27,30,32,34,37,37,34,32,30,27,25,23,20,18,15,13,11, 8, 6, 4, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
253 1, 4, 7, 9,12,14,17,20,22,25,28,30,33,35,38,41,41,38,35,33,30,28,25,22,20,17,14,12, 9, 7, 4, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
254 1, 4, 7,10,13,16,19,22,24,27,30,33,36,39,42,45,45,42,39,36,33,30,27,24,22,19,16,13,10, 7, 4, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
255 2, 5, 8,11,14,17,20,23,27,30,33,36,39,42,45,48,48,45,42,39,36,33,30,27,23,20,17,14,11, 8, 5, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
256 2, 5, 8,12,15,19,22,25,29,32,35,39,42,46,49,52,52,49,46,42,39,35,32,29,25,22,19,15,12, 8, 5, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
257 2, 5, 9,13,16,20,24,27,31,34,38,42,45,49,53,56,56,53,49,45,42,38,34,31,27,24,20,16,13, 9, 5, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
258 2, 6,10,14,17,21,25,29,33,37,41,45,48,52,56,60,60,56,52,48,45,41,37,33,29,25,21,17,14,10, 6, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
259 2, 6,10,14,17,21,25,29,33,37,41,45,48,52,56,60,60,56,52,48,45,41,37,33,29,25,21,17,14,10, 6, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
260 2, 5, 9,13,16,20,24,27,31,34,38,42,45,49,53,56,56,53,49,45,42,38,34,31,27,24,20,16,13, 9, 5, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
261 2, 5, 8,12,15,19,22,25,29,32,35,39,42,46,49,52,52,49,46,42,39,35,32,29,25,22,19,15,12, 8, 5, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
262 2, 5, 8,11,14,17,20,23,27,30,33,36,39,42,45,48,48,45,42,39,36,33,30,27,23,20,17,14,11, 8, 5, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
263 1, 4, 7,10,13,16,19,22,24,27,30,33,36,39,42,45,45,42,39,36,33,30,27,24,22,19,16,13,10, 7, 4, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
264 1, 4, 7, 9,12,14,17,20,22,25,28,30,33,35,38,41,41,38,35,33,30,28,25,22,20,17,14,12, 9, 7, 4, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
265 1, 4, 6, 8,11,13,15,18,20,23,25,27,30,32,34,37,37,34,32,30,27,25,23,20,18,15,13,11, 8, 6, 4, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
266 1, 3, 5, 7,10,12,14,16,18,20,22,24,27,29,31,33,33,31,29,27,24,22,20,18,16,14,12,10, 7, 5, 3, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
267 1, 3, 5, 7, 8,10,12,14,16,18,20,22,23,25,27,29,29,27,25,23,22,20,18,16,14,12,10, 8, 7, 5, 3, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
268 1, 2, 4, 6, 7, 9,11,12,14,15,17,19,20,22,24,25,25,24,22,20,19,17,15,14,12,11, 9, 7, 6, 4, 2, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
269 1, 2, 3, 5, 6, 8, 9,10,12,13,14,16,17,19,20,21,21,20,19,17,16,14,13,12,10, 9, 8, 6, 5, 3, 2, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
270 1, 2, 3, 4, 5, 6, 7, 8,10,11,12,13,14,15,16,17,17,16,15,14,13,12,11,10, 8, 7, 6, 5, 4, 3, 2, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
271 0, 1, 2, 3, 4, 5, 6, 7, 7, 8, 9,10,11,12,13,14,14,13,12,11,10, 9, 8, 7, 7, 6, 5, 4, 3, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
272 0, 1, 2, 2, 3, 3, 4, 5, 5, 6, 7, 7, 8, 8, 9,10,10, 9, 8, 8, 7, 7, 6, 5, 5, 4, 3, 3, 2, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
273 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 5, 5, 5, 4, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
274 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
275 //error:0.000020
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
276 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
277 static const uint8_t obmc16[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
278 0, 1, 1, 2, 2, 3, 3, 4, 4, 3, 3, 2, 2, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
279 1, 2, 4, 5, 7, 8,10,11,11,10, 8, 7, 5, 4, 2, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
280 1, 4, 6, 9,11,14,16,19,19,16,14,11, 9, 6, 4, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
281 2, 5, 9,12,16,19,23,26,26,23,19,16,12, 9, 5, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
282 2, 7,11,16,20,25,29,34,34,29,25,20,16,11, 7, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
283 3, 8,14,19,25,30,36,41,41,36,30,25,19,14, 8, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
284 3,10,16,23,29,36,42,49,49,42,36,29,23,16,10, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
285 4,11,19,26,34,41,49,56,56,49,41,34,26,19,11, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
286 4,11,19,26,34,41,49,56,56,49,41,34,26,19,11, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
287 3,10,16,23,29,36,42,49,49,42,36,29,23,16,10, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
288 3, 8,14,19,25,30,36,41,41,36,30,25,19,14, 8, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
289 2, 7,11,16,20,25,29,34,34,29,25,20,16,11, 7, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
290 2, 5, 9,12,16,19,23,26,26,23,19,16,12, 9, 5, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
291 1, 4, 6, 9,11,14,16,19,19,16,14,11, 9, 6, 4, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
292 1, 2, 4, 5, 7, 8,10,11,11,10, 8, 7, 5, 4, 2, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
293 0, 1, 1, 2, 2, 3, 3, 4, 4, 3, 3, 2, 2, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
294 //error:0.000015
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
295 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
296 #else //64*cos
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
297 static const uint8_t obmc32[1024]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
298 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
299 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
300 0, 0, 0, 1, 1, 1, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
301 0, 0, 1, 1, 1, 2, 2, 3, 4, 5, 5, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 5, 5, 4, 3, 2, 2, 1, 1, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
302 0, 0, 1, 1, 2, 3, 4, 5, 6, 7, 9,10,11,11,12,12,12,12,11,11,10, 9, 7, 6, 5, 4, 3, 2, 1, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
303 0, 0, 1, 2, 3, 5, 6, 8, 9,11,12,14,15,16,17,17,17,17,16,15,14,12,11, 9, 8, 6, 5, 3, 2, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
304 0, 1, 1, 2, 4, 6, 8,10,12,15,17,19,20,21,22,23,23,22,21,20,19,17,15,12,10, 8, 6, 4, 2, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
305 0, 1, 2, 3, 5, 8,10,13,16,19,21,24,26,27,28,29,29,28,27,26,24,21,19,16,13,10, 8, 5, 3, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
306 0, 1, 2, 4, 6, 9,12,16,19,23,26,29,31,33,34,35,35,34,33,31,29,26,23,19,16,12, 9, 6, 4, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
307 0, 1, 3, 5, 7,11,15,19,23,26,30,34,37,39,40,41,41,40,39,37,34,30,26,23,19,15,11, 7, 5, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
308 0, 1, 3, 5, 9,12,17,21,26,30,35,38,42,44,46,47,47,46,44,42,38,35,30,26,21,17,12, 9, 5, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
309 0, 1, 3, 6, 9,14,19,24,29,34,38,43,46,49,51,52,52,51,49,46,43,38,34,29,24,19,14, 9, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
310 0, 1, 3, 6,11,15,20,26,31,37,42,46,50,53,56,57,57,56,53,50,46,42,37,31,26,20,15,11, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
311 0, 1, 3, 7,11,16,21,27,33,39,44,49,53,57,59,60,60,59,57,53,49,44,39,33,27,21,16,11, 7, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
312 0, 1, 4, 7,12,17,22,28,34,40,46,51,56,59,61,63,63,61,59,56,51,46,40,34,28,22,17,12, 7, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
313 0, 1, 4, 7,12,17,23,29,35,41,47,52,57,60,63,64,64,63,60,57,52,47,41,35,29,23,17,12, 7, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
314 0, 1, 4, 7,12,17,23,29,35,41,47,52,57,60,63,64,64,63,60,57,52,47,41,35,29,23,17,12, 7, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
315 0, 1, 4, 7,12,17,22,28,34,40,46,51,56,59,61,63,63,61,59,56,51,46,40,34,28,22,17,12, 7, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
316 0, 1, 3, 7,11,16,21,27,33,39,44,49,53,57,59,60,60,59,57,53,49,44,39,33,27,21,16,11, 7, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
317 0, 1, 3, 6,11,15,20,26,31,37,42,46,50,53,56,57,57,56,53,50,46,42,37,31,26,20,15,11, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
318 0, 1, 3, 6, 9,14,19,24,29,34,38,43,46,49,51,52,52,51,49,46,43,38,34,29,24,19,14, 9, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
319 0, 1, 3, 5, 9,12,17,21,26,30,35,38,42,44,46,47,47,46,44,42,38,35,30,26,21,17,12, 9, 5, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
320 0, 1, 3, 5, 7,11,15,19,23,26,30,34,37,39,40,41,41,40,39,37,34,30,26,23,19,15,11, 7, 5, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
321 0, 1, 2, 4, 6, 9,12,16,19,23,26,29,31,33,34,35,35,34,33,31,29,26,23,19,16,12, 9, 6, 4, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
322 0, 1, 2, 3, 5, 8,10,13,16,19,21,24,26,27,28,29,29,28,27,26,24,21,19,16,13,10, 8, 5, 3, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
323 0, 1, 1, 2, 4, 6, 8,10,12,15,17,19,20,21,22,23,23,22,21,20,19,17,15,12,10, 8, 6, 4, 2, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
324 0, 0, 1, 2, 3, 5, 6, 8, 9,11,12,14,15,16,17,17,17,17,16,15,14,12,11, 9, 8, 6, 5, 3, 2, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
325 0, 0, 1, 1, 2, 3, 4, 5, 6, 7, 9,10,11,11,12,12,12,12,11,11,10, 9, 7, 6, 5, 4, 3, 2, 1, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
326 0, 0, 1, 1, 1, 2, 2, 3, 4, 5, 5, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 5, 5, 4, 3, 2, 2, 1, 1, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
327 0, 0, 0, 1, 1, 1, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
328 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
329 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
330 //error:0.000022
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
331 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
332 static const uint8_t obmc16[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
333 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
334 0, 0, 1, 2, 3, 4, 5, 5, 5, 5, 4, 3, 2, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
335 0, 1, 3, 6, 8,11,13,14,14,13,11, 8, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
336 0, 2, 6,10,15,20,24,26,26,24,20,15,10, 6, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
337 0, 3, 8,16,23,30,35,38,38,35,30,23,16, 8, 3, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
338 1, 4,11,20,30,39,46,49,49,46,39,30,20,11, 4, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
339 1, 5,13,24,35,46,54,58,58,54,46,35,24,13, 5, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
340 0, 5,14,26,38,49,58,63,63,58,49,38,26,14, 5, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
341 0, 5,14,26,38,49,58,63,63,58,49,38,26,14, 5, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
342 1, 5,13,24,35,46,54,58,58,54,46,35,24,13, 5, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
343 1, 4,11,20,30,39,46,49,49,46,39,30,20,11, 4, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
344 0, 3, 8,16,23,30,35,38,38,35,30,23,16, 8, 3, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
345 0, 2, 6,10,15,20,24,26,26,24,20,15,10, 6, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
346 0, 1, 3, 6, 8,11,13,14,14,13,11, 8, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
347 0, 0, 1, 2, 3, 4, 5, 5, 5, 5, 4, 3, 2, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
348 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
349 //error:0.000022
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
350 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
351 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
352
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
353 //linear *64
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
354 static const uint8_t obmc8[64]={
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
355 1, 3, 5, 7, 7, 5, 3, 1,
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
356 3, 9,15,21,21,15, 9, 3,
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
357 5,15,25,35,35,25,15, 5,
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
358 7,21,35,49,49,35,21, 7,
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
359 7,21,35,49,49,35,21, 7,
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
360 5,15,25,35,35,25,15, 5,
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
361 3, 9,15,21,21,15, 9, 3,
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
362 1, 3, 5, 7, 7, 5, 3, 1,
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
363 //error:0.000000
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
364 };
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
365
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
366 //linear *64
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
367 static const uint8_t obmc4[16]={
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
368 4,12,12, 4,
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
369 12,36,36,12,
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
370 12,36,36,12,
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
371 4,12,12, 4,
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
372 //error:0.000000
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
373 };
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
374
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
375 static const uint8_t *obmc_tab[4]={
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
376 obmc32, obmc16, obmc8, obmc4
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
377 };
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
378
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
379 typedef struct BlockNode{
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
380 int16_t mx;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
381 int16_t my;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
382 uint8_t color[3];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
383 uint8_t type;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
384 //#define TYPE_SPLIT 1
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
385 #define BLOCK_INTRA 1
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
386 //#define TYPE_NOCOLOR 4
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
387 uint8_t level; //FIXME merge into type?
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
388 }BlockNode;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
389
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
390 #define LOG2_MB_SIZE 4
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
391 #define MB_SIZE (1<<LOG2_MB_SIZE)
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
392
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
393 typedef struct x_and_coeff{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
394 int16_t x;
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
395 uint16_t coeff;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
396 } x_and_coeff;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
397
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
398 typedef struct SubBand{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
399 int level;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
400 int stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
401 int width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
402 int height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
403 int qlog; ///< log(qscale)/log[2^(1/6)]
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
404 DWTELEM *buf;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
405 int buf_x_offset;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
406 int buf_y_offset;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
407 int stride_line; ///< Stride measured in lines, not pixels.
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
408 x_and_coeff * x_coeff;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
409 struct SubBand *parent;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
410 uint8_t state[/*7*2*/ 7 + 512][32];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
411 }SubBand;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
412
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
413 typedef struct Plane{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
414 int width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
415 int height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
416 SubBand band[MAX_DECOMPOSITIONS][4];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
417 }Plane;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
418
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
419 /** Used to minimize the amount of memory used in order to optimize cache performance. **/
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
420 typedef struct {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
421 DWTELEM * * line; ///< For use by idwt and predict_slices.
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
422 DWTELEM * * data_stack; ///< Used for internal purposes.
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
423 int data_stack_top;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
424 int line_count;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
425 int line_width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
426 int data_count;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
427 DWTELEM * base_buffer; ///< Buffer that this structure is caching.
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
428 } slice_buffer;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
429
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
430 typedef struct SnowContext{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
431 // MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to make the motion estimation eventually independant of MpegEncContext, so this will be removed then (FIXME/XXX)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
432
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
433 AVCodecContext *avctx;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
434 RangeCoder c;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
435 DSPContext dsp;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
436 AVFrame input_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
437 AVFrame current_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
438 AVFrame last_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
439 AVFrame mconly_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
440 // uint8_t q_context[16];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
441 uint8_t header_state[32];
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
442 uint8_t block_state[128 + 32*128];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
443 int keyframe;
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
444 int always_reset;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
445 int version;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
446 int spatial_decomposition_type;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
447 int temporal_decomposition_type;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
448 int spatial_decomposition_count;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
449 int temporal_decomposition_count;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
450 DWTELEM *spatial_dwt_buffer;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
451 int colorspace_type;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
452 int chroma_h_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
453 int chroma_v_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
454 int spatial_scalability;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
455 int qlog;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
456 int lambda;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
457 int lambda2;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
458 int mv_scale;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
459 int qbias;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
460 #define QBIAS_SHIFT 3
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
461 int b_width;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
462 int b_height;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
463 int block_max_depth;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
464 Plane plane[MAX_PLANES];
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
465 BlockNode *block;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
466 slice_buffer sb;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
467
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
468 MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to make the motion estimation eventually independant of MpegEncContext, so this will be removed then (FIXME/XXX)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
469 }SnowContext;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
470
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
471 typedef struct {
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
472 DWTELEM *b0;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
473 DWTELEM *b1;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
474 DWTELEM *b2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
475 DWTELEM *b3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
476 int y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
477 } dwt_compose_t;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
478
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
479 #define slice_buffer_get_line(slice_buf, line_num) ((slice_buf)->line[line_num] ? (slice_buf)->line[line_num] : slice_buffer_load_line((slice_buf), (line_num)))
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
480 //#define slice_buffer_get_line(slice_buf, line_num) (slice_buffer_load_line((slice_buf), (line_num)))
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
481
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
482 static void slice_buffer_init(slice_buffer * buf, int line_count, int max_allocated_lines, int line_width, DWTELEM * base_buffer)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
483 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
484 int i;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
485
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
486 buf->base_buffer = base_buffer;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
487 buf->line_count = line_count;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
488 buf->line_width = line_width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
489 buf->data_count = max_allocated_lines;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
490 buf->line = (DWTELEM * *) av_mallocz (sizeof(DWTELEM *) * line_count);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
491 buf->data_stack = (DWTELEM * *) av_malloc (sizeof(DWTELEM *) * max_allocated_lines);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
492
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
493 for (i = 0; i < max_allocated_lines; i++)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
494 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
495 buf->data_stack[i] = (DWTELEM *) av_malloc (sizeof(DWTELEM) * line_width);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
496 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
497
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
498 buf->data_stack_top = max_allocated_lines - 1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
499 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
500
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
501 static DWTELEM * slice_buffer_load_line(slice_buffer * buf, int line)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
502 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
503 int i;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
504 int offset;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
505 DWTELEM * buffer;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
506
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
507 // av_log(NULL, AV_LOG_DEBUG, "Cache hit: %d\n", line);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
508
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
509 assert(buf->data_stack_top >= 0);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
510 // assert(!buf->line[line]);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
511 if (buf->line[line])
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
512 return buf->line[line];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
513
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
514 offset = buf->line_width * line;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
515 buffer = buf->data_stack[buf->data_stack_top];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
516 buf->data_stack_top--;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
517 buf->line[line] = buffer;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
518
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
519 // av_log(NULL, AV_LOG_DEBUG, "slice_buffer_load_line: line: %d remaining: %d\n", line, buf->data_stack_top + 1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
520
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
521 return buffer;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
522 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
523
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
524 static void slice_buffer_release(slice_buffer * buf, int line)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
525 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
526 int i;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
527 int offset;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
528 DWTELEM * buffer;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
529
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
530 assert(line >= 0 && line < buf->line_count);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
531 assert(buf->line[line]);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
532
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
533 offset = buf->line_width * line;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
534 buffer = buf->line[line];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
535 buf->data_stack_top++;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
536 buf->data_stack[buf->data_stack_top] = buffer;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
537 buf->line[line] = NULL;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
538
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
539 // av_log(NULL, AV_LOG_DEBUG, "slice_buffer_release: line: %d remaining: %d\n", line, buf->data_stack_top + 1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
540 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
541
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
542 static void slice_buffer_flush(slice_buffer * buf)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
543 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
544 int i;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
545 for (i = 0; i < buf->line_count; i++)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
546 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
547 if (buf->line[i])
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
548 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
549 // av_log(NULL, AV_LOG_DEBUG, "slice_buffer_flush: line: %d \n", i);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
550 slice_buffer_release(buf, i);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
551 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
552 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
553 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
554
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
555 static void slice_buffer_destroy(slice_buffer * buf)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
556 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
557 int i;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
558 slice_buffer_flush(buf);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
559
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
560 for (i = buf->data_count - 1; i >= 0; i--)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
561 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
562 assert(buf->data_stack[i]);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
563 av_free(buf->data_stack[i]);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
564 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
565 assert(buf->data_stack);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
566 av_free(buf->data_stack);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
567 assert(buf->line);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
568 av_free(buf->line);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
569 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
570
2368
a7ac68734a91 fix for build on IRIX by (Michel Bardiaux {mbardiaux peaktime be})
michael
parents: 2335
diff changeset
571 #ifdef __sgi
a7ac68734a91 fix for build on IRIX by (Michel Bardiaux {mbardiaux peaktime be})
michael
parents: 2335
diff changeset
572 // Avoid a name clash on SGI IRIX
a7ac68734a91 fix for build on IRIX by (Michel Bardiaux {mbardiaux peaktime be})
michael
parents: 2335
diff changeset
573 #undef qexp
a7ac68734a91 fix for build on IRIX by (Michel Bardiaux {mbardiaux peaktime be})
michael
parents: 2335
diff changeset
574 #endif
2246
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
575 #define QEXPSHIFT (7-FRAC_BITS+8) //FIXME try to change this to 0
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
576 static uint8_t qexp[QROOT];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
577
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
578 static inline int mirror(int v, int m){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
579 if (v<0) return -v;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
580 else if(v>m) return 2*m-v;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
581 else return v;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
582 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
583
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
584 static inline void put_symbol(RangeCoder *c, uint8_t *state, int v, int is_signed){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
585 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
586
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
587 if(v){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
588 const int a= ABS(v);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
589 const int e= av_log2(a);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
590 #if 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
591 const int el= FFMIN(e, 10);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
592 put_rac(c, state+0, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
593
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
594 for(i=0; i<el; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
595 put_rac(c, state+1+i, 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
596 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
597 for(; i<e; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
598 put_rac(c, state+1+9, 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
599 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
600 put_rac(c, state+1+FFMIN(i,9), 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
601
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
602 for(i=e-1; i>=el; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
603 put_rac(c, state+22+9, (a>>i)&1); //22..31
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
604 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
605 for(; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
606 put_rac(c, state+22+i, (a>>i)&1); //22..31
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
607 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
608
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
609 if(is_signed)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
610 put_rac(c, state+11 + el, v < 0); //11..21
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
611 #else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
612
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
613 put_rac(c, state+0, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
614 if(e<=9){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
615 for(i=0; i<e; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
616 put_rac(c, state+1+i, 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
617 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
618 put_rac(c, state+1+i, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
619
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
620 for(i=e-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
621 put_rac(c, state+22+i, (a>>i)&1); //22..31
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
622 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
623
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
624 if(is_signed)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
625 put_rac(c, state+11 + e, v < 0); //11..21
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
626 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
627 for(i=0; i<e; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
628 put_rac(c, state+1+FFMIN(i,9), 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
629 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
630 put_rac(c, state+1+FFMIN(i,9), 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
631
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
632 for(i=e-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
633 put_rac(c, state+22+FFMIN(i,9), (a>>i)&1); //22..31
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
634 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
635
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
636 if(is_signed)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
637 put_rac(c, state+11 + FFMIN(e,10), v < 0); //11..21
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
638 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
639 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
640 }else{
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
641 put_rac(c, state+0, 1);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
642 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
643 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
644
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
645 static inline int get_symbol(RangeCoder *c, uint8_t *state, int is_signed){
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
646 if(get_rac(c, state+0))
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
647 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
648 else{
2240
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
649 int i, e, a;
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
650 e= 0;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
651 while(get_rac(c, state+1 + FFMIN(e,9))){ //1..10
2240
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
652 e++;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
653 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
654
2240
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
655 a= 1;
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
656 for(i=e-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
657 a += a + get_rac(c, state+22 + FFMIN(i,9)); //22..31
2240
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
658 }
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
659
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
660 if(is_signed && get_rac(c, state+11 + FFMIN(e,10))) //11..21
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
661 return -a;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
662 else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
663 return a;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
664 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
665 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
666
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
667 static inline void put_symbol2(RangeCoder *c, uint8_t *state, int v, int log2){
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
668 int i;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
669 int r= log2>=0 ? 1<<log2 : 1;
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
670
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
671 assert(v>=0);
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
672 assert(log2>=-4);
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
673
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
674 while(v >= r){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
675 put_rac(c, state+4+log2, 1);
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
676 v -= r;
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
677 log2++;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
678 if(log2>0) r+=r;
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
679 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
680 put_rac(c, state+4+log2, 0);
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
681
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
682 for(i=log2-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
683 put_rac(c, state+31-i, (v>>i)&1);
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
684 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
685 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
686
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
687 static inline int get_symbol2(RangeCoder *c, uint8_t *state, int log2){
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
688 int i;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
689 int r= log2>=0 ? 1<<log2 : 1;
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
690 int v=0;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
691
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
692 assert(log2>=-4);
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
693
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
694 while(get_rac(c, state+4+log2)){
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
695 v+= r;
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
696 log2++;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
697 if(log2>0) r+=r;
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
698 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
699
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
700 for(i=log2-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
701 v+= get_rac(c, state+31-i)<<i;
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
702 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
703
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
704 return v;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
705 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
706
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
707 static always_inline void lift(DWTELEM *dst, DWTELEM *src, DWTELEM *ref, int dst_step, int src_step, int ref_step, int width, int mul, int add, int shift, int highpass, int inverse){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
708 const int mirror_left= !highpass;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
709 const int mirror_right= (width&1) ^ highpass;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
710 const int w= (width>>1) - 1 + (highpass & width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
711 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
712
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
713 #define LIFT(src, ref, inv) ((src) + ((inv) ? - (ref) : + (ref)))
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
714 if(mirror_left){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
715 dst[0] = LIFT(src[0], ((mul*2*ref[0]+add)>>shift), inverse);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
716 dst += dst_step;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
717 src += src_step;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
718 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
719
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
720 for(i=0; i<w; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
721 dst[i*dst_step] = LIFT(src[i*src_step], ((mul*(ref[i*ref_step] + ref[(i+1)*ref_step])+add)>>shift), inverse);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
722 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
723
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
724 if(mirror_right){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
725 dst[w*dst_step] = LIFT(src[w*src_step], ((mul*2*ref[w*ref_step]+add)>>shift), inverse);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
726 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
727 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
728
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
729 static always_inline void lift5(DWTELEM *dst, DWTELEM *src, DWTELEM *ref, int dst_step, int src_step, int ref_step, int width, int mul, int add, int shift, int highpass, int inverse){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
730 const int mirror_left= !highpass;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
731 const int mirror_right= (width&1) ^ highpass;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
732 const int w= (width>>1) - 1 + (highpass & width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
733 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
734
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
735 if(mirror_left){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
736 int r= 3*2*ref[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
737 r += r>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
738 r += r>>8;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
739 dst[0] = LIFT(src[0], ((r+add)>>shift), inverse);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
740 dst += dst_step;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
741 src += src_step;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
742 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
743
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
744 for(i=0; i<w; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
745 int r= 3*(ref[i*ref_step] + ref[(i+1)*ref_step]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
746 r += r>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
747 r += r>>8;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
748 dst[i*dst_step] = LIFT(src[i*src_step], ((r+add)>>shift), inverse);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
749 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
750
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
751 if(mirror_right){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
752 int r= 3*2*ref[w*ref_step];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
753 r += r>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
754 r += r>>8;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
755 dst[w*dst_step] = LIFT(src[w*src_step], ((r+add)>>shift), inverse);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
756 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
757 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
758
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
759 static always_inline void liftS(DWTELEM *dst, DWTELEM *src, DWTELEM *ref, int dst_step, int src_step, int ref_step, int width, int mul, int add, int shift, int highpass, int inverse){
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
760 const int mirror_left= !highpass;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
761 const int mirror_right= (width&1) ^ highpass;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
762 const int w= (width>>1) - 1 + (highpass & width);
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
763 int i;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
764
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
765 assert(shift == 4);
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
766 #define LIFTS(src, ref, inv) ((inv) ? (src) - (((ref) - 4*(src))>>shift): (16*4*(src) + 4*(ref) + 8 + (5<<27))/(5*16) - (1<<23))
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
767 if(mirror_left){
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
768 dst[0] = LIFTS(src[0], mul*2*ref[0]+add, inverse);
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
769 dst += dst_step;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
770 src += src_step;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
771 }
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
772
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
773 for(i=0; i<w; i++){
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
774 dst[i*dst_step] = LIFTS(src[i*src_step], mul*(ref[i*ref_step] + ref[(i+1)*ref_step])+add, inverse);
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
775 }
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
776
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
777 if(mirror_right){
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
778 dst[w*dst_step] = LIFTS(src[w*src_step], mul*2*ref[w*ref_step]+add, inverse);
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
779 }
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
780 }
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
781
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
782
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
783 static void inplace_lift(DWTELEM *dst, int width, int *coeffs, int n, int shift, int start, int inverse){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
784 int x, i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
785
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
786 for(x=start; x<width; x+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
787 int64_t sum=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
788
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
789 for(i=0; i<n; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
790 int x2= x + 2*i - n + 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
791 if (x2< 0) x2= -x2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
792 else if(x2>=width) x2= 2*width-x2-2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
793 sum += coeffs[i]*(int64_t)dst[x2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
794 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
795 if(inverse) dst[x] -= (sum + (1<<shift)/2)>>shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
796 else dst[x] += (sum + (1<<shift)/2)>>shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
797 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
798 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
799
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
800 static void inplace_liftV(DWTELEM *dst, int width, int height, int stride, int *coeffs, int n, int shift, int start, int inverse){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
801 int x, y, i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
802 for(y=start; y<height; y+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
803 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
804 int64_t sum=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
805
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
806 for(i=0; i<n; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
807 int y2= y + 2*i - n + 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
808 if (y2< 0) y2= -y2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
809 else if(y2>=height) y2= 2*height-y2-2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
810 sum += coeffs[i]*(int64_t)dst[x + y2*stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
811 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
812 if(inverse) dst[x + y*stride] -= (sum + (1<<shift)/2)>>shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
813 else dst[x + y*stride] += (sum + (1<<shift)/2)>>shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
814 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
815 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
816 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
817
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
818 #define SCALEX 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
819 #define LX0 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
820 #define LX1 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
821
2139
michael
parents: 2138
diff changeset
822 #if 0 // more accurate 9/7
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
823 #define N1 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
824 #define SHIFT1 14
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
825 #define COEFFS1 (int[]){-25987,-25987}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
826 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
827 #define SHIFT2 19
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
828 #define COEFFS2 (int[]){-27777,-27777}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
829 #define N3 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
830 #define SHIFT3 15
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
831 #define COEFFS3 (int[]){28931,28931}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
832 #define N4 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
833 #define SHIFT4 15
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
834 #define COEFFS4 (int[]){14533,14533}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
835 #elif 1 // 13/7 CRF
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
836 #define N1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
837 #define SHIFT1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
838 #define COEFFS1 (int[]){1,-9,-9,1}
2139
michael
parents: 2138
diff changeset
839 #define N2 4
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
840 #define SHIFT2 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
841 #define COEFFS2 (int[]){-1,5,5,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
842 #define N3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
843 #define SHIFT3 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
844 #define COEFFS3 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
845 #define N4 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
846 #define SHIFT4 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
847 #define COEFFS4 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
848 #elif 1 // 3/5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
849 #define LX0 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
850 #define LX1 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
851 #define SCALEX 0.5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
852 #define N1 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
853 #define SHIFT1 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
854 #define COEFFS1 (int[]){1,1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
855 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
856 #define SHIFT2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
857 #define COEFFS2 (int[]){-1,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
858 #define N3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
859 #define SHIFT3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
860 #define COEFFS3 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
861 #define N4 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
862 #define SHIFT4 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
863 #define COEFFS4 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
864 #elif 1 // 11/5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
865 #define N1 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
866 #define SHIFT1 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
867 #define COEFFS1 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
868 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
869 #define SHIFT2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
870 #define COEFFS2 (int[]){-1,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
871 #define N3 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
872 #define SHIFT3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
873 #define COEFFS3 (int[]){-1,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
874 #define N4 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
875 #define SHIFT4 7
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
876 #define COEFFS4 (int[]){-5,29,29,-5}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
877 #define SCALEX 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
878 #elif 1 // 9/7 CDF
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
879 #define N1 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
880 #define SHIFT1 7
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
881 #define COEFFS1 (int[]){-203,-203}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
882 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
883 #define SHIFT2 12
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
884 #define COEFFS2 (int[]){-217,-217}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
885 #define N3 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
886 #define SHIFT3 7
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
887 #define COEFFS3 (int[]){113,113}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
888 #define N4 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
889 #define SHIFT4 9
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
890 #define COEFFS4 (int[]){227,227}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
891 #define SCALEX 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
892 #elif 1 // 7/5 CDF
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
893 #define N1 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
894 #define SHIFT1 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
895 #define COEFFS1 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
896 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
897 #define SHIFT2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
898 #define COEFFS2 (int[]){-1,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
899 #define N3 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
900 #define SHIFT3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
901 #define COEFFS3 (int[]){-1,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
902 #define N4 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
903 #define SHIFT4 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
904 #define COEFFS4 (int[]){3,3}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
905 #elif 1 // 9/7 MN
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
906 #define N1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
907 #define SHIFT1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
908 #define COEFFS1 (int[]){1,-9,-9,1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
909 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
910 #define SHIFT2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
911 #define COEFFS2 (int[]){1,1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
912 #define N3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
913 #define SHIFT3 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
914 #define COEFFS3 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
915 #define N4 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
916 #define SHIFT4 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
917 #define COEFFS4 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
918 #else // 13/7 CRF
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
919 #define N1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
920 #define SHIFT1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
921 #define COEFFS1 (int[]){1,-9,-9,1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
922 #define N2 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
923 #define SHIFT2 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
924 #define COEFFS2 (int[]){-1,5,5,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
925 #define N3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
926 #define SHIFT3 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
927 #define COEFFS3 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
928 #define N4 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
929 #define SHIFT4 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
930 #define COEFFS4 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
931 #endif
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
932 static void horizontal_decomposeX(DWTELEM *b, int width){
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
933 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
934 const int width2= width>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
935 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
936 int A1,A2,A3,A4, x;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
937
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
938 inplace_lift(b, width, COEFFS1, N1, SHIFT1, LX1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
939 inplace_lift(b, width, COEFFS2, N2, SHIFT2, LX0, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
940 inplace_lift(b, width, COEFFS3, N3, SHIFT3, LX1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
941 inplace_lift(b, width, COEFFS4, N4, SHIFT4, LX0, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
942
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
943 for(x=0; x<width2; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
944 temp[x ]= b[2*x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
945 temp[x+w2]= b[2*x + 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
946 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
947 if(width&1)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
948 temp[x ]= b[2*x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
949 memcpy(b, temp, width*sizeof(int));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
950 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
951
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
952 static void horizontal_composeX(DWTELEM *b, int width){
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
953 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
954 const int width2= width>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
955 int A1,A2,A3,A4, x;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
956 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
957
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
958 memcpy(temp, b, width*sizeof(int));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
959 for(x=0; x<width2; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
960 b[2*x ]= temp[x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
961 b[2*x + 1]= temp[x+w2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
962 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
963 if(width&1)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
964 b[2*x ]= temp[x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
965
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
966 inplace_lift(b, width, COEFFS4, N4, SHIFT4, LX0, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
967 inplace_lift(b, width, COEFFS3, N3, SHIFT3, LX1, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
968 inplace_lift(b, width, COEFFS2, N2, SHIFT2, LX0, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
969 inplace_lift(b, width, COEFFS1, N1, SHIFT1, LX1, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
970 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
971
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
972 static void spatial_decomposeX(DWTELEM *buffer, int width, int height, int stride){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
973 int x, y;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
974
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
975 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
976 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
977 buffer[y*stride + x] *= SCALEX;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
978 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
979 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
980
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
981 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
982 horizontal_decomposeX(buffer + y*stride, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
983 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
984
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
985 inplace_liftV(buffer, width, height, stride, COEFFS1, N1, SHIFT1, LX1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
986 inplace_liftV(buffer, width, height, stride, COEFFS2, N2, SHIFT2, LX0, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
987 inplace_liftV(buffer, width, height, stride, COEFFS3, N3, SHIFT3, LX1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
988 inplace_liftV(buffer, width, height, stride, COEFFS4, N4, SHIFT4, LX0, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
989 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
990
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
991 static void spatial_composeX(DWTELEM *buffer, int width, int height, int stride){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
992 int x, y;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
993
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
994 inplace_liftV(buffer, width, height, stride, COEFFS4, N4, SHIFT4, LX0, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
995 inplace_liftV(buffer, width, height, stride, COEFFS3, N3, SHIFT3, LX1, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
996 inplace_liftV(buffer, width, height, stride, COEFFS2, N2, SHIFT2, LX0, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
997 inplace_liftV(buffer, width, height, stride, COEFFS1, N1, SHIFT1, LX1, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
998
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
999 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1000 horizontal_composeX(buffer + y*stride, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1001 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1002
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1003 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1004 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1005 buffer[y*stride + x] /= SCALEX;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1006 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1007 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1008 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1009
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1010 static void horizontal_decompose53i(DWTELEM *b, int width){
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1011 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1012 const int width2= width>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1013 int A1,A2,A3,A4, x;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1014 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1015
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1016 for(x=0; x<width2; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1017 temp[x ]= b[2*x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1018 temp[x+w2]= b[2*x + 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1019 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1020 if(width&1)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1021 temp[x ]= b[2*x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1022 #if 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1023 A2= temp[1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1024 A4= temp[0 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1025 A1= temp[0+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1026 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1027 A4 += (A1 + 1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1028 b[0+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1029 b[0 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1030 for(x=1; x+1<width2; x+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1031 A3= temp[x+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1032 A4= temp[x+1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1033 A3 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1034 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1035 b[x+width2] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1036 b[x ] = A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1037
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1038 A1= temp[x+1+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1039 A2= temp[x+2 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1040 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1041 A4 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1042 b[x+1+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1043 b[x+1 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1044 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1045 A3= temp[width-1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1046 A3 -= A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1047 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1048 b[width -1] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1049 b[width2-1] = A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1050 #else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1051 lift(b+w2, temp+w2, temp, 1, 1, 1, width, -1, 0, 1, 1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1052 lift(b , temp , b+w2, 1, 1, 1, width, 1, 2, 2, 0, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1053 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1054 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1055
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1056 static void vertical_decompose53iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1057 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1058
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1059 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1060 b1[i] -= (b0[i] + b2[i])>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1061 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1062 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1063
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1064 static void vertical_decompose53iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1065 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1066
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1067 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1068 b1[i] += (b0[i] + b2[i] + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1069 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1070 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1071
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1072 static void spatial_decompose53i(DWTELEM *buffer, int width, int height, int stride){
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
1073 int y;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1074 DWTELEM *b0= buffer + mirror(-2-1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1075 DWTELEM *b1= buffer + mirror(-2 , height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1076
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1077 for(y=-2; y<height; y+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1078 DWTELEM *b2= buffer + mirror(y+1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1079 DWTELEM *b3= buffer + mirror(y+2, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1080
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1081 {START_TIMER
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1082 if(b1 <= b3) horizontal_decompose53i(b2, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1083 if(y+2 < height) horizontal_decompose53i(b3, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1084 STOP_TIMER("horizontal_decompose53i")}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1085
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1086 {START_TIMER
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1087 if(b1 <= b3) vertical_decompose53iH0(b1, b2, b3, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1088 if(b0 <= b2) vertical_decompose53iL0(b0, b1, b2, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1089 STOP_TIMER("vertical_decompose53i*")}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1090
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1091 b0=b2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1092 b1=b3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1093 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1094 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1095
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1096 #define liftS lift
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1097 #define lift5 lift
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1098 #if 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1099 #define W_AM 3
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1100 #define W_AO 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1101 #define W_AS 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1102
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1103 #undef liftS
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1104 #define W_BM 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1105 #define W_BO 8
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1106 #define W_BS 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1107
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1108 #define W_CM 1
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1109 #define W_CO 0
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1110 #define W_CS 0
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1111
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1112 #define W_DM 3
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1113 #define W_DO 4
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1114 #define W_DS 3
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1115 #elif 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1116 #define W_AM 55
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1117 #define W_AO 16
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1118 #define W_AS 5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1119
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1120 #define W_BM 3
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1121 #define W_BO 32
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1122 #define W_BS 6
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1123
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1124 #define W_CM 127
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1125 #define W_CO 64
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1126 #define W_CS 7
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1127
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1128 #define W_DM 7
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1129 #define W_DO 8
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1130 #define W_DS 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1131 #elif 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1132 #define W_AM 97
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1133 #define W_AO 32
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1134 #define W_AS 6
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1135
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1136 #define W_BM 63
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1137 #define W_BO 512
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1138 #define W_BS 10
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1139
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1140 #define W_CM 13
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1141 #define W_CO 8
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1142 #define W_CS 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1143
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1144 #define W_DM 15
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1145 #define W_DO 16
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1146 #define W_DS 5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1147
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1148 #else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1149
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1150 #define W_AM 203
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1151 #define W_AO 64
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1152 #define W_AS 7
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1153
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1154 #define W_BM 217
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1155 #define W_BO 2048
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1156 #define W_BS 12
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1157
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1158 #define W_CM 113
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1159 #define W_CO 64
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1160 #define W_CS 7
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1161
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1162 #define W_DM 227
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1163 #define W_DO 128
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1164 #define W_DS 9
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1165 #endif
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1166 static void horizontal_decompose97i(DWTELEM *b, int width){
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1167 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1168 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1169
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1170 lift (temp+w2, b +1, b , 1, 2, 2, width, -W_AM, W_AO, W_AS, 1, 0);
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1171 liftS(temp , b , temp+w2, 1, 2, 1, width, -W_BM, W_BO, W_BS, 0, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1172 lift5(b +w2, temp+w2, temp , 1, 1, 1, width, W_CM, W_CO, W_CS, 1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1173 lift (b , temp , b +w2, 1, 1, 1, width, W_DM, W_DO, W_DS, 0, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1174 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1175
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1176
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1177 static void vertical_decompose97iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1178 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1179
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1180 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1181 b1[i] -= (W_AM*(b0[i] + b2[i])+W_AO)>>W_AS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1182 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1183 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1184
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1185 static void vertical_decompose97iH1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1186 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1187
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1188 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1189 #ifdef lift5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1190 b1[i] += (W_CM*(b0[i] + b2[i])+W_CO)>>W_CS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1191 #else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1192 int r= 3*(b0[i] + b2[i]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1193 r+= r>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1194 r+= r>>8;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1195 b1[i] += (r+W_CO)>>W_CS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1196 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1197 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1198 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1199
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1200 static void vertical_decompose97iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1201 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1202
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1203 for(i=0; i<width; i++){
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1204 #ifdef liftS
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1205 b1[i] -= (W_BM*(b0[i] + b2[i])+W_BO)>>W_BS;
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1206 #else
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1207 b1[i] = (16*4*b1[i] - 4*(b0[i] + b2[i]) + 8*5 + (5<<27)) / (5*16) - (1<<23);
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1208 #endif
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1209 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1210 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1211
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1212 static void vertical_decompose97iL1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1213 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1214
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1215 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1216 b1[i] += (W_DM*(b0[i] + b2[i])+W_DO)>>W_DS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1217 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1218 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1219
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1220 static void spatial_decompose97i(DWTELEM *buffer, int width, int height, int stride){
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
1221 int y;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1222 DWTELEM *b0= buffer + mirror(-4-1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1223 DWTELEM *b1= buffer + mirror(-4 , height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1224 DWTELEM *b2= buffer + mirror(-4+1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1225 DWTELEM *b3= buffer + mirror(-4+2, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1226
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1227 for(y=-4; y<height; y+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1228 DWTELEM *b4= buffer + mirror(y+3, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1229 DWTELEM *b5= buffer + mirror(y+4, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1230
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1231 {START_TIMER
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1232 if(b3 <= b5) horizontal_decompose97i(b4, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1233 if(y+4 < height) horizontal_decompose97i(b5, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1234 if(width>400){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1235 STOP_TIMER("horizontal_decompose97i")
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1236 }}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1237
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1238 {START_TIMER
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1239 if(b3 <= b5) vertical_decompose97iH0(b3, b4, b5, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1240 if(b2 <= b4) vertical_decompose97iL0(b2, b3, b4, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1241 if(b1 <= b3) vertical_decompose97iH1(b1, b2, b3, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1242 if(b0 <= b2) vertical_decompose97iL1(b0, b1, b2, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1243
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1244 if(width>400){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1245 STOP_TIMER("vertical_decompose97i")
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1246 }}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1247
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1248 b0=b2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1249 b1=b3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1250 b2=b4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1251 b3=b5;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1252 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1253 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1254
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1255 void ff_spatial_dwt(DWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1256 int level;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1257
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
1258 for(level=0; level<decomposition_count; level++){
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
1259 switch(type){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1260 case 0: spatial_decompose97i(buffer, width>>level, height>>level, stride<<level); break;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1261 case 1: spatial_decompose53i(buffer, width>>level, height>>level, stride<<level); break;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1262 case 2: spatial_decomposeX (buffer, width>>level, height>>level, stride<<level); break;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1263 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1264 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1265 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1266
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1267 static void horizontal_compose53i(DWTELEM *b, int width){
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1268 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1269 const int width2= width>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1270 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1271 int A1,A2,A3,A4, x;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1272
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1273 #if 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1274 A2= temp[1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1275 A4= temp[0 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1276 A1= temp[0+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1277 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1278 A4 += (A1 + 1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1279 b[0+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1280 b[0 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1281 for(x=1; x+1<width2; x+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1282 A3= temp[x+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1283 A4= temp[x+1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1284 A3 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1285 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1286 b[x+width2] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1287 b[x ] = A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1288
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1289 A1= temp[x+1+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1290 A2= temp[x+2 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1291 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1292 A4 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1293 b[x+1+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1294 b[x+1 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1295 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1296 A3= temp[width-1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1297 A3 -= A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1298 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1299 b[width -1] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1300 b[width2-1] = A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1301 #else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1302 lift(temp , b , b+w2, 1, 1, 1, width, 1, 2, 2, 0, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1303 lift(temp+w2, b+w2, temp, 1, 1, 1, width, -1, 0, 1, 1, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1304 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1305 for(x=0; x<width2; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1306 b[2*x ]= temp[x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1307 b[2*x + 1]= temp[x+w2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1308 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1309 if(width&1)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1310 b[2*x ]= temp[x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1311 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1312
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1313 static void vertical_compose53iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1314 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1315
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1316 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1317 b1[i] += (b0[i] + b2[i])>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1318 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1319 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1320
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1321 static void vertical_compose53iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1322 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1323
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1324 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1325 b1[i] -= (b0[i] + b2[i] + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1326 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1327 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1328
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1329 static void spatial_compose53i_buffered_init(dwt_compose_t *cs, slice_buffer * sb, int height, int stride_line){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1330 cs->b0 = slice_buffer_get_line(sb, mirror(-1-1, height-1) * stride_line);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1331 cs->b1 = slice_buffer_get_line(sb, mirror(-1 , height-1) * stride_line);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1332 cs->y = -1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1333 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1334
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1335 static void spatial_compose53i_init(dwt_compose_t *cs, DWTELEM *buffer, int height, int stride){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1336 cs->b0 = buffer + mirror(-1-1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1337 cs->b1 = buffer + mirror(-1 , height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1338 cs->y = -1;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1339 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1340
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1341 static void spatial_compose53i_dy_buffered(dwt_compose_t *cs, slice_buffer * sb, int width, int height, int stride_line){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1342 int y= cs->y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1343 int mirror0 = mirror(y-1, height-1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1344 int mirror1 = mirror(y , height-1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1345 int mirror2 = mirror(y+1, height-1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1346 int mirror3 = mirror(y+2, height-1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1347
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1348 DWTELEM *b0= cs->b0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1349 DWTELEM *b1= cs->b1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1350 DWTELEM *b2= slice_buffer_get_line(sb, mirror2 * stride_line);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1351 DWTELEM *b3= slice_buffer_get_line(sb, mirror3 * stride_line);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1352
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1353 {START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1354 if(mirror1 <= mirror3) vertical_compose53iL0(b1, b2, b3, width);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1355 if(mirror0 <= mirror2) vertical_compose53iH0(b0, b1, b2, width);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1356 STOP_TIMER("vertical_compose53i*")}
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1357
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1358 {START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1359 if(y-1 >= 0) horizontal_compose53i(b0, width);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1360 if(mirror0 <= mirror2) horizontal_compose53i(b1, width);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1361 STOP_TIMER("horizontal_compose53i")}
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1362
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1363 cs->b0 = b2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1364 cs->b1 = b3;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1365 cs->y += 2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1366 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1367
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1368 static void spatial_compose53i_dy(dwt_compose_t *cs, DWTELEM *buffer, int width, int height, int stride){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1369 int y= cs->y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1370 DWTELEM *b0= cs->b0;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1371 DWTELEM *b1= cs->b1;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1372 DWTELEM *b2= buffer + mirror(y+1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1373 DWTELEM *b3= buffer + mirror(y+2, height-1)*stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1374
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1375 {START_TIMER
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1376 if(b1 <= b3) vertical_compose53iL0(b1, b2, b3, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1377 if(b0 <= b2) vertical_compose53iH0(b0, b1, b2, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1378 STOP_TIMER("vertical_compose53i*")}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1379
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1380 {START_TIMER
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1381 if(y-1 >= 0) horizontal_compose53i(b0, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1382 if(b0 <= b2) horizontal_compose53i(b1, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1383 STOP_TIMER("horizontal_compose53i")}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1384
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1385 cs->b0 = b2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1386 cs->b1 = b3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1387 cs->y += 2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1388 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1389
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1390 static void spatial_compose53i(DWTELEM *buffer, int width, int height, int stride){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1391 dwt_compose_t cs;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1392 spatial_compose53i_init(&cs, buffer, height, stride);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1393 while(cs.y <= height)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1394 spatial_compose53i_dy(&cs, buffer, width, height, stride);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1395 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1396
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1397
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1398 static void horizontal_compose97i(DWTELEM *b, int width){
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1399 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1400 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1401
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1402 lift (temp , b , b +w2, 1, 1, 1, width, W_DM, W_DO, W_DS, 0, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1403 lift5(temp+w2, b +w2, temp , 1, 1, 1, width, W_CM, W_CO, W_CS, 1, 1);
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1404 liftS(b , temp , temp+w2, 2, 1, 1, width, -W_BM, W_BO, W_BS, 0, 1);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1405 lift (b+1 , temp+w2, b , 2, 1, 2, width, -W_AM, W_AO, W_AS, 1, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1406 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1407
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1408 static void vertical_compose97iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1409 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1410
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1411 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1412 b1[i] += (W_AM*(b0[i] + b2[i])+W_AO)>>W_AS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1413 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1414 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1415
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1416 static void vertical_compose97iH1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1417 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1418
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1419 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1420 #ifdef lift5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1421 b1[i] -= (W_CM*(b0[i] + b2[i])+W_CO)>>W_CS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1422 #else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1423 int r= 3*(b0[i] + b2[i]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1424 r+= r>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1425 r+= r>>8;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1426 b1[i] -= (r+W_CO)>>W_CS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1427 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1428 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1429 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1430
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1431 static void vertical_compose97iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1432 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1433
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1434 for(i=0; i<width; i++){
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1435 #ifdef liftS
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1436 b1[i] += (W_BM*(b0[i] + b2[i])+W_BO)>>W_BS;
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1437 #else
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1438 b1[i] += (W_BM*(b0[i] + b2[i])+4*b1[i]+W_BO)>>W_BS;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1439 #endif
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1440 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1441 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1442
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1443 static void vertical_compose97iL1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1444 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1445
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1446 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1447 b1[i] -= (W_DM*(b0[i] + b2[i])+W_DO)>>W_DS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1448 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1449 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1450
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1451 static void vertical_compose97i(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, DWTELEM *b3, DWTELEM *b4, DWTELEM *b5, int width){
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1452 int i;
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1453
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1454 for(i=0; i<width; i++){
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1455 int r;
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1456 b4[i] -= (W_DM*(b3[i] + b5[i])+W_DO)>>W_DS;
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1457 #ifdef lift5
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1458 b3[i] -= (W_CM*(b2[i] + b4[i])+W_CO)>>W_CS;
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1459 #else
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1460 r= 3*(b2[i] + b4[i]);
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1461 r+= r>>4;
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1462 r+= r>>8;
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1463 b3[i] -= (r+W_CO)>>W_CS;
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1464 #endif
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1465 #ifdef liftS
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1466 b2[i] += (W_BM*(b1[i] + b3[i])+W_BO)>>W_BS;
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1467 #else
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1468 b2[i] += (W_BM*(b1[i] + b3[i])+4*b2[i]+W_BO)>>W_BS;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1469 #endif
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1470 b1[i] += (W_AM*(b0[i] + b2[i])+W_AO)>>W_AS;
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1471 }
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1472 }
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1473
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1474 static void spatial_compose97i_buffered_init(dwt_compose_t *cs, slice_buffer * sb, int height, int stride_line){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1475 cs->b0 = slice_buffer_get_line(sb, mirror(-3-1, height-1) * stride_line);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1476 cs->b1 = slice_buffer_get_line(sb, mirror(-3 , height-1) * stride_line);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1477 cs->b2 = slice_buffer_get_line(sb, mirror(-3+1, height-1) * stride_line);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1478 cs->b3 = slice_buffer_get_line(sb, mirror(-3+2, height-1) * stride_line);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1479 cs->y = -3;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1480 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1481
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1482 static void spatial_compose97i_init(dwt_compose_t *cs, DWTELEM *buffer, int height, int stride){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1483 cs->b0 = buffer + mirror(-3-1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1484 cs->b1 = buffer + mirror(-3 , height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1485 cs->b2 = buffer + mirror(-3+1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1486 cs->b3 = buffer + mirror(-3+2, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1487 cs->y = -3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1488 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1489
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1490 static void spatial_compose97i_dy_buffered(dwt_compose_t *cs, slice_buffer * sb, int width, int height, int stride_line){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1491 int y = cs->y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1492
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1493 int mirror0 = mirror(y - 1, height - 1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1494 int mirror1 = mirror(y + 0, height - 1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1495 int mirror2 = mirror(y + 1, height - 1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1496 int mirror3 = mirror(y + 2, height - 1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1497 int mirror4 = mirror(y + 3, height - 1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1498 int mirror5 = mirror(y + 4, height - 1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1499 DWTELEM *b0= cs->b0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1500 DWTELEM *b1= cs->b1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1501 DWTELEM *b2= cs->b2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1502 DWTELEM *b3= cs->b3;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1503 DWTELEM *b4= slice_buffer_get_line(sb, mirror4 * stride_line);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1504 DWTELEM *b5= slice_buffer_get_line(sb, mirror5 * stride_line);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1505
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1506 {START_TIMER
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1507 if(y>0 && y+4<height){
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1508 vertical_compose97i(b0, b1, b2, b3, b4, b5, width);
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1509 }else{
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1510 if(mirror3 <= mirror5) vertical_compose97iL1(b3, b4, b5, width);
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1511 if(mirror2 <= mirror4) vertical_compose97iH1(b2, b3, b4, width);
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1512 if(mirror1 <= mirror3) vertical_compose97iL0(b1, b2, b3, width);
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1513 if(mirror0 <= mirror2) vertical_compose97iH0(b0, b1, b2, width);
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1514 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1515 if(width>400){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1516 STOP_TIMER("vertical_compose97i")}}
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1517
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1518 {START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1519 if(y-1>= 0) horizontal_compose97i(b0, width);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1520 if(mirror0 <= mirror2) horizontal_compose97i(b1, width);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1521 if(width>400 && mirror0 <= mirror2){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1522 STOP_TIMER("horizontal_compose97i")}}
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1523
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1524 cs->b0=b2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1525 cs->b1=b3;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1526 cs->b2=b4;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1527 cs->b3=b5;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1528 cs->y += 2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1529 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1530
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1531 static void spatial_compose97i_dy(dwt_compose_t *cs, DWTELEM *buffer, int width, int height, int stride){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1532 int y = cs->y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1533 DWTELEM *b0= cs->b0;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1534 DWTELEM *b1= cs->b1;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1535 DWTELEM *b2= cs->b2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1536 DWTELEM *b3= cs->b3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1537 DWTELEM *b4= buffer + mirror(y+3, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1538 DWTELEM *b5= buffer + mirror(y+4, height-1)*stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1539
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1540 if(stride == width && y+4 < height && 0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1541 int x;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1542 for(x=0; x<width/2; x++)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1543 b5[x] += 64*2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1544 for(; x<width; x++)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1545 b5[x] += 169*2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1546 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1547
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1548 {START_TIMER
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1549 if(b3 <= b5) vertical_compose97iL1(b3, b4, b5, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1550 if(b2 <= b4) vertical_compose97iH1(b2, b3, b4, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1551 if(b1 <= b3) vertical_compose97iL0(b1, b2, b3, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1552 if(b0 <= b2) vertical_compose97iH0(b0, b1, b2, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1553 if(width>400){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1554 STOP_TIMER("vertical_compose97i")}}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1555
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1556 {START_TIMER
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1557 if(y-1>= 0) horizontal_compose97i(b0, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1558 if(b0 <= b2) horizontal_compose97i(b1, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1559 if(width>400 && b0 <= b2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1560 STOP_TIMER("horizontal_compose97i")}}
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1561
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1562 cs->b0=b2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1563 cs->b1=b3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1564 cs->b2=b4;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1565 cs->b3=b5;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1566 cs->y += 2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1567 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1568
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1569 static void spatial_compose97i(DWTELEM *buffer, int width, int height, int stride){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1570 dwt_compose_t cs;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1571 spatial_compose97i_init(&cs, buffer, height, stride);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1572 while(cs.y <= height)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1573 spatial_compose97i_dy(&cs, buffer, width, height, stride);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1574 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1575
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1576 void ff_spatial_idwt_buffered_init(dwt_compose_t *cs, slice_buffer * sb, int width, int height, int stride_line, int type, int decomposition_count){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1577 int level;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1578 for(level=decomposition_count-1; level>=0; level--){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1579 switch(type){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1580 case 0: spatial_compose97i_buffered_init(cs+level, sb, height>>level, stride_line<<level); break;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1581 case 1: spatial_compose53i_buffered_init(cs+level, sb, height>>level, stride_line<<level); break;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1582 /* not slicified yet */
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1583 case 2: /*spatial_composeX(buffer, width>>level, height>>level, stride<<level); break;*/
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1584 av_log(NULL, AV_LOG_ERROR, "spatial_composeX neither buffered nor slicified yet.\n"); break;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1585 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1586 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1587 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1588
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1589 void ff_spatial_idwt_init(dwt_compose_t *cs, DWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1590 int level;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1591 for(level=decomposition_count-1; level>=0; level--){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1592 switch(type){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1593 case 0: spatial_compose97i_init(cs+level, buffer, height>>level, stride<<level); break;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1594 case 1: spatial_compose53i_init(cs+level, buffer, height>>level, stride<<level); break;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1595 /* not slicified yet */
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1596 case 2: spatial_composeX(buffer, width>>level, height>>level, stride<<level); break;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1597 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1598 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1599 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1600
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1601 void ff_spatial_idwt_slice(dwt_compose_t *cs, DWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count, int y){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1602 const int support = type==1 ? 3 : 5;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1603 int level;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1604 if(type==2) return;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1605
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1606 for(level=decomposition_count-1; level>=0; level--){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1607 while(cs[level].y <= FFMIN((y>>level)+support, height>>level)){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1608 switch(type){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1609 case 0: spatial_compose97i_dy(cs+level, buffer, width>>level, height>>level, stride<<level);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1610 break;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1611 case 1: spatial_compose53i_dy(cs+level, buffer, width>>level, height>>level, stride<<level);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1612 break;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1613 case 2: break;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1614 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1615 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1616 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1617 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1618
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1619 void ff_spatial_idwt_buffered_slice(dwt_compose_t *cs, slice_buffer * slice_buf, int width, int height, int stride_line, int type, int decomposition_count, int y){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1620 const int support = type==1 ? 3 : 5;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1621 int level;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1622 if(type==2) return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1623
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1624 for(level=decomposition_count-1; level>=0; level--){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1625 while(cs[level].y <= FFMIN((y>>level)+support, height>>level)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1626 switch(type){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1627 case 0: spatial_compose97i_dy_buffered(cs+level, slice_buf, width>>level, height>>level, stride_line<<level);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1628 break;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1629 case 1: spatial_compose53i_dy_buffered(cs+level, slice_buf, width>>level, height>>level, stride_line<<level);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1630 break;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1631 case 2: break;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1632 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1633 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1634 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1635 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1636
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1637 void ff_spatial_idwt(DWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1638 if(type==2){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1639 int level;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1640 for(level=decomposition_count-1; level>=0; level--)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1641 spatial_composeX (buffer, width>>level, height>>level, stride<<level);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1642 }else{
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1643 dwt_compose_t cs[MAX_DECOMPOSITIONS];
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1644 int y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1645 ff_spatial_idwt_init(cs, buffer, width, height, stride, type, decomposition_count);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1646 for(y=0; y<height; y+=4)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1647 ff_spatial_idwt_slice(cs, buffer, width, height, stride, type, decomposition_count, y);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1648 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1649 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1650
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1651 static int encode_subband_c0run(SnowContext *s, SubBand *b, DWTELEM *src, DWTELEM *parent, int stride, int orientation){
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1652 const int w= b->width;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1653 const int h= b->height;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1654 int x, y;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1655
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1656 if(1){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1657 int run=0;
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1658 int runs[w*h];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1659 int run_index=0;
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1660 int max_index;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1661
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1662 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1663 for(x=0; x<w; x++){
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1664 int v, p=0;
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1665 int /*ll=0, */l=0, lt=0, t=0, rt=0;
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1666 v= src[x + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1667
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1668 if(y){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1669 t= src[x + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1670 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1671 lt= src[x - 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1672 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1673 if(x + 1 < w){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1674 rt= src[x + 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1675 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1676 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1677 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1678 l= src[x - 1 + y*stride];
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1679 /*if(x > 1){
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1680 if(orientation==1) ll= src[y + (x-2)*stride];
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1681 else ll= src[x - 2 + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1682 }*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1683 }
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1684 if(parent){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1685 int px= x>>1;
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1686 int py= y>>1;
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1687 if(px<b->parent->width && py<b->parent->height)
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1688 p= parent[px + py*2*stride];
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1689 }
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1690 if(!(/*ll|*/l|lt|t|rt|p)){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1691 if(v){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1692 runs[run_index++]= run;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1693 run=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1694 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1695 run++;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1696 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1697 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1698 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1699 }
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1700 max_index= run_index;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1701 runs[run_index++]= run;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1702 run_index=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1703 run= runs[run_index++];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1704
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1705 put_symbol2(&s->c, b->state[30], max_index, 0);
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1706 if(run_index <= max_index)
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1707 put_symbol2(&s->c, b->state[1], run, 3);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1708
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1709 for(y=0; y<h; y++){
2435
c89ac0e70c66 10l patch by (matthieu castet <castet.matthieu free fr>)
michael
parents: 2422
diff changeset
1710 if(s->c.bytestream_end - s->c.bytestream < w*40){
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1711 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1712 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1713 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1714 for(x=0; x<w; x++){
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1715 int v, p=0;
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1716 int /*ll=0, */l=0, lt=0, t=0, rt=0;
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1717 v= src[x + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1718
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1719 if(y){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1720 t= src[x + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1721 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1722 lt= src[x - 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1723 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1724 if(x + 1 < w){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1725 rt= src[x + 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1726 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1727 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1728 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1729 l= src[x - 1 + y*stride];
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1730 /*if(x > 1){
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1731 if(orientation==1) ll= src[y + (x-2)*stride];
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1732 else ll= src[x - 2 + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1733 }*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1734 }
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1735 if(parent){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1736 int px= x>>1;
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1737 int py= y>>1;
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1738 if(px<b->parent->width && py<b->parent->height)
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1739 p= parent[px + py*2*stride];
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1740 }
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1741 if(/*ll|*/l|lt|t|rt|p){
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1742 int context= av_log2(/*ABS(ll) + */3*ABS(l) + ABS(lt) + 2*ABS(t) + ABS(rt) + ABS(p));
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1743
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1744 put_rac(&s->c, &b->state[0][context], !!v);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1745 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1746 if(!run){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1747 run= runs[run_index++];
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1748
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1749 if(run_index <= max_index)
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1750 put_symbol2(&s->c, b->state[1], run, 3);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1751 assert(v);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1752 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1753 run--;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1754 assert(!v);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1755 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1756 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1757 if(v){
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1758 int context= av_log2(/*ABS(ll) + */3*ABS(l) + ABS(lt) + 2*ABS(t) + ABS(rt) + ABS(p));
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1759 int l2= 2*ABS(l) + (l<0);
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1760 int t2= 2*ABS(t) + (t<0);
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1761
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
1762 put_symbol2(&s->c, b->state[context + 2], ABS(v)-1, context-4);
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1763 put_rac(&s->c, &b->state[0][16 + 1 + 3 + quant3bA[l2&0xFF] + 3*quant3bA[t2&0xFF]], v<0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1764 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1765 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1766 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1767 }
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1768 return 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1769 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1770
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1771 static int encode_subband(SnowContext *s, SubBand *b, DWTELEM *src, DWTELEM *parent, int stride, int orientation){
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1772 // encode_subband_qtree(s, b, src, parent, stride, orientation);
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1773 // encode_subband_z0run(s, b, src, parent, stride, orientation);
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1774 return encode_subband_c0run(s, b, src, parent, stride, orientation);
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1775 // encode_subband_dzr(s, b, src, parent, stride, orientation);
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1776 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1777
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1778 static inline void unpack_coeffs(SnowContext *s, SubBand *b, SubBand * parent, int orientation){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1779 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1780 const int h= b->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1781 int x,y;
2195
df3079d7806f merge decode_subband() and dequantize()
michael
parents: 2194
diff changeset
1782
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1783 if(1){
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1784 int run, runs;
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1785 x_and_coeff *xc= b->x_coeff;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1786 x_and_coeff *prev_xc= NULL;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1787 x_and_coeff *prev2_xc= xc;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1788 x_and_coeff *parent_xc= parent ? parent->x_coeff : NULL;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1789 x_and_coeff *prev_parent_xc= parent_xc;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1790
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1791 runs= get_symbol2(&s->c, b->state[30], 0);
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1792 if(runs-- > 0) run= get_symbol2(&s->c, b->state[1], 3);
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1793 else run= INT_MAX;
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1794
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1795 for(y=0; y<h; y++){
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1796 int v=0;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1797 int lt=0, t=0, rt=0;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1798
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1799 if(y && prev_xc->x == 0){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1800 rt= prev_xc->coeff;
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1801 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1802 for(x=0; x<w; x++){
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1803 int p=0;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1804 const int l= v;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1805
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1806 lt= t; t= rt;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1807
2194
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1808 if(y){
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1809 if(prev_xc->x <= x)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1810 prev_xc++;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1811 if(prev_xc->x == x + 1)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1812 rt= prev_xc->coeff;
2194
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1813 else
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1814 rt=0;
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1815 }
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1816 if(parent_xc){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1817 if(x>>1 > parent_xc->x){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1818 parent_xc++;
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1819 }
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1820 if(x>>1 == parent_xc->x){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1821 p= parent_xc->coeff;
2194
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1822 }
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1823 }
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1824 if(/*ll|*/l|lt|t|rt|p){
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1825 int context= av_log2(/*ABS(ll) + */3*(l>>1) + (lt>>1) + (t&~1) + (rt>>1) + (p>>1));
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1826
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1827 v=get_rac(&s->c, &b->state[0][context]);
2605
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1828 if(v){
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1829 v= 2*(get_symbol2(&s->c, b->state[context + 2], context-4) + 1);
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1830 v+=get_rac(&s->c, &b->state[0][16 + 1 + 3 + quant3bA[l&0xFF] + 3*quant3bA[t&0xFF]]);
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1831
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1832 xc->x=x;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1833 (xc++)->coeff= v;
2605
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1834 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1835 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1836 if(!run){
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1837 if(runs-- > 0) run= get_symbol2(&s->c, b->state[1], 3);
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1838 else run= INT_MAX;
2605
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1839 v= 2*(get_symbol2(&s->c, b->state[0 + 2], 0-4) + 1);
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1840 v+=get_rac(&s->c, &b->state[0][16 + 1 + 3]);
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1841
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1842 xc->x=x;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1843 (xc++)->coeff= v;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1844 }else{
2606
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1845 int max_run;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1846 run--;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1847 v=0;
2191
44afbcec70b8 50% faster decode_subband()
michael
parents: 2189
diff changeset
1848
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1849 if(y) max_run= FFMIN(run, prev_xc->x - x - 2);
2606
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1850 else max_run= FFMIN(run, w-x-1);
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1851 if(parent_xc)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1852 max_run= FFMIN(max_run, 2*parent_xc->x - x - 1);
2606
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1853 x+= max_run;
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1854 run-= max_run;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1855 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1856 }
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1857 }
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1858 (xc++)->x= w+1; //end marker
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1859 prev_xc= prev2_xc;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1860 prev2_xc= xc;
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1861
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1862 if(parent_xc){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1863 if(y&1){
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1864 while(parent_xc->x != parent->width+1)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1865 parent_xc++;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1866 parent_xc++;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1867 prev_parent_xc= parent_xc;
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1868 }else{
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1869 parent_xc= prev_parent_xc;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1870 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1871 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1872 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1873
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1874 (xc++)->x= w+1; //end marker
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1875 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1876 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1877
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1878 static inline void decode_subband_slice_buffered(SnowContext *s, SubBand *b, slice_buffer * sb, int start_y, int h, int save_state[1]){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1879 const int w= b->width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1880 int x,y;
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
1881 const int qlog= clip(s->qlog + b->qlog, 0, QROOT*16);
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
1882 int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1883 int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1884 int new_index = 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1885
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1886 START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1887
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1888 if(b->buf == s->spatial_dwt_buffer || s->qlog == LOSSLESS_QLOG){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1889 qadd= 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1890 qmul= 1<<QEXPSHIFT;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1891 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1892
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1893 /* If we are on the second or later slice, restore our index. */
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1894 if (start_y != 0)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1895 new_index = save_state[0];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1896
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1897
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1898 for(y=start_y; y<h; y++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1899 int x = 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1900 int v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1901 DWTELEM * line = slice_buffer_get_line(sb, y * b->stride_line + b->buf_y_offset) + b->buf_x_offset;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1902 memset(line, 0, b->width*sizeof(DWTELEM));
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1903 v = b->x_coeff[new_index].coeff;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1904 x = b->x_coeff[new_index++].x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1905 while(x < w)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1906 {
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1907 register int t= ( (v>>1)*qmul + qadd)>>QEXPSHIFT;
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1908 register int u= -(v&1);
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1909 line[x] = (t^u) - u;
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1910
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1911 v = b->x_coeff[new_index].coeff;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1912 x = b->x_coeff[new_index++].x;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1913 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1914 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1915 if(w > 200 && start_y != 0/*level+1 == s->spatial_decomposition_count*/){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1916 STOP_TIMER("decode_subband")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1917 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1918
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1919 /* Save our variables for the next slice. */
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1920 save_state[0] = new_index;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1921
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1922 return;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1923 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1924
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1925 static void reset_contexts(SnowContext *s){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1926 int plane_index, level, orientation;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1927
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
1928 for(plane_index=0; plane_index<3; plane_index++){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1929 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1930 for(orientation=level ? 1:0; orientation<4; orientation++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1931 memset(s->plane[plane_index].band[level][orientation].state, MID_STATE, sizeof(s->plane[plane_index].band[level][orientation].state));
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1932 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1933 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1934 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1935 memset(s->header_state, MID_STATE, sizeof(s->header_state));
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1936 memset(s->block_state, MID_STATE, sizeof(s->block_state));
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1937 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1938
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1939 static int alloc_blocks(SnowContext *s){
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1940 int w= -((-s->avctx->width )>>LOG2_MB_SIZE);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1941 int h= -((-s->avctx->height)>>LOG2_MB_SIZE);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1942
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1943 s->b_width = w;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1944 s->b_height= h;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1945
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1946 s->block= av_mallocz(w * h * sizeof(BlockNode) << (s->block_max_depth*2));
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1947 return 0;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1948 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1949
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1950 static inline void copy_rac_state(RangeCoder *d, RangeCoder *s){
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1951 uint8_t *bytestream= d->bytestream;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1952 uint8_t *bytestream_start= d->bytestream_start;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1953 *d= *s;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1954 d->bytestream= bytestream;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1955 d->bytestream_start= bytestream_start;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1956 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1957
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1958 //near copy & paste from dsputil, FIXME
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1959 static int pix_sum(uint8_t * pix, int line_size, int w)
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1960 {
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1961 int s, i, j;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1962
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1963 s = 0;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1964 for (i = 0; i < w; i++) {
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1965 for (j = 0; j < w; j++) {
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1966 s += pix[0];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1967 pix ++;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1968 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1969 pix += line_size - w;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1970 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1971 return s;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1972 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1973
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1974 //near copy & paste from dsputil, FIXME
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1975 static int pix_norm1(uint8_t * pix, int line_size, int w)
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1976 {
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1977 int s, i, j;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1978 uint32_t *sq = squareTbl + 256;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1979
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1980 s = 0;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1981 for (i = 0; i < w; i++) {
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1982 for (j = 0; j < w; j ++) {
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1983 s += sq[pix[0]];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1984 pix ++;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1985 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1986 pix += line_size - w;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1987 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1988 return s;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1989 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1990
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1991 static inline void set_blocks(SnowContext *s, int level, int x, int y, int l, int cb, int cr, int mx, int my, int type){
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1992 const int w= s->b_width << s->block_max_depth;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1993 const int rem_depth= s->block_max_depth - level;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1994 const int index= (x + y*w) << rem_depth;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1995 const int block_w= 1<<rem_depth;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1996 BlockNode block;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1997 int i,j;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1998
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1999 block.color[0]= l;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2000 block.color[1]= cb;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2001 block.color[2]= cr;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2002 block.mx= mx;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2003 block.my= my;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2004 block.type= type;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2005 block.level= level;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2006
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2007 for(j=0; j<block_w; j++){
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2008 for(i=0; i<block_w; i++){
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2009 s->block[index + i + j*w]= block;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2010 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2011 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2012 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2013
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2014 static inline void init_ref(MotionEstContext *c, uint8_t *src[3], uint8_t *ref[3], uint8_t *ref2[3], int x, int y, int ref_index){
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2015 const int offset[3]= {
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2016 y*c-> stride + x,
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2017 ((y*c->uvstride + x)>>1),
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2018 ((y*c->uvstride + x)>>1),
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2019 };
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2020 int i;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2021 for(i=0; i<3; i++){
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2022 c->src[0][i]= src [i];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2023 c->ref[0][i]= ref [i] + offset[i];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2024 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2025 assert(!ref_index);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2026 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2027
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2028 //FIXME copy&paste
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2029 #define P_LEFT P[1]
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2030 #define P_TOP P[2]
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2031 #define P_TOPRIGHT P[3]
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2032 #define P_MEDIAN P[4]
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2033 #define P_MV1 P[9]
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2034 #define FLAG_QPEL 1 //must be 1
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2035
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2036 static int encode_q_branch(SnowContext *s, int level, int x, int y){
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2037 uint8_t p_buffer[1024];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2038 uint8_t i_buffer[1024];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2039 uint8_t p_state[sizeof(s->block_state)];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2040 uint8_t i_state[sizeof(s->block_state)];
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2041 RangeCoder pc, ic;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2042 uint8_t *pbbak= s->c.bytestream;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2043 uint8_t *pbbak_start= s->c.bytestream_start;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2044 int score, score2, iscore, i_len, p_len, block_s, sum;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2045 const int w= s->b_width << s->block_max_depth;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2046 const int h= s->b_height << s->block_max_depth;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2047 const int rem_depth= s->block_max_depth - level;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2048 const int index= (x + y*w) << rem_depth;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2049 const int block_w= 1<<(LOG2_MB_SIZE - level);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2050 static BlockNode null_block= { //FIXME add border maybe
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2051 .color= {128,128,128},
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2052 .mx= 0,
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2053 .my= 0,
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2054 .type= 0,
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2055 .level= 0,
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2056 };
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2057 int trx= (x+1)<<rem_depth;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2058 int try= (y+1)<<rem_depth;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2059 BlockNode *left = x ? &s->block[index-1] : &null_block;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2060 BlockNode *top = y ? &s->block[index-w] : &null_block;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2061 BlockNode *right = trx<w ? &s->block[index+1] : &null_block;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2062 BlockNode *bottom= try<h ? &s->block[index+w] : &null_block;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2063 BlockNode *tl = y && x ? &s->block[index-w-1] : left;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2064 BlockNode *tr = y && trx<w && ((x&1)==0 || level==0) ? &s->block[index-w+(1<<rem_depth)] : tl; //FIXME use lt
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2065 int pl = left->color[0];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2066 int pcb= left->color[1];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2067 int pcr= left->color[2];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2068 int pmx= mid_pred(left->mx, top->mx, tr->mx);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2069 int pmy= mid_pred(left->my, top->my, tr->my);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2070 int mx=0, my=0;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2071 int l,cr,cb, i;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2072 const int stride= s->current_picture.linesize[0];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2073 const int uvstride= s->current_picture.linesize[1];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2074 const int instride= s->input_picture.linesize[0];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2075 const int uvinstride= s->input_picture.linesize[1];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2076 uint8_t *new_l = s->input_picture.data[0] + (x + y* instride)*block_w;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2077 uint8_t *new_cb= s->input_picture.data[1] + (x + y*uvinstride)*block_w/2;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2078 uint8_t *new_cr= s->input_picture.data[2] + (x + y*uvinstride)*block_w/2;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2079 uint8_t current_mb[3][stride*block_w];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2080 uint8_t *current_data[3]= {&current_mb[0][0], &current_mb[1][0], &current_mb[2][0]};
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2081 int P[10][2];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2082 int16_t last_mv[3][2];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2083 int qpel= !!(s->avctx->flags & CODEC_FLAG_QPEL); //unused
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2084 const int shift= 1+qpel;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2085 MotionEstContext *c= &s->m.me;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2086 int mx_context= av_log2(2*ABS(left->mx - top->mx));
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2087 int my_context= av_log2(2*ABS(left->my - top->my));
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2088 int s_context= 2*left->level + 2*top->level + tl->level + tr->level;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2089
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2090 assert(sizeof(s->block_state) >= 256);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2091 if(s->keyframe){
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2092 set_blocks(s, level, x, y, pl, pcb, pcr, pmx, pmy, BLOCK_INTRA);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2093 return 0;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2094 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2095
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2096 //FIXME optimize
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2097 for(i=0; i<block_w; i++)
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2098 memcpy(&current_mb[0][0] + stride*i, new_l + instride*i, block_w);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2099 for(i=0; i<block_w>>1; i++)
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2100 memcpy(&current_mb[1][0] + uvstride*i, new_cb + uvinstride*i, block_w>>1);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2101 for(i=0; i<block_w>>1; i++)
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2102 memcpy(&current_mb[2][0] + uvstride*i, new_cr + uvinstride*i, block_w>>1);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2103
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2104 // clip predictors / edge ?
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2105
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2106 P_LEFT[0]= left->mx;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2107 P_LEFT[1]= left->my;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2108 P_TOP [0]= top->mx;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2109 P_TOP [1]= top->my;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2110 P_TOPRIGHT[0]= tr->mx;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2111 P_TOPRIGHT[1]= tr->my;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2112
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2113 last_mv[0][0]= s->block[index].mx;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2114 last_mv[0][1]= s->block[index].my;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2115 last_mv[1][0]= right->mx;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2116 last_mv[1][1]= right->my;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2117 last_mv[2][0]= bottom->mx;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2118 last_mv[2][1]= bottom->my;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2119
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2120 s->m.mb_stride=2;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2121 s->m.mb_x=
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2122 s->m.mb_y= 0;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2123 s->m.me.skip= 0;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2124
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2125 init_ref(c, current_data, s->last_picture.data, NULL, block_w*x, block_w*y, 0);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2126
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2127 assert(s->m.me. stride == stride);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2128 assert(s->m.me.uvstride == uvstride);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2129
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2130 c->penalty_factor = get_penalty_factor(s->lambda, s->lambda2, c->avctx->me_cmp);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2131 c->sub_penalty_factor= get_penalty_factor(s->lambda, s->lambda2, c->avctx->me_sub_cmp);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2132 c->mb_penalty_factor = get_penalty_factor(s->lambda, s->lambda2, c->avctx->mb_cmp);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2133 c->current_mv_penalty= c->mv_penalty[s->m.f_code=1] + MAX_MV;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2134
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2135 c->xmin = - x*block_w - 16+2;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2136 c->ymin = - y*block_w - 16+2;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2137 c->xmax = - (x+1)*block_w + (w<<(LOG2_MB_SIZE - s->block_max_depth)) + 16-2;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2138 c->ymax = - (y+1)*block_w + (h<<(LOG2_MB_SIZE - s->block_max_depth)) + 16-2;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2139
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2140 if(P_LEFT[0] > (c->xmax<<shift)) P_LEFT[0] = (c->xmax<<shift);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2141 if(P_LEFT[1] > (c->ymax<<shift)) P_LEFT[1] = (c->ymax<<shift);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2142 if(P_TOP[0] > (c->xmax<<shift)) P_TOP[0] = (c->xmax<<shift);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2143 if(P_TOP[1] > (c->ymax<<shift)) P_TOP[1] = (c->ymax<<shift);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2144 if(P_TOPRIGHT[0] < (c->xmin<<shift)) P_TOPRIGHT[0]= (c->xmin<<shift);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2145 if(P_TOPRIGHT[0] > (c->xmax<<shift)) P_TOPRIGHT[0]= (c->xmax<<shift); //due to pmx no clip
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2146 if(P_TOPRIGHT[1] > (c->ymax<<shift)) P_TOPRIGHT[1]= (c->ymax<<shift);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2147
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2148 P_MEDIAN[0]= mid_pred(P_LEFT[0], P_TOP[0], P_TOPRIGHT[0]);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2149 P_MEDIAN[1]= mid_pred(P_LEFT[1], P_TOP[1], P_TOPRIGHT[1]);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2150
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2151 if (!y) {
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2152 c->pred_x= P_LEFT[0];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2153 c->pred_y= P_LEFT[1];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2154 } else {
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2155 c->pred_x = P_MEDIAN[0];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2156 c->pred_y = P_MEDIAN[1];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2157 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2158
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2159 score= ff_epzs_motion_search(&s->m, &mx, &my, P, 0, /*ref_index*/ 0, last_mv,
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2160 (1<<16)>>shift, level-LOG2_MB_SIZE+4, block_w);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2161
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2162 assert(mx >= c->xmin);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2163 assert(mx <= c->xmax);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2164 assert(my >= c->ymin);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2165 assert(my <= c->ymax);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2166
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2167 score= s->m.me.sub_motion_search(&s->m, &mx, &my, score, 0, 0, level-LOG2_MB_SIZE+4, block_w);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2168 score= ff_get_mb_score(&s->m, mx, my, 0, 0, level-LOG2_MB_SIZE+4, block_w, 0);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2169 //FIXME if mb_cmp != SSE then intra cant be compared currently and mb_penalty vs. lambda2
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2170
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2171 // subpel search
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2172 pc= s->c;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2173 pc.bytestream_start=
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2174 pc.bytestream= p_buffer; //FIXME end/start? and at the other stoo
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2175 memcpy(p_state, s->block_state, sizeof(s->block_state));
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2176
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2177 if(level!=s->block_max_depth)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2178 put_rac(&pc, &p_state[4 + s_context], 1);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2179 put_rac(&pc, &p_state[1 + left->type + top->type], 0);
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2180 put_symbol(&pc, &p_state[128 + 32*mx_context], mx - pmx, 1);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2181 put_symbol(&pc, &p_state[128 + 32*my_context], my - pmy, 1);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2182 p_len= pc.bytestream - pc.bytestream_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2183 score += (s->lambda2*(p_len*8
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2184 + (pc.outstanding_count - s->c.outstanding_count)*8
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2185 + (-av_log2(pc.range) + av_log2(s->c.range))
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2186 ))>>FF_LAMBDA_SHIFT;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2187
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2188 block_s= block_w*block_w;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2189 sum = pix_sum(&current_mb[0][0], stride, block_w);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2190 l= (sum + block_s/2)/block_s;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2191 iscore = pix_norm1(&current_mb[0][0], stride, block_w) - 2*l*sum + l*l*block_s;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2192
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2193 block_s= block_w*block_w>>2;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2194 sum = pix_sum(&current_mb[1][0], uvstride, block_w>>1);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2195 cb= (sum + block_s/2)/block_s;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2196 // iscore += pix_norm1(&current_mb[1][0], uvstride, block_w>>1) - 2*cb*sum + cb*cb*block_s;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2197 sum = pix_sum(&current_mb[2][0], uvstride, block_w>>1);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2198 cr= (sum + block_s/2)/block_s;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2199 // iscore += pix_norm1(&current_mb[2][0], uvstride, block_w>>1) - 2*cr*sum + cr*cr*block_s;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2200
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2201 ic= s->c;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2202 ic.bytestream_start=
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2203 ic.bytestream= i_buffer; //FIXME end/start? and at the other stoo
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2204 memcpy(i_state, s->block_state, sizeof(s->block_state));
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2205 if(level!=s->block_max_depth)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2206 put_rac(&ic, &i_state[4 + s_context], 1);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2207 put_rac(&ic, &i_state[1 + left->type + top->type], 1);
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2208 put_symbol(&ic, &i_state[32], l-pl , 1);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2209 put_symbol(&ic, &i_state[64], cb-pcb, 1);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2210 put_symbol(&ic, &i_state[96], cr-pcr, 1);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2211 i_len= ic.bytestream - ic.bytestream_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2212 iscore += (s->lambda2*(i_len*8
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2213 + (ic.outstanding_count - s->c.outstanding_count)*8
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2214 + (-av_log2(ic.range) + av_log2(s->c.range))
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2215 ))>>FF_LAMBDA_SHIFT;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2216
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2217 // assert(score==256*256*256*64-1);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2218 assert(iscore < 255*255*256 + s->lambda2*10);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2219 assert(iscore >= 0);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2220 assert(l>=0 && l<=255);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2221 assert(pl>=0 && pl<=255);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2222
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2223 if(level==0){
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2224 int varc= iscore >> 8;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2225 int vard= score >> 8;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2226 if (vard <= 64 || vard < varc)
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2227 c->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2228 else
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2229 c->scene_change_score+= s->m.qscale;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2230 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2231
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2232 if(level!=s->block_max_depth){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2233 put_rac(&s->c, &s->block_state[4 + s_context], 0);
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2234 score2 = encode_q_branch(s, level+1, 2*x+0, 2*y+0);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2235 score2+= encode_q_branch(s, level+1, 2*x+1, 2*y+0);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2236 score2+= encode_q_branch(s, level+1, 2*x+0, 2*y+1);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2237 score2+= encode_q_branch(s, level+1, 2*x+1, 2*y+1);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2238 score2+= s->lambda2>>FF_LAMBDA_SHIFT; //FIXME exact split overhead
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2239
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2240 if(score2 < score && score2 < iscore)
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2241 return score2;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2242 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2243
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2244 if(iscore < score){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2245 memcpy(pbbak, i_buffer, i_len);
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2246 s->c= ic;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2247 s->c.bytestream_start= pbbak_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2248 s->c.bytestream= pbbak + i_len;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2249 set_blocks(s, level, x, y, l, cb, cr, pmx, pmy, BLOCK_INTRA);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2250 memcpy(s->block_state, i_state, sizeof(s->block_state));
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2251 return iscore;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2252 }else{
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2253 memcpy(pbbak, p_buffer, p_len);
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2254 s->c= pc;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2255 s->c.bytestream_start= pbbak_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2256 s->c.bytestream= pbbak + p_len;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2257 set_blocks(s, level, x, y, pl, pcb, pcr, mx, my, 0);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2258 memcpy(s->block_state, p_state, sizeof(s->block_state));
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2259 return score;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2260 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2261 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2262
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2263 static void decode_q_branch(SnowContext *s, int level, int x, int y){
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2264 const int w= s->b_width << s->block_max_depth;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2265 const int rem_depth= s->block_max_depth - level;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2266 const int index= (x + y*w) << rem_depth;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2267 static BlockNode null_block= { //FIXME add border maybe
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2268 .color= {128,128,128},
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2269 .mx= 0,
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2270 .my= 0,
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2271 .type= 0,
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2272 .level= 0,
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2273 };
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2274 int trx= (x+1)<<rem_depth;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2275 BlockNode *left = x ? &s->block[index-1] : &null_block;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2276 BlockNode *top = y ? &s->block[index-w] : &null_block;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2277 BlockNode *tl = y && x ? &s->block[index-w-1] : left;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2278 BlockNode *tr = y && trx<w && ((x&1)==0 || level==0) ? &s->block[index-w+(1<<rem_depth)] : tl; //FIXME use lt
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2279 int s_context= 2*left->level + 2*top->level + tl->level + tr->level;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2280
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2281 if(s->keyframe){
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2282 set_blocks(s, level, x, y, null_block.color[0], null_block.color[1], null_block.color[2], null_block.mx, null_block.my, BLOCK_INTRA);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2283 return;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2284 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2285
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2286 if(level==s->block_max_depth || get_rac(&s->c, &s->block_state[4 + s_context])){
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2287 int type;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2288 int l = left->color[0];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2289 int cb= left->color[1];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2290 int cr= left->color[2];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2291 int mx= mid_pred(left->mx, top->mx, tr->mx);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2292 int my= mid_pred(left->my, top->my, tr->my);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2293 int mx_context= av_log2(2*ABS(left->mx - top->mx)) + 0*av_log2(2*ABS(tr->mx - top->mx));
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2294 int my_context= av_log2(2*ABS(left->my - top->my)) + 0*av_log2(2*ABS(tr->my - top->my));
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2295
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2296 type= get_rac(&s->c, &s->block_state[1 + left->type + top->type]) ? BLOCK_INTRA : 0;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2297
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2298 if(type){
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2299 l += get_symbol(&s->c, &s->block_state[32], 1);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2300 cb+= get_symbol(&s->c, &s->block_state[64], 1);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2301 cr+= get_symbol(&s->c, &s->block_state[96], 1);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2302 }else{
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2303 mx+= get_symbol(&s->c, &s->block_state[128 + 32*mx_context], 1);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2304 my+= get_symbol(&s->c, &s->block_state[128 + 32*my_context], 1);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2305 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2306 set_blocks(s, level, x, y, l, cb, cr, mx, my, type);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2307 }else{
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2308 decode_q_branch(s, level+1, 2*x+0, 2*y+0);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2309 decode_q_branch(s, level+1, 2*x+1, 2*y+0);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2310 decode_q_branch(s, level+1, 2*x+0, 2*y+1);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2311 decode_q_branch(s, level+1, 2*x+1, 2*y+1);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2312 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2313 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2314
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2315 static void encode_blocks(SnowContext *s){
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2316 int x, y;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2317 int w= s->b_width;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2318 int h= s->b_height;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2319
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2320 for(y=0; y<h; y++){
2435
c89ac0e70c66 10l patch by (matthieu castet <castet.matthieu free fr>)
michael
parents: 2422
diff changeset
2321 if(s->c.bytestream_end - s->c.bytestream < w*MB_SIZE*MB_SIZE*3){ //FIXME nicer limit
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
2322 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
2323 return;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
2324 }
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2325 for(x=0; x<w; x++){
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2326 encode_q_branch(s, 0, x, y);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2327 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2328 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2329 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2330
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2331 static void decode_blocks(SnowContext *s){
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2332 int x, y;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2333 int w= s->b_width;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2334 int h= s->b_height;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2335
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2336 for(y=0; y<h; y++){
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2337 for(x=0; x<w; x++){
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2338 decode_q_branch(s, 0, x, y);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2339 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2340 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2341 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2342
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2343 static void mc_block(uint8_t *dst, uint8_t *src, uint8_t *tmp, int stride, int b_w, int b_h, int dx, int dy){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2344 int x, y;
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2345 START_TIMER
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2346 for(y=0; y < b_h+5; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2347 for(x=0; x < b_w; x++){
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2348 int a0= src[x ];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2349 int a1= src[x + 1];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2350 int a2= src[x + 2];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2351 int a3= src[x + 3];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2352 int a4= src[x + 4];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2353 int a5= src[x + 5];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2354 // int am= 9*(a1+a2) - (a0+a3);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2355 int am= 20*(a2+a3) - 5*(a1+a4) + (a0+a5);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2356 // int am= 18*(a2+a3) - 2*(a1+a4);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2357 // int aL= (-7*a0 + 105*a1 + 35*a2 - 5*a3)>>3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2358 // int aR= (-7*a3 + 105*a2 + 35*a1 - 5*a0)>>3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2359
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2360 // if(b_w==16) am= 8*(a1+a2);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2361
2610
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2362 if(dx<8) am = (32*a2*( 8-dx) + am* dx + 128)>>8;
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2363 else am = ( am*(16-dx) + 32*a3*(dx-8) + 128)>>8;
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2364
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2365 /* FIXME Try increasing tmp buffer to 16 bits and not clipping here. Should give marginally better results. - Robert*/
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2366 if(am&(~255)) am= ~(am>>31);
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2367
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2368 tmp[x] = am;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2369
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2370 /* if (dx< 4) tmp[x + y*stride]= (16*a1*( 4-dx) + aL* dx + 32)>>6;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2371 else if(dx< 8) tmp[x + y*stride]= ( aL*( 8-dx) + am*(dx- 4) + 32)>>6;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2372 else if(dx<12) tmp[x + y*stride]= ( am*(12-dx) + aR*(dx- 8) + 32)>>6;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2373 else tmp[x + y*stride]= ( aR*(16-dx) + 16*a2*(dx-12) + 32)>>6;*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2374 }
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2375 tmp += stride;
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2376 src += stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2377 }
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2378 tmp -= (b_h+5)*stride;
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2379
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2380 for(y=0; y < b_h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2381 for(x=0; x < b_w; x++){
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2382 int a0= tmp[x + 0*stride];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2383 int a1= tmp[x + 1*stride];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2384 int a2= tmp[x + 2*stride];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2385 int a3= tmp[x + 3*stride];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2386 int a4= tmp[x + 4*stride];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2387 int a5= tmp[x + 5*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2388 int am= 20*(a2+a3) - 5*(a1+a4) + (a0+a5);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2389 // int am= 18*(a2+a3) - 2*(a1+a4);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2390 /* int aL= (-7*a0 + 105*a1 + 35*a2 - 5*a3)>>3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2391 int aR= (-7*a3 + 105*a2 + 35*a1 - 5*a0)>>3;*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2392
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2393 // if(b_w==16) am= 8*(a1+a2);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2394
2610
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2395 if(dy<8) am = (32*a2*( 8-dy) + am* dy + 128)>>8;
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2396 else am = ( am*(16-dy) + 32*a3*(dy-8) + 128)>>8;
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2397
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2398 if(am&(~255)) am= ~(am>>31);
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2399
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2400 dst[x] = am;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2401 /* if (dy< 4) tmp[x + y*stride]= (16*a1*( 4-dy) + aL* dy + 32)>>6;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2402 else if(dy< 8) tmp[x + y*stride]= ( aL*( 8-dy) + am*(dy- 4) + 32)>>6;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2403 else if(dy<12) tmp[x + y*stride]= ( am*(12-dy) + aR*(dy- 8) + 32)>>6;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2404 else tmp[x + y*stride]= ( aR*(16-dy) + 16*a2*(dy-12) + 32)>>6;*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2405 }
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2406 dst += stride;
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2407 tmp += stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2408 }
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2409 STOP_TIMER("mc_block")
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2410 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2411
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2412 #define mca(dx,dy,b_w)\
2224
11d54cb7ac4e 100l (forgot to set the 8x8 mc functions, so ME did use the mpeg ones ...)
michael
parents: 2223
diff changeset
2413 static void mc_block_hpel ## dx ## dy ## b_w(uint8_t *dst, uint8_t *src, int stride, int h){\
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2414 uint8_t tmp[stride*(b_w+5)];\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2415 assert(h==b_w);\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2416 mc_block(dst, src-2-2*stride, tmp, stride, b_w, b_w, dx, dy);\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2417 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2418
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2419 mca( 0, 0,16)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2420 mca( 8, 0,16)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2421 mca( 0, 8,16)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2422 mca( 8, 8,16)
2224
11d54cb7ac4e 100l (forgot to set the 8x8 mc functions, so ME did use the mpeg ones ...)
michael
parents: 2223
diff changeset
2423 mca( 0, 0,8)
11d54cb7ac4e 100l (forgot to set the 8x8 mc functions, so ME did use the mpeg ones ...)
michael
parents: 2223
diff changeset
2424 mca( 8, 0,8)
11d54cb7ac4e 100l (forgot to set the 8x8 mc functions, so ME did use the mpeg ones ...)
michael
parents: 2223
diff changeset
2425 mca( 0, 8,8)
11d54cb7ac4e 100l (forgot to set the 8x8 mc functions, so ME did use the mpeg ones ...)
michael
parents: 2223
diff changeset
2426 mca( 8, 8,8)
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2427
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2428 static void pred_block(SnowContext *s, uint8_t *dst, uint8_t *src, uint8_t *tmp, int stride, int sx, int sy, int b_w, int b_h, BlockNode *block, int plane_index, int w, int h){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2429 if(block->type){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2430 int x, y;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2431 const int color= block->color[plane_index];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2432 for(y=0; y < b_h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2433 for(x=0; x < b_w; x++){
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2434 dst[x + y*stride]= color;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2435 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2436 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2437 }else{
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2438 const int scale= plane_index ? s->mv_scale : 2*s->mv_scale;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2439 int mx= block->mx*scale;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2440 int my= block->my*scale;
2223
b26474e72d6d use h264 MC code if possible
michael
parents: 2221
diff changeset
2441 const int dx= mx&15;
b26474e72d6d use h264 MC code if possible
michael
parents: 2221
diff changeset
2442 const int dy= my&15;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2443 sx += (mx>>4) - 2;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2444 sy += (my>>4) - 2;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2445 src += sx + sy*stride;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2446 if( (unsigned)sx >= w - b_w - 4
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2447 || (unsigned)sy >= h - b_h - 4){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2448 ff_emulated_edge_mc(tmp + MB_SIZE, src, stride, b_w+5, b_h+5, sx, sy, w, h);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2449 src= tmp + MB_SIZE;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2450 }
2223
b26474e72d6d use h264 MC code if possible
michael
parents: 2221
diff changeset
2451 if((dx&3) || (dy&3) || b_w!=b_h || (b_w!=4 && b_w!=8 && b_w!=16))
b26474e72d6d use h264 MC code if possible
michael
parents: 2221
diff changeset
2452 mc_block(dst, src, tmp, stride, b_w, b_h, dx, dy);
b26474e72d6d use h264 MC code if possible
michael
parents: 2221
diff changeset
2453 else
b26474e72d6d use h264 MC code if possible
michael
parents: 2221
diff changeset
2454 s->dsp.put_h264_qpel_pixels_tab[2-(b_w>>3)][dy+(dx>>2)](dst,src + 2 + 2*stride,stride);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2455 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2456 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2457
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2458 static always_inline int same_block(BlockNode *a, BlockNode *b){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2459 return !((a->mx - b->mx) | (a->my - b->my) | a->type | b->type);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2460 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2461
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2462 //FIXME name clenup (b_w, block_w, b_width stuff)
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2463 static always_inline void add_yblock_buffered(SnowContext *s, slice_buffer * sb, DWTELEM *old_dst, uint8_t *dst8, uint8_t *src, uint8_t *obmc, int src_x, int src_y, int b_w, int b_h, int w, int h, int dst_stride, int src_stride, int obmc_stride, int b_x, int b_y, int add, int plane_index){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2464 DWTELEM * dst = NULL;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2465 const int b_width = s->b_width << s->block_max_depth;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2466 const int b_height= s->b_height << s->block_max_depth;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2467 const int b_stride= b_width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2468 BlockNode *lt= &s->block[b_x + b_y*b_stride];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2469 BlockNode *rt= lt+1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2470 BlockNode *lb= lt+b_stride;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2471 BlockNode *rb= lb+1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2472 uint8_t *block[4];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2473 uint8_t tmp[src_stride*(b_h+5)]; //FIXME align
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2474 int x,y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2475
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2476 if(b_x<0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2477 lt= rt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2478 lb= rb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2479 }else if(b_x + 1 >= b_width){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2480 rt= lt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2481 rb= lb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2482 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2483 if(b_y<0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2484 lt= lb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2485 rt= rb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2486 }else if(b_y + 1 >= b_height){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2487 lb= lt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2488 rb= rt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2489 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2490
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2491 if(src_x<0){ //FIXME merge with prev & always round internal width upto *16
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2492 obmc -= src_x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2493 b_w += src_x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2494 src_x=0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2495 }else if(src_x + b_w > w){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2496 b_w = w - src_x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2497 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2498 if(src_y<0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2499 obmc -= src_y*obmc_stride;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2500 b_h += src_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2501 src_y=0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2502 }else if(src_y + b_h> h){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2503 b_h = h - src_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2504 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2505
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2506 if(b_w<=0 || b_h<=0) return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2507
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2508 assert(src_stride > 7*MB_SIZE);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2509 // old_dst += src_x + src_y*dst_stride;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2510 dst8+= src_x + src_y*src_stride;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2511 // src += src_x + src_y*src_stride;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2512
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2513 block[0]= tmp+3*MB_SIZE;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2514 pred_block(s, block[0], src, tmp, src_stride, src_x, src_y, b_w, b_h, lt, plane_index, w, h);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2515
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2516 if(same_block(lt, rt)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2517 block[1]= block[0];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2518 }else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2519 block[1]= tmp + 4*MB_SIZE;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2520 pred_block(s, block[1], src, tmp, src_stride, src_x, src_y, b_w, b_h, rt, plane_index, w, h);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2521 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2522
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2523 if(same_block(lt, lb)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2524 block[2]= block[0];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2525 }else if(same_block(rt, lb)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2526 block[2]= block[1];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2527 }else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2528 block[2]= tmp+5*MB_SIZE;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2529 pred_block(s, block[2], src, tmp, src_stride, src_x, src_y, b_w, b_h, lb, plane_index, w, h);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2530 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2531
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2532 if(same_block(lt, rb) ){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2533 block[3]= block[0];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2534 }else if(same_block(rt, rb)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2535 block[3]= block[1];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2536 }else if(same_block(lb, rb)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2537 block[3]= block[2];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2538 }else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2539 block[3]= tmp+6*MB_SIZE;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2540 pred_block(s, block[3], src, tmp, src_stride, src_x, src_y, b_w, b_h, rb, plane_index, w, h);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2541 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2542 #if 0
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2543 for(y=0; y<b_h; y++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2544 for(x=0; x<b_w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2545 int v= obmc [x + y*obmc_stride] * block[3][x + y*src_stride] * (256/OBMC_MAX);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2546 if(add) dst[x + y*dst_stride] += v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2547 else dst[x + y*dst_stride] -= v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2548 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2549 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2550 for(y=0; y<b_h; y++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2551 uint8_t *obmc2= obmc + (obmc_stride>>1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2552 for(x=0; x<b_w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2553 int v= obmc2[x + y*obmc_stride] * block[2][x + y*src_stride] * (256/OBMC_MAX);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2554 if(add) dst[x + y*dst_stride] += v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2555 else dst[x + y*dst_stride] -= v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2556 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2557 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2558 for(y=0; y<b_h; y++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2559 uint8_t *obmc3= obmc + obmc_stride*(obmc_stride>>1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2560 for(x=0; x<b_w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2561 int v= obmc3[x + y*obmc_stride] * block[1][x + y*src_stride] * (256/OBMC_MAX);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2562 if(add) dst[x + y*dst_stride] += v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2563 else dst[x + y*dst_stride] -= v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2564 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2565 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2566 for(y=0; y<b_h; y++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2567 uint8_t *obmc3= obmc + obmc_stride*(obmc_stride>>1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2568 uint8_t *obmc4= obmc3+ (obmc_stride>>1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2569 for(x=0; x<b_w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2570 int v= obmc4[x + y*obmc_stride] * block[0][x + y*src_stride] * (256/OBMC_MAX);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2571 if(add) dst[x + y*dst_stride] += v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2572 else dst[x + y*dst_stride] -= v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2573 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2574 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2575 #else
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2576 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2577
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2578 START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2579
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2580 int block_index = 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2581 for(y=0; y<b_h; y++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2582 //FIXME ugly missue of obmc_stride
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2583 uint8_t *obmc1= obmc + y*obmc_stride;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2584 uint8_t *obmc2= obmc1+ (obmc_stride>>1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2585 uint8_t *obmc3= obmc1+ obmc_stride*(obmc_stride>>1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2586 uint8_t *obmc4= obmc3+ (obmc_stride>>1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2587 dst = slice_buffer_get_line(sb, src_y + y);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2588 for(x=0; x<b_w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2589 int v= obmc1[x] * block[3][x + y*src_stride]
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2590 +obmc2[x] * block[2][x + y*src_stride]
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2591 +obmc3[x] * block[1][x + y*src_stride]
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2592 +obmc4[x] * block[0][x + y*src_stride];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2593
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2594 v <<= 8 - LOG2_OBMC_MAX;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2595 if(FRAC_BITS != 8){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2596 v += 1<<(7 - FRAC_BITS);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2597 v >>= 8 - FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2598 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2599 if(add){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2600 // v += old_dst[x + y*dst_stride];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2601 v += dst[x + src_x];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2602 v = (v + (1<<(FRAC_BITS-1))) >> FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2603 if(v&(~255)) v= ~(v>>31);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2604 dst8[x + y*src_stride] = v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2605 }else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2606 // old_dst[x + y*dst_stride] -= v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2607 dst[x + src_x] -= v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2608 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2609 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2610 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2611 STOP_TIMER("Inner add y block")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2612 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2613 #endif
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2614 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2615
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2616 //FIXME name clenup (b_w, block_w, b_width stuff)
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2617 static always_inline void add_yblock(SnowContext *s, DWTELEM *dst, uint8_t *dst8, uint8_t *src, uint8_t *obmc, int src_x, int src_y, int b_w, int b_h, int w, int h, int dst_stride, int src_stride, int obmc_stride, int b_x, int b_y, int add, int plane_index){
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2618 const int b_width = s->b_width << s->block_max_depth;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2619 const int b_height= s->b_height << s->block_max_depth;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2620 const int b_stride= b_width;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2621 BlockNode *lt= &s->block[b_x + b_y*b_stride];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2622 BlockNode *rt= lt+1;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2623 BlockNode *lb= lt+b_stride;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2624 BlockNode *rb= lb+1;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2625 uint8_t *block[4];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2626 uint8_t tmp[src_stride*(b_h+5)]; //FIXME align
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2627 int x,y;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2628
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2629 if(b_x<0){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2630 lt= rt;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2631 lb= rb;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2632 }else if(b_x + 1 >= b_width){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2633 rt= lt;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2634 rb= lb;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2635 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2636 if(b_y<0){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2637 lt= lb;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2638 rt= rb;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2639 }else if(b_y + 1 >= b_height){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2640 lb= lt;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2641 rb= rt;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2642 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2643
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2644 if(src_x<0){ //FIXME merge with prev & always round internal width upto *16
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2645 obmc -= src_x;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2646 b_w += src_x;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2647 src_x=0;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2648 }else if(src_x + b_w > w){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2649 b_w = w - src_x;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2650 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2651 if(src_y<0){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2652 obmc -= src_y*obmc_stride;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2653 b_h += src_y;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2654 src_y=0;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2655 }else if(src_y + b_h> h){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2656 b_h = h - src_y;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2657 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2658
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2659 if(b_w<=0 || b_h<=0) return;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2660
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2661 assert(src_stride > 7*MB_SIZE);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2662 dst += src_x + src_y*dst_stride;
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2663 dst8+= src_x + src_y*src_stride;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2664 // src += src_x + src_y*src_stride;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2665
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2666 block[0]= tmp+3*MB_SIZE;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2667 pred_block(s, block[0], src, tmp, src_stride, src_x, src_y, b_w, b_h, lt, plane_index, w, h);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2668
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2669 if(same_block(lt, rt)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2670 block[1]= block[0];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2671 }else{
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2672 block[1]= tmp + 4*MB_SIZE;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2673 pred_block(s, block[1], src, tmp, src_stride, src_x, src_y, b_w, b_h, rt, plane_index, w, h);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2674 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2675
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2676 if(same_block(lt, lb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2677 block[2]= block[0];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2678 }else if(same_block(rt, lb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2679 block[2]= block[1];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2680 }else{
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2681 block[2]= tmp+5*MB_SIZE;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2682 pred_block(s, block[2], src, tmp, src_stride, src_x, src_y, b_w, b_h, lb, plane_index, w, h);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2683 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2684
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2685 if(same_block(lt, rb) ){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2686 block[3]= block[0];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2687 }else if(same_block(rt, rb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2688 block[3]= block[1];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2689 }else if(same_block(lb, rb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2690 block[3]= block[2];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2691 }else{
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2692 block[3]= tmp+6*MB_SIZE;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2693 pred_block(s, block[3], src, tmp, src_stride, src_x, src_y, b_w, b_h, rb, plane_index, w, h);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2694 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2695 #if 0
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2696 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2697 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2698 int v= obmc [x + y*obmc_stride] * block[3][x + y*src_stride] * (256/OBMC_MAX);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2699 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2700 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2701 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2702 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2703 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2704 uint8_t *obmc2= obmc + (obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2705 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2706 int v= obmc2[x + y*obmc_stride] * block[2][x + y*src_stride] * (256/OBMC_MAX);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2707 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2708 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2709 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2710 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2711 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2712 uint8_t *obmc3= obmc + obmc_stride*(obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2713 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2714 int v= obmc3[x + y*obmc_stride] * block[1][x + y*src_stride] * (256/OBMC_MAX);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2715 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2716 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2717 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2718 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2719 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2720 uint8_t *obmc3= obmc + obmc_stride*(obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2721 uint8_t *obmc4= obmc3+ (obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2722 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2723 int v= obmc4[x + y*obmc_stride] * block[0][x + y*src_stride] * (256/OBMC_MAX);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2724 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2725 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2726 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2727 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2728 #else
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2729 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2730 //FIXME ugly missue of obmc_stride
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2731 uint8_t *obmc1= obmc + y*obmc_stride;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2732 uint8_t *obmc2= obmc1+ (obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2733 uint8_t *obmc3= obmc1+ obmc_stride*(obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2734 uint8_t *obmc4= obmc3+ (obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2735 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2736 int v= obmc1[x] * block[3][x + y*src_stride]
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2737 +obmc2[x] * block[2][x + y*src_stride]
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2738 +obmc3[x] * block[1][x + y*src_stride]
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2739 +obmc4[x] * block[0][x + y*src_stride];
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2740
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2741 v <<= 8 - LOG2_OBMC_MAX;
2246
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
2742 if(FRAC_BITS != 8){
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
2743 v += 1<<(7 - FRAC_BITS);
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
2744 v >>= 8 - FRAC_BITS;
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
2745 }
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2746 if(add){
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2747 v += dst[x + y*dst_stride];
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2748 v = (v + (1<<(FRAC_BITS-1))) >> FRAC_BITS;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2749 if(v&(~255)) v= ~(v>>31);
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2750 dst8[x + y*src_stride] = v;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2751 }else{
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2752 dst[x + y*dst_stride] -= v;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2753 }
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2754 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2755 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2756 #endif
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2757 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2758
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2759 static always_inline void predict_slice_buffered(SnowContext *s, slice_buffer * sb, DWTELEM * old_buffer, int plane_index, int add, int mb_y){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2760 Plane *p= &s->plane[plane_index];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2761 const int mb_w= s->b_width << s->block_max_depth;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2762 const int mb_h= s->b_height << s->block_max_depth;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2763 int x, y, mb_x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2764 int block_size = MB_SIZE >> s->block_max_depth;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2765 int block_w = plane_index ? block_size/2 : block_size;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2766 const uint8_t *obmc = plane_index ? obmc_tab[s->block_max_depth+1] : obmc_tab[s->block_max_depth];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2767 int obmc_stride= plane_index ? block_size : 2*block_size;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2768 int ref_stride= s->current_picture.linesize[plane_index];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2769 uint8_t *ref = s->last_picture.data[plane_index];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2770 uint8_t *dst8= s->current_picture.data[plane_index];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2771 int w= p->width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2772 int h= p->height;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2773 START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2774
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2775 if(s->keyframe || (s->avctx->debug&512)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2776 if(mb_y==mb_h)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2777 return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2778
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2779 if(add){
2604
b7e6c3d31c65 Snow segfault bug in revision 1.43 patch by (Yartrebo /yartrebo earthlink net/)
michael
parents: 2602
diff changeset
2780 for(y=block_w*mb_y; y<FFMIN(h,block_w*(mb_y+1)); y++)
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2781 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2782 // DWTELEM * line = slice_buffer_get_line(sb, y);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2783 DWTELEM * line = sb->line[y];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2784 for(x=0; x<w; x++)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2785 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2786 // int v= buf[x + y*w] + (128<<FRAC_BITS) + (1<<(FRAC_BITS-1));
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2787 int v= line[x] + (128<<FRAC_BITS) + (1<<(FRAC_BITS-1));
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2788 v >>= FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2789 if(v&(~255)) v= ~(v>>31);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2790 dst8[x + y*ref_stride]= v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2791 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2792 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2793 }else{
2604
b7e6c3d31c65 Snow segfault bug in revision 1.43 patch by (Yartrebo /yartrebo earthlink net/)
michael
parents: 2602
diff changeset
2794 for(y=block_w*mb_y; y<FFMIN(h,block_w*(mb_y+1)); y++)
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2795 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2796 // DWTELEM * line = slice_buffer_get_line(sb, y);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2797 DWTELEM * line = sb->line[y];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2798 for(x=0; x<w; x++)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2799 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2800 line[x] -= 128 << FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2801 // buf[x + y*w]-= 128<<FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2802 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2803 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2804 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2805
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2806 return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2807 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2808
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2809 for(mb_x=0; mb_x<=mb_w; mb_x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2810 START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2811
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2812 add_yblock_buffered(s, sb, old_buffer, dst8, ref, obmc,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2813 block_w*mb_x - block_w/2,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2814 block_w*mb_y - block_w/2,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2815 block_w, block_w,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2816 w, h,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2817 w, ref_stride, obmc_stride,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2818 mb_x - 1, mb_y - 1,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2819 add, plane_index);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2820
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2821 STOP_TIMER("add_yblock")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2822 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2823
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2824 STOP_TIMER("predict_slice")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2825 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2826
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2827 static always_inline void predict_slice(SnowContext *s, DWTELEM *buf, int plane_index, int add, int mb_y){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2828 Plane *p= &s->plane[plane_index];
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2829 const int mb_w= s->b_width << s->block_max_depth;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2830 const int mb_h= s->b_height << s->block_max_depth;
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2831 int x, y, mb_x;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2832 int block_size = MB_SIZE >> s->block_max_depth;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2833 int block_w = plane_index ? block_size/2 : block_size;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2834 const uint8_t *obmc = plane_index ? obmc_tab[s->block_max_depth+1] : obmc_tab[s->block_max_depth];
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2835 int obmc_stride= plane_index ? block_size : 2*block_size;
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2836 int ref_stride= s->current_picture.linesize[plane_index];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2837 uint8_t *ref = s->last_picture.data[plane_index];
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2838 uint8_t *dst8= s->current_picture.data[plane_index];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2839 int w= p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2840 int h= p->height;
2197
michael
parents: 2195
diff changeset
2841 START_TIMER
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2842
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2843 if(s->keyframe || (s->avctx->debug&512)){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2844 if(mb_y==mb_h)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2845 return;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2846
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2847 if(add){
2604
b7e6c3d31c65 Snow segfault bug in revision 1.43 patch by (Yartrebo /yartrebo earthlink net/)
michael
parents: 2602
diff changeset
2848 for(y=block_w*mb_y; y<FFMIN(h,block_w*(mb_y+1)); y++){
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2849 for(x=0; x<w; x++){
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2850 int v= buf[x + y*w] + (128<<FRAC_BITS) + (1<<(FRAC_BITS-1));
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2851 v >>= FRAC_BITS;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2852 if(v&(~255)) v= ~(v>>31);
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2853 dst8[x + y*ref_stride]= v;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2854 }
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2855 }
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2856 }else{
2604
b7e6c3d31c65 Snow segfault bug in revision 1.43 patch by (Yartrebo /yartrebo earthlink net/)
michael
parents: 2602
diff changeset
2857 for(y=block_w*mb_y; y<FFMIN(h,block_w*(mb_y+1)); y++){
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2858 for(x=0; x<w; x++){
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2859 buf[x + y*w]-= 128<<FRAC_BITS;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2860 }
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2861 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2862 }
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2863
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2864 return;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2865 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2866
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2867 for(mb_x=0; mb_x<=mb_w; mb_x++){
2197
michael
parents: 2195
diff changeset
2868 START_TIMER
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2869
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2870 add_yblock(s, buf, dst8, ref, obmc,
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2871 block_w*mb_x - block_w/2,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2872 block_w*mb_y - block_w/2,
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2873 block_w, block_w,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2874 w, h,
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2875 w, ref_stride, obmc_stride,
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2876 mb_x - 1, mb_y - 1,
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2877 add, plane_index);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2878
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2879 STOP_TIMER("add_yblock")
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2880 }
2197
michael
parents: 2195
diff changeset
2881
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2882 STOP_TIMER("predict_slice")
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2883 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2884
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2885 static always_inline void predict_plane(SnowContext *s, DWTELEM *buf, int plane_index, int add){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2886 const int mb_h= s->b_height << s->block_max_depth;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2887 int mb_y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2888 for(mb_y=0; mb_y<=mb_h; mb_y++)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2889 predict_slice(s, buf, plane_index, add, mb_y);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2890 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2891
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2892 static void quantize(SnowContext *s, SubBand *b, DWTELEM *src, int stride, int bias){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2893 const int level= b->level;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2894 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2895 const int h= b->height;
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
2896 const int qlog= clip(s->qlog + b->qlog, 0, QROOT*16);
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
2897 const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2898 int x,y, thres1, thres2;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2899 START_TIMER
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2900
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
2901 if(s->qlog == LOSSLESS_QLOG) return;
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
2902
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2903 bias= bias ? 0 : (3*qmul)>>3;
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2904 thres1= ((qmul - bias)>>QEXPSHIFT) - 1;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2905 thres2= 2*thres1;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2906
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2907 if(!bias){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2908 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2909 for(x=0; x<w; x++){
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2910 int i= src[x + y*stride];
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2911
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2912 if((unsigned)(i+thres1) > thres2){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2913 if(i>=0){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2914 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2915 i/= qmul; //FIXME optimize
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2916 src[x + y*stride]= i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2917 }else{
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2918 i= -i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2919 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2920 i/= qmul; //FIXME optimize
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2921 src[x + y*stride]= -i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2922 }
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2923 }else
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2924 src[x + y*stride]= 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2925 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2926 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2927 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2928 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2929 for(x=0; x<w; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2930 int i= src[x + y*stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2931
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2932 if((unsigned)(i+thres1) > thres2){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2933 if(i>=0){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2934 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2935 i= (i + bias) / qmul; //FIXME optimize
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2936 src[x + y*stride]= i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2937 }else{
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2938 i= -i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2939 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2940 i= (i + bias) / qmul; //FIXME optimize
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2941 src[x + y*stride]= -i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2942 }
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2943 }else
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2944 src[x + y*stride]= 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2945 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2946 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2947 }
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2948 if(level+1 == s->spatial_decomposition_count){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2949 // STOP_TIMER("quantize")
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2950 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2951 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2952
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
2953 static void dequantize_slice_buffered(SnowContext *s, slice_buffer * sb, SubBand *b, DWTELEM *src, int stride, int start_y, int end_y){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2954 const int w= b->width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2955 const int h= b->height;
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
2956 const int qlog= clip(s->qlog + b->qlog, 0, QROOT*16);
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
2957 const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2958 const int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2959 int x,y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2960 START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2961
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2962 if(s->qlog == LOSSLESS_QLOG) return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2963
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
2964 for(y=start_y; y<end_y; y++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2965 // DWTELEM * line = slice_buffer_get_line_from_address(sb, src + (y * stride));
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2966 DWTELEM * line = slice_buffer_get_line(sb, (y * b->stride_line) + b->buf_y_offset) + b->buf_x_offset;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2967 for(x=0; x<w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2968 int i= line[x];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2969 if(i<0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2970 line[x]= -((-i*qmul + qadd)>>(QEXPSHIFT)); //FIXME try different bias
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2971 }else if(i>0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2972 line[x]= (( i*qmul + qadd)>>(QEXPSHIFT));
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2973 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2974 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2975 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2976 if(w > 200 /*level+1 == s->spatial_decomposition_count*/){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2977 STOP_TIMER("dquant")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2978 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2979 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2980
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2981 static void dequantize(SnowContext *s, SubBand *b, DWTELEM *src, int stride){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2982 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2983 const int h= b->height;
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
2984 const int qlog= clip(s->qlog + b->qlog, 0, QROOT*16);
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
2985 const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2986 const int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2987 int x,y;
2195
df3079d7806f merge decode_subband() and dequantize()
michael
parents: 2194
diff changeset
2988 START_TIMER
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2989
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
2990 if(s->qlog == LOSSLESS_QLOG) return;
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
2991
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2992 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2993 for(x=0; x<w; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2994 int i= src[x + y*stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2995 if(i<0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2996 src[x + y*stride]= -((-i*qmul + qadd)>>(QEXPSHIFT)); //FIXME try different bias
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2997 }else if(i>0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2998 src[x + y*stride]= (( i*qmul + qadd)>>(QEXPSHIFT));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2999 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3000 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3001 }
2195
df3079d7806f merge decode_subband() and dequantize()
michael
parents: 2194
diff changeset
3002 if(w > 200 /*level+1 == s->spatial_decomposition_count*/){
df3079d7806f merge decode_subband() and dequantize()
michael
parents: 2194
diff changeset
3003 STOP_TIMER("dquant")
df3079d7806f merge decode_subband() and dequantize()
michael
parents: 2194
diff changeset
3004 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3005 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3006
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3007 static void decorrelate(SnowContext *s, SubBand *b, DWTELEM *src, int stride, int inverse, int use_median){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3008 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3009 const int h= b->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3010 int x,y;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3011
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3012 for(y=h-1; y>=0; y--){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3013 for(x=w-1; x>=0; x--){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3014 int i= x + y*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3015
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3016 if(x){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3017 if(use_median){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3018 if(y && x+1<w) src[i] -= mid_pred(src[i - 1], src[i - stride], src[i - stride + 1]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3019 else src[i] -= src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3020 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3021 if(y) src[i] -= mid_pred(src[i - 1], src[i - stride], src[i - 1] + src[i - stride] - src[i - 1 - stride]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3022 else src[i] -= src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3023 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3024 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3025 if(y) src[i] -= src[i - stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3026 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3027 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3028 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3029 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3030
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3031 static void correlate_slice_buffered(SnowContext *s, slice_buffer * sb, SubBand *b, DWTELEM *src, int stride, int inverse, int use_median, int start_y, int end_y){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3032 const int w= b->width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3033 const int h= b->height;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3034 int x,y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3035
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3036 // START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3037
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3038 DWTELEM * line;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3039 DWTELEM * prev;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3040
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3041 if (start_y != 0)
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3042 line = slice_buffer_get_line(sb, ((start_y - 1) * b->stride_line) + b->buf_y_offset) + b->buf_x_offset;
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3043
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3044 for(y=start_y; y<end_y; y++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3045 prev = line;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3046 // line = slice_buffer_get_line_from_address(sb, src + (y * stride));
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3047 line = slice_buffer_get_line(sb, (y * b->stride_line) + b->buf_y_offset) + b->buf_x_offset;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3048 for(x=0; x<w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3049 if(x){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3050 if(use_median){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3051 if(y && x+1<w) line[x] += mid_pred(line[x - 1], prev[x], prev[x + 1]);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3052 else line[x] += line[x - 1];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3053 }else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3054 if(y) line[x] += mid_pred(line[x - 1], prev[x], line[x - 1] + prev[x] - prev[x - 1]);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3055 else line[x] += line[x - 1];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3056 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3057 }else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3058 if(y) line[x] += prev[x];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3059 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3060 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3061 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3062
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3063 // STOP_TIMER("correlate")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3064 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3065
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3066 static void correlate(SnowContext *s, SubBand *b, DWTELEM *src, int stride, int inverse, int use_median){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3067 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3068 const int h= b->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3069 int x,y;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3070
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3071 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3072 for(x=0; x<w; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3073 int i= x + y*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3074
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3075 if(x){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3076 if(use_median){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3077 if(y && x+1<w) src[i] += mid_pred(src[i - 1], src[i - stride], src[i - stride + 1]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3078 else src[i] += src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3079 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3080 if(y) src[i] += mid_pred(src[i - 1], src[i - stride], src[i - 1] + src[i - stride] - src[i - 1 - stride]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3081 else src[i] += src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3082 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3083 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3084 if(y) src[i] += src[i - stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3085 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3086 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3087 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3088 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3089
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3090 static void encode_header(SnowContext *s){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3091 int plane_index, level, orientation;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3092 uint8_t kstate[32];
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3093
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3094 memset(kstate, MID_STATE, sizeof(kstate));
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3095
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3096 put_rac(&s->c, kstate, s->keyframe);
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
3097 if(s->keyframe || s->always_reset)
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
3098 reset_contexts(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3099 if(s->keyframe){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3100 put_symbol(&s->c, s->header_state, s->version, 0);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3101 put_rac(&s->c, s->header_state, s->always_reset);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3102 put_symbol(&s->c, s->header_state, s->temporal_decomposition_type, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3103 put_symbol(&s->c, s->header_state, s->temporal_decomposition_count, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3104 put_symbol(&s->c, s->header_state, s->spatial_decomposition_count, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3105 put_symbol(&s->c, s->header_state, s->colorspace_type, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3106 put_symbol(&s->c, s->header_state, s->chroma_h_shift, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3107 put_symbol(&s->c, s->header_state, s->chroma_v_shift, 0);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3108 put_rac(&s->c, s->header_state, s->spatial_scalability);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3109 // put_rac(&s->c, s->header_state, s->rate_scalability);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3110
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3111 for(plane_index=0; plane_index<2; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3112 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3113 for(orientation=level ? 1:0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3114 if(orientation==2) continue;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3115 put_symbol(&s->c, s->header_state, s->plane[plane_index].band[level][orientation].qlog, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3116 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3117 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3118 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3119 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3120 put_symbol(&s->c, s->header_state, s->spatial_decomposition_type, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3121 put_symbol(&s->c, s->header_state, s->qlog, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3122 put_symbol(&s->c, s->header_state, s->mv_scale, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3123 put_symbol(&s->c, s->header_state, s->qbias, 1);
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3124 put_symbol(&s->c, s->header_state, s->block_max_depth, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3125 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3126
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3127 static int decode_header(SnowContext *s){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3128 int plane_index, level, orientation;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3129 uint8_t kstate[32];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3130
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3131 memset(kstate, MID_STATE, sizeof(kstate));
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3132
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3133 s->keyframe= get_rac(&s->c, kstate);
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
3134 if(s->keyframe || s->always_reset)
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
3135 reset_contexts(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3136 if(s->keyframe){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3137 s->version= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3138 if(s->version>0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3139 av_log(s->avctx, AV_LOG_ERROR, "version %d not supported", s->version);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3140 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3141 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3142 s->always_reset= get_rac(&s->c, s->header_state);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3143 s->temporal_decomposition_type= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3144 s->temporal_decomposition_count= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3145 s->spatial_decomposition_count= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3146 s->colorspace_type= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3147 s->chroma_h_shift= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3148 s->chroma_v_shift= get_symbol(&s->c, s->header_state, 0);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3149 s->spatial_scalability= get_rac(&s->c, s->header_state);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3150 // s->rate_scalability= get_rac(&s->c, s->header_state);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3151
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3152 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3153 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3154 for(orientation=level ? 1:0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3155 int q;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3156 if (plane_index==2) q= s->plane[1].band[level][orientation].qlog;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3157 else if(orientation==2) q= s->plane[plane_index].band[level][1].qlog;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3158 else q= get_symbol(&s->c, s->header_state, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3159 s->plane[plane_index].band[level][orientation].qlog= q;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3160 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3161 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3162 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3163 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3164
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3165 s->spatial_decomposition_type= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3166 if(s->spatial_decomposition_type > 2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3167 av_log(s->avctx, AV_LOG_ERROR, "spatial_decomposition_type %d not supported", s->spatial_decomposition_type);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3168 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3169 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3170
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3171 s->qlog= get_symbol(&s->c, s->header_state, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3172 s->mv_scale= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3173 s->qbias= get_symbol(&s->c, s->header_state, 1);
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3174 s->block_max_depth= get_symbol(&s->c, s->header_state, 0);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3175
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3176 return 0;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3177 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3178
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3179 static void init_qexp(){
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3180 int i;
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3181 double v=128;
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3182
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3183 for(i=0; i<QROOT; i++){
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3184 qexp[i]= lrintf(v);
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3185 v *= pow(2, 1.0 / QROOT);
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3186 }
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3187 }
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3188
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3189 static int common_init(AVCodecContext *avctx){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3190 SnowContext *s = avctx->priv_data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3191 int width, height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3192 int level, orientation, plane_index, dec;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3193
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3194 s->avctx= avctx;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3195
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3196 dsputil_init(&s->dsp, avctx);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3197
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3198 #define mcf(dx,dy)\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3199 s->dsp.put_qpel_pixels_tab [0][dy+dx/4]=\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3200 s->dsp.put_no_rnd_qpel_pixels_tab[0][dy+dx/4]=\
2224
11d54cb7ac4e 100l (forgot to set the 8x8 mc functions, so ME did use the mpeg ones ...)
michael
parents: 2223
diff changeset
3201 s->dsp.put_h264_qpel_pixels_tab[0][dy+dx/4];\
11d54cb7ac4e 100l (forgot to set the 8x8 mc functions, so ME did use the mpeg ones ...)
michael
parents: 2223
diff changeset
3202 s->dsp.put_qpel_pixels_tab [1][dy+dx/4]=\
11d54cb7ac4e 100l (forgot to set the 8x8 mc functions, so ME did use the mpeg ones ...)
michael
parents: 2223
diff changeset
3203 s->dsp.put_no_rnd_qpel_pixels_tab[1][dy+dx/4]=\
11d54cb7ac4e 100l (forgot to set the 8x8 mc functions, so ME did use the mpeg ones ...)
michael
parents: 2223
diff changeset
3204 s->dsp.put_h264_qpel_pixels_tab[1][dy+dx/4];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3205
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3206 mcf( 0, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3207 mcf( 4, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3208 mcf( 8, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3209 mcf(12, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3210 mcf( 0, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3211 mcf( 4, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3212 mcf( 8, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3213 mcf(12, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3214 mcf( 0, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3215 mcf( 4, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3216 mcf( 8, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3217 mcf(12, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3218 mcf( 0,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3219 mcf( 4,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3220 mcf( 8,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3221 mcf(12,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3222
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3223 #define mcfh(dx,dy)\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3224 s->dsp.put_pixels_tab [0][dy/4+dx/8]=\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3225 s->dsp.put_no_rnd_pixels_tab[0][dy/4+dx/8]=\
2224
11d54cb7ac4e 100l (forgot to set the 8x8 mc functions, so ME did use the mpeg ones ...)
michael
parents: 2223
diff changeset
3226 mc_block_hpel ## dx ## dy ## 16;\
11d54cb7ac4e 100l (forgot to set the 8x8 mc functions, so ME did use the mpeg ones ...)
michael
parents: 2223
diff changeset
3227 s->dsp.put_pixels_tab [1][dy/4+dx/8]=\
11d54cb7ac4e 100l (forgot to set the 8x8 mc functions, so ME did use the mpeg ones ...)
michael
parents: 2223
diff changeset
3228 s->dsp.put_no_rnd_pixels_tab[1][dy/4+dx/8]=\
11d54cb7ac4e 100l (forgot to set the 8x8 mc functions, so ME did use the mpeg ones ...)
michael
parents: 2223
diff changeset
3229 mc_block_hpel ## dx ## dy ## 8;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3230
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3231 mcfh(0, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3232 mcfh(8, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3233 mcfh(0, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3234 mcfh(8, 8)
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3235
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3236 if(!qexp[0])
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3237 init_qexp();
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3238
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3239 dec= s->spatial_decomposition_count= 5;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3240 s->spatial_decomposition_type= avctx->prediction_method; //FIXME add decorrelator type r transform_type
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3241
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3242 s->chroma_h_shift= 1; //FIXME XXX
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3243 s->chroma_v_shift= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3244
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3245 // dec += FFMAX(s->chroma_h_shift, s->chroma_v_shift);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3246
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3247 width= s->avctx->width;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3248 height= s->avctx->height;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3249
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3250 s->spatial_dwt_buffer= av_mallocz(width*height*sizeof(DWTELEM));
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3251
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3252 s->mv_scale= (s->avctx->flags & CODEC_FLAG_QPEL) ? 2 : 4;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3253 s->block_max_depth= (s->avctx->flags & CODEC_FLAG_4MV) ? 1 : 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3254
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3255 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3256 int w= s->avctx->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3257 int h= s->avctx->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3258
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3259 if(plane_index){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3260 w>>= s->chroma_h_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3261 h>>= s->chroma_v_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3262 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3263 s->plane[plane_index].width = w;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3264 s->plane[plane_index].height= h;
2160
11e1425b3a66 cleanup
michael
parents: 2159
diff changeset
3265 //av_log(NULL, AV_LOG_DEBUG, "%d %d\n", w, h);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3266 for(level=s->spatial_decomposition_count-1; level>=0; level--){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3267 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3268 SubBand *b= &s->plane[plane_index].band[level][orientation];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3269
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3270 b->buf= s->spatial_dwt_buffer;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3271 b->level= level;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3272 b->stride= s->plane[plane_index].width << (s->spatial_decomposition_count - level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3273 b->width = (w + !(orientation&1))>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3274 b->height= (h + !(orientation>1))>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3275
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3276 b->stride_line = 1 << (s->spatial_decomposition_count - level);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3277 b->buf_x_offset = 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3278 b->buf_y_offset = 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3279
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3280 if(orientation&1){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3281 b->buf += (w+1)>>1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3282 b->buf_x_offset = (w+1)>>1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3283 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3284 if(orientation>1){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3285 b->buf += b->stride>>1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3286 b->buf_y_offset = b->stride_line >> 1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3287 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3288
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3289 if(level)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3290 b->parent= &s->plane[plane_index].band[level-1][orientation];
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3291 b->x_coeff=av_mallocz(((b->width+1) * b->height+1)*sizeof(x_and_coeff));
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3292 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3293 w= (w+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3294 h= (h+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3295 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3296 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3297
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3298 reset_contexts(s);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3299 /*
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3300 width= s->width= avctx->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3301 height= s->height= avctx->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3302
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3303 assert(width && height);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3304 */
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3305 s->avctx->get_buffer(s->avctx, &s->mconly_picture);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3306
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3307 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3308 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3309
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3310
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3311 static void calculate_vissual_weight(SnowContext *s, Plane *p){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3312 int width = p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3313 int height= p->height;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
3314 int level, orientation, x, y;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3315
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3316 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3317 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3318 SubBand *b= &p->band[level][orientation];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3319 DWTELEM *buf= b->buf;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3320 int64_t error=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3321
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3322 memset(s->spatial_dwt_buffer, 0, sizeof(int)*width*height);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3323 buf[b->width/2 + b->height/2*b->stride]= 256*256;
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3324 ff_spatial_idwt(s->spatial_dwt_buffer, width, height, width, s->spatial_decomposition_type, s->spatial_decomposition_count);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3325 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3326 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3327 int64_t d= s->spatial_dwt_buffer[x + y*width];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3328 error += d*d;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3329 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3330 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3331
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3332 b->qlog= (int)(log(352256.0/sqrt(error)) / log(pow(2.0, 1.0/QROOT))+0.5);
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3333 // av_log(NULL, AV_LOG_DEBUG, "%d %d %d\n", level, orientation, b->qlog/*, sqrt(error)*/);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3334 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3335 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3336 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3337
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3338 static int encode_init(AVCodecContext *avctx)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3339 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3340 SnowContext *s = avctx->priv_data;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
3341 int plane_index;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3342
2658
d1609cfeb1d0 #defines for strict_std_compliance and split between inofficial extensions and non standarized things
michael
parents: 2635
diff changeset
3343 if(avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL){
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2610
diff changeset
3344 av_log(avctx, AV_LOG_ERROR, "this codec is under development, files encoded with it may not be decodable with future versions!!!\n"
2658
d1609cfeb1d0 #defines for strict_std_compliance and split between inofficial extensions and non standarized things
michael
parents: 2635
diff changeset
3345 "use vstrict=-2 / -strict -2 to use it anyway\n");
2151
44c973bfec0f dont segfault without -strict -1
michael
parents: 2150
diff changeset
3346 return -1;
44c973bfec0f dont segfault without -strict -1
michael
parents: 2150
diff changeset
3347 }
44c973bfec0f dont segfault without -strict -1
michael
parents: 2150
diff changeset
3348
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3349 common_init(avctx);
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3350 alloc_blocks(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3351
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3352 s->version=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3353
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3354 s->m.avctx = avctx;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3355 s->m.flags = avctx->flags;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3356 s->m.bit_rate= avctx->bit_rate;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3357
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3358 s->m.me.scratchpad= av_mallocz((avctx->width+64)*2*16*2*sizeof(uint8_t));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3359 s->m.me.map = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3360 s->m.me.score_map = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3361 h263_encode_init(&s->m); //mv_penalty
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3362
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3363 if(avctx->flags&CODEC_FLAG_PASS1){
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3364 if(!avctx->stats_out)
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3365 avctx->stats_out = av_mallocz(256);
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3366 }
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3367 if(avctx->flags&CODEC_FLAG_PASS2){
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3368 if(ff_rate_control_init(&s->m) < 0)
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3369 return -1;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3370 }
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3371
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3372 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3373 calculate_vissual_weight(s, &s->plane[plane_index]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3374 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3375
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3376
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3377 avctx->coded_frame= &s->current_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3378 switch(avctx->pix_fmt){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3379 // case PIX_FMT_YUV444P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3380 // case PIX_FMT_YUV422P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3381 case PIX_FMT_YUV420P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3382 case PIX_FMT_GRAY8:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3383 // case PIX_FMT_YUV411P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3384 // case PIX_FMT_YUV410P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3385 s->colorspace_type= 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3386 break;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3387 /* case PIX_FMT_RGBA32:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3388 s->colorspace= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3389 break;*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3390 default:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3391 av_log(avctx, AV_LOG_ERROR, "format not supported\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3392 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3393 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3394 // avcodec_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_h_shift, &s->chroma_v_shift);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3395 s->chroma_h_shift= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3396 s->chroma_v_shift= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3397 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3398 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3399
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3400 static int frame_start(SnowContext *s){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3401 AVFrame tmp;
2187
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
3402 int w= s->avctx->width; //FIXME round up to x16 ?
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
3403 int h= s->avctx->height;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3404
2187
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
3405 if(s->current_picture.data[0]){
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
3406 draw_edges(s->current_picture.data[0], s->current_picture.linesize[0], w , h , EDGE_WIDTH );
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
3407 draw_edges(s->current_picture.data[1], s->current_picture.linesize[1], w>>1, h>>1, EDGE_WIDTH/2);
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
3408 draw_edges(s->current_picture.data[2], s->current_picture.linesize[2], w>>1, h>>1, EDGE_WIDTH/2);
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
3409 }
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
3410
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3411 tmp= s->last_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3412 s->last_picture= s->current_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3413 s->current_picture= tmp;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3414
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3415 s->current_picture.reference= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3416 if(s->avctx->get_buffer(s->avctx, &s->current_picture) < 0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3417 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3418 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3419 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3420
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3421 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3422 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3423
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3424 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3425 SnowContext *s = avctx->priv_data;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3426 RangeCoder * const c= &s->c;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3427 AVFrame *pict = data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3428 const int width= s->avctx->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3429 const int height= s->avctx->height;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
3430 int level, orientation, plane_index;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3431
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3432 ff_init_range_encoder(c, buf, buf_size);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3433 ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3434
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3435 s->input_picture = *pict;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3436
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3437 if(avctx->flags&CODEC_FLAG_PASS2){
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3438 s->m.pict_type =
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3439 pict->pict_type= s->m.rc_context.entry[avctx->frame_number].new_pict_type;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3440 s->keyframe= pict->pict_type==FF_I_TYPE;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3441 s->m.picture_number= avctx->frame_number;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3442 pict->quality= ff_rate_estimate_qscale(&s->m);
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3443 }else{
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3444 s->keyframe= avctx->gop_size==0 || avctx->frame_number % avctx->gop_size == 0;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3445 pict->pict_type= s->keyframe ? FF_I_TYPE : FF_P_TYPE;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3446 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3447
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3448 if(pict->quality){
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3449 s->qlog= rint(QROOT*log(pict->quality / (float)FF_QP2LAMBDA)/log(2));
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3450 //<64 >60
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3451 s->qlog += 61*QROOT/8;
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3452 }else{
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3453 s->qlog= LOSSLESS_QLOG;
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3454 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3455
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3456 frame_start(s);
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
3457 s->current_picture.key_frame= s->keyframe;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3458
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3459 s->m.current_picture_ptr= &s->m.current_picture;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3460 if(pict->pict_type == P_TYPE){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3461 int block_width = (width +15)>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3462 int block_height= (height+15)>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3463 int stride= s->current_picture.linesize[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3464
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3465 assert(s->current_picture.data[0]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3466 assert(s->last_picture.data[0]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3467
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3468 s->m.avctx= s->avctx;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3469 s->m.current_picture.data[0]= s->current_picture.data[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3470 s->m. last_picture.data[0]= s-> last_picture.data[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3471 s->m. new_picture.data[0]= s-> input_picture.data[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3472 s->m. last_picture_ptr= &s->m. last_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3473 s->m.linesize=
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3474 s->m. last_picture.linesize[0]=
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3475 s->m. new_picture.linesize[0]=
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3476 s->m.current_picture.linesize[0]= stride;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3477 s->m.uvlinesize= s->current_picture.linesize[1];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3478 s->m.width = width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3479 s->m.height= height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3480 s->m.mb_width = block_width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3481 s->m.mb_height= block_height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3482 s->m.mb_stride= s->m.mb_width+1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3483 s->m.b8_stride= 2*s->m.mb_width+1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3484 s->m.f_code=1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3485 s->m.pict_type= pict->pict_type;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3486 s->m.me_method= s->avctx->me_method;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3487 s->m.me.scene_change_score=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3488 s->m.flags= s->avctx->flags;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3489 s->m.quarter_sample= (s->avctx->flags & CODEC_FLAG_QPEL)!=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3490 s->m.out_format= FMT_H263;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3491 s->m.unrestricted_mv= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3492
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3493 s->lambda = s->m.lambda= pict->quality * 3/2; //FIXME bug somewhere else
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3494 s->m.qscale= (s->m.lambda*139 + FF_LAMBDA_SCALE*64) >> (FF_LAMBDA_SHIFT + 7);
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3495 s->lambda2= s->m.lambda2= (s->m.lambda*s->m.lambda + FF_LAMBDA_SCALE/2) >> FF_LAMBDA_SHIFT;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3496
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3497 s->m.dsp= s->dsp; //move
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3498 ff_init_me(&s->m);
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3499 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3500
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3501 redo_frame:
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3502
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3503 s->qbias= pict->pict_type == P_TYPE ? 2 : 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3504
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3505 encode_header(s);
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3506 s->m.misc_bits = 8*(s->c.bytestream - s->c.bytestream_start);
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3507 encode_blocks(s);
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3508 s->m.mv_bits = 8*(s->c.bytestream - s->c.bytestream_start) - s->m.misc_bits;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3509
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3510 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3511 Plane *p= &s->plane[plane_index];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3512 int w= p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3513 int h= p->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3514 int x, y;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
3515 // int bits= put_bits_count(&s->c.pb);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3516
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3517 //FIXME optimize
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3518 if(pict->data[plane_index]) //FIXME gray hack
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3519 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3520 for(x=0; x<w; x++){
2246
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
3521 s->spatial_dwt_buffer[y*w + x]= pict->data[plane_index][y*pict->linesize[plane_index] + x]<<FRAC_BITS;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3522 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3523 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3524 predict_plane(s, s->spatial_dwt_buffer, plane_index, 0);
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3525
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3526 if( plane_index==0
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3527 && pict->pict_type == P_TYPE
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3528 && s->m.me.scene_change_score > s->avctx->scenechange_threshold){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3529 ff_init_range_encoder(c, buf, buf_size);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3530 ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3531 pict->pict_type= FF_I_TYPE;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3532 s->keyframe=1;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3533 reset_contexts(s);
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3534 goto redo_frame;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3535 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3536
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3537 if(s->qlog == LOSSLESS_QLOG){
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3538 for(y=0; y<h; y++){
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3539 for(x=0; x<w; x++){
2595
6b385f3e07a3 fixing lossless snow
michael
parents: 2592
diff changeset
3540 s->spatial_dwt_buffer[y*w + x]= (s->spatial_dwt_buffer[y*w + x] + (1<<(FRAC_BITS-1))-1)>>FRAC_BITS;
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3541 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3542 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3543 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3544
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3545 ff_spatial_dwt(s->spatial_dwt_buffer, w, h, w, s->spatial_decomposition_type, s->spatial_decomposition_count);
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3546
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3547 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3548 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3549 SubBand *b= &p->band[level][orientation];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3550
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3551 quantize(s, b, b->buf, b->stride, s->qbias);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3552 if(orientation==0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3553 decorrelate(s, b, b->buf, b->stride, pict->pict_type == P_TYPE, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3554 encode_subband(s, b, b->buf, b->parent ? b->parent->buf : NULL, b->stride, orientation);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3555 assert(b->parent==NULL || b->parent->stride == b->stride*2);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3556 if(orientation==0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3557 correlate(s, b, b->buf, b->stride, 1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3558 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3559 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3560 // av_log(NULL, AV_LOG_DEBUG, "plane:%d bits:%d\n", plane_index, put_bits_count(&s->c.pb) - bits);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3561
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3562 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3563 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3564 SubBand *b= &p->band[level][orientation];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3565
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3566 dequantize(s, b, b->buf, b->stride);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3567 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3568 }
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3569
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3570 ff_spatial_idwt(s->spatial_dwt_buffer, w, h, w, s->spatial_decomposition_type, s->spatial_decomposition_count);
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3571 if(s->qlog == LOSSLESS_QLOG){
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3572 for(y=0; y<h; y++){
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3573 for(x=0; x<w; x++){
2246
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
3574 s->spatial_dwt_buffer[y*w + x]<<=FRAC_BITS;
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3575 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3576 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3577 }
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
3578 {START_TIMER
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3579 predict_plane(s, s->spatial_dwt_buffer, plane_index, 1);
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
3580 STOP_TIMER("pred-conv")}
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3581 if(s->avctx->flags&CODEC_FLAG_PSNR){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3582 int64_t error= 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3583
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3584 if(pict->data[plane_index]) //FIXME gray hack
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3585 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3586 for(x=0; x<w; x++){
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3587 int d= s->current_picture.data[plane_index][y*s->current_picture.linesize[plane_index] + x] - pict->data[plane_index][y*pict->linesize[plane_index] + x];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3588 error += d*d;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3589 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3590 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3591 s->avctx->error[plane_index] += error;
2232
960e3552e418 per picture psnr
michael
parents: 2224
diff changeset
3592 s->current_picture.error[plane_index] = error;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3593 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3594 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3595
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3596 if(s->last_picture.data[0])
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3597 avctx->release_buffer(avctx, &s->last_picture);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3598
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3599 s->current_picture.coded_picture_number = avctx->frame_number;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3600 s->current_picture.pict_type = pict->pict_type;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3601 s->current_picture.quality = pict->quality;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3602 if(avctx->flags&CODEC_FLAG_PASS1){
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3603 s->m.p_tex_bits = 8*(s->c.bytestream - s->c.bytestream_start) - s->m.misc_bits - s->m.mv_bits;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3604 s->m.current_picture.display_picture_number =
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3605 s->m.current_picture.coded_picture_number = avctx->frame_number;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3606 s->m.pict_type = pict->pict_type;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3607 s->m.current_picture.quality = pict->quality;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3608 ff_write_pass1_stats(&s->m);
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3609 }
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3610 if(avctx->flags&CODEC_FLAG_PASS2){
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3611 s->m.total_bits += 8*(s->c.bytestream - s->c.bytestream_start);
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3612 }
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3613
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3614 emms_c();
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3615
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3616 return ff_rac_terminate(c);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3617 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3618
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3619 static void common_end(SnowContext *s){
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
3620 int plane_index, level, orientation;
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
3621
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3622 av_freep(&s->spatial_dwt_buffer);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3623
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3624 av_freep(&s->m.me.scratchpad);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3625 av_freep(&s->m.me.map);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3626 av_freep(&s->m.me.score_map);
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3627
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3628 av_freep(&s->block);
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
3629
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
3630 for(plane_index=0; plane_index<3; plane_index++){
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
3631 for(level=s->spatial_decomposition_count-1; level>=0; level--){
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
3632 for(orientation=level ? 1 : 0; orientation<4; orientation++){
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
3633 SubBand *b= &s->plane[plane_index].band[level][orientation];
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
3634
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3635 av_freep(&b->x_coeff);
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
3636 }
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
3637 }
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
3638 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3639 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3640
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3641 static int encode_end(AVCodecContext *avctx)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3642 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3643 SnowContext *s = avctx->priv_data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3644
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3645 common_end(s);
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3646 av_free(avctx->stats_out);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3647
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3648 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3649 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3650
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3651 static int decode_init(AVCodecContext *avctx)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3652 {
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3653 SnowContext *s = avctx->priv_data;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3654 int block_size;
2635
eaa57c3336fc PIX_FMT_NONE and related fixes
michael
parents: 2634
diff changeset
3655
eaa57c3336fc PIX_FMT_NONE and related fixes
michael
parents: 2634
diff changeset
3656 avctx->pix_fmt= PIX_FMT_YUV420P;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3657
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3658 common_init(avctx);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3659
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3660 block_size = MB_SIZE >> s->block_max_depth;
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3661 slice_buffer_init(&s->sb, s->plane[0].height, (block_size) + (s->spatial_decomposition_count * (s->spatial_decomposition_count + 2)) + 1, s->plane[0].width, s->spatial_dwt_buffer);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3662
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3663 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3664 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3665
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3666 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3667 SnowContext *s = avctx->priv_data;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3668 RangeCoder * const c= &s->c;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3669 int bytes_read;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3670 AVFrame *picture = data;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
3671 int level, orientation, plane_index;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3672
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3673 ff_init_range_decoder(c, buf, buf_size);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3674 ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3675
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3676 s->current_picture.pict_type= FF_I_TYPE; //FIXME I vs. P
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3677 decode_header(s);
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3678 if(!s->block) alloc_blocks(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3679
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3680 frame_start(s);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3681 //keyframe flag dupliaction mess FIXME
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3682 if(avctx->debug&FF_DEBUG_PICT_INFO)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3683 av_log(avctx, AV_LOG_ERROR, "keyframe:%d qlog:%d\n", s->keyframe, s->qlog);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3684
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3685 decode_blocks(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3686
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3687 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3688 Plane *p= &s->plane[plane_index];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3689 int w= p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3690 int h= p->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3691 int x, y;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3692 int decode_state[MAX_DECOMPOSITIONS][4][1]; /* Stored state info for unpack_coeffs. 1 variable per instance. */
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3693
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3694 if(s->avctx->debug&2048){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3695 memset(s->spatial_dwt_buffer, 0, sizeof(DWTELEM)*w*h);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3696 predict_plane(s, s->spatial_dwt_buffer, plane_index, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3697
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3698 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3699 for(x=0; x<w; x++){
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
3700 int v= s->current_picture.data[plane_index][y*s->current_picture.linesize[plane_index] + x];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3701 s->mconly_picture.data[plane_index][y*s->mconly_picture.linesize[plane_index] + x]= v;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3702 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3703 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3704 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3705
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3706 { START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3707 for(level=0; level<s->spatial_decomposition_count; level++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3708 for(orientation=level ? 1 : 0; orientation<4; orientation++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3709 SubBand *b= &p->band[level][orientation];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3710 unpack_coeffs(s, b, b->parent, orientation);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3711 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3712 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3713 STOP_TIMER("unpack coeffs");
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3714 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3715
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3716 {START_TIMER
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3717 const int mb_h= s->b_height << s->block_max_depth;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3718 const int block_size = MB_SIZE >> s->block_max_depth;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3719 const int block_w = plane_index ? block_size/2 : block_size;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3720 int mb_y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3721 dwt_compose_t cs[MAX_DECOMPOSITIONS];
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3722 int yd=0, yq=0;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3723 int y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3724 int end_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3725
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3726 ff_spatial_idwt_buffered_init(cs, &s->sb, w, h, 1, s->spatial_decomposition_type, s->spatial_decomposition_count);
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3727 for(mb_y=0; mb_y<=mb_h; mb_y++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3728
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3729 int slice_starty = block_w*mb_y;
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3730 int slice_h = block_w*(mb_y+1);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3731 if (!(s->keyframe || s->avctx->debug&512)){
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3732 slice_starty = FFMAX(0, slice_starty - (block_w >> 1));
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3733 slice_h -= (block_w >> 1);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3734 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3735
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3736 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3737 START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3738 for(level=0; level<s->spatial_decomposition_count; level++){
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3739 for(orientation=level ? 1 : 0; orientation<4; orientation++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3740 SubBand *b= &p->band[level][orientation];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3741 int start_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3742 int end_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3743 int our_mb_start = mb_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3744 int our_mb_end = (mb_y + 1);
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3745 start_y = (mb_y ? ((block_w * our_mb_start) >> (s->spatial_decomposition_count - level)) + s->spatial_decomposition_count - level + 2: 0);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3746 end_y = (((block_w * our_mb_end) >> (s->spatial_decomposition_count - level)) + s->spatial_decomposition_count - level + 2);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3747 if (!(s->keyframe || s->avctx->debug&512)){
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3748 start_y = FFMAX(0, start_y - (block_w >> (1+s->spatial_decomposition_count - level)));
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3749 end_y = FFMAX(0, end_y - (block_w >> (1+s->spatial_decomposition_count - level)));
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3750 }
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3751 start_y = FFMIN(b->height, start_y);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3752 end_y = FFMIN(b->height, end_y);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3753
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3754 if (start_y != end_y){
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3755 if (orientation == 0){
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3756 SubBand * correlate_band = &p->band[0][0];
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3757 int correlate_end_y = FFMIN(b->height, end_y + 1);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3758 int correlate_start_y = FFMIN(b->height, (start_y ? start_y + 1 : 0));
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3759 decode_subband_slice_buffered(s, correlate_band, &s->sb, correlate_start_y, correlate_end_y, decode_state[0][0]);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3760 correlate_slice_buffered(s, &s->sb, correlate_band, correlate_band->buf, correlate_band->stride, 1, 0, correlate_start_y, correlate_end_y);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3761 dequantize_slice_buffered(s, &s->sb, correlate_band, correlate_band->buf, correlate_band->stride, start_y, end_y);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3762 }
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3763 else
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3764 decode_subband_slice_buffered(s, b, &s->sb, start_y, end_y, decode_state[level][orientation]);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3765 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3766 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3767 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3768 STOP_TIMER("decode_subband_slice");
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3769 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3770
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3771 { START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3772 for(; yd<slice_h; yd+=4){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3773 ff_spatial_idwt_buffered_slice(cs, &s->sb, w, h, 1, s->spatial_decomposition_type, s->spatial_decomposition_count, yd);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3774 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3775 STOP_TIMER("idwt slice");}
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3776
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3777
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3778 if(s->qlog == LOSSLESS_QLOG){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3779 for(; yq<slice_h && yq<h; yq++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3780 DWTELEM * line = slice_buffer_get_line(&s->sb, yq);
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3781 for(x=0; x<w; x++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3782 line[x] <<= FRAC_BITS;
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3783 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3784 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3785 }
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3786
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3787 predict_slice_buffered(s, &s->sb, s->spatial_dwt_buffer, plane_index, 1, mb_y);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3788
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3789 y = FFMIN(p->height, slice_starty);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3790 end_y = FFMIN(p->height, slice_h);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3791 while(y < end_y)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3792 slice_buffer_release(&s->sb, y++);
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3793 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3794
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3795 slice_buffer_flush(&s->sb);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3796
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3797 STOP_TIMER("idwt + predict_slices")}
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3798 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3799
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3800 emms_c();
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3801
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3802 if(s->last_picture.data[0])
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3803 avctx->release_buffer(avctx, &s->last_picture);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3804
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3805 if(!(s->avctx->debug&2048))
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3806 *picture= s->current_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3807 else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3808 *picture= s->mconly_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3809
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3810 *data_size = sizeof(AVFrame);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3811
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3812 bytes_read= c->bytestream - c->bytestream_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3813 if(bytes_read ==0) av_log(s->avctx, AV_LOG_ERROR, "error at end of frame\n"); //FIXME
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3814
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3815 return bytes_read;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3816 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3817
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3818 static int decode_end(AVCodecContext *avctx)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3819 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3820 SnowContext *s = avctx->priv_data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3821
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3822 slice_buffer_destroy(&s->sb);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3823
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3824 common_end(s);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3825
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3826 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3827 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3828
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3829 AVCodec snow_decoder = {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3830 "snow",
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3831 CODEC_TYPE_VIDEO,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3832 CODEC_ID_SNOW,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3833 sizeof(SnowContext),
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3834 decode_init,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3835 NULL,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3836 decode_end,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3837 decode_frame,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3838 0 /*CODEC_CAP_DR1*/ /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3839 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3840 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3841
2408
a6e4da1c28ee Disable encoders patch by (Gianluigi Tiesi <mplayer netfarm it>)
michael
parents: 2368
diff changeset
3842 #ifdef CONFIG_ENCODERS
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3843 AVCodec snow_encoder = {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3844 "snow",
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3845 CODEC_TYPE_VIDEO,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3846 CODEC_ID_SNOW,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3847 sizeof(SnowContext),
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3848 encode_init,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3849 encode_frame,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3850 encode_end,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3851 };
2408
a6e4da1c28ee Disable encoders patch by (Gianluigi Tiesi <mplayer netfarm it>)
michael
parents: 2368
diff changeset
3852 #endif
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3853
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3854
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3855 #if 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3856 #undef malloc
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3857 #undef free
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3858 #undef printf
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3859
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3860 int main(){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3861 int width=256;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3862 int height=256;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3863 int buffer[2][width*height];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3864 SnowContext s;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3865 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3866 s.spatial_decomposition_count=6;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3867 s.spatial_decomposition_type=1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3868
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3869 printf("testing 5/3 DWT\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3870 for(i=0; i<width*height; i++)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3871 buffer[0][i]= buffer[1][i]= random()%54321 - 12345;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3872
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3873 ff_spatial_dwt(buffer[0], width, height, width, s->spatial_decomposition_type, s->spatial_decomposition_count);
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3874 ff_spatial_idwt(buffer[0], width, height, width, s->spatial_decomposition_type, s->spatial_decomposition_count);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3875
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3876 for(i=0; i<width*height; i++)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3877 if(buffer[0][i]!= buffer[1][i]) printf("fsck: %d %d %d\n",i, buffer[0][i], buffer[1][i]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3878
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3879 printf("testing 9/7 DWT\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3880 s.spatial_decomposition_type=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3881 for(i=0; i<width*height; i++)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3882 buffer[0][i]= buffer[1][i]= random()%54321 - 12345;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3883
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3884 ff_spatial_dwt(buffer[0], width, height, width, s->spatial_decomposition_type, s->spatial_decomposition_count);
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3885 ff_spatial_idwt(buffer[0], width, height, width, s->spatial_decomposition_type, s->spatial_decomposition_count);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3886
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3887 for(i=0; i<width*height; i++)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3888 if(buffer[0][i]!= buffer[1][i]) printf("fsck: %d %d %d\n",i, buffer[0][i], buffer[1][i]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3889
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3890 printf("testing AC coder\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3891 memset(s.header_state, 0, sizeof(s.header_state));
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3892 ff_init_range_encoder(&s.c, buffer[0], 256*256);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3893 ff_init_cabac_states(&s.c, ff_h264_lps_range, ff_h264_mps_state, ff_h264_lps_state, 64);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3894
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3895 for(i=-256; i<256; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3896 START_TIMER
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3897 put_symbol(&s.c, s.header_state, i*i*i/3*ABS(i), 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3898 STOP_TIMER("put_symbol")
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3899 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3900 ff_rac_terminate(&s.c);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3901
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3902 memset(s.header_state, 0, sizeof(s.header_state));
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3903 ff_init_range_decoder(&s.c, buffer[0], 256*256);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3904 ff_init_cabac_states(&s.c, ff_h264_lps_range, ff_h264_mps_state, ff_h264_lps_state, 64);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3905
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3906 for(i=-256; i<256; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3907 int j;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3908 START_TIMER
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3909 j= get_symbol(&s.c, s.header_state, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3910 STOP_TIMER("get_symbol")
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3911 if(j!=i*i*i/3*ABS(i)) printf("fsck: %d != %d\n", i, j);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3912 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3913 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3914 int level, orientation, x, y;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3915 int64_t errors[8][4];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3916 int64_t g=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3917
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3918 memset(errors, 0, sizeof(errors));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3919 s.spatial_decomposition_count=3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3920 s.spatial_decomposition_type=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3921 for(level=0; level<s.spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3922 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3923 int w= width >> (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3924 int h= height >> (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3925 int stride= width << (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3926 DWTELEM *buf= buffer[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3927 int64_t error=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3928
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3929 if(orientation&1) buf+=w;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3930 if(orientation>1) buf+=stride>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3931
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3932 memset(buffer[0], 0, sizeof(int)*width*height);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3933 buf[w/2 + h/2*stride]= 256*256;
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3934 ff_spatial_idwt(buffer[0], width, height, width, s->spatial_decomposition_type, s->spatial_decomposition_count);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3935 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3936 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3937 int64_t d= buffer[0][x + y*width];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3938 error += d*d;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3939 if(ABS(width/2-x)<9 && ABS(height/2-y)<9 && level==2) printf("%8lld ", d);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3940 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3941 if(ABS(height/2-y)<9 && level==2) printf("\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3942 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3943 error= (int)(sqrt(error)+0.5);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3944 errors[level][orientation]= error;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3945 if(g) g=ff_gcd(g, error);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3946 else g= error;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3947 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3948 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3949 printf("static int const visual_weight[][4]={\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3950 for(level=0; level<s.spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3951 printf(" {");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3952 for(orientation=0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3953 printf("%8lld,", errors[level][orientation]/g);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3954 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3955 printf("},\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3956 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3957 printf("};\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3958 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3959 int level=2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3960 int orientation=3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3961 int w= width >> (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3962 int h= height >> (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3963 int stride= width << (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3964 DWTELEM *buf= buffer[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3965 int64_t error=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3966
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3967 buf+=w;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3968 buf+=stride>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3969
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3970 memset(buffer[0], 0, sizeof(int)*width*height);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3971 #if 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3972 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3973 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3974 int tab[4]={0,2,3,1};
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3975 buffer[0][x+width*y]= 256*256*tab[(x&1) + 2*(y&1)];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3976 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3977 }
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3978 ff_spatial_dwt(buffer[0], width, height, width, s->spatial_decomposition_type, s->spatial_decomposition_count);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3979 #else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3980 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3981 for(x=0; x<w; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3982 buf[x + y*stride ]=169;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3983 buf[x + y*stride-w]=64;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3984 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3985 }
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3986 ff_spatial_idwt(buffer[0], width, height, width, s->spatial_decomposition_type, s->spatial_decomposition_count);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3987 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3988 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3989 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3990 int64_t d= buffer[0][x + y*width];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3991 error += d*d;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3992 if(ABS(width/2-x)<9 && ABS(height/2-y)<9) printf("%8lld ", d);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3993 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3994 if(ABS(height/2-y)<9) printf("\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3995 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3996 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3997
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3998 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3999 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4000 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4001 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4002