annotate snow.c @ 2600:2bcea6618a87 libavcodec

fix QROOT != 8
author michael
date Sat, 09 Apr 2005 19:48:59 +0000
parents 3e90a8cfddc6
children c31a28f27d9a
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
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
34 #define QSHIFT 3
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
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
759
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
760 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
761 int x, i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
762
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
763 for(x=start; x<width; x+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
764 int64_t sum=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
765
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
766 for(i=0; i<n; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
767 int x2= x + 2*i - n + 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
768 if (x2< 0) x2= -x2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
769 else if(x2>=width) x2= 2*width-x2-2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
770 sum += coeffs[i]*(int64_t)dst[x2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
771 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
772 if(inverse) dst[x] -= (sum + (1<<shift)/2)>>shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
773 else dst[x] += (sum + (1<<shift)/2)>>shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
774 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
775 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
776
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
777 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
778 int x, y, i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
779 for(y=start; y<height; y+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
780 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
781 int64_t sum=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
782
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
783 for(i=0; i<n; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
784 int y2= y + 2*i - n + 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
785 if (y2< 0) y2= -y2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
786 else if(y2>=height) y2= 2*height-y2-2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
787 sum += coeffs[i]*(int64_t)dst[x + y2*stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
788 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
789 if(inverse) dst[x + y*stride] -= (sum + (1<<shift)/2)>>shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
790 else dst[x + y*stride] += (sum + (1<<shift)/2)>>shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
791 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
792 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
793 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
794
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
795 #define SCALEX 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
796 #define LX0 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
797 #define LX1 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
798
2139
michael
parents: 2138
diff changeset
799 #if 0 // more accurate 9/7
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
800 #define N1 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
801 #define SHIFT1 14
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
802 #define COEFFS1 (int[]){-25987,-25987}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
803 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
804 #define SHIFT2 19
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
805 #define COEFFS2 (int[]){-27777,-27777}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
806 #define N3 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
807 #define SHIFT3 15
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
808 #define COEFFS3 (int[]){28931,28931}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
809 #define N4 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
810 #define SHIFT4 15
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
811 #define COEFFS4 (int[]){14533,14533}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
812 #elif 1 // 13/7 CRF
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
813 #define N1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
814 #define SHIFT1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
815 #define COEFFS1 (int[]){1,-9,-9,1}
2139
michael
parents: 2138
diff changeset
816 #define N2 4
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
817 #define SHIFT2 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
818 #define COEFFS2 (int[]){-1,5,5,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
819 #define N3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
820 #define SHIFT3 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
821 #define COEFFS3 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
822 #define N4 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
823 #define SHIFT4 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
824 #define COEFFS4 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
825 #elif 1 // 3/5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
826 #define LX0 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
827 #define LX1 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
828 #define SCALEX 0.5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
829 #define N1 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
830 #define SHIFT1 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
831 #define COEFFS1 (int[]){1,1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
832 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
833 #define SHIFT2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
834 #define COEFFS2 (int[]){-1,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
835 #define N3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
836 #define SHIFT3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
837 #define COEFFS3 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
838 #define N4 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
839 #define SHIFT4 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
840 #define COEFFS4 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
841 #elif 1 // 11/5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
842 #define N1 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
843 #define SHIFT1 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
844 #define COEFFS1 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
845 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
846 #define SHIFT2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
847 #define COEFFS2 (int[]){-1,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
848 #define N3 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
849 #define SHIFT3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
850 #define COEFFS3 (int[]){-1,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
851 #define N4 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
852 #define SHIFT4 7
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
853 #define COEFFS4 (int[]){-5,29,29,-5}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
854 #define SCALEX 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
855 #elif 1 // 9/7 CDF
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
856 #define N1 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
857 #define SHIFT1 7
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
858 #define COEFFS1 (int[]){-203,-203}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
859 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
860 #define SHIFT2 12
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
861 #define COEFFS2 (int[]){-217,-217}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
862 #define N3 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
863 #define SHIFT3 7
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
864 #define COEFFS3 (int[]){113,113}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
865 #define N4 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
866 #define SHIFT4 9
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
867 #define COEFFS4 (int[]){227,227}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
868 #define SCALEX 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
869 #elif 1 // 7/5 CDF
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
870 #define N1 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
871 #define SHIFT1 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
872 #define COEFFS1 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
873 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
874 #define SHIFT2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
875 #define COEFFS2 (int[]){-1,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
876 #define N3 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
877 #define SHIFT3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
878 #define COEFFS3 (int[]){-1,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
879 #define N4 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
880 #define SHIFT4 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
881 #define COEFFS4 (int[]){3,3}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
882 #elif 1 // 9/7 MN
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
883 #define N1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
884 #define SHIFT1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
885 #define COEFFS1 (int[]){1,-9,-9,1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
886 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
887 #define SHIFT2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
888 #define COEFFS2 (int[]){1,1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
889 #define N3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
890 #define SHIFT3 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
891 #define COEFFS3 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
892 #define N4 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
893 #define SHIFT4 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
894 #define COEFFS4 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
895 #else // 13/7 CRF
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
896 #define N1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
897 #define SHIFT1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
898 #define COEFFS1 (int[]){1,-9,-9,1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
899 #define N2 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
900 #define SHIFT2 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
901 #define COEFFS2 (int[]){-1,5,5,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
902 #define N3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
903 #define SHIFT3 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
904 #define COEFFS3 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
905 #define N4 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
906 #define SHIFT4 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
907 #define COEFFS4 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
908 #endif
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
909 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
910 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
911 const int width2= width>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
912 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
913 int A1,A2,A3,A4, x;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
914
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
915 inplace_lift(b, width, COEFFS1, N1, SHIFT1, LX1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
916 inplace_lift(b, width, COEFFS2, N2, SHIFT2, LX0, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
917 inplace_lift(b, width, COEFFS3, N3, SHIFT3, LX1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
918 inplace_lift(b, width, COEFFS4, N4, SHIFT4, LX0, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
919
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
920 for(x=0; x<width2; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
921 temp[x ]= b[2*x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
922 temp[x+w2]= b[2*x + 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
923 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
924 if(width&1)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
925 temp[x ]= b[2*x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
926 memcpy(b, temp, width*sizeof(int));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
927 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
928
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
929 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
930 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
931 const int width2= width>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
932 int A1,A2,A3,A4, x;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
933 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
934
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
935 memcpy(temp, b, width*sizeof(int));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
936 for(x=0; x<width2; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
937 b[2*x ]= temp[x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
938 b[2*x + 1]= temp[x+w2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
939 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
940 if(width&1)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
941 b[2*x ]= temp[x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
942
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
943 inplace_lift(b, width, COEFFS4, N4, SHIFT4, LX0, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
944 inplace_lift(b, width, COEFFS3, N3, SHIFT3, LX1, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
945 inplace_lift(b, width, COEFFS2, N2, SHIFT2, LX0, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
946 inplace_lift(b, width, COEFFS1, N1, SHIFT1, LX1, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
947 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
948
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
949 static void spatial_decomposeX(DWTELEM *buffer, int width, int height, int stride){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
950 int x, y;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
951
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
952 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
953 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
954 buffer[y*stride + x] *= SCALEX;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
955 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
956 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
957
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
958 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
959 horizontal_decomposeX(buffer + y*stride, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
960 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
961
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
962 inplace_liftV(buffer, width, height, stride, COEFFS1, N1, SHIFT1, LX1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
963 inplace_liftV(buffer, width, height, stride, COEFFS2, N2, SHIFT2, LX0, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
964 inplace_liftV(buffer, width, height, stride, COEFFS3, N3, SHIFT3, LX1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
965 inplace_liftV(buffer, width, height, stride, COEFFS4, N4, SHIFT4, LX0, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
966 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
967
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
968 static void spatial_composeX(DWTELEM *buffer, int width, int height, int stride){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
969 int x, y;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
970
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
971 inplace_liftV(buffer, width, height, stride, COEFFS4, N4, SHIFT4, LX0, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
972 inplace_liftV(buffer, width, height, stride, COEFFS3, N3, SHIFT3, LX1, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
973 inplace_liftV(buffer, width, height, stride, COEFFS2, N2, SHIFT2, LX0, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
974 inplace_liftV(buffer, width, height, stride, COEFFS1, N1, SHIFT1, LX1, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
975
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
976 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
977 horizontal_composeX(buffer + y*stride, width);
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 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
981 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
982 buffer[y*stride + x] /= SCALEX;
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 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
986
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
987 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
988 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
989 const int width2= width>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
990 int A1,A2,A3,A4, x;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
991 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
992
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
993 for(x=0; x<width2; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
994 temp[x ]= b[2*x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
995 temp[x+w2]= b[2*x + 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
996 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
997 if(width&1)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
998 temp[x ]= b[2*x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
999 #if 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1000 A2= temp[1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1001 A4= temp[0 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1002 A1= temp[0+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1003 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1004 A4 += (A1 + 1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1005 b[0+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1006 b[0 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1007 for(x=1; x+1<width2; x+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1008 A3= temp[x+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1009 A4= temp[x+1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1010 A3 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1011 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1012 b[x+width2] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1013 b[x ] = A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1014
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1015 A1= temp[x+1+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1016 A2= temp[x+2 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1017 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1018 A4 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1019 b[x+1+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1020 b[x+1 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1021 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1022 A3= temp[width-1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1023 A3 -= A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1024 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1025 b[width -1] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1026 b[width2-1] = A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1027 #else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1028 lift(b+w2, temp+w2, temp, 1, 1, 1, width, -1, 0, 1, 1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1029 lift(b , temp , b+w2, 1, 1, 1, width, 1, 2, 2, 0, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1030 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1031 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1032
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1033 static void vertical_decompose53iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1034 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1035
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1036 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1037 b1[i] -= (b0[i] + b2[i])>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1038 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1039 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1040
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1041 static void vertical_decompose53iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1042 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1043
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1044 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1045 b1[i] += (b0[i] + b2[i] + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1046 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1047 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1048
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1049 static void spatial_decompose53i(DWTELEM *buffer, int width, int height, int stride){
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
1050 int y;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1051 DWTELEM *b0= buffer + mirror(-2-1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1052 DWTELEM *b1= buffer + mirror(-2 , height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1053
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1054 for(y=-2; y<height; y+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1055 DWTELEM *b2= buffer + mirror(y+1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1056 DWTELEM *b3= buffer + mirror(y+2, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1057
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1058 {START_TIMER
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1059 if(b1 <= b3) horizontal_decompose53i(b2, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1060 if(y+2 < height) horizontal_decompose53i(b3, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1061 STOP_TIMER("horizontal_decompose53i")}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1062
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1063 {START_TIMER
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1064 if(b1 <= b3) vertical_decompose53iH0(b1, b2, b3, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1065 if(b0 <= b2) vertical_decompose53iL0(b0, b1, b2, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1066 STOP_TIMER("vertical_decompose53i*")}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1067
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1068 b0=b2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1069 b1=b3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1070 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1071 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1072
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1073 #define lift5 lift
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1074 #if 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1075 #define W_AM 3
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1076 #define W_AO 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1077 #define W_AS 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1078
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1079 #define W_BM 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1080 #define W_BO 8
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1081 #define W_BS 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1082
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1083 #undef lift5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1084 #define W_CM 9999
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1085 #define W_CO 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1086 #define W_CS 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1087
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1088 #define W_DM 15
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1089 #define W_DO 16
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1090 #define W_DS 5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1091 #elif 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1092 #define W_AM 55
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1093 #define W_AO 16
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1094 #define W_AS 5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1095
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1096 #define W_BM 3
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1097 #define W_BO 32
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1098 #define W_BS 6
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1099
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1100 #define W_CM 127
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1101 #define W_CO 64
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1102 #define W_CS 7
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1103
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1104 #define W_DM 7
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1105 #define W_DO 8
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1106 #define W_DS 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1107 #elif 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1108 #define W_AM 97
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1109 #define W_AO 32
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1110 #define W_AS 6
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1111
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1112 #define W_BM 63
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1113 #define W_BO 512
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1114 #define W_BS 10
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1115
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1116 #define W_CM 13
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1117 #define W_CO 8
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1118 #define W_CS 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1119
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1120 #define W_DM 15
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1121 #define W_DO 16
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1122 #define W_DS 5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1123
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1124 #else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1125
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1126 #define W_AM 203
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1127 #define W_AO 64
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1128 #define W_AS 7
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1129
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1130 #define W_BM 217
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1131 #define W_BO 2048
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1132 #define W_BS 12
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1133
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1134 #define W_CM 113
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1135 #define W_CO 64
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1136 #define W_CS 7
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1137
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1138 #define W_DM 227
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1139 #define W_DO 128
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1140 #define W_DS 9
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1141 #endif
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1142 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
1143 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1144 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1145
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1146 lift (temp+w2, b +1, b , 1, 2, 2, width, -W_AM, W_AO, W_AS, 1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1147 lift (temp , b , temp+w2, 1, 2, 1, width, -W_BM, W_BO, W_BS, 0, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1148 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
1149 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
1150 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1151
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1152
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1153 static void vertical_decompose97iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1154 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1155
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1156 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1157 b1[i] -= (W_AM*(b0[i] + b2[i])+W_AO)>>W_AS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1158 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1159 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1160
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1161 static void vertical_decompose97iH1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1162 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1163
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1164 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1165 #ifdef lift5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1166 b1[i] += (W_CM*(b0[i] + b2[i])+W_CO)>>W_CS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1167 #else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1168 int r= 3*(b0[i] + b2[i]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1169 r+= r>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1170 r+= r>>8;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1171 b1[i] += (r+W_CO)>>W_CS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1172 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1173 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1174 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1175
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1176 static void vertical_decompose97iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1177 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1178
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1179 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1180 b1[i] -= (W_BM*(b0[i] + b2[i])+W_BO)>>W_BS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1181 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1182 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1183
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1184 static void vertical_decompose97iL1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1185 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1186
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1187 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1188 b1[i] += (W_DM*(b0[i] + b2[i])+W_DO)>>W_DS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1189 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1190 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1191
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1192 static void spatial_decompose97i(DWTELEM *buffer, int width, int height, int stride){
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
1193 int y;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1194 DWTELEM *b0= buffer + mirror(-4-1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1195 DWTELEM *b1= buffer + mirror(-4 , height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1196 DWTELEM *b2= buffer + mirror(-4+1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1197 DWTELEM *b3= buffer + mirror(-4+2, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1198
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1199 for(y=-4; y<height; y+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1200 DWTELEM *b4= buffer + mirror(y+3, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1201 DWTELEM *b5= buffer + mirror(y+4, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1202
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1203 {START_TIMER
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1204 if(b3 <= b5) horizontal_decompose97i(b4, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1205 if(y+4 < height) horizontal_decompose97i(b5, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1206 if(width>400){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1207 STOP_TIMER("horizontal_decompose97i")
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1208 }}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1209
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1210 {START_TIMER
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1211 if(b3 <= b5) vertical_decompose97iH0(b3, b4, b5, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1212 if(b2 <= b4) vertical_decompose97iL0(b2, b3, b4, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1213 if(b1 <= b3) vertical_decompose97iH1(b1, b2, b3, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1214 if(b0 <= b2) vertical_decompose97iL1(b0, b1, b2, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1215
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1216 if(width>400){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1217 STOP_TIMER("vertical_decompose97i")
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1218 }}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1219
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1220 b0=b2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1221 b1=b3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1222 b2=b4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1223 b3=b5;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1224 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1225 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1226
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1227 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
1228 int level;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1229
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
1230 for(level=0; level<decomposition_count; level++){
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
1231 switch(type){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1232 case 0: spatial_decompose97i(buffer, width>>level, height>>level, stride<<level); break;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1233 case 1: spatial_decompose53i(buffer, width>>level, height>>level, stride<<level); break;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1234 case 2: spatial_decomposeX (buffer, width>>level, height>>level, stride<<level); break;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1235 }
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
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1239 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
1240 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1241 const int width2= width>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1242 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1243 int A1,A2,A3,A4, x;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1244
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1245 #if 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1246 A2= temp[1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1247 A4= temp[0 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1248 A1= temp[0+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1249 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1250 A4 += (A1 + 1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1251 b[0+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1252 b[0 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1253 for(x=1; x+1<width2; x+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1254 A3= temp[x+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1255 A4= temp[x+1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1256 A3 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1257 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1258 b[x+width2] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1259 b[x ] = A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1260
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1261 A1= temp[x+1+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1262 A2= temp[x+2 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1263 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1264 A4 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1265 b[x+1+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1266 b[x+1 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1267 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1268 A3= temp[width-1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1269 A3 -= A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1270 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1271 b[width -1] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1272 b[width2-1] = A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1273 #else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1274 lift(temp , b , b+w2, 1, 1, 1, width, 1, 2, 2, 0, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1275 lift(temp+w2, b+w2, temp, 1, 1, 1, width, -1, 0, 1, 1, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1276 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1277 for(x=0; x<width2; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1278 b[2*x ]= temp[x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1279 b[2*x + 1]= temp[x+w2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1280 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1281 if(width&1)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1282 b[2*x ]= temp[x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1283 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1284
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1285 static void vertical_compose53iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1286 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1287
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1288 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1289 b1[i] += (b0[i] + b2[i])>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1290 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1291 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1292
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1293 static void vertical_compose53iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1294 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1295
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1296 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1297 b1[i] -= (b0[i] + b2[i] + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1298 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1299 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1300
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1301 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
1302 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
1303 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
1304 cs->y = -1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1305 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1306
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1307 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
1308 cs->b0 = buffer + mirror(-1-1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1309 cs->b1 = buffer + mirror(-1 , height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1310 cs->y = -1;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1311 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1312
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1313 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
1314 int y= cs->y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1315 int mirror0 = mirror(y-1, height-1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1316 int mirror1 = mirror(y , height-1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1317 int mirror2 = mirror(y+1, height-1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1318 int mirror3 = mirror(y+2, height-1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1319
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1320 DWTELEM *b0= cs->b0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1321 DWTELEM *b1= cs->b1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1322 DWTELEM *b2= slice_buffer_get_line(sb, mirror2 * stride_line);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1323 DWTELEM *b3= slice_buffer_get_line(sb, mirror3 * stride_line);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1324
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1325 {START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1326 if(mirror1 <= mirror3) vertical_compose53iL0(b1, b2, b3, width);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1327 if(mirror0 <= mirror2) vertical_compose53iH0(b0, b1, b2, width);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1328 STOP_TIMER("vertical_compose53i*")}
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1329
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1330 {START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1331 if(y-1 >= 0) horizontal_compose53i(b0, width);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1332 if(mirror0 <= mirror2) horizontal_compose53i(b1, width);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1333 STOP_TIMER("horizontal_compose53i")}
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1334
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1335 cs->b0 = b2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1336 cs->b1 = b3;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1337 cs->y += 2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1338 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1339
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1340 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
1341 int y= cs->y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1342 DWTELEM *b0= cs->b0;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1343 DWTELEM *b1= cs->b1;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1344 DWTELEM *b2= buffer + mirror(y+1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1345 DWTELEM *b3= buffer + mirror(y+2, height-1)*stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1346
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1347 {START_TIMER
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1348 if(b1 <= b3) vertical_compose53iL0(b1, b2, b3, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1349 if(b0 <= b2) vertical_compose53iH0(b0, b1, b2, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1350 STOP_TIMER("vertical_compose53i*")}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1351
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1352 {START_TIMER
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1353 if(y-1 >= 0) horizontal_compose53i(b0, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1354 if(b0 <= b2) horizontal_compose53i(b1, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1355 STOP_TIMER("horizontal_compose53i")}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1356
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1357 cs->b0 = b2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1358 cs->b1 = b3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1359 cs->y += 2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1360 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1361
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1362 static void spatial_compose53i(DWTELEM *buffer, int width, int height, int stride){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1363 dwt_compose_t cs;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1364 spatial_compose53i_init(&cs, buffer, height, stride);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1365 while(cs.y <= height)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1366 spatial_compose53i_dy(&cs, buffer, width, height, stride);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1367 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1368
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1369
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1370 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
1371 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1372 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1373
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1374 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
1375 lift5(temp+w2, b +w2, temp , 1, 1, 1, width, W_CM, W_CO, W_CS, 1, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1376 lift (b , temp , temp+w2, 2, 1, 1, width, -W_BM, W_BO, W_BS, 0, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1377 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
1378 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1379
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1380 static void vertical_compose97iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1381 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1382
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1383 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1384 b1[i] += (W_AM*(b0[i] + b2[i])+W_AO)>>W_AS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1385 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1386 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1387
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1388 static void vertical_compose97iH1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1389 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1390
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1391 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1392 #ifdef lift5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1393 b1[i] -= (W_CM*(b0[i] + b2[i])+W_CO)>>W_CS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1394 #else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1395 int r= 3*(b0[i] + b2[i]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1396 r+= r>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1397 r+= r>>8;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1398 b1[i] -= (r+W_CO)>>W_CS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1399 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1400 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1401 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1402
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1403 static void vertical_compose97iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1404 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1405
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1406 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1407 b1[i] += (W_BM*(b0[i] + b2[i])+W_BO)>>W_BS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1408 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1409 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1410
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1411 static void vertical_compose97iL1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1412 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1413
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1414 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1415 b1[i] -= (W_DM*(b0[i] + b2[i])+W_DO)>>W_DS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1416 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1417 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1418
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1419 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
1420 int i;
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1421
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1422 for(i=0; i<width; i++){
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1423 int r;
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1424 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
1425 #ifdef lift5
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1426 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
1427 #else
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1428 r= 3*(b2[i] + b4[i]);
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1429 r+= r>>4;
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1430 r+= r>>8;
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1431 b3[i] -= (r+W_CO)>>W_CS;
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1432 #endif
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1433 b2[i] += (W_BM*(b1[i] + b3[i])+W_BO)>>W_BS;
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1434 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
1435 }
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1436 }
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1437
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1438 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
1439 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
1440 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
1441 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
1442 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
1443 cs->y = -3;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1444 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1445
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1446 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
1447 cs->b0 = buffer + mirror(-3-1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1448 cs->b1 = buffer + mirror(-3 , height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1449 cs->b2 = buffer + mirror(-3+1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1450 cs->b3 = buffer + mirror(-3+2, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1451 cs->y = -3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1452 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1453
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1454 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
1455 int y = cs->y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1456
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1457 int mirror0 = mirror(y - 1, height - 1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1458 int mirror1 = mirror(y + 0, height - 1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1459 int mirror2 = mirror(y + 1, height - 1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1460 int mirror3 = mirror(y + 2, height - 1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1461 int mirror4 = mirror(y + 3, height - 1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1462 int mirror5 = mirror(y + 4, height - 1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1463 DWTELEM *b0= cs->b0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1464 DWTELEM *b1= cs->b1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1465 DWTELEM *b2= cs->b2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1466 DWTELEM *b3= cs->b3;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1467 DWTELEM *b4= slice_buffer_get_line(sb, mirror4 * stride_line);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1468 DWTELEM *b5= slice_buffer_get_line(sb, mirror5 * stride_line);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1469
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1470 {START_TIMER
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1471 if(y>0 && y+4<height){
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1472 vertical_compose97i(b0, b1, b2, b3, b4, b5, width);
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1473 }else{
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1474 if(mirror3 <= mirror5) vertical_compose97iL1(b3, b4, b5, width);
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1475 if(mirror2 <= mirror4) vertical_compose97iH1(b2, b3, b4, width);
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1476 if(mirror1 <= mirror3) vertical_compose97iL0(b1, b2, b3, width);
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1477 if(mirror0 <= mirror2) vertical_compose97iH0(b0, b1, b2, width);
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1478 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1479 if(width>400){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1480 STOP_TIMER("vertical_compose97i")}}
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1481
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1482 {START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1483 if(y-1>= 0) horizontal_compose97i(b0, width);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1484 if(mirror0 <= mirror2) horizontal_compose97i(b1, width);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1485 if(width>400 && mirror0 <= mirror2){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1486 STOP_TIMER("horizontal_compose97i")}}
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1487
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1488 cs->b0=b2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1489 cs->b1=b3;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1490 cs->b2=b4;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1491 cs->b3=b5;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1492 cs->y += 2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1493 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1494
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1495 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
1496 int y = cs->y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1497 DWTELEM *b0= cs->b0;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1498 DWTELEM *b1= cs->b1;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1499 DWTELEM *b2= cs->b2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1500 DWTELEM *b3= cs->b3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1501 DWTELEM *b4= buffer + mirror(y+3, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1502 DWTELEM *b5= buffer + mirror(y+4, height-1)*stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1503
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1504 if(stride == width && y+4 < height && 0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1505 int x;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1506 for(x=0; x<width/2; x++)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1507 b5[x] += 64*2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1508 for(; x<width; x++)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1509 b5[x] += 169*2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1510 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1511
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1512 {START_TIMER
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1513 if(b3 <= b5) vertical_compose97iL1(b3, b4, b5, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1514 if(b2 <= b4) vertical_compose97iH1(b2, b3, b4, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1515 if(b1 <= b3) vertical_compose97iL0(b1, b2, b3, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1516 if(b0 <= b2) vertical_compose97iH0(b0, b1, b2, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1517 if(width>400){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1518 STOP_TIMER("vertical_compose97i")}}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1519
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1520 {START_TIMER
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1521 if(y-1>= 0) horizontal_compose97i(b0, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1522 if(b0 <= b2) horizontal_compose97i(b1, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1523 if(width>400 && b0 <= b2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1524 STOP_TIMER("horizontal_compose97i")}}
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1525
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1526 cs->b0=b2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1527 cs->b1=b3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1528 cs->b2=b4;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1529 cs->b3=b5;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1530 cs->y += 2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1531 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1532
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1533 static void spatial_compose97i(DWTELEM *buffer, int width, int height, int stride){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1534 dwt_compose_t cs;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1535 spatial_compose97i_init(&cs, buffer, height, stride);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1536 while(cs.y <= height)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1537 spatial_compose97i_dy(&cs, buffer, width, height, stride);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1538 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1539
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1540 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
1541 int level;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1542 for(level=decomposition_count-1; level>=0; level--){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1543 switch(type){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1544 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
1545 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
1546 /* not slicified yet */
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1547 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
1548 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
1549 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1550 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1551 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1552
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1553 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
1554 int level;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1555 for(level=decomposition_count-1; level>=0; level--){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1556 switch(type){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1557 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
1558 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
1559 /* not slicified yet */
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1560 case 2: spatial_composeX(buffer, width>>level, height>>level, stride<<level); break;
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 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1563 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1564
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1565 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
1566 const int support = type==1 ? 3 : 5;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1567 int level;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1568 if(type==2) return;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1569
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1570 for(level=decomposition_count-1; level>=0; level--){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1571 while(cs[level].y <= FFMIN((y>>level)+support, height>>level)){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1572 switch(type){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1573 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
1574 break;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1575 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
1576 break;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1577 case 2: break;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1578 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1579 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1580 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1581 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1582
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1583 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
1584 const int support = type==1 ? 3 : 5;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1585 int level;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1586 if(type==2) return;
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 for(level=decomposition_count-1; level>=0; level--){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1589 while(cs[level].y <= FFMIN((y>>level)+support, height>>level)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1590 switch(type){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1591 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
1592 break;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1593 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
1594 break;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1595 case 2: break;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1596 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1597 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1598 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1599 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1600
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1601 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
1602 if(type==2){
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 for(level=decomposition_count-1; level>=0; level--)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1605 spatial_composeX (buffer, width>>level, height>>level, stride<<level);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1606 }else{
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1607 dwt_compose_t cs[MAX_DECOMPOSITIONS];
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1608 int y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1609 ff_spatial_idwt_init(cs, buffer, width, height, stride, type, decomposition_count);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1610 for(y=0; y<height; y+=4)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1611 ff_spatial_idwt_slice(cs, buffer, width, height, stride, type, decomposition_count, y);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1612 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1613 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1614
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1615 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
1616 const int w= b->width;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1617 const int h= b->height;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1618 int x, y;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1619
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1620 if(1){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1621 int run=0;
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1622 int runs[w*h];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1623 int run_index=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1624
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1625 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1626 for(x=0; x<w; x++){
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1627 int v, p=0;
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1628 int /*ll=0, */l=0, lt=0, t=0, rt=0;
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1629 v= src[x + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1630
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1631 if(y){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1632 t= src[x + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1633 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1634 lt= src[x - 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1635 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1636 if(x + 1 < w){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1637 rt= src[x + 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1638 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1639 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1640 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1641 l= src[x - 1 + y*stride];
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1642 /*if(x > 1){
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1643 if(orientation==1) ll= src[y + (x-2)*stride];
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1644 else ll= src[x - 2 + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1645 }*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1646 }
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1647 if(parent){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1648 int px= x>>1;
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1649 int py= y>>1;
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1650 if(px<b->parent->width && py<b->parent->height)
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1651 p= parent[px + py*2*stride];
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1652 }
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1653 if(!(/*ll|*/l|lt|t|rt|p)){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1654 if(v){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1655 runs[run_index++]= run;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1656 run=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1657 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1658 run++;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1659 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1660 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1661 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1662 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1663 runs[run_index++]= run;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1664 run_index=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1665 run= runs[run_index++];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1666
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1667 put_symbol2(&s->c, b->state[1], run, 3);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1668
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1669 for(y=0; y<h; y++){
2435
c89ac0e70c66 10l patch by (matthieu castet <castet.matthieu free fr>)
michael
parents: 2422
diff changeset
1670 if(s->c.bytestream_end - s->c.bytestream < w*40){
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1671 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1672 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1673 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1674 for(x=0; x<w; x++){
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1675 int v, p=0;
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1676 int /*ll=0, */l=0, lt=0, t=0, rt=0;
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1677 v= src[x + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1678
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1679 if(y){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1680 t= src[x + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1681 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1682 lt= src[x - 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1683 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1684 if(x + 1 < w){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1685 rt= src[x + 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1686 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1687 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1688 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1689 l= src[x - 1 + y*stride];
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1690 /*if(x > 1){
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1691 if(orientation==1) ll= src[y + (x-2)*stride];
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1692 else ll= src[x - 2 + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1693 }*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1694 }
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1695 if(parent){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1696 int px= x>>1;
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1697 int py= y>>1;
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1698 if(px<b->parent->width && py<b->parent->height)
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1699 p= parent[px + py*2*stride];
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1700 }
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1701 if(/*ll|*/l|lt|t|rt|p){
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1702 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
1703
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1704 put_rac(&s->c, &b->state[0][context], !!v);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1705 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1706 if(!run){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1707 run= runs[run_index++];
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1708
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1709 put_symbol2(&s->c, b->state[1], run, 3);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1710 assert(v);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1711 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1712 run--;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1713 assert(!v);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1714 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1715 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1716 if(v){
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1717 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
1718 int l2= 2*ABS(l) + (l<0);
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1719 int t2= 2*ABS(t) + (t<0);
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1720
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
1721 put_symbol2(&s->c, b->state[context + 2], ABS(v)-1, context-4);
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1722 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
1723 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1724 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1725 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1726 }
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1727 return 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1728 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1729
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1730 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
1731 // 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
1732 // encode_subband_z0run(s, b, src, parent, stride, orientation);
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1733 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
1734 // 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
1735 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1736
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1737 static inline void unpack_coeffs(SnowContext *s, SubBand *b, SubBand * parent, int orientation){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1738 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1739 const int h= b->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1740 int x,y;
2195
df3079d7806f merge decode_subband() and dequantize()
michael
parents: 2194
diff changeset
1741
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1742 if(1){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1743 int run;
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1744 int index=0;
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1745 int prev_index=-1;
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1746 int prev2_index=0;
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1747 int parent_index= 0;
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1748 int prev_parent_index= 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1749
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1750 run= get_symbol2(&s->c, b->state[1], 3);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1751 for(y=0; y<h; y++){
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1752 int v=0;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1753 int lt=0, t=0, rt=0;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1754
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1755 if(y && b->x_coeff[prev_index].x == 0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1756 rt= b->x_coeff[prev_index].coeff;
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1757 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1758 for(x=0; x<w; x++){
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1759 int p=0;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1760 const int l= v;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1761
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1762 lt= t; t= rt;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1763
2194
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1764 if(y){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1765 if(b->x_coeff[prev_index].x <= x)
2194
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1766 prev_index++;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1767 if(b->x_coeff[prev_index].x == x + 1)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1768 rt= b->x_coeff[prev_index].coeff;
2194
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1769 else
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1770 rt=0;
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1771 }
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1772 if(parent){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1773 if(x>>1 > parent->x_coeff[parent_index].x){
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1774 parent_index++;
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1775 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1776 if(x>>1 == parent->x_coeff[parent_index].x){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1777 p= parent->x_coeff[parent_index].coeff;
2194
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1778 }
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1779 }
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1780 if(/*ll|*/l|lt|t|rt|p){
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1781 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
1782
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1783 v=get_rac(&s->c, &b->state[0][context]);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1784 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1785 if(!run){
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1786 run= get_symbol2(&s->c, b->state[1], 3);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1787 v=1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1788 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1789 run--;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1790 v=0;
2191
44afbcec70b8 50% faster decode_subband()
michael
parents: 2189
diff changeset
1791
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1792 if(y && parent){
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1793 int max_run;
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1794
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1795 max_run= FFMIN(run, b->x_coeff[prev_index].x - x - 2);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1796 max_run= FFMIN(max_run, 2*parent->x_coeff[parent_index].x - x - 1);
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1797 x+= max_run;
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1798 run-= max_run;
2191
44afbcec70b8 50% faster decode_subband()
michael
parents: 2189
diff changeset
1799 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1800 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1801 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1802 if(v){
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1803 int context= av_log2(/*ABS(ll) + */3*(l>>1) + (lt>>1) + (t&~1) + (rt>>1) + (p>>1));
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1804 v= 2*(get_symbol2(&s->c, b->state[context + 2], context-4) + 1);
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1805 v+=get_rac(&s->c, &b->state[0][16 + 1 + 3 + quant3bA[l&0xFF] + 3*quant3bA[t&0xFF]]);
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1806
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1807 b->x_coeff[index].x=x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1808 b->x_coeff[index++].coeff= v;
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1809 }
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1810 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1811 b->x_coeff[index++].x= w+1; //end marker
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1812 prev_index= prev2_index;
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1813 prev2_index= index;
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1814
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1815 if(parent){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1816 if(y&1){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1817 while(parent->x_coeff[parent_index].x != parent->width+1)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1818 parent_index++;
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1819 parent_index++;
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1820 prev_parent_index= parent_index;
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1821 }else{
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1822 parent_index= prev_parent_index;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1823 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1824 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1825 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1826
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1827 b->x_coeff[index++].x= w+1; //end marker
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1828 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1829 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1830
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1831 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
1832 const int w= b->width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1833 int x,y;
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
1834 const int qlog= clip(s->qlog + b->qlog, 0, QROOT*16);
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
1835 int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1836 int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1837 int new_index = 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1838
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1839 START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1840
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1841 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
1842 qadd= 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1843 qmul= 1<<QEXPSHIFT;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1844 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1845
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1846 /* 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
1847 if (start_y != 0)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1848 new_index = save_state[0];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1849
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1850
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1851 for(y=start_y; y<h; y++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1852 int x = 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1853 int v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1854 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
1855 memset(line, 0, b->width*sizeof(DWTELEM));
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1856 v = b->x_coeff[new_index].coeff;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1857 x = b->x_coeff[new_index++].x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1858 while(x < w)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1859 {
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1860 register int t= ( (v>>1)*qmul + qadd)>>QEXPSHIFT;
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1861 register int u= -(v&1);
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1862 line[x] = (t^u) - u;
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1863
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1864 v = b->x_coeff[new_index].coeff;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1865 x = b->x_coeff[new_index++].x;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1866 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1867 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1868 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
1869 STOP_TIMER("decode_subband")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1870 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1871
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1872 /* Save our variables for the next slice. */
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1873 save_state[0] = new_index;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1874
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1875 return;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1876 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1877
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1878 static void reset_contexts(SnowContext *s){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1879 int plane_index, level, orientation;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1880
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
1881 for(plane_index=0; plane_index<3; plane_index++){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1882 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1883 for(orientation=level ? 1:0; orientation<4; orientation++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1884 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
1885 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1886 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1887 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1888 memset(s->header_state, MID_STATE, sizeof(s->header_state));
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1889 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
1890 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1891
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1892 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
1893 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
1894 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
1895
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1896 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
1897 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
1898
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1899 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
1900 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
1901 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1902
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1903 static inline void copy_rac_state(RangeCoder *d, RangeCoder *s){
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1904 uint8_t *bytestream= d->bytestream;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1905 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
1906 *d= *s;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1907 d->bytestream= bytestream;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1908 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
1909 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1910
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1911 //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
1912 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
1913 {
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1914 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
1915
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1916 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
1917 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
1918 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
1919 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
1920 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
1921 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1922 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
1923 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1924 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
1925 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1926
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1927 //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
1928 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
1929 {
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1930 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
1931 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
1932
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1933 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
1934 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
1935 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
1936 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
1937 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
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 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
1940 }
70b27300a496 quad 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 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
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
70b27300a496 quad 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 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
1945 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
1946 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
1947 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
1948 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
1949 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
1950 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
1951
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1952 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
1953 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
1954 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
1955 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
1956 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
1957 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
1958 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
1959
70b27300a496 quad 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 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
1961 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
1962 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
1963 }
70b27300a496 quad 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 }
70b27300a496 quad 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 }
70b27300a496 quad 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
70b27300a496 quad 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 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
1968 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
1969 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
1970 ((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
1971 ((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
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 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
1974 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
1975 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
1976 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
1977 }
70b27300a496 quad 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 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
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
70b27300a496 quad 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 //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
1982 #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
1983 #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
1984 #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
1985 #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
1986 #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
1987 #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
1988
70b27300a496 quad 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 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
1990 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
1991 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
1992 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
1993 uint8_t i_state[sizeof(s->block_state)];
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1994 RangeCoder pc, ic;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1995 uint8_t *pbbak= s->c.bytestream;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1996 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
1997 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
1998 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
1999 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
2000 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
2001 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
2002 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
2003 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
2004 .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
2005 .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
2006 .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
2007 .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
2008 .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
2009 };
70b27300a496 quad 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 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
2011 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
2012 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
2013 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
2014 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
2015 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
2016 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
2017 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
2018 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
2019 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
2020 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
2021 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
2022 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
2023 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
2024 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
2025 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
2026 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
2027 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
2028 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
2029 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
2030 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
2031 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
2032 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
2033 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
2034 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
2035 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
2036 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
2037 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
2038 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
2039 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
2040 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
2041 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
2042
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2043 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
2044 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
2045 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
2046 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
2047 }
70b27300a496 quad 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
70b27300a496 quad 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 //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
2050 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
2051 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
2052 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
2053 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
2054 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
2055 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
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 // 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
2058
70b27300a496 quad 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 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
2060 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
2061 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
2062 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
2063 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
2064 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
2065
70b27300a496 quad 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 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
2067 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
2068 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
2069 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
2070 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
2071 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
2072
70b27300a496 quad 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 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
2074 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
2075 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
2076 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
2077
70b27300a496 quad 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 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
2079
70b27300a496 quad 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 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
2081 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
2082
70b27300a496 quad 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 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
2084 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
2085 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
2086 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
2087
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2088 c->xmin = - x*block_w - 16+2;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2089 c->ymin = - y*block_w - 16+2;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2090 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
2091 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
2092
70b27300a496 quad 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 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
2094 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
2095 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
2096 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
2097 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
2098 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
2099 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
2100
70b27300a496 quad 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 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
2102 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
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 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
2105 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
2106 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
2107 } 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
2108 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
2109 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
2110 }
70b27300a496 quad 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
70b27300a496 quad 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 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
2113 (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
2114
70b27300a496 quad 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 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
2116 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
2117 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
2118 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
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 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
2121 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
2122 //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
2123
70b27300a496 quad 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 // 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
2125 pc= s->c;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2126 pc.bytestream_start=
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2127 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
2128 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
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 if(level!=s->block_max_depth)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2131 put_rac(&pc, &p_state[4 + s_context], 1);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2132 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
2133 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
2134 put_symbol(&pc, &p_state[128 + 32*my_context], my - pmy, 1);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2135 p_len= pc.bytestream - pc.bytestream_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2136 score += (s->lambda2*(p_len*8
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2137 + (pc.outstanding_count - s->c.outstanding_count)*8
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2138 + (-av_log2(pc.range) + av_log2(s->c.range))
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2139 ))>>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
2140
70b27300a496 quad 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 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
2142 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
2143 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
2144 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
2145
70b27300a496 quad 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 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
2147 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
2148 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
2149 // 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
2150 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
2151 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
2152 // 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
2153
70b27300a496 quad 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 ic= s->c;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2155 ic.bytestream_start=
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2156 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
2157 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
2158 if(level!=s->block_max_depth)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2159 put_rac(&ic, &i_state[4 + s_context], 1);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2160 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
2161 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
2162 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
2163 put_symbol(&ic, &i_state[96], cr-pcr, 1);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2164 i_len= ic.bytestream - ic.bytestream_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2165 iscore += (s->lambda2*(i_len*8
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2166 + (ic.outstanding_count - s->c.outstanding_count)*8
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2167 + (-av_log2(ic.range) + av_log2(s->c.range))
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2168 ))>>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
2169
70b27300a496 quad 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 // 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
2171 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
2172 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
2173 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
2174 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
2175
70b27300a496 quad 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 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
2177 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
2178 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
2179 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
2180 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
2181 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
2182 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
2183 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2184
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2185 if(level!=s->block_max_depth){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2186 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
2187 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
2188 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
2189 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
2190 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
2191 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
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 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
2194 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
2195 }
70b27300a496 quad 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
70b27300a496 quad 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 if(iscore < score){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2198 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
2199 s->c= ic;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2200 s->c.bytestream_start= pbbak_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2201 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
2202 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
2203 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
2204 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
2205 }else{
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2206 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
2207 s->c= pc;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2208 s->c.bytestream_start= pbbak_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2209 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
2210 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
2211 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
2212 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
2213 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2214 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2215
70b27300a496 quad 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 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
2217 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
2218 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
2219 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
2220 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
2221 .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
2222 .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
2223 .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
2224 .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
2225 .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
2226 };
70b27300a496 quad 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 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
2228 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
2229 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
2230 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
2231 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
2232 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
2233
70b27300a496 quad 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 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
2235 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
2236 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
2237 }
70b27300a496 quad 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
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2239 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
2240 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
2241 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
2242 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
2243 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
2244 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
2245 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
2246 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
2247 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
2248
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2249 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
2250
70b27300a496 quad 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 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
2252 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
2253 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
2254 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
2255 }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
2256 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
2257 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
2258 }
70b27300a496 quad 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 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
2260 }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
2261 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
2262 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
2263 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
2264 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
2265 }
70b27300a496 quad 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 }
70b27300a496 quad 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
70b27300a496 quad 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 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
2269 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
2270 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
2271 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
2272
70b27300a496 quad 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 for(y=0; y<h; y++){
2435
c89ac0e70c66 10l patch by (matthieu castet <castet.matthieu free fr>)
michael
parents: 2422
diff changeset
2274 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
2275 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
2276 return;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
2277 }
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
2278 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
2279 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
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 }
70b27300a496 quad 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 }
70b27300a496 quad 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
70b27300a496 quad 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 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
2285 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
2286 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
2287 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
2288
70b27300a496 quad 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 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
2290 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
2291 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
2292 }
70b27300a496 quad 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 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2294 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2295
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2296 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
2297 int x, y;
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2298 START_TIMER
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2299 for(y=0; y < b_h+5; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2300 for(x=0; x < b_w; x++){
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2301 int a0= src[x ];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2302 int a1= src[x + 1];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2303 int a2= src[x + 2];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2304 int a3= src[x + 3];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2305 int a4= src[x + 4];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2306 int a5= src[x + 5];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2307 // int am= 9*(a1+a2) - (a0+a3);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2308 int am= 20*(a2+a3) - 5*(a1+a4) + (a0+a5);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2309 // int am= 18*(a2+a3) - 2*(a1+a4);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2310 // int aL= (-7*a0 + 105*a1 + 35*a2 - 5*a3)>>3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2311 // int aR= (-7*a3 + 105*a2 + 35*a1 - 5*a0)>>3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2312
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2313 // if(b_w==16) am= 8*(a1+a2);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2314
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2315 if(dx<8) tmp[x]= (32*a2*( 8-dx) + am* dx + 128)>>8;
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2316 else tmp[x]= ( am*(16-dx) + 32*a3*(dx-8) + 128)>>8;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2317
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2318 /* if (dx< 4) tmp[x + y*stride]= (16*a1*( 4-dx) + aL* dx + 32)>>6;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2319 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
2320 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
2321 else tmp[x + y*stride]= ( aR*(16-dx) + 16*a2*(dx-12) + 32)>>6;*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2322 }
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2323 tmp += stride;
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2324 src += stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2325 }
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2326 tmp -= (b_h+5)*stride;
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2327
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2328 for(y=0; y < b_h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2329 for(x=0; x < b_w; x++){
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2330 int a0= tmp[x + 0*stride];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2331 int a1= tmp[x + 1*stride];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2332 int a2= tmp[x + 2*stride];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2333 int a3= tmp[x + 3*stride];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2334 int a4= tmp[x + 4*stride];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2335 int a5= tmp[x + 5*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2336 int am= 20*(a2+a3) - 5*(a1+a4) + (a0+a5);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2337 // int am= 18*(a2+a3) - 2*(a1+a4);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2338 /* int aL= (-7*a0 + 105*a1 + 35*a2 - 5*a3)>>3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2339 int aR= (-7*a3 + 105*a2 + 35*a1 - 5*a0)>>3;*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2340
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2341 // if(b_w==16) am= 8*(a1+a2);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2342
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2343 if(dy<8) dst[x]= (32*a2*( 8-dy) + am* dy + 128)>>8;
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2344 else dst[x]= ( am*(16-dy) + 32*a3*(dy-8) + 128)>>8;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2345
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2346 /* if (dy< 4) tmp[x + y*stride]= (16*a1*( 4-dy) + aL* dy + 32)>>6;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2347 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
2348 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
2349 else tmp[x + y*stride]= ( aR*(16-dy) + 16*a2*(dy-12) + 32)>>6;*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2350 }
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2351 dst += stride;
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2352 tmp += stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2353 }
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2354 STOP_TIMER("mc_block")
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2355 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2356
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2357 #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
2358 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
2359 uint8_t tmp[stride*(b_w+5)];\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2360 assert(h==b_w);\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2361 mc_block(dst, src-2-2*stride, tmp, stride, b_w, b_w, dx, dy);\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2362 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2363
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2364 mca( 0, 0,16)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2365 mca( 8, 0,16)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2366 mca( 0, 8,16)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2367 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
2368 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
2369 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
2370 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
2371 mca( 8, 8,8)
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2372
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2373 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
2374 if(block->type){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2375 int x, y;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2376 const int color= block->color[plane_index];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2377 for(y=0; y < b_h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2378 for(x=0; x < b_w; x++){
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2379 dst[x + y*stride]= color;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2380 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2381 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2382 }else{
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2383 const int scale= plane_index ? s->mv_scale : 2*s->mv_scale;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2384 int mx= block->mx*scale;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2385 int my= block->my*scale;
2223
b26474e72d6d use h264 MC code if possible
michael
parents: 2221
diff changeset
2386 const int dx= mx&15;
b26474e72d6d use h264 MC code if possible
michael
parents: 2221
diff changeset
2387 const int dy= my&15;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2388 sx += (mx>>4) - 2;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2389 sy += (my>>4) - 2;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2390 src += sx + sy*stride;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2391 if( (unsigned)sx >= w - b_w - 4
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2392 || (unsigned)sy >= h - b_h - 4){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2393 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
2394 src= tmp + MB_SIZE;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2395 }
2223
b26474e72d6d use h264 MC code if possible
michael
parents: 2221
diff changeset
2396 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
2397 mc_block(dst, src, tmp, stride, b_w, b_h, dx, dy);
b26474e72d6d use h264 MC code if possible
michael
parents: 2221
diff changeset
2398 else
b26474e72d6d use h264 MC code if possible
michael
parents: 2221
diff changeset
2399 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
2400 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2401 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2402
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2403 static always_inline int same_block(BlockNode *a, BlockNode *b){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2404 return !((a->mx - b->mx) | (a->my - b->my) | a->type | b->type);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2405 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2406
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2407 //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
2408 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
2409 DWTELEM * dst = NULL;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2410 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
2411 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
2412 const int b_stride= b_width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2413 BlockNode *lt= &s->block[b_x + b_y*b_stride];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2414 BlockNode *rt= lt+1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2415 BlockNode *lb= lt+b_stride;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2416 BlockNode *rb= lb+1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2417 uint8_t *block[4];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2418 uint8_t tmp[src_stride*(b_h+5)]; //FIXME align
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2419 int x,y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2420
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2421 if(b_x<0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2422 lt= rt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2423 lb= rb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2424 }else if(b_x + 1 >= b_width){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2425 rt= lt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2426 rb= lb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2427 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2428 if(b_y<0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2429 lt= lb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2430 rt= rb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2431 }else if(b_y + 1 >= b_height){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2432 lb= lt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2433 rb= rt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2434 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2435
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2436 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
2437 obmc -= src_x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2438 b_w += src_x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2439 src_x=0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2440 }else if(src_x + b_w > w){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2441 b_w = w - src_x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2442 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2443 if(src_y<0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2444 obmc -= src_y*obmc_stride;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2445 b_h += src_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2446 src_y=0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2447 }else if(src_y + b_h> h){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2448 b_h = h - src_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2449 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2450
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2451 if(b_w<=0 || b_h<=0) return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2452
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2453 assert(src_stride > 7*MB_SIZE);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2454 // old_dst += src_x + src_y*dst_stride;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2455 dst8+= src_x + src_y*src_stride;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2456 // src += src_x + src_y*src_stride;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2457
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2458 block[0]= tmp+3*MB_SIZE;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2459 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
2460
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2461 if(same_block(lt, rt)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2462 block[1]= block[0];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2463 }else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2464 block[1]= tmp + 4*MB_SIZE;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2465 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
2466 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2467
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2468 if(same_block(lt, lb)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2469 block[2]= block[0];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2470 }else if(same_block(rt, lb)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2471 block[2]= block[1];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2472 }else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2473 block[2]= tmp+5*MB_SIZE;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2474 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
2475 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2476
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2477 if(same_block(lt, rb) ){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2478 block[3]= block[0];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2479 }else if(same_block(rt, rb)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2480 block[3]= block[1];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2481 }else if(same_block(lb, rb)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2482 block[3]= block[2];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2483 }else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2484 block[3]= tmp+6*MB_SIZE;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2485 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
2486 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2487 #if 0
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2488 for(y=0; y<b_h; y++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2489 for(x=0; x<b_w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2490 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
2491 if(add) dst[x + y*dst_stride] += v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2492 else dst[x + y*dst_stride] -= v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2493 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2494 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2495 for(y=0; y<b_h; y++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2496 uint8_t *obmc2= obmc + (obmc_stride>>1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2497 for(x=0; x<b_w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2498 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
2499 if(add) dst[x + y*dst_stride] += v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2500 else dst[x + y*dst_stride] -= v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2501 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2502 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2503 for(y=0; y<b_h; y++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2504 uint8_t *obmc3= obmc + obmc_stride*(obmc_stride>>1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2505 for(x=0; x<b_w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2506 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
2507 if(add) dst[x + y*dst_stride] += v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2508 else dst[x + y*dst_stride] -= v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2509 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2510 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2511 for(y=0; y<b_h; y++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2512 uint8_t *obmc3= obmc + obmc_stride*(obmc_stride>>1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2513 uint8_t *obmc4= obmc3+ (obmc_stride>>1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2514 for(x=0; x<b_w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2515 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
2516 if(add) dst[x + y*dst_stride] += v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2517 else dst[x + y*dst_stride] -= v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2518 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2519 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2520 #else
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 START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2524
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2525 int block_index = 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2526 for(y=0; y<b_h; y++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2527 //FIXME ugly missue of obmc_stride
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2528 uint8_t *obmc1= obmc + y*obmc_stride;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2529 uint8_t *obmc2= obmc1+ (obmc_stride>>1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2530 uint8_t *obmc3= obmc1+ obmc_stride*(obmc_stride>>1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2531 uint8_t *obmc4= obmc3+ (obmc_stride>>1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2532 dst = slice_buffer_get_line(sb, src_y + y);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2533 for(x=0; x<b_w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2534 int v= obmc1[x] * block[3][x + y*src_stride]
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2535 +obmc2[x] * block[2][x + y*src_stride]
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2536 +obmc3[x] * block[1][x + y*src_stride]
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2537 +obmc4[x] * block[0][x + y*src_stride];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2538
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2539 v <<= 8 - LOG2_OBMC_MAX;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2540 if(FRAC_BITS != 8){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2541 v += 1<<(7 - FRAC_BITS);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2542 v >>= 8 - FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2543 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2544 if(add){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2545 // v += old_dst[x + y*dst_stride];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2546 v += dst[x + src_x];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2547 v = (v + (1<<(FRAC_BITS-1))) >> FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2548 if(v&(~255)) v= ~(v>>31);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2549 dst8[x + y*src_stride] = v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2550 }else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2551 // old_dst[x + y*dst_stride] -= v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2552 dst[x + src_x] -= v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2553 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2554 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2555 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2556 STOP_TIMER("Inner add y block")
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 #endif
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2559 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2560
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2561 //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
2562 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
2563 const int b_width = s->b_width << s->block_max_depth;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2564 const int b_height= s->b_height << s->block_max_depth;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2565 const int b_stride= b_width;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2566 BlockNode *lt= &s->block[b_x + b_y*b_stride];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2567 BlockNode *rt= lt+1;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2568 BlockNode *lb= lt+b_stride;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2569 BlockNode *rb= lb+1;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2570 uint8_t *block[4];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2571 uint8_t tmp[src_stride*(b_h+5)]; //FIXME align
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2572 int x,y;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2573
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2574 if(b_x<0){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2575 lt= rt;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2576 lb= rb;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2577 }else if(b_x + 1 >= b_width){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2578 rt= lt;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2579 rb= lb;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2580 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2581 if(b_y<0){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2582 lt= lb;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2583 rt= rb;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2584 }else if(b_y + 1 >= b_height){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2585 lb= lt;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2586 rb= rt;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2587 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2588
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2589 if(src_x<0){ //FIXME merge with prev & always round internal width upto *16
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2590 obmc -= src_x;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2591 b_w += src_x;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2592 src_x=0;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2593 }else if(src_x + b_w > w){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2594 b_w = w - src_x;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2595 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2596 if(src_y<0){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2597 obmc -= src_y*obmc_stride;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2598 b_h += src_y;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2599 src_y=0;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2600 }else if(src_y + b_h> h){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2601 b_h = h - src_y;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2602 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2603
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2604 if(b_w<=0 || b_h<=0) return;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2605
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2606 assert(src_stride > 7*MB_SIZE);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2607 dst += src_x + src_y*dst_stride;
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2608 dst8+= src_x + src_y*src_stride;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2609 // src += src_x + src_y*src_stride;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2610
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2611 block[0]= tmp+3*MB_SIZE;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2612 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
2613
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2614 if(same_block(lt, rt)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2615 block[1]= block[0];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2616 }else{
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2617 block[1]= tmp + 4*MB_SIZE;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2618 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
2619 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2620
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2621 if(same_block(lt, lb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2622 block[2]= block[0];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2623 }else if(same_block(rt, lb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2624 block[2]= block[1];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2625 }else{
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2626 block[2]= tmp+5*MB_SIZE;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2627 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
2628 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2629
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2630 if(same_block(lt, rb) ){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2631 block[3]= block[0];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2632 }else if(same_block(rt, rb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2633 block[3]= block[1];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2634 }else if(same_block(lb, rb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2635 block[3]= block[2];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2636 }else{
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2637 block[3]= tmp+6*MB_SIZE;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2638 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
2639 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2640 #if 0
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2641 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2642 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2643 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
2644 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2645 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2646 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2647 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2648 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2649 uint8_t *obmc2= obmc + (obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2650 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2651 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
2652 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2653 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2654 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2655 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2656 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2657 uint8_t *obmc3= obmc + obmc_stride*(obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2658 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2659 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
2660 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2661 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2662 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2663 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2664 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2665 uint8_t *obmc3= obmc + obmc_stride*(obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2666 uint8_t *obmc4= obmc3+ (obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2667 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2668 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
2669 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2670 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2671 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2672 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2673 #else
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2674 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2675 //FIXME ugly missue of obmc_stride
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2676 uint8_t *obmc1= obmc + y*obmc_stride;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2677 uint8_t *obmc2= obmc1+ (obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2678 uint8_t *obmc3= obmc1+ obmc_stride*(obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2679 uint8_t *obmc4= obmc3+ (obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2680 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2681 int v= obmc1[x] * block[3][x + y*src_stride]
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2682 +obmc2[x] * block[2][x + y*src_stride]
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2683 +obmc3[x] * block[1][x + y*src_stride]
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2684 +obmc4[x] * block[0][x + y*src_stride];
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2685
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2686 v <<= 8 - LOG2_OBMC_MAX;
2246
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
2687 if(FRAC_BITS != 8){
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
2688 v += 1<<(7 - FRAC_BITS);
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
2689 v >>= 8 - FRAC_BITS;
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
2690 }
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2691 if(add){
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2692 v += dst[x + y*dst_stride];
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2693 v = (v + (1<<(FRAC_BITS-1))) >> FRAC_BITS;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2694 if(v&(~255)) v= ~(v>>31);
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2695 dst8[x + y*src_stride] = v;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2696 }else{
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2697 dst[x + y*dst_stride] -= v;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2698 }
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2699 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2700 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2701 #endif
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2702 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2703
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2704 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
2705 Plane *p= &s->plane[plane_index];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2706 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
2707 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
2708 int x, y, mb_x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2709 int block_size = MB_SIZE >> s->block_max_depth;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2710 int block_w = plane_index ? block_size/2 : block_size;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2711 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
2712 int obmc_stride= plane_index ? block_size : 2*block_size;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2713 int ref_stride= s->current_picture.linesize[plane_index];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2714 uint8_t *ref = s->last_picture.data[plane_index];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2715 uint8_t *dst8= s->current_picture.data[plane_index];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2716 int w= p->width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2717 int h= p->height;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2718 START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2719
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2720 if(s->keyframe || (s->avctx->debug&512)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2721 if(mb_y==mb_h)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2722 return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2723
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2724 if(add){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2725 for(y=block_w*mb_y; y<block_w*(mb_y+1); y++)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2726 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2727 // DWTELEM * line = slice_buffer_get_line(sb, y);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2728 DWTELEM * line = sb->line[y];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2729 for(x=0; x<w; x++)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2730 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2731 // 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
2732 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
2733 v >>= FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2734 if(v&(~255)) v= ~(v>>31);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2735 dst8[x + y*ref_stride]= v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2736 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2737 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2738 }else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2739 for(y=block_w*mb_y; y<block_w*(mb_y+1); y++)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2740 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2741 // DWTELEM * line = slice_buffer_get_line(sb, y);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2742 DWTELEM * line = sb->line[y];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2743 for(x=0; x<w; x++)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2744 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2745 line[x] -= 128 << FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2746 // buf[x + y*w]-= 128<<FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2747 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2748 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2749 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2750
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2751 return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2752 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2753
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2754 for(mb_x=0; mb_x<=mb_w; mb_x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2755 START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2756
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2757 add_yblock_buffered(s, sb, old_buffer, dst8, ref, obmc,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2758 block_w*mb_x - block_w/2,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2759 block_w*mb_y - block_w/2,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2760 block_w, block_w,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2761 w, h,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2762 w, ref_stride, obmc_stride,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2763 mb_x - 1, mb_y - 1,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2764 add, plane_index);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2765
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2766 STOP_TIMER("add_yblock")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2767 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2768
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2769 STOP_TIMER("predict_slice")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2770 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2771
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2772 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
2773 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
2774 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
2775 const int mb_h= s->b_height << s->block_max_depth;
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2776 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
2777 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
2778 int block_w = plane_index ? block_size/2 : block_size;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2779 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
2780 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
2781 int ref_stride= s->current_picture.linesize[plane_index];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2782 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
2783 uint8_t *dst8= s->current_picture.data[plane_index];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2784 int w= p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2785 int h= p->height;
2197
michael
parents: 2195
diff changeset
2786 START_TIMER
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2787
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2788 if(s->keyframe || (s->avctx->debug&512)){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2789 if(mb_y==mb_h)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2790 return;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2791
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2792 if(add){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2793 for(y=block_w*mb_y; y<block_w*(mb_y+1); y++){
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2794 for(x=0; x<w; x++){
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2795 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
2796 v >>= FRAC_BITS;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2797 if(v&(~255)) v= ~(v>>31);
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2798 dst8[x + y*ref_stride]= v;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2799 }
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2800 }
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2801 }else{
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2802 for(y=block_w*mb_y; y<block_w*(mb_y+1); y++){
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2803 for(x=0; x<w; x++){
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2804 buf[x + y*w]-= 128<<FRAC_BITS;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2805 }
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2806 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2807 }
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2808
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2809 return;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2810 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2811
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2812 for(mb_x=0; mb_x<=mb_w; mb_x++){
2197
michael
parents: 2195
diff changeset
2813 START_TIMER
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2814
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2815 add_yblock(s, buf, dst8, ref, obmc,
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2816 block_w*mb_x - block_w/2,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2817 block_w*mb_y - block_w/2,
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2818 block_w, block_w,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2819 w, h,
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2820 w, ref_stride, obmc_stride,
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2821 mb_x - 1, mb_y - 1,
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2822 add, plane_index);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2823
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2824 STOP_TIMER("add_yblock")
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2825 }
2197
michael
parents: 2195
diff changeset
2826
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2827 STOP_TIMER("predict_slice")
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2828 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2829
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2830 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
2831 const int mb_h= s->b_height << s->block_max_depth;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2832 int mb_y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2833 for(mb_y=0; mb_y<=mb_h; mb_y++)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2834 predict_slice(s, buf, plane_index, add, mb_y);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2835 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2836
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2837 static void quantize(SnowContext *s, SubBand *b, DWTELEM *src, int stride, int bias){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2838 const int level= b->level;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2839 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2840 const int h= b->height;
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
2841 const int qlog= clip(s->qlog + b->qlog, 0, QROOT*16);
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
2842 const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2843 int x,y, thres1, thres2;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2844 START_TIMER
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2845
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
2846 if(s->qlog == LOSSLESS_QLOG) return;
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
2847
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2848 bias= bias ? 0 : (3*qmul)>>3;
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2849 thres1= ((qmul - bias)>>QEXPSHIFT) - 1;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2850 thres2= 2*thres1;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2851
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2852 if(!bias){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2853 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2854 for(x=0; x<w; x++){
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2855 int i= src[x + y*stride];
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2856
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2857 if((unsigned)(i+thres1) > thres2){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2858 if(i>=0){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2859 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2860 i/= qmul; //FIXME optimize
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2861 src[x + y*stride]= i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2862 }else{
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2863 i= -i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2864 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2865 i/= qmul; //FIXME optimize
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2866 src[x + y*stride]= -i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2867 }
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2868 }else
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2869 src[x + y*stride]= 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2870 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2871 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2872 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2873 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2874 for(x=0; x<w; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2875 int i= src[x + y*stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2876
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2877 if((unsigned)(i+thres1) > thres2){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2878 if(i>=0){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2879 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2880 i= (i + bias) / qmul; //FIXME optimize
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2881 src[x + y*stride]= i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2882 }else{
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2883 i= -i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2884 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2885 i= (i + bias) / qmul; //FIXME optimize
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2886 src[x + y*stride]= -i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2887 }
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2888 }else
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2889 src[x + y*stride]= 0;
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 }
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2893 if(level+1 == s->spatial_decomposition_count){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2894 // STOP_TIMER("quantize")
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
2895 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2896 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2897
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2898 static void dequantize_buffered(SnowContext *s, slice_buffer * sb, SubBand *b, DWTELEM *src, int stride){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2899 const int w= b->width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2900 const int h= b->height;
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
2901 const int qlog= clip(s->qlog + b->qlog, 0, QROOT*16);
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
2902 const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2903 const int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2904 int x,y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2905 START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2906
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2907 if(s->qlog == LOSSLESS_QLOG) return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2908
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2909 for(y=0; y<h; y++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2910 // 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
2911 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
2912 for(x=0; x<w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2913 int i= line[x];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2914 if(i<0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2915 line[x]= -((-i*qmul + qadd)>>(QEXPSHIFT)); //FIXME try different bias
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2916 }else if(i>0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2917 line[x]= (( i*qmul + qadd)>>(QEXPSHIFT));
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2918 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2919 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2920 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2921 if(w > 200 /*level+1 == s->spatial_decomposition_count*/){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2922 STOP_TIMER("dquant")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2923 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2924 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2925
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2926 static void dequantize(SnowContext *s, SubBand *b, DWTELEM *src, int stride){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2927 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2928 const int h= b->height;
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
2929 const int qlog= clip(s->qlog + b->qlog, 0, QROOT*16);
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
2930 const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2931 const int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2932 int x,y;
2195
df3079d7806f merge decode_subband() and dequantize()
michael
parents: 2194
diff changeset
2933 START_TIMER
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2934
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
2935 if(s->qlog == LOSSLESS_QLOG) return;
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
2936
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2937 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2938 for(x=0; x<w; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2939 int i= src[x + y*stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2940 if(i<0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2941 src[x + y*stride]= -((-i*qmul + qadd)>>(QEXPSHIFT)); //FIXME try different bias
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2942 }else if(i>0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2943 src[x + y*stride]= (( i*qmul + qadd)>>(QEXPSHIFT));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2944 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2945 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2946 }
2195
df3079d7806f merge decode_subband() and dequantize()
michael
parents: 2194
diff changeset
2947 if(w > 200 /*level+1 == s->spatial_decomposition_count*/){
df3079d7806f merge decode_subband() and dequantize()
michael
parents: 2194
diff changeset
2948 STOP_TIMER("dquant")
df3079d7806f merge decode_subband() and dequantize()
michael
parents: 2194
diff changeset
2949 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2950 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2951
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2952 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
2953 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2954 const int h= b->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2955 int x,y;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2956
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2957 for(y=h-1; y>=0; y--){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2958 for(x=w-1; x>=0; x--){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2959 int i= x + y*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2960
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2961 if(x){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2962 if(use_median){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2963 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
2964 else src[i] -= src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2965 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2966 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
2967 else src[i] -= src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2968 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2969 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2970 if(y) src[i] -= src[i - stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2971 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2972 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2973 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2974 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2975
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2976 static void correlate_buffered(SnowContext *s, slice_buffer * sb, SubBand *b, DWTELEM *src, int stride, int inverse, int use_median){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2977 const int w= b->width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2978 const int h= b->height;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2979 int x,y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2980
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2981 // START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2982
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2983 DWTELEM * line;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2984 DWTELEM * prev;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2985
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2986 for(y=0; y<h; y++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2987 prev = line;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2988 // 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
2989 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
2990 for(x=0; x<w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2991 if(x){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2992 if(use_median){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2993 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
2994 else line[x] += line[x - 1];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2995 }else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2996 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
2997 else line[x] += line[x - 1];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2998 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2999 }else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3000 if(y) line[x] += prev[x];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3001 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3002 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3003 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3004
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3005 // STOP_TIMER("correlate")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3006 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3007
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3008 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
3009 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3010 const int h= b->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3011 int x,y;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3012
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3013 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3014 for(x=0; x<w; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3015 int i= x + y*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3016
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3017 if(x){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3018 if(use_median){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3019 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
3020 else src[i] += src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3021 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3022 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
3023 else src[i] += src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3024 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3025 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3026 if(y) src[i] += src[i - stride];
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 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3031
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3032 static void encode_header(SnowContext *s){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3033 int plane_index, level, orientation;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3034 uint8_t kstate[32];
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3035
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3036 memset(kstate, MID_STATE, sizeof(kstate));
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3037
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3038 put_rac(&s->c, kstate, s->keyframe);
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
3039 if(s->keyframe || s->always_reset)
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
3040 reset_contexts(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3041 if(s->keyframe){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3042 put_symbol(&s->c, s->header_state, s->version, 0);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3043 put_rac(&s->c, s->header_state, s->always_reset);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3044 put_symbol(&s->c, s->header_state, s->temporal_decomposition_type, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3045 put_symbol(&s->c, s->header_state, s->temporal_decomposition_count, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3046 put_symbol(&s->c, s->header_state, s->spatial_decomposition_count, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3047 put_symbol(&s->c, s->header_state, s->colorspace_type, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3048 put_symbol(&s->c, s->header_state, s->chroma_h_shift, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3049 put_symbol(&s->c, s->header_state, s->chroma_v_shift, 0);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3050 put_rac(&s->c, s->header_state, s->spatial_scalability);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3051 // put_rac(&s->c, s->header_state, s->rate_scalability);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3052
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3053 for(plane_index=0; plane_index<2; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3054 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3055 for(orientation=level ? 1:0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3056 if(orientation==2) continue;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3057 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
3058 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3059 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3060 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3061 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3062 put_symbol(&s->c, s->header_state, s->spatial_decomposition_type, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3063 put_symbol(&s->c, s->header_state, s->qlog, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3064 put_symbol(&s->c, s->header_state, s->mv_scale, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3065 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
3066 put_symbol(&s->c, s->header_state, s->block_max_depth, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3067 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3068
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3069 static int decode_header(SnowContext *s){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3070 int plane_index, level, orientation;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3071 uint8_t kstate[32];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3072
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3073 memset(kstate, MID_STATE, sizeof(kstate));
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3074
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3075 s->keyframe= get_rac(&s->c, kstate);
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
3076 if(s->keyframe || s->always_reset)
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
3077 reset_contexts(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3078 if(s->keyframe){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3079 s->version= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3080 if(s->version>0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3081 av_log(s->avctx, AV_LOG_ERROR, "version %d not supported", s->version);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3082 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3083 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3084 s->always_reset= get_rac(&s->c, s->header_state);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3085 s->temporal_decomposition_type= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3086 s->temporal_decomposition_count= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3087 s->spatial_decomposition_count= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3088 s->colorspace_type= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3089 s->chroma_h_shift= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3090 s->chroma_v_shift= get_symbol(&s->c, s->header_state, 0);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3091 s->spatial_scalability= get_rac(&s->c, s->header_state);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3092 // s->rate_scalability= get_rac(&s->c, s->header_state);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3093
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3094 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3095 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3096 for(orientation=level ? 1:0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3097 int q;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3098 if (plane_index==2) q= s->plane[1].band[level][orientation].qlog;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3099 else if(orientation==2) q= s->plane[plane_index].band[level][1].qlog;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3100 else q= get_symbol(&s->c, s->header_state, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3101 s->plane[plane_index].band[level][orientation].qlog= q;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3102 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3103 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3104 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3105 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3106
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3107 s->spatial_decomposition_type= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3108 if(s->spatial_decomposition_type > 2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3109 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
3110 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3111 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3112
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3113 s->qlog= get_symbol(&s->c, s->header_state, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3114 s->mv_scale= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3115 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
3116 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
3117
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3118 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
3119 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3120
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3121 static void init_qexp(){
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3122 int i;
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3123 double v=128;
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3124
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3125 for(i=0; i<QROOT; i++){
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3126 qexp[i]= lrintf(v);
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3127 v *= pow(2, 1.0 / QROOT);
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3128 }
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3129 }
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3130
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3131 static int common_init(AVCodecContext *avctx){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3132 SnowContext *s = avctx->priv_data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3133 int width, height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3134 int level, orientation, plane_index, dec;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3135
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3136 s->avctx= avctx;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3137
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3138 dsputil_init(&s->dsp, avctx);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3139
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3140 #define mcf(dx,dy)\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3141 s->dsp.put_qpel_pixels_tab [0][dy+dx/4]=\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3142 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
3143 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
3144 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
3145 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
3146 s->dsp.put_h264_qpel_pixels_tab[1][dy+dx/4];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3147
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3148 mcf( 0, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3149 mcf( 4, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3150 mcf( 8, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3151 mcf(12, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3152 mcf( 0, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3153 mcf( 4, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3154 mcf( 8, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3155 mcf(12, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3156 mcf( 0, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3157 mcf( 4, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3158 mcf( 8, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3159 mcf(12, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3160 mcf( 0,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3161 mcf( 4,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3162 mcf( 8,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3163 mcf(12,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3164
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3165 #define mcfh(dx,dy)\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3166 s->dsp.put_pixels_tab [0][dy/4+dx/8]=\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3167 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
3168 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
3169 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
3170 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
3171 mc_block_hpel ## dx ## dy ## 8;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3172
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3173 mcfh(0, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3174 mcfh(8, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3175 mcfh(0, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3176 mcfh(8, 8)
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3177
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3178 if(!qexp[0])
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3179 init_qexp();
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3180
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3181 dec= s->spatial_decomposition_count= 5;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3182 s->spatial_decomposition_type= avctx->prediction_method; //FIXME add decorrelator type r transform_type
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3183
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3184 s->chroma_h_shift= 1; //FIXME XXX
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3185 s->chroma_v_shift= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3186
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3187 // dec += FFMAX(s->chroma_h_shift, s->chroma_v_shift);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3188
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
3189 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
3190 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
3191
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3192 s->spatial_dwt_buffer= av_mallocz(width*height*sizeof(DWTELEM));
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3193
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3194 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
3195 s->block_max_depth= (s->avctx->flags & CODEC_FLAG_4MV) ? 1 : 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3196
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3197 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3198 int w= s->avctx->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3199 int h= s->avctx->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3200
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3201 if(plane_index){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3202 w>>= s->chroma_h_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3203 h>>= s->chroma_v_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3204 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3205 s->plane[plane_index].width = w;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3206 s->plane[plane_index].height= h;
2160
11e1425b3a66 cleanup
michael
parents: 2159
diff changeset
3207 //av_log(NULL, AV_LOG_DEBUG, "%d %d\n", w, h);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3208 for(level=s->spatial_decomposition_count-1; level>=0; level--){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3209 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3210 SubBand *b= &s->plane[plane_index].band[level][orientation];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3211
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3212 b->buf= s->spatial_dwt_buffer;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3213 b->level= level;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3214 b->stride= s->plane[plane_index].width << (s->spatial_decomposition_count - level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3215 b->width = (w + !(orientation&1))>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3216 b->height= (h + !(orientation>1))>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3217
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3218 b->stride_line = 1 << (s->spatial_decomposition_count - level);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3219 b->buf_x_offset = 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3220 b->buf_y_offset = 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3221
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3222 if(orientation&1){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3223 b->buf += (w+1)>>1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3224 b->buf_x_offset = (w+1)>>1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3225 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3226 if(orientation>1){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3227 b->buf += b->stride>>1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3228 b->buf_y_offset = b->stride_line >> 1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3229 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3230
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3231 if(level)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3232 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
3233 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
3234 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3235 w= (w+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3236 h= (h+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3237 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3238 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3239
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3240 reset_contexts(s);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3241 /*
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3242 width= s->width= avctx->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3243 height= s->height= avctx->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3244
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3245 assert(width && height);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3246 */
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3247 s->avctx->get_buffer(s->avctx, &s->mconly_picture);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3248
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3249 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3250 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3251
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3252
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3253 static void calculate_vissual_weight(SnowContext *s, Plane *p){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3254 int width = p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3255 int height= p->height;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
3256 int level, orientation, x, y;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3257
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3258 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3259 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3260 SubBand *b= &p->band[level][orientation];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3261 DWTELEM *buf= b->buf;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3262 int64_t error=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3263
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3264 memset(s->spatial_dwt_buffer, 0, sizeof(int)*width*height);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3265 buf[b->width/2 + b->height/2*b->stride]= 256*256;
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3266 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
3267 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3268 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3269 int64_t d= s->spatial_dwt_buffer[x + y*width];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3270 error += d*d;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3271 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3272 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3273
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3274 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
3275 // 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
3276 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3277 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3278 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3279
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3280 static int encode_init(AVCodecContext *avctx)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3281 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3282 SnowContext *s = avctx->priv_data;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
3283 int plane_index;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3284
2151
44c973bfec0f dont segfault without -strict -1
michael
parents: 2150
diff changeset
3285 if(avctx->strict_std_compliance >= 0){
44c973bfec0f dont segfault without -strict -1
michael
parents: 2150
diff changeset
3286 av_log(avctx, AV_LOG_ERROR, "this codec is under development, files encoded with it wont be decodeable with future versions!!!\n"
2521
d3885f927bc7 -strict -1 comment fix
michael
parents: 2453
diff changeset
3287 "use vstrict=-1 / -strict -1 to use it anyway\n");
2151
44c973bfec0f dont segfault without -strict -1
michael
parents: 2150
diff changeset
3288 return -1;
44c973bfec0f dont segfault without -strict -1
michael
parents: 2150
diff changeset
3289 }
44c973bfec0f dont segfault without -strict -1
michael
parents: 2150
diff changeset
3290
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3291 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
3292 alloc_blocks(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3293
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3294 s->version=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3295
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3296 s->m.me.scratchpad= av_mallocz((avctx->width+64)*2*16*2*sizeof(uint8_t));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3297 s->m.me.map = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3298 s->m.me.score_map = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3299 h263_encode_init(&s->m); //mv_penalty
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3300
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3301 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3302 calculate_vissual_weight(s, &s->plane[plane_index]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3303 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3304
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3305
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3306 avctx->coded_frame= &s->current_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3307 switch(avctx->pix_fmt){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3308 // case PIX_FMT_YUV444P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3309 // case PIX_FMT_YUV422P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3310 case PIX_FMT_YUV420P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3311 case PIX_FMT_GRAY8:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3312 // case PIX_FMT_YUV411P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3313 // case PIX_FMT_YUV410P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3314 s->colorspace_type= 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3315 break;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3316 /* case PIX_FMT_RGBA32:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3317 s->colorspace= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3318 break;*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3319 default:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3320 av_log(avctx, AV_LOG_ERROR, "format not supported\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3321 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3322 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3323 // 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
3324 s->chroma_h_shift= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3325 s->chroma_v_shift= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3326 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3327 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3328
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3329 static int frame_start(SnowContext *s){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3330 AVFrame tmp;
2187
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
3331 int w= s->avctx->width; //FIXME round up to x16 ?
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
3332 int h= s->avctx->height;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3333
2187
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
3334 if(s->current_picture.data[0]){
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
3335 draw_edges(s->current_picture.data[0], s->current_picture.linesize[0], w , h , EDGE_WIDTH );
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
3336 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
3337 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
3338 }
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
3339
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3340 tmp= s->last_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3341 s->last_picture= s->current_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3342 s->current_picture= tmp;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3343
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3344 s->current_picture.reference= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3345 if(s->avctx->get_buffer(s->avctx, &s->current_picture) < 0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3346 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3347 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3348 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3349
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3350 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3351 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3352
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3353 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3354 SnowContext *s = avctx->priv_data;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3355 RangeCoder * const c= &s->c;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3356 AVFrame *pict = data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3357 const int width= s->avctx->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3358 const int height= s->avctx->height;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
3359 int level, orientation, plane_index;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3360
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3361 ff_init_range_encoder(c, buf, buf_size);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3362 ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3363
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3364 s->input_picture = *pict;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3365
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3366 s->keyframe=avctx->gop_size==0 || avctx->frame_number % avctx->gop_size == 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3367 pict->pict_type= s->keyframe ? FF_I_TYPE : FF_P_TYPE;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3368
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3369 if(pict->quality){
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3370 s->qlog= rint(QROOT*log(pict->quality / (float)FF_QP2LAMBDA)/log(2));
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3371 //<64 >60
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3372 s->qlog += 61*QROOT/8;
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3373 }else{
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3374 s->qlog= LOSSLESS_QLOG;
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3375 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3376
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3377 frame_start(s);
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
3378 s->current_picture.key_frame= s->keyframe;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3379
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3380 if(pict->pict_type == P_TYPE){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3381 int block_width = (width +15)>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3382 int block_height= (height+15)>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3383 int stride= s->current_picture.linesize[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3384
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3385 assert(s->current_picture.data[0]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3386 assert(s->last_picture.data[0]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3387
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3388 s->m.avctx= s->avctx;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3389 s->m.current_picture.data[0]= s->current_picture.data[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3390 s->m. last_picture.data[0]= s-> last_picture.data[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3391 s->m. new_picture.data[0]= s-> input_picture.data[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3392 s->m.current_picture_ptr= &s->m.current_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3393 s->m. last_picture_ptr= &s->m. last_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3394 s->m.linesize=
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3395 s->m. last_picture.linesize[0]=
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3396 s->m. new_picture.linesize[0]=
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3397 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
3398 s->m.uvlinesize= s->current_picture.linesize[1];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3399 s->m.width = width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3400 s->m.height= height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3401 s->m.mb_width = block_width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3402 s->m.mb_height= block_height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3403 s->m.mb_stride= s->m.mb_width+1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3404 s->m.b8_stride= 2*s->m.mb_width+1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3405 s->m.f_code=1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3406 s->m.pict_type= pict->pict_type;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3407 s->m.me_method= s->avctx->me_method;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3408 s->m.me.scene_change_score=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3409 s->m.flags= s->avctx->flags;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3410 s->m.quarter_sample= (s->avctx->flags & CODEC_FLAG_QPEL)!=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3411 s->m.out_format= FMT_H263;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3412 s->m.unrestricted_mv= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3413
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
3414 s->lambda = s->m.lambda= pict->quality * 3/2; //FIXME bug somewhere else
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3415 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
3416 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
3417
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3418 s->m.dsp= s->dsp; //move
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3419 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
3420 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3421
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
3422 redo_frame:
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3423
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3424 s->qbias= pict->pict_type == P_TYPE ? 2 : 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3425
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3426 encode_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
3427 encode_blocks(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
3428
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3429 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3430 Plane *p= &s->plane[plane_index];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3431 int w= p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3432 int h= p->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3433 int x, y;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
3434 // int bits= put_bits_count(&s->c.pb);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3435
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3436 //FIXME optimize
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3437 if(pict->data[plane_index]) //FIXME gray hack
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3438 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3439 for(x=0; x<w; x++){
2246
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
3440 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
3441 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3442 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3443 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
3444
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3445 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
3446 && 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
3447 && s->m.me.scene_change_score > s->avctx->scenechange_threshold){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3448 ff_init_range_encoder(c, buf, buf_size);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3449 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
3450 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
3451 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
3452 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
3453 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
3454 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3455
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3456 if(s->qlog == LOSSLESS_QLOG){
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3457 for(y=0; y<h; y++){
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3458 for(x=0; x<w; x++){
2595
6b385f3e07a3 fixing lossless snow
michael
parents: 2592
diff changeset
3459 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
3460 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3461 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3462 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3463
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3464 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
3465
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3466 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3467 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3468 SubBand *b= &p->band[level][orientation];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3469
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3470 quantize(s, b, b->buf, b->stride, s->qbias);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3471 if(orientation==0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3472 decorrelate(s, b, b->buf, b->stride, pict->pict_type == P_TYPE, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3473 encode_subband(s, b, b->buf, b->parent ? b->parent->buf : NULL, b->stride, orientation);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3474 assert(b->parent==NULL || b->parent->stride == b->stride*2);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3475 if(orientation==0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3476 correlate(s, b, b->buf, b->stride, 1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3477 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3478 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3479 // 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
3480
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3481 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3482 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3483 SubBand *b= &p->band[level][orientation];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3484
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3485 dequantize(s, b, b->buf, b->stride);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3486 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3487 }
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3488
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3489 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
3490 if(s->qlog == LOSSLESS_QLOG){
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3491 for(y=0; y<h; y++){
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3492 for(x=0; x<w; x++){
2246
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
3493 s->spatial_dwt_buffer[y*w + x]<<=FRAC_BITS;
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3494 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3495 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3496 }
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
3497 {START_TIMER
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3498 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
3499 STOP_TIMER("pred-conv")}
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3500 if(s->avctx->flags&CODEC_FLAG_PSNR){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3501 int64_t error= 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3502
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3503 if(pict->data[plane_index]) //FIXME gray hack
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3504 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3505 for(x=0; x<w; x++){
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3506 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
3507 error += d*d;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3508 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3509 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3510 s->avctx->error[plane_index] += error;
2232
960e3552e418 per picture psnr
michael
parents: 2224
diff changeset
3511 s->current_picture.error[plane_index] = error;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3512 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3513 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3514
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3515 if(s->last_picture.data[0])
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3516 avctx->release_buffer(avctx, &s->last_picture);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3517
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3518 emms_c();
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3519
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3520 return ff_rac_terminate(c);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3521 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3522
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3523 static void common_end(SnowContext *s){
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
3524 int plane_index, level, orientation;
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
3525
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3526 av_freep(&s->spatial_dwt_buffer);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3527
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3528 av_freep(&s->m.me.scratchpad);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3529 av_freep(&s->m.me.map);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3530 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
3531
70b27300a496 quad 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 av_freep(&s->block);
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
3533
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
3534 for(plane_index=0; plane_index<3; plane_index++){
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
3535 for(level=s->spatial_decomposition_count-1; level>=0; level--){
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
3536 for(orientation=level ? 1 : 0; orientation<4; orientation++){
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
3537 SubBand *b= &s->plane[plane_index].band[level][orientation];
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
3538
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3539 av_freep(&b->x_coeff);
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
3540 }
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
3541 }
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
3542 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3543 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3544
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3545 static int encode_end(AVCodecContext *avctx)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3546 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3547 SnowContext *s = avctx->priv_data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3548
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3549 common_end(s);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3550
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3551 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3552 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3553
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3554 static int decode_init(AVCodecContext *avctx)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3555 {
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3556 SnowContext *s = avctx->priv_data;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3557 int block_size;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3558
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3559 common_init(avctx);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3560
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3561 block_size = MB_SIZE >> s->block_max_depth;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3562 /* FIXME block_size * 2 is determined empirically. block_size * 1.5 is definitely needed, but I (Robert) cannot figure out why more than that is needed. Perhaps there is a bug, or perhaps I overlooked some demands that are placed on the buffer. */
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3563 /* FIXME The formula is WRONG. For height > 480, the buffer will overflow. */
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3564 /* FIXME For now, I will use a full frame of lines. Fortunately, this should not materially effect cache performance because lines are allocated using a stack, so if in fact only 50 out of 496 lines are needed at a time, the other 446 will sit allocated but never accessed. */
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3565 // slice_buffer_init(s->plane[0].sb, s->plane[0].height, (block_size * 2) + (s->spatial_decomposition_count * s->spatial_decomposition_count), s->plane[0].width, s->spatial_dwt_buffer);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3566 slice_buffer_init(&s->sb, s->plane[0].height, s->plane[0].height, s->plane[0].width, s->spatial_dwt_buffer);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3567
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3568 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3569 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3570
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3571 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
3572 SnowContext *s = avctx->priv_data;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3573 RangeCoder * const c= &s->c;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3574 int bytes_read;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3575 AVFrame *picture = data;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
3576 int level, orientation, plane_index;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3577
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3578 ff_init_range_decoder(c, buf, buf_size);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3579 ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3580
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3581 s->current_picture.pict_type= FF_I_TYPE; //FIXME I vs. P
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3582 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
3583 if(!s->block) alloc_blocks(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3584
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3585 frame_start(s);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3586 //keyframe flag dupliaction mess FIXME
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3587 if(avctx->debug&FF_DEBUG_PICT_INFO)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3588 av_log(avctx, AV_LOG_ERROR, "keyframe:%d qlog:%d\n", s->keyframe, s->qlog);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3589
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
3590 decode_blocks(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3591
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3592 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3593 Plane *p= &s->plane[plane_index];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3594 int w= p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3595 int h= p->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3596 int x, y;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3597 int decode_state[MAX_DECOMPOSITIONS][4][1]; /* Stored state info for unpack_coeffs. 1 variable per instance. */
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3598 SubBand * correlate_band;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3599
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3600 if(s->avctx->debug&2048){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3601 memset(s->spatial_dwt_buffer, 0, sizeof(DWTELEM)*w*h);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3602 predict_plane(s, s->spatial_dwt_buffer, plane_index, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3603
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3604 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3605 for(x=0; x<w; x++){
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
3606 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
3607 s->mconly_picture.data[plane_index][y*s->mconly_picture.linesize[plane_index] + x]= v;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3608 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3609 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3610 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3611
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3612 { START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3613 for(level=0; level<s->spatial_decomposition_count; level++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3614 for(orientation=level ? 1 : 0; orientation<4; orientation++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3615 SubBand *b= &p->band[level][orientation];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3616 unpack_coeffs(s, b, b->parent, orientation);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3617 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3618 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3619 STOP_TIMER("unpack coeffs");
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3620 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3621
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3622 /* Handle level 0, orientation 0 specially. It is particularly resistant to slicing but fortunately quite small, so process it in one pass. */
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3623 correlate_band = &p->band[0][0];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3624 decode_subband_slice_buffered(s, correlate_band, &s->sb, 0, correlate_band->height, decode_state[0][0]);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3625 correlate_buffered(s, &s->sb, correlate_band, correlate_band->buf, correlate_band->stride, 1, 0);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3626 dequantize_buffered(s, &s->sb, correlate_band, correlate_band->buf, correlate_band->stride);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3627
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3628 {START_TIMER
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3629 const int mb_h= s->b_height << s->block_max_depth;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3630 const int block_size = MB_SIZE >> s->block_max_depth;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3631 const int block_w = plane_index ? block_size/2 : block_size;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3632 int mb_y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3633 dwt_compose_t cs[MAX_DECOMPOSITIONS];
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3634 int yd=0, yq=0;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3635 int y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3636 int end_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3637
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3638 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
3639 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
3640
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3641 const int slice_starty = block_w*mb_y;
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3642 const int slice_h = block_w*(mb_y+1);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3643
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3644 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3645 START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3646 for(level=0; level<s->spatial_decomposition_count; level++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3647 for(orientation=level ? 1 : 1; orientation<4; orientation++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3648 SubBand *b= &p->band[level][orientation];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3649 int start_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3650 int end_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3651 int our_mb_start = mb_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3652 int our_mb_end = (mb_y + 1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3653 start_y = FFMIN(b->height, (mb_y ? ((block_w * our_mb_start - 4) >> (s->spatial_decomposition_count - level)) + 5 : 0));
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3654 end_y = FFMIN(b->height, (((block_w * our_mb_end - 4) >> (s->spatial_decomposition_count - level)) + 5));
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3655
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3656 if (start_y != end_y)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3657 decode_subband_slice_buffered(s, b, &s->sb, start_y, end_y, decode_state[level][orientation]);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3658 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3659 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3660 STOP_TIMER("decode_subband_slice");
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3661 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3662
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3663 { START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3664 for(; yd<slice_h; yd+=4){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3665 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
3666 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3667 STOP_TIMER("idwt slice");}
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3668
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3669
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3670 if(s->qlog == LOSSLESS_QLOG){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3671 for(; yq<slice_h && yq<h; yq++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3672 DWTELEM * line = slice_buffer_get_line(&s->sb, yq);
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3673 for(x=0; x<w; x++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3674 line[x] <<= FRAC_BITS;
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3675 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3676 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3677 }
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3678
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3679 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
3680
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3681 /* Nasty hack based empirically on how predict_slice_buffered() hits the buffer. */
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3682 /* FIXME If possible, make predict_slice fit into the slice. As of now, it works on some previous lines (up to slice_height / 2) if the condition on the next line is false. */
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3683 if (s->keyframe || (s->avctx->debug&512)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3684 y = FFMIN(p->height, slice_starty);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3685 end_y = FFMIN(p->height, slice_h);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3686 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3687 else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3688 y = FFMAX(0, FFMIN(p->height, slice_starty - (block_w >> 1)));
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3689 end_y = FFMAX(0, FFMIN(p->height, slice_h - (block_w >> 1)));
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3690 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3691 while(y < end_y)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3692 slice_buffer_release(&s->sb, y++);
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3693 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3694
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3695 slice_buffer_flush(&s->sb);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3696
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
3697 STOP_TIMER("idwt + predict_slices")}
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3698 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3699
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3700 emms_c();
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3701
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3702 if(s->last_picture.data[0])
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3703 avctx->release_buffer(avctx, &s->last_picture);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3704
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3705 if(!(s->avctx->debug&2048))
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3706 *picture= s->current_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3707 else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3708 *picture= s->mconly_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3709
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3710 *data_size = sizeof(AVFrame);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3711
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3712 bytes_read= c->bytestream - c->bytestream_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3713 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
3714
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3715 return bytes_read;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3716 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3717
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3718 static int decode_end(AVCodecContext *avctx)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3719 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3720 SnowContext *s = avctx->priv_data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3721
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3722 slice_buffer_destroy(&s->sb);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3723
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3724 common_end(s);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3725
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3726 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3727 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3728
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3729 AVCodec snow_decoder = {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3730 "snow",
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3731 CODEC_TYPE_VIDEO,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3732 CODEC_ID_SNOW,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3733 sizeof(SnowContext),
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3734 decode_init,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3735 NULL,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3736 decode_end,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3737 decode_frame,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3738 0 /*CODEC_CAP_DR1*/ /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3739 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3740 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3741
2408
a6e4da1c28ee Disable encoders patch by (Gianluigi Tiesi <mplayer netfarm it>)
michael
parents: 2368
diff changeset
3742 #ifdef CONFIG_ENCODERS
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3743 AVCodec snow_encoder = {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3744 "snow",
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3745 CODEC_TYPE_VIDEO,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3746 CODEC_ID_SNOW,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3747 sizeof(SnowContext),
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3748 encode_init,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3749 encode_frame,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3750 encode_end,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3751 };
2408
a6e4da1c28ee Disable encoders patch by (Gianluigi Tiesi <mplayer netfarm it>)
michael
parents: 2368
diff changeset
3752 #endif
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3753
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3754
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3755 #if 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3756 #undef malloc
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3757 #undef free
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3758 #undef printf
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3759
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3760 int main(){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3761 int width=256;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3762 int height=256;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3763 int buffer[2][width*height];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3764 SnowContext s;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3765 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3766 s.spatial_decomposition_count=6;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3767 s.spatial_decomposition_type=1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3768
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3769 printf("testing 5/3 DWT\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3770 for(i=0; i<width*height; i++)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3771 buffer[0][i]= buffer[1][i]= random()%54321 - 12345;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3772
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3773 ff_spatial_dwt(buffer[0], width, height, width, s->spatial_decomposition_type, s->spatial_decomposition_count);
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3774 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
3775
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3776 for(i=0; i<width*height; i++)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3777 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
3778
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3779 printf("testing 9/7 DWT\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3780 s.spatial_decomposition_type=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3781 for(i=0; i<width*height; i++)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3782 buffer[0][i]= buffer[1][i]= random()%54321 - 12345;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3783
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3784 ff_spatial_dwt(buffer[0], width, height, width, s->spatial_decomposition_type, s->spatial_decomposition_count);
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3785 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
3786
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3787 for(i=0; i<width*height; i++)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3788 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
3789
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3790 printf("testing AC coder\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3791 memset(s.header_state, 0, sizeof(s.header_state));
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3792 ff_init_range_encoder(&s.c, buffer[0], 256*256);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3793 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
3794
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3795 for(i=-256; i<256; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3796 START_TIMER
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3797 put_symbol(&s.c, s.header_state, i*i*i/3*ABS(i), 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3798 STOP_TIMER("put_symbol")
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3799 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3800 ff_rac_terminate(&s.c);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3801
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3802 memset(s.header_state, 0, sizeof(s.header_state));
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3803 ff_init_range_decoder(&s.c, buffer[0], 256*256);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3804 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
3805
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3806 for(i=-256; i<256; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3807 int j;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3808 START_TIMER
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3809 j= get_symbol(&s.c, s.header_state, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3810 STOP_TIMER("get_symbol")
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3811 if(j!=i*i*i/3*ABS(i)) printf("fsck: %d != %d\n", i, j);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3812 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3813 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3814 int level, orientation, x, y;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3815 int64_t errors[8][4];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3816 int64_t g=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3817
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3818 memset(errors, 0, sizeof(errors));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3819 s.spatial_decomposition_count=3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3820 s.spatial_decomposition_type=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3821 for(level=0; level<s.spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3822 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3823 int w= width >> (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3824 int h= height >> (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3825 int stride= width << (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3826 DWTELEM *buf= buffer[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3827 int64_t error=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3828
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3829 if(orientation&1) buf+=w;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3830 if(orientation>1) buf+=stride>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3831
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3832 memset(buffer[0], 0, sizeof(int)*width*height);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3833 buf[w/2 + h/2*stride]= 256*256;
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3834 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
3835 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3836 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3837 int64_t d= buffer[0][x + y*width];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3838 error += d*d;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3839 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
3840 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3841 if(ABS(height/2-y)<9 && level==2) printf("\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3842 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3843 error= (int)(sqrt(error)+0.5);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3844 errors[level][orientation]= error;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3845 if(g) g=ff_gcd(g, error);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3846 else g= error;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3847 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3848 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3849 printf("static int const visual_weight[][4]={\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3850 for(level=0; level<s.spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3851 printf(" {");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3852 for(orientation=0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3853 printf("%8lld,", errors[level][orientation]/g);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3854 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3855 printf("},\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3856 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3857 printf("};\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3858 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3859 int level=2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3860 int orientation=3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3861 int w= width >> (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3862 int h= height >> (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3863 int stride= width << (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3864 DWTELEM *buf= buffer[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3865 int64_t error=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3866
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3867 buf+=w;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3868 buf+=stride>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3869
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3870 memset(buffer[0], 0, sizeof(int)*width*height);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3871 #if 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3872 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3873 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3874 int tab[4]={0,2,3,1};
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3875 buffer[0][x+width*y]= 256*256*tab[(x&1) + 2*(y&1)];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3876 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3877 }
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3878 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
3879 #else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3880 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3881 for(x=0; x<w; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3882 buf[x + y*stride ]=169;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3883 buf[x + y*stride-w]=64;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3884 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3885 }
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3886 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
3887 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3888 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3889 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3890 int64_t d= buffer[0][x + y*width];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3891 error += d*d;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3892 if(ABS(width/2-x)<9 && ABS(height/2-y)<9) printf("%8lld ", d);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3893 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3894 if(ABS(height/2-y)<9) printf("\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3895 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3896 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3897
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3898 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3899 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3900 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3901 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3902