annotate snow.c @ 5050:a5f6fbc9fa66 libavcodec

loosen dependencies over mpegaudiodec
author aurel
date Sun, 20 May 2007 13:40:07 +0000
parents f99e40a7155b
children 176ac8353f48
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 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3920
diff changeset
4 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3920
diff changeset
5 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3920
diff changeset
6 * FFmpeg is free software; you can redistribute it and/or
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
7 * modify it under the terms of the GNU Lesser General Public
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
8 * License as published by the Free Software Foundation; either
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3920
diff changeset
9 * version 2.1 of the License, or (at your option) any later version.
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
10 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3920
diff changeset
11 * FFmpeg is distributed in the hope that it will be useful,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
14 * Lesser General Public License for more details.
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
15 *
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
16 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3920
diff changeset
17 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 3035
diff changeset
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
19 */
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
20
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
21 #include "avcodec.h"
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
22 #include "dsputil.h"
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
23 #include "snow.h"
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
24
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
25 #include "rangecoder.h"
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
26
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
27 #include "mpegvideo.h"
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
28
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
29 #undef NDEBUG
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
30 #include <assert.h>
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
31
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
32 static const int8_t quant3[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
33 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
34 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
35 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
36 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
37 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
38 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
39 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
40 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
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, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
49 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
50 static const int8_t quant3b[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
51 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
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, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
56 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
57 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
58 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
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 };
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
68 static const int8_t quant3bA[256]={
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
69 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
70 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
71 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
72 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
73 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
74 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
75 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
76 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
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 };
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
86 static const int8_t quant5[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
87 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
88 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
89 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
90 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
91 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
92 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
93 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
94 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
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,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
103 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
104 static const int8_t quant7[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
105 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
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, 3, 3, 3, 3, 3, 3, 3, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
108 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
109 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
110 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
111 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
112 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
113 -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
114 -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
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,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
119 -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
120 -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
121 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
122 static const int8_t quant9[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
123 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
124 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
125 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
126 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
127 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
128 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
129 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
130 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
131 -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
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,-3,-3,-3,-3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
138 -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
139 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
140 static const int8_t quant11[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
141 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
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, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
144 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
145 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
146 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
147 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
148 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
149 -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
150 -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
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,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
155 -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
156 -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
157 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
158 static const int8_t quant13[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
159 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
160 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
161 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
162 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
163 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
164 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
165 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
166 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
167 -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
168 -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
169 -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
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,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
172 -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
173 -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
174 -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
175 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
176
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
177 #if 0 //64*cubic
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
178 static const uint8_t obmc32[1024]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
179 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
180 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
181 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
182 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
183 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
184 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
185 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
186 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
187 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
188 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
189 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
190 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
191 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
192 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
193 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
194 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
195 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
196 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
197 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
198 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
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, 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
201 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
202 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
203 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
204 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
205 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
206 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
207 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
208 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
209 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
210 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
211 //error:0.000022
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
212 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
213 static const uint8_t obmc16[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
214 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
215 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
216 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
217 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
218 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
219 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
220 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
221 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
222 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
223 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
224 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
225 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
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, 1, 4, 6, 9,11,13,15,15,13,11, 9, 6, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
228 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
229 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
230 //error:0.000033
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
231 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
232 #elif 1 // 64*linear
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
233 static const uint8_t obmc32[1024]={
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
234 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
235 0, 4, 4, 4, 8, 8, 8, 12, 12, 16, 16, 16, 20, 20, 20, 24, 24, 20, 20, 20, 16, 16, 16, 12, 12, 8, 8, 8, 4, 4, 4, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
236 0, 4, 8, 8, 12, 12, 16, 20, 20, 24, 28, 28, 32, 32, 36, 40, 40, 36, 32, 32, 28, 28, 24, 20, 20, 16, 12, 12, 8, 8, 4, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
237 0, 4, 8, 12, 16, 20, 24, 28, 28, 32, 36, 40, 44, 48, 52, 56, 56, 52, 48, 44, 40, 36, 32, 28, 28, 24, 20, 16, 12, 8, 4, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
238 4, 8, 12, 16, 20, 24, 28, 32, 40, 44, 48, 52, 56, 60, 64, 68, 68, 64, 60, 56, 52, 48, 44, 40, 32, 28, 24, 20, 16, 12, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
239 4, 8, 12, 20, 24, 32, 36, 40, 48, 52, 56, 64, 68, 76, 80, 84, 84, 80, 76, 68, 64, 56, 52, 48, 40, 36, 32, 24, 20, 12, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
240 4, 8, 16, 24, 28, 36, 44, 48, 56, 60, 68, 76, 80, 88, 96,100,100, 96, 88, 80, 76, 68, 60, 56, 48, 44, 36, 28, 24, 16, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
241 4, 12, 20, 28, 32, 40, 48, 56, 64, 72, 80, 88, 92,100,108,116,116,108,100, 92, 88, 80, 72, 64, 56, 48, 40, 32, 28, 20, 12, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
242 4, 12, 20, 28, 40, 48, 56, 64, 72, 80, 88, 96,108,116,124,132,132,124,116,108, 96, 88, 80, 72, 64, 56, 48, 40, 28, 20, 12, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
243 4, 16, 24, 32, 44, 52, 60, 72, 80, 92,100,108,120,128,136,148,148,136,128,120,108,100, 92, 80, 72, 60, 52, 44, 32, 24, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
244 4, 16, 28, 36, 48, 56, 68, 80, 88,100,112,120,132,140,152,164,164,152,140,132,120,112,100, 88, 80, 68, 56, 48, 36, 28, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
245 4, 16, 28, 40, 52, 64, 76, 88, 96,108,120,132,144,156,168,180,180,168,156,144,132,120,108, 96, 88, 76, 64, 52, 40, 28, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
246 8, 20, 32, 44, 56, 68, 80, 92,108,120,132,144,156,168,180,192,192,180,168,156,144,132,120,108, 92, 80, 68, 56, 44, 32, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
247 8, 20, 32, 48, 60, 76, 88,100,116,128,140,156,168,184,196,208,208,196,184,168,156,140,128,116,100, 88, 76, 60, 48, 32, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
248 8, 20, 36, 52, 64, 80, 96,108,124,136,152,168,180,196,212,224,224,212,196,180,168,152,136,124,108, 96, 80, 64, 52, 36, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
249 8, 24, 40, 56, 68, 84,100,116,132,148,164,180,192,208,224,240,240,224,208,192,180,164,148,132,116,100, 84, 68, 56, 40, 24, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
250 8, 24, 40, 56, 68, 84,100,116,132,148,164,180,192,208,224,240,240,224,208,192,180,164,148,132,116,100, 84, 68, 56, 40, 24, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
251 8, 20, 36, 52, 64, 80, 96,108,124,136,152,168,180,196,212,224,224,212,196,180,168,152,136,124,108, 96, 80, 64, 52, 36, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
252 8, 20, 32, 48, 60, 76, 88,100,116,128,140,156,168,184,196,208,208,196,184,168,156,140,128,116,100, 88, 76, 60, 48, 32, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
253 8, 20, 32, 44, 56, 68, 80, 92,108,120,132,144,156,168,180,192,192,180,168,156,144,132,120,108, 92, 80, 68, 56, 44, 32, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
254 4, 16, 28, 40, 52, 64, 76, 88, 96,108,120,132,144,156,168,180,180,168,156,144,132,120,108, 96, 88, 76, 64, 52, 40, 28, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
255 4, 16, 28, 36, 48, 56, 68, 80, 88,100,112,120,132,140,152,164,164,152,140,132,120,112,100, 88, 80, 68, 56, 48, 36, 28, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
256 4, 16, 24, 32, 44, 52, 60, 72, 80, 92,100,108,120,128,136,148,148,136,128,120,108,100, 92, 80, 72, 60, 52, 44, 32, 24, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
257 4, 12, 20, 28, 40, 48, 56, 64, 72, 80, 88, 96,108,116,124,132,132,124,116,108, 96, 88, 80, 72, 64, 56, 48, 40, 28, 20, 12, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
258 4, 12, 20, 28, 32, 40, 48, 56, 64, 72, 80, 88, 92,100,108,116,116,108,100, 92, 88, 80, 72, 64, 56, 48, 40, 32, 28, 20, 12, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
259 4, 8, 16, 24, 28, 36, 44, 48, 56, 60, 68, 76, 80, 88, 96,100,100, 96, 88, 80, 76, 68, 60, 56, 48, 44, 36, 28, 24, 16, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
260 4, 8, 12, 20, 24, 32, 36, 40, 48, 52, 56, 64, 68, 76, 80, 84, 84, 80, 76, 68, 64, 56, 52, 48, 40, 36, 32, 24, 20, 12, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
261 4, 8, 12, 16, 20, 24, 28, 32, 40, 44, 48, 52, 56, 60, 64, 68, 68, 64, 60, 56, 52, 48, 44, 40, 32, 28, 24, 20, 16, 12, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
262 0, 4, 8, 12, 16, 20, 24, 28, 28, 32, 36, 40, 44, 48, 52, 56, 56, 52, 48, 44, 40, 36, 32, 28, 28, 24, 20, 16, 12, 8, 4, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
263 0, 4, 8, 8, 12, 12, 16, 20, 20, 24, 28, 28, 32, 32, 36, 40, 40, 36, 32, 32, 28, 28, 24, 20, 20, 16, 12, 12, 8, 8, 4, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
264 0, 4, 4, 4, 8, 8, 8, 12, 12, 16, 16, 16, 20, 20, 20, 24, 24, 20, 20, 20, 16, 16, 16, 12, 12, 8, 8, 8, 4, 4, 4, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
265 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
266 //error:0.000020
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
267 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
268 static const uint8_t obmc16[256]={
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
269 0, 4, 4, 8, 8, 12, 12, 16, 16, 12, 12, 8, 8, 4, 4, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
270 4, 8, 16, 20, 28, 32, 40, 44, 44, 40, 32, 28, 20, 16, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
271 4, 16, 24, 36, 44, 56, 64, 76, 76, 64, 56, 44, 36, 24, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
272 8, 20, 36, 48, 64, 76, 92,104,104, 92, 76, 64, 48, 36, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
273 8, 28, 44, 64, 80,100,116,136,136,116,100, 80, 64, 44, 28, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
274 12, 32, 56, 76,100,120,144,164,164,144,120,100, 76, 56, 32, 12,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
275 12, 40, 64, 92,116,144,168,196,196,168,144,116, 92, 64, 40, 12,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
276 16, 44, 76,104,136,164,196,224,224,196,164,136,104, 76, 44, 16,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
277 16, 44, 76,104,136,164,196,224,224,196,164,136,104, 76, 44, 16,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
278 12, 40, 64, 92,116,144,168,196,196,168,144,116, 92, 64, 40, 12,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
279 12, 32, 56, 76,100,120,144,164,164,144,120,100, 76, 56, 32, 12,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
280 8, 28, 44, 64, 80,100,116,136,136,116,100, 80, 64, 44, 28, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
281 8, 20, 36, 48, 64, 76, 92,104,104, 92, 76, 64, 48, 36, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
282 4, 16, 24, 36, 44, 56, 64, 76, 76, 64, 56, 44, 36, 24, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
283 4, 8, 16, 20, 28, 32, 40, 44, 44, 40, 32, 28, 20, 16, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
284 0, 4, 4, 8, 8, 12, 12, 16, 16, 12, 12, 8, 8, 4, 4, 0,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
285 //error:0.000015
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
286 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
287 #else //64*cos
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
288 static const uint8_t obmc32[1024]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
289 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
290 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
291 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
292 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
293 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
294 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
295 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
296 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
297 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
298 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
299 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
300 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
301 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
302 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
303 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
304 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
305 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
306 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
307 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
308 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
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, 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
311 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
312 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
313 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
314 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
315 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
316 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
317 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
318 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
319 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
320 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
321 //error:0.000022
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
322 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
323 static const uint8_t obmc16[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
324 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
325 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
326 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
327 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
328 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
329 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
330 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
331 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
332 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
333 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
334 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
335 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
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, 1, 3, 6, 8,11,13,14,14,13,11, 8, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
338 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
339 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
340 //error:0.000022
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
341 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
342 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
343
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
344 //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
345 static const uint8_t obmc8[64]={
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
346 4, 12, 20, 28, 28, 20, 12, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
347 12, 36, 60, 84, 84, 60, 36, 12,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
348 20, 60,100,140,140,100, 60, 20,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
349 28, 84,140,196,196,140, 84, 28,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
350 28, 84,140,196,196,140, 84, 28,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
351 20, 60,100,140,140,100, 60, 20,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
352 12, 36, 60, 84, 84, 60, 36, 12,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
353 4, 12, 20, 28, 28, 20, 12, 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
354 //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
355 };
70b27300a496 quad 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
70b27300a496 quad 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 //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
358 static const uint8_t obmc4[16]={
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
359 16, 48, 48, 16,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
360 48,144,144, 48,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
361 48,144,144, 48,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
362 16, 48, 48, 16,
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
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 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
367 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
368 };
70b27300a496 quad 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
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
370 static int scale_mv_ref[MAX_REF_FRAMES][MAX_REF_FRAMES];
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
371
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
372 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
373 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
374 int16_t my;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
375 uint8_t ref;
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
376 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
377 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
378 //#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
379 #define BLOCK_INTRA 1
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
380 #define BLOCK_OPT 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
381 //#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
382 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
383 }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
384
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
385 static const BlockNode null_block= { //FIXME add border maybe
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
386 .color= {128,128,128},
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
387 .mx= 0,
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
388 .my= 0,
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
389 .ref= 0,
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
390 .type= 0,
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
391 .level= 0,
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
392 };
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
393
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
394 #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
395 #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
396
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
397 typedef struct x_and_coeff{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
398 int16_t x;
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
399 uint16_t coeff;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
400 } x_and_coeff;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
401
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
402 typedef struct SubBand{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
403 int level;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
404 int stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
405 int width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
406 int height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
407 int qlog; ///< log(qscale)/log[2^(1/6)]
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
408 DWTELEM *buf;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
409 int buf_x_offset;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
410 int buf_y_offset;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
411 int stride_line; ///< Stride measured in lines, not pixels.
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
412 x_and_coeff * x_coeff;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
413 struct SubBand *parent;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
414 uint8_t state[/*7*2*/ 7 + 512][32];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
415 }SubBand;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
416
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
417 typedef struct Plane{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
418 int width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
419 int height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
420 SubBand band[MAX_DECOMPOSITIONS][4];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
421 }Plane;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
422
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
423 typedef struct SnowContext{
4588
fc155ff94878 cosmetics: Fix another common typo, dependAnt --> dependEnt.
diego
parents: 4494
diff changeset
424 // MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to make the motion estimation eventually independent of MpegEncContext, so this will be removed then (FIXME/XXX)
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
425
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
426 AVCodecContext *avctx;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
427 RangeCoder c;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
428 DSPContext dsp;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
429 AVFrame new_picture;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
430 AVFrame input_picture; ///< new_picture with the internal linesizes
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
431 AVFrame current_picture;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
432 AVFrame last_picture[MAX_REF_FRAMES];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
433 AVFrame mconly_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
434 // uint8_t q_context[16];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
435 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
436 uint8_t block_state[128 + 32*128];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
437 int keyframe;
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
438 int always_reset;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
439 int version;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
440 int spatial_decomposition_type;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
441 int last_spatial_decomposition_type;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
442 int temporal_decomposition_type;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
443 int spatial_decomposition_count;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
444 int temporal_decomposition_count;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
445 int max_ref_frames;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
446 int ref_frames;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
447 int16_t (*ref_mvs[MAX_REF_FRAMES])[2];
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
448 uint32_t *ref_scores[MAX_REF_FRAMES];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
449 DWTELEM *spatial_dwt_buffer;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
450 int colorspace_type;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
451 int chroma_h_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
452 int chroma_v_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
453 int spatial_scalability;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
454 int qlog;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
455 int last_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;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
458 int pass1_rc;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
459 int mv_scale;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
460 int last_mv_scale;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
461 int qbias;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
462 int last_qbias;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
463 #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
464 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
465 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
466 int block_max_depth;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
467 int last_block_max_depth;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
468 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
469 BlockNode *block;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
470 #define ME_CACHE_SIZE 1024
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
471 int me_cache[ME_CACHE_SIZE];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
472 int me_cache_generation;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
473 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
474
4588
fc155ff94878 cosmetics: Fix another common typo, dependAnt --> dependEnt.
diego
parents: 4494
diff changeset
475 MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to make the motion estimation eventually independent of MpegEncContext, so this will be removed then (FIXME/XXX)
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
476 }SnowContext;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
477
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
478 typedef struct {
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
479 DWTELEM *b0;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
480 DWTELEM *b1;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
481 DWTELEM *b2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
482 DWTELEM *b3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
483 int y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
484 } dwt_compose_t;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
485
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
486 #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
487 //#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
488
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
489 static void iterative_me(SnowContext *s);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
490
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
491 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
492 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
493 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
494
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
495 buf->base_buffer = base_buffer;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
496 buf->line_count = line_count;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
497 buf->line_width = line_width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
498 buf->data_count = max_allocated_lines;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
499 buf->line = (DWTELEM * *) av_mallocz (sizeof(DWTELEM *) * line_count);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
500 buf->data_stack = (DWTELEM * *) av_malloc (sizeof(DWTELEM *) * max_allocated_lines);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
501
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
502 for (i = 0; i < max_allocated_lines; i++)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
503 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
504 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
505 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
506
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
507 buf->data_stack_top = max_allocated_lines - 1;
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
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
510 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
511 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
512 int offset;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
513 DWTELEM * buffer;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
514
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
515 // av_log(NULL, AV_LOG_DEBUG, "Cache hit: %d\n", line);
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
516
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
517 assert(buf->data_stack_top >= 0);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
518 // assert(!buf->line[line]);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
519 if (buf->line[line])
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
520 return buf->line[line];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
521
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
522 offset = buf->line_width * line;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
523 buffer = buf->data_stack[buf->data_stack_top];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
524 buf->data_stack_top--;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
525 buf->line[line] = buffer;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
526
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
527 // av_log(NULL, AV_LOG_DEBUG, "slice_buffer_load_line: line: %d remaining: %d\n", line, buf->data_stack_top + 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
528
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
529 return buffer;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
530 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
531
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
532 static void slice_buffer_release(slice_buffer * buf, int line)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
533 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
534 int offset;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
535 DWTELEM * buffer;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
536
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
537 assert(line >= 0 && line < buf->line_count);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
538 assert(buf->line[line]);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
539
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
540 offset = buf->line_width * line;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
541 buffer = buf->line[line];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
542 buf->data_stack_top++;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
543 buf->data_stack[buf->data_stack_top] = buffer;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
544 buf->line[line] = NULL;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
545
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
546 // 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
547 }
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 static void slice_buffer_flush(slice_buffer * buf)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
550 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
551 int i;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
552 for (i = 0; i < buf->line_count; i++)
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 if (buf->line[i])
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
555 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
556 // 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
557 slice_buffer_release(buf, i);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
558 }
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 }
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 static void slice_buffer_destroy(slice_buffer * buf)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
563 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
564 int i;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
565 slice_buffer_flush(buf);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
566
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
567 for (i = buf->data_count - 1; i >= 0; i--)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
568 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
569 assert(buf->data_stack[i]);
3190
e9fa3ac61966 av_free -> av_freep
michael
parents: 3189
diff changeset
570 av_freep(&buf->data_stack[i]);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
571 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
572 assert(buf->data_stack);
3190
e9fa3ac61966 av_free -> av_freep
michael
parents: 3189
diff changeset
573 av_freep(&buf->data_stack);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
574 assert(buf->line);
3190
e9fa3ac61966 av_free -> av_freep
michael
parents: 3189
diff changeset
575 av_freep(&buf->line);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
576 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
577
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2975
diff changeset
578 #ifdef __sgi
2368
a7ac68734a91 fix for build on IRIX by (Michel Bardiaux {mbardiaux peaktime be})
michael
parents: 2335
diff changeset
579 // Avoid a name clash on SGI IRIX
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2975
diff changeset
580 #undef qexp
2368
a7ac68734a91 fix for build on IRIX by (Michel Bardiaux {mbardiaux peaktime be})
michael
parents: 2335
diff changeset
581 #endif
2246
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
582 #define QEXPSHIFT (7-FRAC_BITS+8) //FIXME try to change this to 0
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
583 static uint8_t qexp[QROOT];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
584
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
585 static inline int mirror(int v, int m){
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
586 while((unsigned)v > (unsigned)m){
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
587 v=-v;
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
588 if(v<0) v+= 2*m;
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
589 }
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
590 return v;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
591 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
592
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
593 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
594 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
595
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
596 if(v){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
597 const int a= FFABS(v);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
598 const int e= av_log2(a);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
599 #if 1
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
600 const int el= FFMIN(e, 10);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
601 put_rac(c, state+0, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
602
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
603 for(i=0; i<el; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
604 put_rac(c, state+1+i, 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
605 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
606 for(; i<e; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
607 put_rac(c, state+1+9, 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
608 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
609 put_rac(c, state+1+FFMIN(i,9), 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
610
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
611 for(i=e-1; i>=el; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
612 put_rac(c, state+22+9, (a>>i)&1); //22..31
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
613 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
614 for(; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
615 put_rac(c, state+22+i, (a>>i)&1); //22..31
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
616 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
617
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
618 if(is_signed)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
619 put_rac(c, state+11 + el, v < 0); //11..21
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
620 #else
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
621
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
622 put_rac(c, state+0, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
623 if(e<=9){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
624 for(i=0; i<e; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
625 put_rac(c, state+1+i, 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
626 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
627 put_rac(c, state+1+i, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
628
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
629 for(i=e-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
630 put_rac(c, state+22+i, (a>>i)&1); //22..31
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
631 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
632
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
633 if(is_signed)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
634 put_rac(c, state+11 + e, v < 0); //11..21
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
635 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
636 for(i=0; i<e; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
637 put_rac(c, state+1+FFMIN(i,9), 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
638 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
639 put_rac(c, state+1+FFMIN(i,9), 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
640
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
641 for(i=e-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
642 put_rac(c, state+22+FFMIN(i,9), (a>>i)&1); //22..31
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
643 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
644
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
645 if(is_signed)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
646 put_rac(c, state+11 + FFMIN(e,10), v < 0); //11..21
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
647 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
648 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
649 }else{
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
650 put_rac(c, state+0, 1);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
651 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
652 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
653
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
654 static inline int get_symbol(RangeCoder *c, uint8_t *state, int is_signed){
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
655 if(get_rac(c, state+0))
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
656 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
657 else{
2240
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
658 int i, e, a;
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
659 e= 0;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
660 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
661 e++;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
662 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
663
2240
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
664 a= 1;
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
665 for(i=e-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
666 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
667 }
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
668
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
669 if(is_signed && get_rac(c, state+11 + FFMIN(e,10))) //11..21
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
670 return -a;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
671 else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
672 return a;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
673 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
674 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
675
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
676 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
677 int i;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
678 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
679
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
680 assert(v>=0);
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
681 assert(log2>=-4);
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
682
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
683 while(v >= r){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
684 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
685 v -= r;
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
686 log2++;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
687 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
688 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
689 put_rac(c, state+4+log2, 0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
690
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
691 for(i=log2-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
692 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
693 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
694 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
695
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
696 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
697 int i;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
698 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
699 int v=0;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
700
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
701 assert(log2>=-4);
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
702
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
703 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
704 v+= r;
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
705 log2++;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
706 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
707 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
708
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
709 for(i=log2-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
710 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
711 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
712
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
713 return v;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
714 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
715
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
716 static av_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){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
717 const int mirror_left= !highpass;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
718 const int mirror_right= (width&1) ^ highpass;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
719 const int w= (width>>1) - 1 + (highpass & width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
720 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
721
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
722 #define LIFT(src, ref, inv) ((src) + ((inv) ? - (ref) : + (ref)))
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
723 if(mirror_left){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
724 dst[0] = LIFT(src[0], ((mul*2*ref[0]+add)>>shift), inverse);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
725 dst += dst_step;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
726 src += src_step;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
727 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
728
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
729 for(i=0; i<w; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
730 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
731 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
732
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
733 if(mirror_right){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
734 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
735 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
736 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
737
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
738 #ifndef lift5
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
739 static av_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){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
740 const int mirror_left= !highpass;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
741 const int mirror_right= (width&1) ^ highpass;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
742 const int w= (width>>1) - 1 + (highpass & width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
743 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
744
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
745 if(mirror_left){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
746 int r= 3*2*ref[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
747 r += r>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
748 r += r>>8;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
749 dst[0] = LIFT(src[0], ((r+add)>>shift), inverse);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
750 dst += dst_step;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
751 src += src_step;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
752 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
753
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
754 for(i=0; i<w; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
755 int r= 3*(ref[i*ref_step] + ref[(i+1)*ref_step]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
756 r += r>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
757 r += r>>8;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
758 dst[i*dst_step] = LIFT(src[i*src_step], ((r+add)>>shift), inverse);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
759 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
760
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
761 if(mirror_right){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
762 int r= 3*2*ref[w*ref_step];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
763 r += r>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
764 r += r>>8;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
765 dst[w*dst_step] = LIFT(src[w*src_step], ((r+add)>>shift), inverse);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
766 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
767 }
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
768 #endif
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
769
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
770 #ifndef liftS
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
771 static av_always_inline void liftS(DWTELEM *dst, DWTELEM *src, DWTELEM *ref, int dst_step, int src_step, int ref_step, int width, int mul, int add, int shift, int highpass, int inverse){
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
772 const int mirror_left= !highpass;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
773 const int mirror_right= (width&1) ^ highpass;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
774 const int w= (width>>1) - 1 + (highpass & width);
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
775 int i;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
776
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
777 assert(shift == 4);
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
778 #define LIFTS(src, ref, inv) ((inv) ? (src) - (((ref) - 4*(src))>>shift): (16*4*(src) + 4*(ref) + 8 + (5<<27))/(5*16) - (1<<23))
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
779 if(mirror_left){
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
780 dst[0] = LIFTS(src[0], mul*2*ref[0]+add, inverse);
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
781 dst += dst_step;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
782 src += src_step;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
783 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
784
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
785 for(i=0; i<w; i++){
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
786 dst[i*dst_step] = LIFTS(src[i*src_step], mul*(ref[i*ref_step] + ref[(i+1)*ref_step])+add, inverse);
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
787 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
788
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
789 if(mirror_right){
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
790 dst[w*dst_step] = LIFTS(src[w*src_step], mul*2*ref[w*ref_step]+add, inverse);
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
791 }
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
792 }
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
793 #endif
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
794
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
795
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
796 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
797 int x, i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
798
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
799 for(x=start; x<width; x+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
800 int64_t sum=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
801
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
802 for(i=0; i<n; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
803 int x2= x + 2*i - n + 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
804 if (x2< 0) x2= -x2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
805 else if(x2>=width) x2= 2*width-x2-2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
806 sum += coeffs[i]*(int64_t)dst[x2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
807 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
808 if(inverse) dst[x] -= (sum + (1<<shift)/2)>>shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
809 else dst[x] += (sum + (1<<shift)/2)>>shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
810 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
811 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
812
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
813 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
814 int x, y, i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
815 for(y=start; y<height; y+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
816 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
817 int64_t sum=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
818
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
819 for(i=0; i<n; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
820 int y2= y + 2*i - n + 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
821 if (y2< 0) y2= -y2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
822 else if(y2>=height) y2= 2*height-y2-2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
823 sum += coeffs[i]*(int64_t)dst[x + y2*stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
824 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
825 if(inverse) dst[x + y*stride] -= (sum + (1<<shift)/2)>>shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
826 else dst[x + y*stride] += (sum + (1<<shift)/2)>>shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
827 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
828 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
829 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
830
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
831 #define SCALEX 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
832 #define LX0 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
833 #define LX1 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
834
2139
michael
parents: 2138
diff changeset
835 #if 0 // more accurate 9/7
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
836 #define N1 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
837 #define SHIFT1 14
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
838 #define COEFFS1 (int[]){-25987,-25987}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
839 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
840 #define SHIFT2 19
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
841 #define COEFFS2 (int[]){-27777,-27777}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
842 #define N3 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
843 #define SHIFT3 15
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
844 #define COEFFS3 (int[]){28931,28931}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
845 #define N4 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
846 #define SHIFT4 15
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
847 #define COEFFS4 (int[]){14533,14533}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
848 #elif 1 // 13/7 CRF
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
849 #define N1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
850 #define SHIFT1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
851 #define COEFFS1 (int[]){1,-9,-9,1}
2139
michael
parents: 2138
diff changeset
852 #define N2 4
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
853 #define SHIFT2 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
854 #define COEFFS2 (int[]){-1,5,5,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
855 #define N3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
856 #define SHIFT3 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
857 #define COEFFS3 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
858 #define N4 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
859 #define SHIFT4 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
860 #define COEFFS4 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
861 #elif 1 // 3/5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
862 #define LX0 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
863 #define LX1 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
864 #define SCALEX 0.5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
865 #define N1 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
866 #define SHIFT1 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
867 #define COEFFS1 (int[]){1,1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
868 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
869 #define SHIFT2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
870 #define COEFFS2 (int[]){-1,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
871 #define N3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
872 #define SHIFT3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
873 #define COEFFS3 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
874 #define N4 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
875 #define SHIFT4 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
876 #define COEFFS4 NULL
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
877 #elif 1 // 11/5
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
878 #define N1 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
879 #define SHIFT1 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
880 #define COEFFS1 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
881 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
882 #define SHIFT2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
883 #define COEFFS2 (int[]){-1,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
884 #define N3 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
885 #define SHIFT3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
886 #define COEFFS3 (int[]){-1,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
887 #define N4 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
888 #define SHIFT4 7
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
889 #define COEFFS4 (int[]){-5,29,29,-5}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
890 #define SCALEX 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
891 #elif 1 // 9/7 CDF
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
892 #define N1 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
893 #define SHIFT1 7
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
894 #define COEFFS1 (int[]){-203,-203}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
895 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
896 #define SHIFT2 12
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
897 #define COEFFS2 (int[]){-217,-217}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
898 #define N3 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
899 #define SHIFT3 7
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
900 #define COEFFS3 (int[]){113,113}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
901 #define N4 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
902 #define SHIFT4 9
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
903 #define COEFFS4 (int[]){227,227}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
904 #define SCALEX 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
905 #elif 1 // 7/5 CDF
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
906 #define N1 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
907 #define SHIFT1 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
908 #define COEFFS1 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
909 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
910 #define SHIFT2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
911 #define COEFFS2 (int[]){-1,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
912 #define N3 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
913 #define SHIFT3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
914 #define COEFFS3 (int[]){-1,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
915 #define N4 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
916 #define SHIFT4 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
917 #define COEFFS4 (int[]){3,3}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
918 #elif 1 // 9/7 MN
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
919 #define N1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
920 #define SHIFT1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
921 #define COEFFS1 (int[]){1,-9,-9,1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
922 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
923 #define SHIFT2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
924 #define COEFFS2 (int[]){1,1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
925 #define N3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
926 #define SHIFT3 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
927 #define COEFFS3 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
928 #define N4 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
929 #define SHIFT4 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
930 #define COEFFS4 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
931 #else // 13/7 CRF
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
932 #define N1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
933 #define SHIFT1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
934 #define COEFFS1 (int[]){1,-9,-9,1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
935 #define N2 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
936 #define SHIFT2 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
937 #define COEFFS2 (int[]){-1,5,5,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
938 #define N3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
939 #define SHIFT3 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
940 #define COEFFS3 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
941 #define N4 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
942 #define SHIFT4 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
943 #define COEFFS4 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
944 #endif
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
945 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
946 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
947 const int width2= width>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
948 const int w2= (width+1)>>1;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
949 int x;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
950
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
951 inplace_lift(b, width, COEFFS1, N1, SHIFT1, LX1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
952 inplace_lift(b, width, COEFFS2, N2, SHIFT2, LX0, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
953 inplace_lift(b, width, COEFFS3, N3, SHIFT3, LX1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
954 inplace_lift(b, width, COEFFS4, N4, SHIFT4, LX0, 0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
955
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
956 for(x=0; x<width2; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
957 temp[x ]= b[2*x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
958 temp[x+w2]= b[2*x + 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
959 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
960 if(width&1)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
961 temp[x ]= b[2*x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
962 memcpy(b, temp, width*sizeof(int));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
963 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
964
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
965 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
966 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
967 const int width2= width>>1;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
968 int x;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
969 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
970
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
971 memcpy(temp, b, width*sizeof(int));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
972 for(x=0; x<width2; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
973 b[2*x ]= temp[x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
974 b[2*x + 1]= temp[x+w2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
975 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
976 if(width&1)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
977 b[2*x ]= temp[x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
978
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
979 inplace_lift(b, width, COEFFS4, N4, SHIFT4, LX0, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
980 inplace_lift(b, width, COEFFS3, N3, SHIFT3, LX1, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
981 inplace_lift(b, width, COEFFS2, N2, SHIFT2, LX0, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
982 inplace_lift(b, width, COEFFS1, N1, SHIFT1, LX1, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
983 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
984
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
985 static void spatial_decomposeX(DWTELEM *buffer, int width, int height, int stride){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
986 int x, y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
987
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
988 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
989 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
990 buffer[y*stride + x] *= SCALEX;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
991 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
992 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
993
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
994 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
995 horizontal_decomposeX(buffer + y*stride, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
996 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
997
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
998 inplace_liftV(buffer, width, height, stride, COEFFS1, N1, SHIFT1, LX1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
999 inplace_liftV(buffer, width, height, stride, COEFFS2, N2, SHIFT2, LX0, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1000 inplace_liftV(buffer, width, height, stride, COEFFS3, N3, SHIFT3, LX1, 0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1001 inplace_liftV(buffer, width, height, stride, COEFFS4, N4, SHIFT4, LX0, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1002 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1003
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1004 static void spatial_composeX(DWTELEM *buffer, int width, int height, int stride){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1005 int x, y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1006
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1007 inplace_liftV(buffer, width, height, stride, COEFFS4, N4, SHIFT4, LX0, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1008 inplace_liftV(buffer, width, height, stride, COEFFS3, N3, SHIFT3, LX1, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1009 inplace_liftV(buffer, width, height, stride, COEFFS2, N2, SHIFT2, LX0, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1010 inplace_liftV(buffer, width, height, stride, COEFFS1, N1, SHIFT1, LX1, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1011
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1012 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1013 horizontal_composeX(buffer + y*stride, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1014 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1015
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1016 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1017 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1018 buffer[y*stride + x] /= SCALEX;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1019 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1020 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1021 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1022
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1023 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
1024 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1025 const int width2= width>>1;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1026 int x;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1027 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1028
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1029 for(x=0; x<width2; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1030 temp[x ]= b[2*x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1031 temp[x+w2]= b[2*x + 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1032 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1033 if(width&1)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1034 temp[x ]= b[2*x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1035 #if 0
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1036 {
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1037 int A1,A2,A3,A4;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1038 A2= temp[1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1039 A4= temp[0 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1040 A1= temp[0+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1041 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1042 A4 += (A1 + 1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1043 b[0+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1044 b[0 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1045 for(x=1; x+1<width2; x+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1046 A3= temp[x+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1047 A4= temp[x+1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1048 A3 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1049 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1050 b[x+width2] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1051 b[x ] = A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1052
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1053 A1= temp[x+1+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1054 A2= temp[x+2 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1055 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1056 A4 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1057 b[x+1+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1058 b[x+1 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1059 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1060 A3= temp[width-1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1061 A3 -= A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1062 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1063 b[width -1] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1064 b[width2-1] = A2;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1065 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1066 #else
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1067 lift(b+w2, temp+w2, temp, 1, 1, 1, width, -1, 0, 1, 1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1068 lift(b , temp , b+w2, 1, 1, 1, width, 1, 2, 2, 0, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1069 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1070 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1071
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1072 static void vertical_decompose53iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1073 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1074
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1075 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1076 b1[i] -= (b0[i] + b2[i])>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1077 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1078 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1079
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1080 static void vertical_decompose53iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1081 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1082
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1083 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1084 b1[i] += (b0[i] + b2[i] + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1085 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1086 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1087
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1088 static void spatial_decompose53i(DWTELEM *buffer, int width, int height, int stride){
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
1089 int y;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1090 DWTELEM *b0= buffer + mirror(-2-1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1091 DWTELEM *b1= buffer + mirror(-2 , height-1)*stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1092
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1093 for(y=-2; y<height; y+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1094 DWTELEM *b2= buffer + mirror(y+1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1095 DWTELEM *b3= buffer + mirror(y+2, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1096
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1097 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1098 if(y+1<(unsigned)height) horizontal_decompose53i(b2, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1099 if(y+2<(unsigned)height) horizontal_decompose53i(b3, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1100 STOP_TIMER("horizontal_decompose53i")}
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1101
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1102 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1103 if(y+1<(unsigned)height) vertical_decompose53iH0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1104 if(y+0<(unsigned)height) vertical_decompose53iL0(b0, b1, b2, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1105 STOP_TIMER("vertical_decompose53i*")}
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1106
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1107 b0=b2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1108 b1=b3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1109 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1110 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1111
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1112 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
1113 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1114 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1115
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1116 lift (temp+w2, b +1, b , 1, 2, 2, width, -W_AM, W_AO, W_AS, 1, 0);
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1117 liftS(temp , b , temp+w2, 1, 2, 1, width, -W_BM, W_BO, W_BS, 0, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1118 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
1119 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
1120 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1121
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1122
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1123 static void vertical_decompose97iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1124 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1125
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1126 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1127 b1[i] -= (W_AM*(b0[i] + b2[i])+W_AO)>>W_AS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1128 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1129 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1130
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1131 static void vertical_decompose97iH1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1132 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1133
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1134 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1135 #ifdef lift5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1136 b1[i] += (W_CM*(b0[i] + b2[i])+W_CO)>>W_CS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1137 #else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1138 int r= 3*(b0[i] + b2[i]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1139 r+= r>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1140 r+= r>>8;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1141 b1[i] += (r+W_CO)>>W_CS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1142 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1143 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1144 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1145
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1146 static void vertical_decompose97iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1147 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1148
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1149 for(i=0; i<width; i++){
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1150 #ifdef liftS
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1151 b1[i] -= (W_BM*(b0[i] + b2[i])+W_BO)>>W_BS;
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1152 #else
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1153 b1[i] = (16*4*b1[i] - 4*(b0[i] + b2[i]) + 8*5 + (5<<27)) / (5*16) - (1<<23);
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1154 #endif
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1155 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1156 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1157
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1158 static void vertical_decompose97iL1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1159 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1160
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1161 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1162 b1[i] += (W_DM*(b0[i] + b2[i])+W_DO)>>W_DS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1163 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1164 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1165
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1166 static void spatial_decompose97i(DWTELEM *buffer, int width, int height, int stride){
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
1167 int y;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1168 DWTELEM *b0= buffer + mirror(-4-1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1169 DWTELEM *b1= buffer + mirror(-4 , height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1170 DWTELEM *b2= buffer + mirror(-4+1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1171 DWTELEM *b3= buffer + mirror(-4+2, height-1)*stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1172
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1173 for(y=-4; y<height; y+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1174 DWTELEM *b4= buffer + mirror(y+3, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1175 DWTELEM *b5= buffer + mirror(y+4, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1176
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1177 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1178 if(y+3<(unsigned)height) horizontal_decompose97i(b4, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1179 if(y+4<(unsigned)height) horizontal_decompose97i(b5, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1180 if(width>400){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1181 STOP_TIMER("horizontal_decompose97i")
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1182 }}
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1183
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1184 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1185 if(y+3<(unsigned)height) vertical_decompose97iH0(b3, b4, b5, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1186 if(y+2<(unsigned)height) vertical_decompose97iL0(b2, b3, b4, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1187 if(y+1<(unsigned)height) vertical_decompose97iH1(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1188 if(y+0<(unsigned)height) vertical_decompose97iL1(b0, b1, b2, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1189
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1190 if(width>400){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1191 STOP_TIMER("vertical_decompose97i")
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1192 }}
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1193
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1194 b0=b2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1195 b1=b3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1196 b2=b4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1197 b3=b5;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1198 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1199 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1200
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1201 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
1202 int level;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1203
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
1204 for(level=0; level<decomposition_count; level++){
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
1205 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1206 case DWT_97: spatial_decompose97i(buffer, width>>level, height>>level, stride<<level); break;
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1207 case DWT_53: spatial_decompose53i(buffer, width>>level, height>>level, stride<<level); break;
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1208 case DWT_X: spatial_decomposeX (buffer, width>>level, height>>level, stride<<level); break;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1209 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1210 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1211 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1212
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1213 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
1214 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1215 const int width2= width>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1216 const int w2= (width+1)>>1;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1217 int x;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1218
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1219 #if 0
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1220 int A1,A2,A3,A4;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1221 A2= temp[1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1222 A4= temp[0 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1223 A1= temp[0+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1224 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1225 A4 += (A1 + 1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1226 b[0+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1227 b[0 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1228 for(x=1; x+1<width2; x+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1229 A3= temp[x+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1230 A4= temp[x+1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1231 A3 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1232 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1233 b[x+width2] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1234 b[x ] = A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1235
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1236 A1= temp[x+1+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1237 A2= temp[x+2 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1238 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1239 A4 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1240 b[x+1+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1241 b[x+1 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1242 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1243 A3= temp[width-1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1244 A3 -= A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1245 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1246 b[width -1] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1247 b[width2-1] = A2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1248 #else
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1249 lift(temp , b , b+w2, 1, 1, 1, width, 1, 2, 2, 0, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1250 lift(temp+w2, b+w2, temp, 1, 1, 1, width, -1, 0, 1, 1, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1251 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1252 for(x=0; x<width2; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1253 b[2*x ]= temp[x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1254 b[2*x + 1]= temp[x+w2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1255 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1256 if(width&1)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1257 b[2*x ]= temp[x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1258 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1259
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1260 static void vertical_compose53iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1261 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1262
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1263 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1264 b1[i] += (b0[i] + b2[i])>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1265 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1266 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1267
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1268 static void vertical_compose53iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1269 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1270
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1271 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1272 b1[i] -= (b0[i] + b2[i] + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1273 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1274 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1275
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1276 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
1277 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
1278 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
1279 cs->y = -1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1280 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1281
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1282 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
1283 cs->b0 = buffer + mirror(-1-1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1284 cs->b1 = buffer + mirror(-1 , height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1285 cs->y = -1;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1286 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1287
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1288 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
1289 int y= cs->y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1290
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1291 DWTELEM *b0= cs->b0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1292 DWTELEM *b1= cs->b1;
3012
088920c095fc cleanup
michael
parents: 3000
diff changeset
1293 DWTELEM *b2= slice_buffer_get_line(sb, mirror(y+1, height-1) * stride_line);
088920c095fc cleanup
michael
parents: 3000
diff changeset
1294 DWTELEM *b3= slice_buffer_get_line(sb, mirror(y+2, height-1) * stride_line);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1295
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1296 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1297 if(y+1<(unsigned)height) vertical_compose53iL0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1298 if(y+0<(unsigned)height) vertical_compose53iH0(b0, b1, b2, width);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1299 STOP_TIMER("vertical_compose53i*")}
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1300
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1301 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1302 if(y-1<(unsigned)height) horizontal_compose53i(b0, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1303 if(y+0<(unsigned)height) horizontal_compose53i(b1, width);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1304 STOP_TIMER("horizontal_compose53i")}
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 cs->b0 = b2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1307 cs->b1 = b3;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1308 cs->y += 2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1309 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1310
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1311 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
1312 int y= cs->y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1313 DWTELEM *b0= cs->b0;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1314 DWTELEM *b1= cs->b1;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1315 DWTELEM *b2= buffer + mirror(y+1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1316 DWTELEM *b3= buffer + mirror(y+2, height-1)*stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1317
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1318 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1319 if(y+1<(unsigned)height) vertical_compose53iL0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1320 if(y+0<(unsigned)height) vertical_compose53iH0(b0, b1, b2, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1321 STOP_TIMER("vertical_compose53i*")}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1322
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1323 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1324 if(y-1<(unsigned)height) horizontal_compose53i(b0, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1325 if(y+0<(unsigned)height) horizontal_compose53i(b1, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1326 STOP_TIMER("horizontal_compose53i")}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1327
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1328 cs->b0 = b2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1329 cs->b1 = b3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1330 cs->y += 2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1331 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1332
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1333 static void spatial_compose53i(DWTELEM *buffer, int width, int height, int stride){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1334 dwt_compose_t cs;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1335 spatial_compose53i_init(&cs, buffer, height, stride);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1336 while(cs.y <= height)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1337 spatial_compose53i_dy(&cs, buffer, width, height, stride);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1338 }
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1339
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1340
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1341 void ff_snow_horizontal_compose97i(DWTELEM *b, int width){
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1342 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1343 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1344
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1345 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
1346 lift5(temp+w2, b +w2, temp , 1, 1, 1, width, W_CM, W_CO, W_CS, 1, 1);
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1347 liftS(b , temp , temp+w2, 2, 1, 1, width, -W_BM, W_BO, W_BS, 0, 1);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1348 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
1349 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1350
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1351 static void vertical_compose97iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1352 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1353
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1354 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1355 b1[i] += (W_AM*(b0[i] + b2[i])+W_AO)>>W_AS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1356 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1357 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1358
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1359 static void vertical_compose97iH1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1360 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1361
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1362 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1363 #ifdef lift5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1364 b1[i] -= (W_CM*(b0[i] + b2[i])+W_CO)>>W_CS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1365 #else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1366 int r= 3*(b0[i] + b2[i]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1367 r+= r>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1368 r+= r>>8;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1369 b1[i] -= (r+W_CO)>>W_CS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1370 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1371 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1372 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1373
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1374 static void vertical_compose97iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1375 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1376
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1377 for(i=0; i<width; i++){
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1378 #ifdef liftS
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1379 b1[i] += (W_BM*(b0[i] + b2[i])+W_BO)>>W_BS;
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1380 #else
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1381 b1[i] += (W_BM*(b0[i] + b2[i])+4*b1[i]+W_BO)>>W_BS;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1382 #endif
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1383 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1384 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1385
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1386 static void vertical_compose97iL1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1387 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1388
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1389 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1390 b1[i] -= (W_DM*(b0[i] + b2[i])+W_DO)>>W_DS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1391 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1392 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1393
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1394 void ff_snow_vertical_compose97i(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, DWTELEM *b3, DWTELEM *b4, DWTELEM *b5, int width){
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1395 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1396
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1397 for(i=0; i<width; i++){
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1398 #ifndef lift5
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1399 int r;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1400 #endif
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1401 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
1402 #ifdef lift5
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1403 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
1404 #else
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1405 r= 3*(b2[i] + b4[i]);
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1406 r+= r>>4;
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1407 r+= r>>8;
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1408 b3[i] -= (r+W_CO)>>W_CS;
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1409 #endif
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1410 #ifdef liftS
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1411 b2[i] += (W_BM*(b1[i] + b3[i])+W_BO)>>W_BS;
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1412 #else
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1413 b2[i] += (W_BM*(b1[i] + b3[i])+4*b2[i]+W_BO)>>W_BS;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1414 #endif
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1415 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
1416 }
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1417 }
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1418
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1419 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
1420 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
1421 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
1422 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
1423 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
1424 cs->y = -3;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1425 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1426
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1427 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
1428 cs->b0 = buffer + mirror(-3-1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1429 cs->b1 = buffer + mirror(-3 , height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1430 cs->b2 = buffer + mirror(-3+1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1431 cs->b3 = buffer + mirror(-3+2, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1432 cs->y = -3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1433 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1434
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1435 static void spatial_compose97i_dy_buffered(DSPContext *dsp, dwt_compose_t *cs, slice_buffer * sb, int width, int height, int stride_line){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1436 int y = cs->y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1437
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1438 DWTELEM *b0= cs->b0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1439 DWTELEM *b1= cs->b1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1440 DWTELEM *b2= cs->b2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1441 DWTELEM *b3= cs->b3;
3012
088920c095fc cleanup
michael
parents: 3000
diff changeset
1442 DWTELEM *b4= slice_buffer_get_line(sb, mirror(y + 3, height - 1) * stride_line);
088920c095fc cleanup
michael
parents: 3000
diff changeset
1443 DWTELEM *b5= slice_buffer_get_line(sb, mirror(y + 4, height - 1) * stride_line);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1444
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1445 {START_TIMER
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1446 if(y>0 && y+4<height){
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1447 dsp->vertical_compose97i(b0, b1, b2, b3, b4, b5, width);
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1448 }else{
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1449 if(y+3<(unsigned)height) vertical_compose97iL1(b3, b4, b5, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1450 if(y+2<(unsigned)height) vertical_compose97iH1(b2, b3, b4, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1451 if(y+1<(unsigned)height) vertical_compose97iL0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1452 if(y+0<(unsigned)height) vertical_compose97iH0(b0, b1, b2, width);
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1453 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1454 if(width>400){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1455 STOP_TIMER("vertical_compose97i")}}
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 {START_TIMER
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1458 if(y-1<(unsigned)height) dsp->horizontal_compose97i(b0, width);
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1459 if(y+0<(unsigned)height) dsp->horizontal_compose97i(b1, width);
3012
088920c095fc cleanup
michael
parents: 3000
diff changeset
1460 if(width>400 && y+0<(unsigned)height){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1461 STOP_TIMER("horizontal_compose97i")}}
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1462
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1463 cs->b0=b2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1464 cs->b1=b3;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1465 cs->b2=b4;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1466 cs->b3=b5;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1467 cs->y += 2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1468 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1469
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1470 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
1471 int y = cs->y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1472 DWTELEM *b0= cs->b0;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1473 DWTELEM *b1= cs->b1;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1474 DWTELEM *b2= cs->b2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1475 DWTELEM *b3= cs->b3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1476 DWTELEM *b4= buffer + mirror(y+3, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1477 DWTELEM *b5= buffer + mirror(y+4, height-1)*stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1478
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1479 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1480 if(y+3<(unsigned)height) vertical_compose97iL1(b3, b4, b5, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1481 if(y+2<(unsigned)height) vertical_compose97iH1(b2, b3, b4, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1482 if(y+1<(unsigned)height) vertical_compose97iL0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1483 if(y+0<(unsigned)height) vertical_compose97iH0(b0, b1, b2, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1484 if(width>400){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1485 STOP_TIMER("vertical_compose97i")}}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1486
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1487 {START_TIMER
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1488 if(y-1<(unsigned)height) ff_snow_horizontal_compose97i(b0, width);
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1489 if(y+0<(unsigned)height) ff_snow_horizontal_compose97i(b1, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1490 if(width>400 && b0 <= b2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1491 STOP_TIMER("horizontal_compose97i")}}
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1492
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1493 cs->b0=b2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1494 cs->b1=b3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1495 cs->b2=b4;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1496 cs->b3=b5;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1497 cs->y += 2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1498 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1499
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1500 static void spatial_compose97i(DWTELEM *buffer, int width, int height, int stride){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1501 dwt_compose_t cs;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1502 spatial_compose97i_init(&cs, buffer, height, stride);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1503 while(cs.y <= height)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1504 spatial_compose97i_dy(&cs, buffer, width, height, stride);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1505 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1506
3075
961af1358c7f add static keyword to some functions
mru
parents: 3063
diff changeset
1507 static 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){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1508 int level;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1509 for(level=decomposition_count-1; level>=0; level--){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1510 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1511 case DWT_97: spatial_compose97i_buffered_init(cs+level, sb, height>>level, stride_line<<level); break;
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1512 case DWT_53: spatial_compose53i_buffered_init(cs+level, sb, height>>level, stride_line<<level); break;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1513 /* not slicified yet */
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1514 case DWT_X: /*spatial_composeX(buffer, width>>level, height>>level, stride<<level); break;*/
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1515 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
1516 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1517 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1518 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1519
3075
961af1358c7f add static keyword to some functions
mru
parents: 3063
diff changeset
1520 static void ff_spatial_idwt_init(dwt_compose_t *cs, 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
1521 int level;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1522 for(level=decomposition_count-1; level>=0; level--){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1523 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1524 case DWT_97: spatial_compose97i_init(cs+level, buffer, height>>level, stride<<level); break;
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1525 case DWT_53: spatial_compose53i_init(cs+level, buffer, height>>level, stride<<level); break;
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1526 /* not slicified yet */
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1527 case DWT_X: spatial_composeX(buffer, width>>level, height>>level, stride<<level); break;
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1528 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1529 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1530 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1531
3075
961af1358c7f add static keyword to some functions
mru
parents: 3063
diff changeset
1532 static void ff_spatial_idwt_slice(dwt_compose_t *cs, DWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count, int y){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1533 const int support = type==1 ? 3 : 5;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1534 int level;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1535 if(type==2) return;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1536
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1537 for(level=decomposition_count-1; level>=0; level--){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1538 while(cs[level].y <= FFMIN((y>>level)+support, height>>level)){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1539 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1540 case DWT_97: spatial_compose97i_dy(cs+level, buffer, width>>level, height>>level, stride<<level);
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1541 break;
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1542 case DWT_53: spatial_compose53i_dy(cs+level, buffer, width>>level, height>>level, stride<<level);
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1543 break;
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1544 case DWT_X: break;
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1545 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1546 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1547 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1548 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1549
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1550 static void ff_spatial_idwt_buffered_slice(DSPContext *dsp, dwt_compose_t *cs, slice_buffer * slice_buf, int width, int height, int stride_line, int type, int decomposition_count, int y){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1551 const int support = type==1 ? 3 : 5;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1552 int level;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1553 if(type==2) return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1554
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1555 for(level=decomposition_count-1; level>=0; level--){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1556 while(cs[level].y <= FFMIN((y>>level)+support, height>>level)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1557 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1558 case DWT_97: spatial_compose97i_dy_buffered(dsp, cs+level, slice_buf, width>>level, height>>level, stride_line<<level);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1559 break;
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1560 case DWT_53: spatial_compose53i_dy_buffered(cs+level, slice_buf, width>>level, height>>level, stride_line<<level);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1561 break;
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1562 case DWT_X: break;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1563 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1564 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1565 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1566 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1567
3075
961af1358c7f add static keyword to some functions
mru
parents: 3063
diff changeset
1568 static 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
1569 if(type==2){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1570 int level;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1571 for(level=decomposition_count-1; level>=0; level--)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1572 spatial_composeX (buffer, width>>level, height>>level, stride<<level);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1573 }else{
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1574 dwt_compose_t cs[MAX_DECOMPOSITIONS];
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1575 int y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1576 ff_spatial_idwt_init(cs, buffer, width, height, stride, type, decomposition_count);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1577 for(y=0; y<height; y+=4)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1578 ff_spatial_idwt_slice(cs, buffer, width, height, stride, type, decomposition_count, y);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1579 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1580 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1581
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1582 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
1583 const int w= b->width;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1584 const int h= b->height;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1585 int x, y;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1586
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1587 if(1){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1588 int run=0;
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1589 int runs[w*h];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1590 int run_index=0;
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1591 int max_index;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1592
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1593 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1594 for(x=0; x<w; x++){
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1595 int v, p=0;
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1596 int /*ll=0, */l=0, lt=0, t=0, rt=0;
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1597 v= src[x + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1598
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1599 if(y){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1600 t= src[x + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1601 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1602 lt= src[x - 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1603 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1604 if(x + 1 < w){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1605 rt= src[x + 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1606 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1607 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1608 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1609 l= src[x - 1 + y*stride];
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1610 /*if(x > 1){
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1611 if(orientation==1) ll= src[y + (x-2)*stride];
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1612 else ll= src[x - 2 + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1613 }*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1614 }
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1615 if(parent){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1616 int px= x>>1;
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1617 int py= y>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1618 if(px<b->parent->width && py<b->parent->height)
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1619 p= parent[px + py*2*stride];
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1620 }
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1621 if(!(/*ll|*/l|lt|t|rt|p)){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1622 if(v){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1623 runs[run_index++]= run;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1624 run=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1625 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1626 run++;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1627 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1628 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1629 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1630 }
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1631 max_index= run_index;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1632 runs[run_index++]= run;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1633 run_index=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1634 run= runs[run_index++];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1635
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1636 put_symbol2(&s->c, b->state[30], max_index, 0);
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1637 if(run_index <= max_index)
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1638 put_symbol2(&s->c, b->state[1], run, 3);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1639
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1640 for(y=0; y<h; y++){
2435
c89ac0e70c66 10l patch by (matthieu castet <castet.matthieu free fr>)
michael
parents: 2422
diff changeset
1641 if(s->c.bytestream_end - s->c.bytestream < w*40){
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1642 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1643 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1644 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1645 for(x=0; x<w; x++){
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1646 int v, p=0;
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1647 int /*ll=0, */l=0, lt=0, t=0, rt=0;
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1648 v= src[x + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1649
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1650 if(y){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1651 t= src[x + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1652 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1653 lt= src[x - 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1654 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1655 if(x + 1 < w){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1656 rt= src[x + 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1657 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1658 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1659 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1660 l= src[x - 1 + y*stride];
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1661 /*if(x > 1){
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1662 if(orientation==1) ll= src[y + (x-2)*stride];
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1663 else ll= src[x - 2 + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1664 }*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1665 }
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1666 if(parent){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1667 int px= x>>1;
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1668 int py= y>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1669 if(px<b->parent->width && py<b->parent->height)
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1670 p= parent[px + py*2*stride];
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1671 }
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1672 if(/*ll|*/l|lt|t|rt|p){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1673 int context= av_log2(/*FFABS(ll) + */3*FFABS(l) + FFABS(lt) + 2*FFABS(t) + FFABS(rt) + FFABS(p));
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1674
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1675 put_rac(&s->c, &b->state[0][context], !!v);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1676 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1677 if(!run){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1678 run= runs[run_index++];
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1679
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1680 if(run_index <= max_index)
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1681 put_symbol2(&s->c, b->state[1], run, 3);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1682 assert(v);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1683 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1684 run--;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1685 assert(!v);
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(v){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1689 int context= av_log2(/*FFABS(ll) + */3*FFABS(l) + FFABS(lt) + 2*FFABS(t) + FFABS(rt) + FFABS(p));
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1690 int l2= 2*FFABS(l) + (l<0);
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1691 int t2= 2*FFABS(t) + (t<0);
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1692
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1693 put_symbol2(&s->c, b->state[context + 2], FFABS(v)-1, context-4);
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1694 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
1695 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1696 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1697 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1698 }
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1699 return 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1700 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1701
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1702 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
1703 // 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
1704 // encode_subband_z0run(s, b, src, parent, stride, orientation);
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1705 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
1706 // 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
1707 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1708
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1709 static inline void unpack_coeffs(SnowContext *s, SubBand *b, SubBand * parent, int orientation){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1710 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1711 const int h= b->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1712 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1713
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1714 if(1){
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1715 int run, runs;
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1716 x_and_coeff *xc= b->x_coeff;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1717 x_and_coeff *prev_xc= NULL;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1718 x_and_coeff *prev2_xc= xc;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1719 x_and_coeff *parent_xc= parent ? parent->x_coeff : NULL;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1720 x_and_coeff *prev_parent_xc= parent_xc;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1721
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1722 runs= get_symbol2(&s->c, b->state[30], 0);
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1723 if(runs-- > 0) run= get_symbol2(&s->c, b->state[1], 3);
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1724 else run= INT_MAX;
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1725
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1726 for(y=0; y<h; y++){
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1727 int v=0;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1728 int lt=0, t=0, rt=0;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1729
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1730 if(y && prev_xc->x == 0){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1731 rt= prev_xc->coeff;
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1732 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1733 for(x=0; x<w; x++){
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1734 int p=0;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1735 const int l= v;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1736
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1737 lt= t; t= rt;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1738
2194
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1739 if(y){
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1740 if(prev_xc->x <= x)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1741 prev_xc++;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1742 if(prev_xc->x == x + 1)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1743 rt= prev_xc->coeff;
2194
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1744 else
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1745 rt=0;
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1746 }
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1747 if(parent_xc){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1748 if(x>>1 > parent_xc->x){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1749 parent_xc++;
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1750 }
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1751 if(x>>1 == parent_xc->x){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1752 p= parent_xc->coeff;
2194
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1753 }
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1754 }
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1755 if(/*ll|*/l|lt|t|rt|p){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1756 int context= av_log2(/*FFABS(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
1757
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1758 v=get_rac(&s->c, &b->state[0][context]);
2605
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1759 if(v){
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1760 v= 2*(get_symbol2(&s->c, b->state[context + 2], context-4) + 1);
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1761 v+=get_rac(&s->c, &b->state[0][16 + 1 + 3 + quant3bA[l&0xFF] + 3*quant3bA[t&0xFF]]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1762
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1763 xc->x=x;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1764 (xc++)->coeff= v;
2605
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1765 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1766 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1767 if(!run){
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1768 if(runs-- > 0) run= get_symbol2(&s->c, b->state[1], 3);
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1769 else run= INT_MAX;
2605
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1770 v= 2*(get_symbol2(&s->c, b->state[0 + 2], 0-4) + 1);
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1771 v+=get_rac(&s->c, &b->state[0][16 + 1 + 3]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1772
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1773 xc->x=x;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1774 (xc++)->coeff= v;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1775 }else{
2606
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1776 int max_run;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1777 run--;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1778 v=0;
2191
44afbcec70b8 50% faster decode_subband()
michael
parents: 2189
diff changeset
1779
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1780 if(y) max_run= FFMIN(run, prev_xc->x - x - 2);
2606
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1781 else max_run= FFMIN(run, w-x-1);
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1782 if(parent_xc)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1783 max_run= FFMIN(max_run, 2*parent_xc->x - x - 1);
2606
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1784 x+= max_run;
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1785 run-= max_run;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1786 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1787 }
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1788 }
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1789 (xc++)->x= w+1; //end marker
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1790 prev_xc= prev2_xc;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1791 prev2_xc= xc;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1792
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1793 if(parent_xc){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1794 if(y&1){
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1795 while(parent_xc->x != parent->width+1)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1796 parent_xc++;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1797 parent_xc++;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1798 prev_parent_xc= parent_xc;
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1799 }else{
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1800 parent_xc= prev_parent_xc;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1801 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1802 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1803 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1804
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1805 (xc++)->x= w+1; //end marker
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1806 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1807 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1808
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1809 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
1810 const int w= b->width;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1811 int y;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4588
diff changeset
1812 const int qlog= av_clip(s->qlog + b->qlog, 0, QROOT*16);
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
1813 int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1814 int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1815 int new_index = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1816
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1817 START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1818
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1819 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
1820 qadd= 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1821 qmul= 1<<QEXPSHIFT;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1822 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1823
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1824 /* 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
1825 if (start_y != 0)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1826 new_index = save_state[0];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1827
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1828
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1829 for(y=start_y; y<h; y++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1830 int x = 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1831 int v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1832 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
1833 memset(line, 0, b->width*sizeof(DWTELEM));
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1834 v = b->x_coeff[new_index].coeff;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1835 x = b->x_coeff[new_index++].x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1836 while(x < w)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1837 {
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1838 register int t= ( (v>>1)*qmul + qadd)>>QEXPSHIFT;
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1839 register int u= -(v&1);
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1840 line[x] = (t^u) - u;
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1841
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1842 v = b->x_coeff[new_index].coeff;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1843 x = b->x_coeff[new_index++].x;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1844 }
2589
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(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
1847 STOP_TIMER("decode_subband")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1848 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1849
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1850 /* Save our variables for the next slice. */
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1851 save_state[0] = new_index;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1852
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1853 return;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1854 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1855
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
1856 static void reset_contexts(SnowContext *s){ //FIXME better initial contexts
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1857 int plane_index, level, orientation;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1858
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
1859 for(plane_index=0; plane_index<3; plane_index++){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1860 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1861 for(orientation=level ? 1:0; orientation<4; orientation++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1862 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
1863 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1864 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1865 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1866 memset(s->header_state, MID_STATE, sizeof(s->header_state));
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1867 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
1868 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1869
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1870 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
1871 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
1872 int h= -((-s->avctx->height)>>LOG2_MB_SIZE);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1873
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
1874 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
1875 s->b_height= h;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1876
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
1877 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
1878 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
1879 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1880
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1881 static inline void copy_rac_state(RangeCoder *d, RangeCoder *s){
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1882 uint8_t *bytestream= d->bytestream;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1883 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
1884 *d= *s;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1885 d->bytestream= bytestream;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1886 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
1887 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1888
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1889 //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
1890 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
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 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
1893
70b27300a496 quad 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 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
1895 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
1896 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
1897 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
1898 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
1899 }
70b27300a496 quad 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 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
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 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
1903 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1904
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1905 //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
1906 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
1907 {
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1908 int s, i, j;
4179
46d38e3d7038 rename squareTbl -> ff_squareTbl
mru
parents: 4123
diff changeset
1909 uint32_t *sq = ff_squareTbl + 256;
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
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 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
1912 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
1913 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
1914 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
1915 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
1916 }
70b27300a496 quad 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 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
1918 }
70b27300a496 quad 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 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
1920 }
70b27300a496 quad 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
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1922 static inline void set_blocks(SnowContext *s, int level, int x, int y, int l, int cb, int cr, int mx, int my, int ref, int type){
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
1923 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
1924 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
1925 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
1926 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
1927 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
1928 int i,j;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1929
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
1930 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
1931 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
1932 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
1933 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
1934 block.my= my;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1935 block.ref= ref;
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
1936 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
1937 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
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 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
1940 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
1941 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
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 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1945
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1946 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
1947 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
1948 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
1949 ((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
1950 ((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
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 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
1953 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
1954 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
1955 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
1956 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1957 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
1958 }
70b27300a496 quad 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
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1960 static inline void pred_mv(SnowContext *s, int *mx, int *my, int ref,
4408
c3be13eac2d6 Bring down the number of snow.c warnings from 27 to 17 by using the const
takis
parents: 4407
diff changeset
1961 const BlockNode *left, const BlockNode *top, const BlockNode *tr){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1962 if(s->ref_frames == 1){
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1963 *mx = mid_pred(left->mx, top->mx, tr->mx);
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1964 *my = mid_pred(left->my, top->my, tr->my);
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1965 }else{
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1966 const int *scale = scale_mv_ref[ref];
4407
15688bdfe1b5 Brings down the number of snow.c warnings from 33 to 27 by putting parentheses
takis
parents: 4360
diff changeset
1967 *mx = mid_pred((left->mx * scale[left->ref] + 128) >>8,
15688bdfe1b5 Brings down the number of snow.c warnings from 33 to 27 by putting parentheses
takis
parents: 4360
diff changeset
1968 (top ->mx * scale[top ->ref] + 128) >>8,
15688bdfe1b5 Brings down the number of snow.c warnings from 33 to 27 by putting parentheses
takis
parents: 4360
diff changeset
1969 (tr ->mx * scale[tr ->ref] + 128) >>8);
15688bdfe1b5 Brings down the number of snow.c warnings from 33 to 27 by putting parentheses
takis
parents: 4360
diff changeset
1970 *my = mid_pred((left->my * scale[left->ref] + 128) >>8,
15688bdfe1b5 Brings down the number of snow.c warnings from 33 to 27 by putting parentheses
takis
parents: 4360
diff changeset
1971 (top ->my * scale[top ->ref] + 128) >>8,
15688bdfe1b5 Brings down the number of snow.c warnings from 33 to 27 by putting parentheses
takis
parents: 4360
diff changeset
1972 (tr ->my * scale[tr ->ref] + 128) >>8);
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1973 }
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1974 }
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1975
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
1976 //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
1977 #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
1978 #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
1979 #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
1980 #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
1981 #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
1982 #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
1983
70b27300a496 quad 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 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
1985 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
1986 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
1987 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
1988 uint8_t i_state[sizeof(s->block_state)];
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1989 RangeCoder pc, ic;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1990 uint8_t *pbbak= s->c.bytestream;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1991 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
1992 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
1993 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
1994 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
1995 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
1996 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
1997 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
1998 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
1999 int try= (y+1)<<rem_depth;
4408
c3be13eac2d6 Bring down the number of snow.c warnings from 27 to 17 by using the const
takis
parents: 4407
diff changeset
2000 const BlockNode *left = x ? &s->block[index-1] : &null_block;
c3be13eac2d6 Bring down the number of snow.c warnings from 27 to 17 by using the const
takis
parents: 4407
diff changeset
2001 const BlockNode *top = y ? &s->block[index-w] : &null_block;
c3be13eac2d6 Bring down the number of snow.c warnings from 27 to 17 by using the const
takis
parents: 4407
diff changeset
2002 const BlockNode *right = trx<w ? &s->block[index+1] : &null_block;
c3be13eac2d6 Bring down the number of snow.c warnings from 27 to 17 by using the const
takis
parents: 4407
diff changeset
2003 const BlockNode *bottom= try<h ? &s->block[index+w] : &null_block;
c3be13eac2d6 Bring down the number of snow.c warnings from 27 to 17 by using the const
takis
parents: 4407
diff changeset
2004 const BlockNode *tl = y && x ? &s->block[index-w-1] : left;
c3be13eac2d6 Bring down the number of snow.c warnings from 27 to 17 by using the const
takis
parents: 4407
diff changeset
2005 const BlockNode *tr = y && trx<w && ((x&1)==0 || level==0) ? &s->block[index-w+(1<<rem_depth)] : tl; //FIXME use lt
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
2006 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
2007 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
2008 int pcr= left->color[2];
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2009 int pmx, pmy;
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
2010 int mx=0, my=0;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2011 int l,cr,cb;
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
2012 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
2013 const int uvstride= s->current_picture.linesize[1];
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2014 uint8_t *current_data[3]= { s->input_picture.data[0] + (x + y* stride)*block_w,
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2015 s->input_picture.data[1] + (x + y*uvstride)*block_w/2,
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2016 s->input_picture.data[2] + (x + y*uvstride)*block_w/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
2017 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
2018 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
2019 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
2020 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
2021 MotionEstContext *c= &s->m.me;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2022 int ref_context= av_log2(2*left->ref) + av_log2(2*top->ref);
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2023 int mx_context= av_log2(2*FFABS(left->mx - top->mx));
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2024 int my_context= av_log2(2*FFABS(left->my - top->my));
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
2025 int s_context= 2*left->level + 2*top->level + tl->level + tr->level;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2026 int ref, best_ref, ref_score, ref_mx, ref_my;
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
2027
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2028 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
2029 if(s->keyframe){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2030 set_blocks(s, level, x, y, pl, pcb, pcr, 0, 0, 0, BLOCK_INTRA);
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
2031 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
2032 }
70b27300a496 quad 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
70b27300a496 quad 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 // 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
2035
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2036 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
2037 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
2038 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
2039 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
2040 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
2041 P_TOPRIGHT[1]= tr->my;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2042
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
2043 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
2044 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
2045 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
2046 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
2047 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
2048 last_mv[2][1]= bottom->my;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2049
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
2050 s->m.mb_stride=2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2051 s->m.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
2052 s->m.mb_y= 0;
4360
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
2053 c->skip= 0;
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
2054
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
2055 assert(c-> stride == stride);
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
2056 assert(c->uvstride == uvstride);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2057
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
2058 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
2059 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
2060 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
2061 c->current_mv_penalty= c->mv_penalty[s->m.f_code=1] + MAX_MV;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2062
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2063 c->xmin = - x*block_w - 16+2;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2064 c->ymin = - y*block_w - 16+2;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2065 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
2066 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
2067
70b27300a496 quad 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 if(P_LEFT[0] > (c->xmax<<shift)) P_LEFT[0] = (c->xmax<<shift);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2069 if(P_LEFT[1] > (c->ymax<<shift)) P_LEFT[1] = (c->ymax<<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
2070 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
2071 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
2072 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
2073 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
2074 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
2075
70b27300a496 quad 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 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
2077 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
2078
70b27300a496 quad 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 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
2080 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
2081 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
2082 } 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
2083 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
2084 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
2085 }
70b27300a496 quad 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
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2087 score= INT_MAX;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2088 best_ref= 0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2089 for(ref=0; ref<s->ref_frames; ref++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2090 init_ref(c, current_data, s->last_picture[ref].data, NULL, block_w*x, block_w*y, 0);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2091
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2092 ref_score= ff_epzs_motion_search(&s->m, &ref_mx, &ref_my, P, 0, /*ref_index*/ 0, last_mv,
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2093 (1<<16)>>shift, level-LOG2_MB_SIZE+4, block_w);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2094
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2095 assert(ref_mx >= c->xmin);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2096 assert(ref_mx <= c->xmax);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2097 assert(ref_my >= c->ymin);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2098 assert(ref_my <= c->ymax);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2099
4360
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
2100 ref_score= c->sub_motion_search(&s->m, &ref_mx, &ref_my, ref_score, 0, 0, level-LOG2_MB_SIZE+4, block_w);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2101 ref_score= ff_get_mb_score(&s->m, ref_mx, ref_my, 0, 0, level-LOG2_MB_SIZE+4, block_w, 0);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2102 ref_score+= 2*av_log2(2*ref)*c->penalty_factor;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2103 if(s->ref_mvs[ref]){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2104 s->ref_mvs[ref][index][0]= ref_mx;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2105 s->ref_mvs[ref][index][1]= ref_my;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2106 s->ref_scores[ref][index]= ref_score;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2107 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2108 if(score > ref_score){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2109 score= ref_score;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2110 best_ref= ref;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2111 mx= ref_mx;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2112 my= ref_my;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2113 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2114 }
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
2115 //FIXME if mb_cmp != SSE then intra cant be compared currently and mb_penalty vs. lambda2
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2116
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
2117 // 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
2118 pc= s->c;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2119 pc.bytestream_start=
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2120 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
2121 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
2122
70b27300a496 quad 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 if(level!=s->block_max_depth)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2124 put_rac(&pc, &p_state[4 + s_context], 1);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2125 put_rac(&pc, &p_state[1 + left->type + top->type], 0);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2126 if(s->ref_frames > 1)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2127 put_symbol(&pc, &p_state[128 + 1024 + 32*ref_context], best_ref, 0);
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2128 pred_mv(s, &pmx, &pmy, best_ref, left, top, tr);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2129 put_symbol(&pc, &p_state[128 + 32*(mx_context + 16*!!best_ref)], mx - pmx, 1);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2130 put_symbol(&pc, &p_state[128 + 32*(my_context + 16*!!best_ref)], my - pmy, 1);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2131 p_len= pc.bytestream - pc.bytestream_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2132 score += (s->lambda2*(p_len*8
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2133 + (pc.outstanding_count - s->c.outstanding_count)*8
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2134 + (-av_log2(pc.range) + av_log2(s->c.range))
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2135 ))>>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
2136
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2137 block_s= block_w*block_w;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2138 sum = pix_sum(current_data[0], stride, block_w);
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2139 l= (sum + block_s/2)/block_s;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2140 iscore = pix_norm1(current_data[0], stride, block_w) - 2*l*sum + l*l*block_s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2141
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
2142 block_s= block_w*block_w>>2;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2143 sum = pix_sum(current_data[1], uvstride, block_w>>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
2144 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
2145 // iscore += pix_norm1(&current_mb[1][0], uvstride, block_w>>1) - 2*cb*sum + cb*cb*block_s;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2146 sum = pix_sum(current_data[2], uvstride, block_w>>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
2147 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
2148 // 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
2149
70b27300a496 quad 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 ic= s->c;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2151 ic.bytestream_start=
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2152 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
2153 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
2154 if(level!=s->block_max_depth)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2155 put_rac(&ic, &i_state[4 + s_context], 1);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2156 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
2157 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
2158 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
2159 put_symbol(&ic, &i_state[96], cr-pcr, 1);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2160 i_len= ic.bytestream - ic.bytestream_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2161 iscore += (s->lambda2*(i_len*8
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2162 + (ic.outstanding_count - s->c.outstanding_count)*8
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2163 + (-av_log2(ic.range) + av_log2(s->c.range))
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2164 ))>>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
2165
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2166 // 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
2167 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
2168 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
2169 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
2170 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
2171
70b27300a496 quad 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 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
2173 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
2174 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
2175 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
2176 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
2177 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
2178 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
2179 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2180
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
2181 if(level!=s->block_max_depth){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2182 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
2183 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
2184 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
2185 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
2186 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
2187 score2+= s->lambda2>>FF_LAMBDA_SHIFT; //FIXME exact split overhead
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2188
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
2189 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
2190 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
2191 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2192
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
2193 if(iscore < score){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2194 pred_mv(s, &pmx, &pmy, 0, left, top, tr);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2195 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
2196 s->c= ic;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2197 s->c.bytestream_start= pbbak_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2198 s->c.bytestream= pbbak + i_len;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2199 set_blocks(s, level, x, y, l, cb, cr, pmx, pmy, 0, BLOCK_INTRA);
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
2200 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
2201 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
2202 }else{
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2203 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
2204 s->c= pc;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2205 s->c.bytestream_start= pbbak_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2206 s->c.bytestream= pbbak + p_len;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2207 set_blocks(s, level, x, y, pl, pcb, pcr, mx, my, best_ref, 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
2208 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
2209 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
2210 }
70b27300a496 quad 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 }
70b27300a496 quad 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
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
2213 static av_always_inline int same_block(BlockNode *a, BlockNode *b){
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2214 if((a->type&BLOCK_INTRA) && (b->type&BLOCK_INTRA)){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2215 return !((a->color[0] - b->color[0]) | (a->color[1] - b->color[1]) | (a->color[2] - b->color[2]));
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2216 }else{
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2217 return !((a->mx - b->mx) | (a->my - b->my) | (a->ref - b->ref) | ((a->type ^ b->type)&BLOCK_INTRA));
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2218 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2219 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2220
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2221 static void encode_q_branch2(SnowContext *s, int level, int x, int y){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2222 const int w= s->b_width << s->block_max_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2223 const int rem_depth= s->block_max_depth - level;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2224 const int index= (x + y*w) << rem_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2225 int trx= (x+1)<<rem_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2226 BlockNode *b= &s->block[index];
4408
c3be13eac2d6 Bring down the number of snow.c warnings from 27 to 17 by using the const
takis
parents: 4407
diff changeset
2227 const BlockNode *left = x ? &s->block[index-1] : &null_block;
c3be13eac2d6 Bring down the number of snow.c warnings from 27 to 17 by using the const
takis
parents: 4407
diff changeset
2228 const BlockNode *top = y ? &s->block[index-w] : &null_block;
c3be13eac2d6 Bring down the number of snow.c warnings from 27 to 17 by using the const
takis
parents: 4407
diff changeset
2229 const BlockNode *tl = y && x ? &s->block[index-w-1] : left;
c3be13eac2d6 Bring down the number of snow.c warnings from 27 to 17 by using the const
takis
parents: 4407
diff changeset
2230 const BlockNode *tr = y && trx<w && ((x&1)==0 || level==0) ? &s->block[index-w+(1<<rem_depth)] : tl; //FIXME use lt
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2231 int pl = left->color[0];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2232 int pcb= left->color[1];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2233 int pcr= left->color[2];
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2234 int pmx, pmy;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2235 int ref_context= av_log2(2*left->ref) + av_log2(2*top->ref);
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2236 int mx_context= av_log2(2*FFABS(left->mx - top->mx)) + 16*!!b->ref;
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2237 int my_context= av_log2(2*FFABS(left->my - top->my)) + 16*!!b->ref;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2238 int s_context= 2*left->level + 2*top->level + tl->level + tr->level;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2239
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2240 if(s->keyframe){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2241 set_blocks(s, level, x, y, pl, pcb, pcr, 0, 0, 0, BLOCK_INTRA);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2242 return;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2243 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2244
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2245 if(level!=s->block_max_depth){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2246 if(same_block(b,b+1) && same_block(b,b+w) && same_block(b,b+w+1)){
2995
dfc271b90fe6 4mv + iter ME 10l fix (still not bugfree but better)
michael
parents: 2994
diff changeset
2247 put_rac(&s->c, &s->block_state[4 + s_context], 1);
dfc271b90fe6 4mv + iter ME 10l fix (still not bugfree but better)
michael
parents: 2994
diff changeset
2248 }else{
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2249 put_rac(&s->c, &s->block_state[4 + s_context], 0);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2250 encode_q_branch2(s, level+1, 2*x+0, 2*y+0);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2251 encode_q_branch2(s, level+1, 2*x+1, 2*y+0);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2252 encode_q_branch2(s, level+1, 2*x+0, 2*y+1);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2253 encode_q_branch2(s, level+1, 2*x+1, 2*y+1);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2254 return;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2255 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2256 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2257 if(b->type & BLOCK_INTRA){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2258 pred_mv(s, &pmx, &pmy, 0, left, top, tr);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2259 put_rac(&s->c, &s->block_state[1 + (left->type&1) + (top->type&1)], 1);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2260 put_symbol(&s->c, &s->block_state[32], b->color[0]-pl , 1);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2261 put_symbol(&s->c, &s->block_state[64], b->color[1]-pcb, 1);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2262 put_symbol(&s->c, &s->block_state[96], b->color[2]-pcr, 1);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2263 set_blocks(s, level, x, y, b->color[0], b->color[1], b->color[2], pmx, pmy, 0, BLOCK_INTRA);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2264 }else{
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2265 pred_mv(s, &pmx, &pmy, b->ref, left, top, tr);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2266 put_rac(&s->c, &s->block_state[1 + (left->type&1) + (top->type&1)], 0);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2267 if(s->ref_frames > 1)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2268 put_symbol(&s->c, &s->block_state[128 + 1024 + 32*ref_context], b->ref, 0);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2269 put_symbol(&s->c, &s->block_state[128 + 32*mx_context], b->mx - pmx, 1);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2270 put_symbol(&s->c, &s->block_state[128 + 32*my_context], b->my - pmy, 1);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2271 set_blocks(s, level, x, y, pl, pcb, pcr, b->mx, b->my, b->ref, 0);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2272 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2273 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2274
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
2275 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
2276 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
2277 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
2278 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
2279 int trx= (x+1)<<rem_depth;
4408
c3be13eac2d6 Bring down the number of snow.c warnings from 27 to 17 by using the const
takis
parents: 4407
diff changeset
2280 const BlockNode *left = x ? &s->block[index-1] : &null_block;
c3be13eac2d6 Bring down the number of snow.c warnings from 27 to 17 by using the const
takis
parents: 4407
diff changeset
2281 const BlockNode *top = y ? &s->block[index-w] : &null_block;
c3be13eac2d6 Bring down the number of snow.c warnings from 27 to 17 by using the const
takis
parents: 4407
diff changeset
2282 const BlockNode *tl = y && x ? &s->block[index-w-1] : left;
c3be13eac2d6 Bring down the number of snow.c warnings from 27 to 17 by using the const
takis
parents: 4407
diff changeset
2283 const BlockNode *tr = y && trx<w && ((x&1)==0 || level==0) ? &s->block[index-w+(1<<rem_depth)] : tl; //FIXME use lt
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
2284 int s_context= 2*left->level + 2*top->level + tl->level + tr->level;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2285
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
2286 if(s->keyframe){
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2287 set_blocks(s, level, x, y, null_block.color[0], null_block.color[1], null_block.color[2], null_block.mx, null_block.my, null_block.ref, BLOCK_INTRA);
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
2288 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
2289 }
70b27300a496 quad 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
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2291 if(level==s->block_max_depth || get_rac(&s->c, &s->block_state[4 + s_context])){
4332
35812973e0bc dead code removial
michael
parents: 4331
diff changeset
2292 int type, mx, my;
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
2293 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
2294 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
2295 int cr= left->color[2];
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2296 int ref = 0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2297 int ref_context= av_log2(2*left->ref) + av_log2(2*top->ref);
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2298 int mx_context= av_log2(2*FFABS(left->mx - top->mx)) + 0*av_log2(2*FFABS(tr->mx - top->mx));
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2299 int my_context= av_log2(2*FFABS(left->my - top->my)) + 0*av_log2(2*FFABS(tr->my - top->my));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2300
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2301 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
2302
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2303 if(type){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2304 pred_mv(s, &mx, &my, 0, left, top, tr);
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
2305 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
2306 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
2307 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
2308 }else{
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2309 if(s->ref_frames > 1)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2310 ref= get_symbol(&s->c, &s->block_state[128 + 1024 + 32*ref_context], 0);
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2311 pred_mv(s, &mx, &my, ref, left, top, tr);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2312 mx+= get_symbol(&s->c, &s->block_state[128 + 32*(mx_context + 16*!!ref)], 1);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2313 my+= get_symbol(&s->c, &s->block_state[128 + 32*(my_context + 16*!!ref)], 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
2314 }
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2315 set_blocks(s, level, x, y, l, cb, cr, mx, my, ref, type);
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
2316 }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
2317 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
2318 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
2319 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
2320 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
2321 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2322 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2323
3661
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
2324 static void encode_blocks(SnowContext *s, int search){
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2325 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
2326 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
2327 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
2328
3661
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
2329 if(s->avctx->me_method == ME_ITER && !s->keyframe && search)
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2330 iterative_me(s);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2331
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
2332 for(y=0; y<h; y++){
2435
c89ac0e70c66 10l patch by (matthieu castet <castet.matthieu free fr>)
michael
parents: 2422
diff changeset
2333 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
2334 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
2335 return;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
2336 }
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
2337 for(x=0; x<w; x++){
3661
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
2338 if(s->avctx->me_method == ME_ITER || !search)
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2339 encode_q_branch2(s, 0, x, y);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2340 else
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2341 encode_q_branch (s, 0, x, y);
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
2342 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2343 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2344 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2345
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2346 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
2347 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
2348 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
2349 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
2350
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2351 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
2352 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
2353 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
2354 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2355 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2356 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2357
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2358 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
2359 int x, y;
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2360 START_TIMER
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2361 for(y=0; y < b_h+5; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2362 for(x=0; x < b_w; x++){
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2363 int a0= src[x ];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2364 int a1= src[x + 1];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2365 int a2= src[x + 2];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2366 int a3= src[x + 3];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2367 int a4= src[x + 4];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2368 int a5= src[x + 5];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2369 // int am= 9*(a1+a2) - (a0+a3);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2370 int am= 20*(a2+a3) - 5*(a1+a4) + (a0+a5);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2371 // int am= 18*(a2+a3) - 2*(a1+a4);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2372 // int aL= (-7*a0 + 105*a1 + 35*a2 - 5*a3)>>3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2373 // int aR= (-7*a3 + 105*a2 + 35*a1 - 5*a0)>>3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2374
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2375 // if(b_w==16) am= 8*(a1+a2);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2376
2610
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2377 if(dx<8) am = (32*a2*( 8-dx) + am* dx + 128)>>8;
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2378 else am = ( am*(16-dx) + 32*a3*(dx-8) + 128)>>8;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2379
2610
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2380 /* FIXME Try increasing tmp buffer to 16 bits and not clipping here. Should give marginally better results. - Robert*/
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2381 if(am&(~255)) am= ~(am>>31);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2382
2610
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2383 tmp[x] = am;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2384
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2385 /* if (dx< 4) tmp[x + y*stride]= (16*a1*( 4-dx) + aL* dx + 32)>>6;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2386 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
2387 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
2388 else tmp[x + y*stride]= ( aR*(16-dx) + 16*a2*(dx-12) + 32)>>6;*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2389 }
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2390 tmp += stride;
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2391 src += stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2392 }
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2393 tmp -= (b_h+5)*stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2394
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2395 for(y=0; y < b_h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2396 for(x=0; x < b_w; x++){
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2397 int a0= tmp[x + 0*stride];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2398 int a1= tmp[x + 1*stride];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2399 int a2= tmp[x + 2*stride];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2400 int a3= tmp[x + 3*stride];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2401 int a4= tmp[x + 4*stride];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2402 int a5= tmp[x + 5*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2403 int am= 20*(a2+a3) - 5*(a1+a4) + (a0+a5);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2404 // int am= 18*(a2+a3) - 2*(a1+a4);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2405 /* int aL= (-7*a0 + 105*a1 + 35*a2 - 5*a3)>>3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2406 int aR= (-7*a3 + 105*a2 + 35*a1 - 5*a0)>>3;*/
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2407
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2408 // if(b_w==16) am= 8*(a1+a2);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2409
2610
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2410 if(dy<8) am = (32*a2*( 8-dy) + am* dy + 128)>>8;
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2411 else am = ( am*(16-dy) + 32*a3*(dy-8) + 128)>>8;
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2412
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2413 if(am&(~255)) am= ~(am>>31);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2414
2610
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2415 dst[x] = am;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2416 /* if (dy< 4) tmp[x + y*stride]= (16*a1*( 4-dy) + aL* dy + 32)>>6;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2417 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
2418 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
2419 else tmp[x + y*stride]= ( aR*(16-dy) + 16*a2*(dy-12) + 32)>>6;*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2420 }
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2421 dst += stride;
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2422 tmp += stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2423 }
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2424 STOP_TIMER("mc_block")
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2425 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2426
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2427 #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
2428 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
2429 uint8_t tmp[stride*(b_w+5)];\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2430 assert(h==b_w);\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2431 mc_block(dst, src-2-2*stride, tmp, stride, b_w, b_w, dx, dy);\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2432 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2433
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2434 mca( 0, 0,16)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2435 mca( 8, 0,16)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2436 mca( 0, 8,16)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2437 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
2438 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
2439 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
2440 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
2441 mca( 8, 8,8)
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2442
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2443 static void pred_block(SnowContext *s, uint8_t *dst, uint8_t *tmp, int stride, int sx, int sy, int b_w, int b_h, BlockNode *block, int plane_index, int w, int h){
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2444 if(block->type & BLOCK_INTRA){
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2445 int x, y;
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2446 const int color = block->color[plane_index];
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2447 const int color4= color*0x01010101;
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2448 if(b_w==32){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2449 for(y=0; y < b_h; y++){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2450 *(uint32_t*)&dst[0 + y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2451 *(uint32_t*)&dst[4 + y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2452 *(uint32_t*)&dst[8 + y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2453 *(uint32_t*)&dst[12+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2454 *(uint32_t*)&dst[16+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2455 *(uint32_t*)&dst[20+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2456 *(uint32_t*)&dst[24+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2457 *(uint32_t*)&dst[28+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2458 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2459 }else if(b_w==16){
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2460 for(y=0; y < b_h; y++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2461 *(uint32_t*)&dst[0 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2462 *(uint32_t*)&dst[4 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2463 *(uint32_t*)&dst[8 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2464 *(uint32_t*)&dst[12+ y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2465 }
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2466 }else if(b_w==8){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2467 for(y=0; y < b_h; y++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2468 *(uint32_t*)&dst[0 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2469 *(uint32_t*)&dst[4 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2470 }
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2471 }else if(b_w==4){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2472 for(y=0; y < b_h; y++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2473 *(uint32_t*)&dst[0 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2474 }
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2475 }else{
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2476 for(y=0; y < b_h; y++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2477 for(x=0; x < b_w; x++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2478 dst[x + y*stride]= color;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2479 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2480 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2481 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2482 }else{
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2483 uint8_t *src= s->last_picture[block->ref].data[plane_index];
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2484 const int scale= plane_index ? s->mv_scale : 2*s->mv_scale;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2485 int mx= block->mx*scale;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2486 int my= block->my*scale;
2223
b26474e72d6d use h264 MC code if possible
michael
parents: 2221
diff changeset
2487 const int dx= mx&15;
b26474e72d6d use h264 MC code if possible
michael
parents: 2221
diff changeset
2488 const int dy= my&15;
3020
c75fb0747e74 use h264 MC functions for 2xX Xx2 blocks in snow too
michael
parents: 3018
diff changeset
2489 const int tab_index= 3 - (b_w>>2) + (b_w>>4);
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2490 sx += (mx>>4) - 2;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2491 sy += (my>>4) - 2;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2492 src += sx + sy*stride;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2493 if( (unsigned)sx >= w - b_w - 4
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2494 || (unsigned)sy >= h - b_h - 4){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2495 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
2496 src= tmp + MB_SIZE;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2497 }
3189
e1cbe2635325 fix %8 != 0 w/h
michael
parents: 3075
diff changeset
2498 // assert(b_w == b_h || 2*b_w == b_h || b_w == 2*b_h);
e1cbe2635325 fix %8 != 0 w/h
michael
parents: 3075
diff changeset
2499 // assert(!(b_w&(b_w-1)));
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2500 assert(b_w>1 && b_h>1);
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2501 assert(tab_index>=0 && tab_index<4 || b_w==32);
3189
e1cbe2635325 fix %8 != 0 w/h
michael
parents: 3075
diff changeset
2502 if((dx&3) || (dy&3) || !(b_w == b_h || 2*b_w == b_h || b_w == 2*b_h) || (b_w&(b_w-1)))
2223
b26474e72d6d use h264 MC code if possible
michael
parents: 2221
diff changeset
2503 mc_block(dst, src, tmp, stride, b_w, b_h, dx, dy);
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2504 else if(b_w==32){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2505 int y;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2506 for(y=0; y<b_h; y+=16){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2507 s->dsp.put_h264_qpel_pixels_tab[0][dy+(dx>>2)](dst + y*stride, src + 2 + (y+2)*stride,stride);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2508 s->dsp.put_h264_qpel_pixels_tab[0][dy+(dx>>2)](dst + 16 + y*stride, src + 18 + (y+2)*stride,stride);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2509 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2510 }else if(b_w==b_h)
3020
c75fb0747e74 use h264 MC functions for 2xX Xx2 blocks in snow too
michael
parents: 3018
diff changeset
2511 s->dsp.put_h264_qpel_pixels_tab[tab_index ][dy+(dx>>2)](dst,src + 2 + 2*stride,stride);
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2512 else if(b_w==2*b_h){
3020
c75fb0747e74 use h264 MC functions for 2xX Xx2 blocks in snow too
michael
parents: 3018
diff changeset
2513 s->dsp.put_h264_qpel_pixels_tab[tab_index+1][dy+(dx>>2)](dst ,src + 2 + 2*stride,stride);
c75fb0747e74 use h264 MC functions for 2xX Xx2 blocks in snow too
michael
parents: 3018
diff changeset
2514 s->dsp.put_h264_qpel_pixels_tab[tab_index+1][dy+(dx>>2)](dst+b_h,src + 2 + b_h + 2*stride,stride);
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2515 }else{
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2516 assert(2*b_w==b_h);
3020
c75fb0747e74 use h264 MC functions for 2xX Xx2 blocks in snow too
michael
parents: 3018
diff changeset
2517 s->dsp.put_h264_qpel_pixels_tab[tab_index ][dy+(dx>>2)](dst ,src + 2 + 2*stride ,stride);
c75fb0747e74 use h264 MC functions for 2xX Xx2 blocks in snow too
michael
parents: 3018
diff changeset
2518 s->dsp.put_h264_qpel_pixels_tab[tab_index ][dy+(dx>>2)](dst+b_w*stride,src + 2 + 2*stride+b_w*stride,stride);
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2519 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2520 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2521 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2522
4436
d3e389536b0a Add the const specifier as needed to reduce the number of warnings.
takis
parents: 4409
diff changeset
2523 void ff_snow_inner_add_yblock(const uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h,
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2524 int src_x, int src_y, int src_stride, slice_buffer * sb, int add, uint8_t * dst8){
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2525 int y, x;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2526 DWTELEM * dst;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2527 for(y=0; y<b_h; y++){
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2528 //FIXME ugly missue of obmc_stride
4436
d3e389536b0a Add the const specifier as needed to reduce the number of warnings.
takis
parents: 4409
diff changeset
2529 const uint8_t *obmc1= obmc + y*obmc_stride;
d3e389536b0a Add the const specifier as needed to reduce the number of warnings.
takis
parents: 4409
diff changeset
2530 const uint8_t *obmc2= obmc1+ (obmc_stride>>1);
d3e389536b0a Add the const specifier as needed to reduce the number of warnings.
takis
parents: 4409
diff changeset
2531 const uint8_t *obmc3= obmc1+ obmc_stride*(obmc_stride>>1);
d3e389536b0a Add the const specifier as needed to reduce the number of warnings.
takis
parents: 4409
diff changeset
2532 const uint8_t *obmc4= obmc3+ (obmc_stride>>1);
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2533 dst = slice_buffer_get_line(sb, src_y + y);
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2534 for(x=0; x<b_w; x++){
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2535 int v= obmc1[x] * block[3][x + y*src_stride]
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2536 +obmc2[x] * block[2][x + y*src_stride]
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2537 +obmc3[x] * block[1][x + y*src_stride]
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2538 +obmc4[x] * block[0][x + y*src_stride];
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2539
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2540 v <<= 8 - LOG2_OBMC_MAX;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2541 if(FRAC_BITS != 8){
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2542 v += 1<<(7 - FRAC_BITS);
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2543 v >>= 8 - FRAC_BITS;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2544 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2545 if(add){
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2546 v += dst[x + src_x];
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2547 v = (v + (1<<(FRAC_BITS-1))) >> FRAC_BITS;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2548 if(v&(~255)) v= ~(v>>31);
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2549 dst8[x + y*src_stride] = v;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2550 }else{
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2551 dst[x + src_x] -= v;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2552 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2553 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2554 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2555 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2556
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2557 //FIXME name clenup (b_w, block_w, b_width stuff)
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
2558 static av_always_inline void add_yblock(SnowContext *s, int sliced, slice_buffer *sb, DWTELEM *dst, uint8_t *dst8, const 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 offset_dst, int plane_index){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2559 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
2560 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
2561 const int b_stride= b_width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2562 BlockNode *lt= &s->block[b_x + b_y*b_stride];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2563 BlockNode *rt= lt+1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2564 BlockNode *lb= lt+b_stride;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2565 BlockNode *rb= lb+1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2566 uint8_t *block[4];
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2567 int tmp_step= src_stride >= 7*MB_SIZE ? MB_SIZE : MB_SIZE*src_stride;
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2568 uint8_t tmp[src_stride*7*MB_SIZE]; //FIXME align
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2569 uint8_t *ptmp;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2570 int x,y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2571
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2572 if(b_x<0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2573 lt= rt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2574 lb= rb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2575 }else if(b_x + 1 >= b_width){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2576 rt= lt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2577 rb= lb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2578 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2579 if(b_y<0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2580 lt= lb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2581 rt= rb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2582 }else if(b_y + 1 >= b_height){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2583 lb= lt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2584 rb= rt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2585 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2586
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2587 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
2588 obmc -= src_x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2589 b_w += src_x;
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2590 if(!sliced && !offset_dst)
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2591 dst -= src_x;
2206
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;
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2599 if(!sliced && !offset_dst)
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2600 dst -= src_y*dst_stride;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2601 src_y=0;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2602 }else if(src_y + b_h> h){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2603 b_h = h - src_y;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2604 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2605
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2606 if(b_w<=0 || b_h<=0) return;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2607
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2608 assert(src_stride > 2*MB_SIZE + 5);
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2609 if(!sliced && offset_dst)
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2610 dst += src_x + src_y*dst_stride;
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2611 dst8+= src_x + src_y*src_stride;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2612 // src += src_x + src_y*src_stride;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2613
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2614 ptmp= tmp + 3*tmp_step;
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2615 block[0]= ptmp;
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2616 ptmp+=tmp_step;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2617 pred_block(s, block[0], tmp, src_stride, src_x, src_y, b_w, b_h, lt, plane_index, w, h);
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2618
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2619 if(same_block(lt, rt)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2620 block[1]= block[0];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2621 }else{
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2622 block[1]= ptmp;
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2623 ptmp+=tmp_step;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2624 pred_block(s, block[1], tmp, src_stride, src_x, src_y, b_w, b_h, rt, plane_index, w, h);
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2625 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2626
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2627 if(same_block(lt, lb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2628 block[2]= block[0];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2629 }else if(same_block(rt, lb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2630 block[2]= block[1];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2631 }else{
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2632 block[2]= ptmp;
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2633 ptmp+=tmp_step;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2634 pred_block(s, block[2], tmp, src_stride, src_x, src_y, b_w, b_h, lb, plane_index, w, h);
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2635 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2636
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2637 if(same_block(lt, rb) ){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2638 block[3]= block[0];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2639 }else if(same_block(rt, rb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2640 block[3]= block[1];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2641 }else if(same_block(lb, rb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2642 block[3]= block[2];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2643 }else{
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2644 block[3]= ptmp;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2645 pred_block(s, block[3], tmp, src_stride, src_x, src_y, b_w, b_h, rb, plane_index, w, h);
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2646 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2647 #if 0
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 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2650 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
2651 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2652 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2653 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2654 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2655 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2656 uint8_t *obmc2= obmc + (obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2657 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2658 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
2659 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2660 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2661 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2662 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2663 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2664 uint8_t *obmc3= obmc + obmc_stride*(obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2665 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2666 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
2667 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2668 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2669 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2670 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2671 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2672 uint8_t *obmc3= obmc + obmc_stride*(obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2673 uint8_t *obmc4= obmc3+ (obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2674 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2675 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
2676 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2677 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2678 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2679 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2680 #else
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2681 if(sliced){
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2682 START_TIMER
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2683
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2684 s->dsp.inner_add_yblock(obmc, obmc_stride, block, b_w, b_h, src_x,src_y, src_stride, sb, add, dst8);
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2685 STOP_TIMER("inner_add_yblock")
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2686 }else
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2687 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2688 //FIXME ugly missue of obmc_stride
4436
d3e389536b0a Add the const specifier as needed to reduce the number of warnings.
takis
parents: 4409
diff changeset
2689 const uint8_t *obmc1= obmc + y*obmc_stride;
d3e389536b0a Add the const specifier as needed to reduce the number of warnings.
takis
parents: 4409
diff changeset
2690 const uint8_t *obmc2= obmc1+ (obmc_stride>>1);
d3e389536b0a Add the const specifier as needed to reduce the number of warnings.
takis
parents: 4409
diff changeset
2691 const uint8_t *obmc3= obmc1+ obmc_stride*(obmc_stride>>1);
d3e389536b0a Add the const specifier as needed to reduce the number of warnings.
takis
parents: 4409
diff changeset
2692 const uint8_t *obmc4= obmc3+ (obmc_stride>>1);
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2693 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2694 int v= obmc1[x] * block[3][x + y*src_stride]
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2695 +obmc2[x] * block[2][x + y*src_stride]
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2696 +obmc3[x] * block[1][x + y*src_stride]
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2697 +obmc4[x] * block[0][x + y*src_stride];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2698
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2699 v <<= 8 - LOG2_OBMC_MAX;
2246
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
2700 if(FRAC_BITS != 8){
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
2701 v += 1<<(7 - FRAC_BITS);
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
2702 v >>= 8 - FRAC_BITS;
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
2703 }
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2704 if(add){
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2705 v += dst[x + y*dst_stride];
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2706 v = (v + (1<<(FRAC_BITS-1))) >> FRAC_BITS;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2707 if(v&(~255)) v= ~(v>>31);
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2708 dst8[x + y*src_stride] = v;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2709 }else{
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2710 dst[x + y*dst_stride] -= v;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2711 }
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2712 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2713 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2714 #endif
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2715 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2716
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
2717 static av_always_inline void predict_slice_buffered(SnowContext *s, slice_buffer * sb, DWTELEM * old_buffer, int plane_index, int add, int mb_y){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2718 Plane *p= &s->plane[plane_index];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2719 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
2720 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
2721 int x, y, mb_x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2722 int block_size = MB_SIZE >> s->block_max_depth;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2723 int block_w = plane_index ? block_size/2 : block_size;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2724 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
2725 int obmc_stride= plane_index ? block_size : 2*block_size;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2726 int ref_stride= s->current_picture.linesize[plane_index];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2727 uint8_t *dst8= s->current_picture.data[plane_index];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2728 int w= p->width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2729 int h= p->height;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2730 START_TIMER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2731
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2732 if(s->keyframe || (s->avctx->debug&512)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2733 if(mb_y==mb_h)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2734 return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2735
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2736 if(add){
2604
b7e6c3d31c65 Snow segfault bug in revision 1.43 patch by (Yartrebo /yartrebo earthlink net/)
michael
parents: 2602
diff changeset
2737 for(y=block_w*mb_y; y<FFMIN(h,block_w*(mb_y+1)); y++)
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2738 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2739 // DWTELEM * line = slice_buffer_get_line(sb, y);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2740 DWTELEM * line = sb->line[y];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2741 for(x=0; x<w; x++)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2742 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2743 // 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
2744 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
2745 v >>= FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2746 if(v&(~255)) v= ~(v>>31);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2747 dst8[x + y*ref_stride]= v;
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 }else{
2604
b7e6c3d31c65 Snow segfault bug in revision 1.43 patch by (Yartrebo /yartrebo earthlink net/)
michael
parents: 2602
diff changeset
2751 for(y=block_w*mb_y; y<FFMIN(h,block_w*(mb_y+1)); y++)
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2752 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2753 // DWTELEM * line = slice_buffer_get_line(sb, y);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2754 DWTELEM * line = sb->line[y];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2755 for(x=0; x<w; x++)
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 line[x] -= 128 << FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2758 // buf[x + y*w]-= 128<<FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2759 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2760 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2761 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2762
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2763 return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2764 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2765
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2766 for(mb_x=0; mb_x<=mb_w; mb_x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2767 START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2768
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2769 add_yblock(s, 1, sb, old_buffer, dst8, obmc,
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2770 block_w*mb_x - block_w/2,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2771 block_w*mb_y - block_w/2,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2772 block_w, block_w,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2773 w, h,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2774 w, ref_stride, obmc_stride,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2775 mb_x - 1, mb_y - 1,
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2776 add, 0, plane_index);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2777
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2778 STOP_TIMER("add_yblock")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2779 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2780
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2781 STOP_TIMER("predict_slice")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2782 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2783
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
2784 static av_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
2785 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
2786 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
2787 const int mb_h= s->b_height << s->block_max_depth;
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2788 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
2789 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
2790 int block_w = plane_index ? block_size/2 : block_size;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2791 const uint8_t *obmc = plane_index ? obmc_tab[s->block_max_depth+1] : obmc_tab[s->block_max_depth];
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2792 const 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
2793 int ref_stride= s->current_picture.linesize[plane_index];
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2794 uint8_t *dst8= s->current_picture.data[plane_index];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2795 int w= p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2796 int h= p->height;
2197
michael
parents: 2195
diff changeset
2797 START_TIMER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2798
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2799 if(s->keyframe || (s->avctx->debug&512)){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2800 if(mb_y==mb_h)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2801 return;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2802
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2803 if(add){
2604
b7e6c3d31c65 Snow segfault bug in revision 1.43 patch by (Yartrebo /yartrebo earthlink net/)
michael
parents: 2602
diff changeset
2804 for(y=block_w*mb_y; y<FFMIN(h,block_w*(mb_y+1)); y++){
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2805 for(x=0; x<w; x++){
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2806 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
2807 v >>= FRAC_BITS;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2808 if(v&(~255)) v= ~(v>>31);
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2809 dst8[x + y*ref_stride]= v;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2810 }
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2811 }
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2812 }else{
2604
b7e6c3d31c65 Snow segfault bug in revision 1.43 patch by (Yartrebo /yartrebo earthlink net/)
michael
parents: 2602
diff changeset
2813 for(y=block_w*mb_y; y<FFMIN(h,block_w*(mb_y+1)); y++){
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2814 for(x=0; x<w; x++){
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2815 buf[x + y*w]-= 128<<FRAC_BITS;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2816 }
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2817 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2818 }
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2819
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2820 return;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2821 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2822
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2823 for(mb_x=0; mb_x<=mb_w; mb_x++){
2197
michael
parents: 2195
diff changeset
2824 START_TIMER
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2825
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2826 add_yblock(s, 0, NULL, buf, dst8, obmc,
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2827 block_w*mb_x - block_w/2,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2828 block_w*mb_y - block_w/2,
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2829 block_w, block_w,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2830 w, h,
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2831 w, ref_stride, obmc_stride,
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2832 mb_x - 1, mb_y - 1,
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2833 add, 1, plane_index);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2834
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2835 STOP_TIMER("add_yblock")
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2836 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2837
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2838 STOP_TIMER("predict_slice")
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2839 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2840
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
2841 static av_always_inline void predict_plane(SnowContext *s, DWTELEM *buf, int plane_index, int add){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2842 const int mb_h= s->b_height << s->block_max_depth;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2843 int mb_y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2844 for(mb_y=0; mb_y<=mb_h; mb_y++)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2845 predict_slice(s, buf, plane_index, add, mb_y);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2846 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2847
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2848 static int get_dc(SnowContext *s, int mb_x, int mb_y, int plane_index){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2849 int i, x2, y2;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2850 Plane *p= &s->plane[plane_index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2851 const int block_size = MB_SIZE >> s->block_max_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2852 const int block_w = plane_index ? block_size/2 : block_size;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2853 const uint8_t *obmc = plane_index ? obmc_tab[s->block_max_depth+1] : obmc_tab[s->block_max_depth];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2854 const int obmc_stride= plane_index ? block_size : 2*block_size;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2855 const int ref_stride= s->current_picture.linesize[plane_index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2856 uint8_t *src= s-> input_picture.data[plane_index];
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2857 DWTELEM *dst= (DWTELEM*)s->m.obmc_scratchpad + plane_index*block_size*block_size*4;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2858 const int b_stride = s->b_width << s->block_max_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2859 const int w= p->width;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2860 const int h= p->height;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2861 int index= mb_x + mb_y*b_stride;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2862 BlockNode *b= &s->block[index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2863 BlockNode backup= *b;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2864 int ab=0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2865 int aa=0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2866
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2867 b->type|= BLOCK_INTRA;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2868 b->color[plane_index]= 0;
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2869 memset(dst, 0, obmc_stride*obmc_stride*sizeof(DWTELEM));
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2870
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2871 for(i=0; i<4; i++){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2872 int mb_x2= mb_x + (i &1) - 1;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2873 int mb_y2= mb_y + (i>>1) - 1;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2874 int x= block_w*mb_x2 + block_w/2;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2875 int y= block_w*mb_y2 + block_w/2;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2876
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2877 add_yblock(s, 0, NULL, dst + ((i&1)+(i>>1)*obmc_stride)*block_w, NULL, obmc,
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2878 x, y, block_w, block_w, w, h, obmc_stride, ref_stride, obmc_stride, mb_x2, mb_y2, 0, 0, plane_index);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2879
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2880 for(y2= FFMAX(y, 0); y2<FFMIN(h, y+block_w); y2++){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2881 for(x2= FFMAX(x, 0); x2<FFMIN(w, x+block_w); x2++){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2882 int index= x2-(block_w*mb_x - block_w/2) + (y2-(block_w*mb_y - block_w/2))*obmc_stride;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2883 int obmc_v= obmc[index];
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2884 int d;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2885 if(y<0) obmc_v += obmc[index + block_w*obmc_stride];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2886 if(x<0) obmc_v += obmc[index + block_w];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2887 if(y+block_w>h) obmc_v += obmc[index - block_w*obmc_stride];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2888 if(x+block_w>w) obmc_v += obmc[index - block_w];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2889 //FIXME precalc this or simplify it somehow else
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2890
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2891 d = -dst[index] + (1<<(FRAC_BITS-1));
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2892 dst[index] = d;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2893 ab += (src[x2 + y2*ref_stride] - (d>>FRAC_BITS)) * obmc_v;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2894 aa += obmc_v * obmc_v; //FIXME precalclate this
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2895 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2896 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2897 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2898 *b= backup;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2899
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4588
diff changeset
2900 return av_clip(((ab<<LOG2_OBMC_MAX) + aa/2)/aa, 0, 255); //FIXME we shouldnt need cliping
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2901 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2902
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2903 static inline int get_block_bits(SnowContext *s, int x, int y, int w){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2904 const int b_stride = s->b_width << s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2905 const int b_height = s->b_height<< s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2906 int index= x + y*b_stride;
4408
c3be13eac2d6 Bring down the number of snow.c warnings from 27 to 17 by using the const
takis
parents: 4407
diff changeset
2907 const BlockNode *b = &s->block[index];
c3be13eac2d6 Bring down the number of snow.c warnings from 27 to 17 by using the const
takis
parents: 4407
diff changeset
2908 const BlockNode *left = x ? &s->block[index-1] : &null_block;
c3be13eac2d6 Bring down the number of snow.c warnings from 27 to 17 by using the const
takis
parents: 4407
diff changeset
2909 const BlockNode *top = y ? &s->block[index-b_stride] : &null_block;
c3be13eac2d6 Bring down the number of snow.c warnings from 27 to 17 by using the const
takis
parents: 4407
diff changeset
2910 const BlockNode *tl = y && x ? &s->block[index-b_stride-1] : left;
c3be13eac2d6 Bring down the number of snow.c warnings from 27 to 17 by using the const
takis
parents: 4407
diff changeset
2911 const BlockNode *tr = y && x+w<b_stride ? &s->block[index-b_stride+w] : tl;
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2912 int dmx, dmy;
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2913 // int mx_context= av_log2(2*FFABS(left->mx - top->mx));
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2914 // int my_context= av_log2(2*FFABS(left->my - top->my));
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2915
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2916 if(x<0 || x>=b_stride || y>=b_height)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2917 return 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2918 /*
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2919 1 0 0
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2920 01X 1-2 1
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2921 001XX 3-6 2-3
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2922 0001XXX 7-14 4-7
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2923 00001XXXX 15-30 8-15
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2924 */
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2925 //FIXME try accurate rate
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2926 //FIXME intra and inter predictors if surrounding blocks arent the same type
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2927 if(b->type & BLOCK_INTRA){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2928 return 3+2*( av_log2(2*FFABS(left->color[0] - b->color[0]))
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2929 + av_log2(2*FFABS(left->color[1] - b->color[1]))
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2930 + av_log2(2*FFABS(left->color[2] - b->color[2])));
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2931 }else{
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2932 pred_mv(s, &dmx, &dmy, b->ref, left, top, tr);
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2933 dmx-= b->mx;
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2934 dmy-= b->my;
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2935 return 2*(1 + av_log2(2*FFABS(dmx)) //FIXME kill the 2* can be merged in lambda
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2936 + av_log2(2*FFABS(dmy))
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2937 + av_log2(2*b->ref));
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2938 }
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2939 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2940
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2941 static int get_block_rd(SnowContext *s, int mb_x, int mb_y, int plane_index, const uint8_t *obmc_edged){
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2942 Plane *p= &s->plane[plane_index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2943 const int block_size = MB_SIZE >> s->block_max_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2944 const int block_w = plane_index ? block_size/2 : block_size;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2945 const int obmc_stride= plane_index ? block_size : 2*block_size;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2946 const int ref_stride= s->current_picture.linesize[plane_index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2947 uint8_t *dst= s->current_picture.data[plane_index];
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2948 uint8_t *src= s-> input_picture.data[plane_index];
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2949 DWTELEM *pred= (DWTELEM*)s->m.obmc_scratchpad + plane_index*block_size*block_size*4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2950 uint8_t cur[ref_stride*2*MB_SIZE]; //FIXME alignment
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2951 uint8_t tmp[ref_stride*(2*MB_SIZE+5)];
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2952 const int b_stride = s->b_width << s->block_max_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2953 const int b_height = s->b_height<< s->block_max_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2954 const int w= p->width;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2955 const int h= p->height;
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2956 int distortion;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2957 int rate= 0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2958 const int penalty_factor= get_penalty_factor(s->lambda, s->lambda2, s->avctx->me_cmp);
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2959 int sx= block_w*mb_x - block_w/2;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2960 int sy= block_w*mb_y - block_w/2;
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2961 int x0= FFMAX(0,-sx);
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2962 int y0= FFMAX(0,-sy);
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2963 int x1= FFMIN(block_w*2, w-sx);
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2964 int y1= FFMIN(block_w*2, h-sy);
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2965 int i,x,y;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2966
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2967 pred_block(s, cur, tmp, ref_stride, sx, sy, block_w*2, block_w*2, &s->block[mb_x + mb_y*b_stride], plane_index, w, h);
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2968
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2969 for(y=y0; y<y1; y++){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2970 const uint8_t *obmc1= obmc_edged + y*obmc_stride;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2971 const DWTELEM *pred1 = pred + y*obmc_stride;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2972 uint8_t *cur1 = cur + y*ref_stride;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2973 uint8_t *dst1 = dst + sx + (sy+y)*ref_stride;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2974 for(x=x0; x<x1; x++){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2975 int v = (cur1[x] * obmc1[x]) << (FRAC_BITS - LOG2_OBMC_MAX);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2976 v = (v + pred1[x]) >> FRAC_BITS;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2977 if(v&(~255)) v= ~(v>>31);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2978 dst1[x] = v;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2979 }
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2980 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2981
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2982 /* copy the regions where obmc[] = (uint8_t)256 */
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2983 if(LOG2_OBMC_MAX == 8
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2984 && (mb_x == 0 || mb_x == b_stride-1)
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2985 && (mb_y == 0 || mb_y == b_height-1)){
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2986 if(mb_x == 0)
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2987 x1 = block_w;
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2988 else
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2989 x0 = block_w;
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2990 if(mb_y == 0)
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2991 y1 = block_w;
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2992 else
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2993 y0 = block_w;
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2994 for(y=y0; y<y1; y++)
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2995 memcpy(dst + sx+x0 + (sy+y)*ref_stride, cur + x0 + y*ref_stride, x1-x0);
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2996 }
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2997
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2998 if(block_w==16){
3323
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
2999 /* FIXME rearrange dsputil to fit 32x32 cmp functions */
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3000 /* FIXME check alignment of the cmp wavelet vs the encoding wavelet */
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3001 /* FIXME cmps overlap but don't cover the wavelet's whole support,
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3002 * so improving the score of one block is not strictly guaranteed to
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3003 * improve the score of the whole frame, so iterative motion est
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3004 * doesn't always converge. */
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3005 if(s->avctx->me_cmp == FF_CMP_W97)
4197
bbe0bc387a19 revert bad checkin
mru
parents: 4196
diff changeset
3006 distortion = w97_32_c(&s->m, src + sx + sy*ref_stride, dst + sx + sy*ref_stride, ref_stride, 32);
3323
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3007 else if(s->avctx->me_cmp == FF_CMP_W53)
4197
bbe0bc387a19 revert bad checkin
mru
parents: 4196
diff changeset
3008 distortion = w53_32_c(&s->m, src + sx + sy*ref_stride, dst + sx + sy*ref_stride, ref_stride, 32);
3323
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3009 else{
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3010 distortion = 0;
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3011 for(i=0; i<4; i++){
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3012 int off = sx+16*(i&1) + (sy+16*(i>>1))*ref_stride;
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3013 distortion += s->dsp.me_cmp[0](&s->m, src + off, dst + off, ref_stride, 16);
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3014 }
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3015 }
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3016 }else{
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3017 assert(block_w==8);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3018 distortion = s->dsp.me_cmp[0](&s->m, src + sx + sy*ref_stride, dst + sx + sy*ref_stride, ref_stride, block_w*2);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3019 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3020
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3021 if(plane_index==0){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3022 for(i=0; i<4; i++){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3023 /* ..RRr
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3024 * .RXx.
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3025 * rxx..
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3026 */
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3027 rate += get_block_bits(s, mb_x + (i&1) - (i>>1), mb_y + (i>>1), 1);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3028 }
3057
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
3029 if(mb_x == b_stride-2)
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
3030 rate += get_block_bits(s, mb_x + 1, mb_y + 1, 1);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3031 }
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3032 return distortion + rate*penalty_factor;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3033 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3034
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3035 static int get_4block_rd(SnowContext *s, int mb_x, int mb_y, int plane_index){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3036 int i, y2;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3037 Plane *p= &s->plane[plane_index];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3038 const int block_size = MB_SIZE >> s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3039 const int block_w = plane_index ? block_size/2 : block_size;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3040 const uint8_t *obmc = plane_index ? obmc_tab[s->block_max_depth+1] : obmc_tab[s->block_max_depth];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3041 const int obmc_stride= plane_index ? block_size : 2*block_size;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3042 const int ref_stride= s->current_picture.linesize[plane_index];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3043 uint8_t *dst= s->current_picture.data[plane_index];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3044 uint8_t *src= s-> input_picture.data[plane_index];
3556
6805c1e5507e Fix some "'static' is not at beginning of declaration" warnings.
diego
parents: 3338
diff changeset
3045 static const DWTELEM zero_dst[4096]; //FIXME
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3046 const int b_stride = s->b_width << s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3047 const int w= p->width;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3048 const int h= p->height;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3049 int distortion= 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3050 int rate= 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3051 const int penalty_factor= get_penalty_factor(s->lambda, s->lambda2, s->avctx->me_cmp);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3052
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3053 for(i=0; i<9; i++){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3054 int mb_x2= mb_x + (i%3) - 1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3055 int mb_y2= mb_y + (i/3) - 1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3056 int x= block_w*mb_x2 + block_w/2;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3057 int y= block_w*mb_y2 + block_w/2;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3058
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
3059 add_yblock(s, 0, NULL, zero_dst, dst, obmc,
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3060 x, y, block_w, block_w, w, h, /*dst_stride*/0, ref_stride, obmc_stride, mb_x2, mb_y2, 1, 1, plane_index);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3061
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3062 //FIXME find a cleaner/simpler way to skip the outside stuff
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3063 for(y2= y; y2<0; y2++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3064 memcpy(dst + x + y2*ref_stride, src + x + y2*ref_stride, block_w);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3065 for(y2= h; y2<y+block_w; y2++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3066 memcpy(dst + x + y2*ref_stride, src + x + y2*ref_stride, block_w);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3067 if(x<0){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3068 for(y2= y; y2<y+block_w; y2++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3069 memcpy(dst + x + y2*ref_stride, src + x + y2*ref_stride, -x);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3070 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3071 if(x+block_w > w){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3072 for(y2= y; y2<y+block_w; y2++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3073 memcpy(dst + w + y2*ref_stride, src + w + y2*ref_stride, x+block_w - w);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3074 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3075
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3076 assert(block_w== 8 || block_w==16);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3077 distortion += s->dsp.me_cmp[block_w==8](&s->m, src + x + y*ref_stride, dst + x + y*ref_stride, ref_stride, block_w);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3078 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3079
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3080 if(plane_index==0){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3081 BlockNode *b= &s->block[mb_x+mb_y*b_stride];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3082 int merged= same_block(b,b+1) && same_block(b,b+b_stride) && same_block(b,b+b_stride+1);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3083
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3084 /* ..RRRr
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3085 * .RXXx.
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3086 * .RXXx.
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3087 * rxxx.
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3088 */
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3089 if(merged)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3090 rate = get_block_bits(s, mb_x, mb_y, 2);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3091 for(i=merged?4:0; i<9; i++){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3092 static const int dxy[9][2] = {{0,0},{1,0},{0,1},{1,1},{2,0},{2,1},{-1,2},{0,2},{1,2}};
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3093 rate += get_block_bits(s, mb_x + dxy[i][0], mb_y + dxy[i][1], 1);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3094 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3095 }
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3096 return distortion + rate*penalty_factor;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3097 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3098
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
3099 static av_always_inline int check_block(SnowContext *s, int mb_x, int mb_y, int p[3], int intra, const uint8_t *obmc_edged, int *best_rd){
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3100 const int b_stride= s->b_width << s->block_max_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3101 BlockNode *block= &s->block[mb_x + mb_y * b_stride];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3102 BlockNode backup= *block;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3103 int rd, index, value;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3104
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3105 assert(mb_x>=0 && mb_y>=0);
2994
michael
parents: 2993
diff changeset
3106 assert(mb_x<b_stride);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3107
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3108 if(intra){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3109 block->color[0] = p[0];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3110 block->color[1] = p[1];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3111 block->color[2] = p[2];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3112 block->type |= BLOCK_INTRA;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3113 }else{
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3114 index= (p[0] + 31*p[1]) & (ME_CACHE_SIZE-1);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3115 value= s->me_cache_generation + (p[0]>>10) + (p[1]<<6) + (block->ref<<12);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3116 if(s->me_cache[index] == value)
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3117 return 0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3118 s->me_cache[index]= value;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3119
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3120 block->mx= p[0];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3121 block->my= p[1];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3122 block->type &= ~BLOCK_INTRA;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3123 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3124
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3125 rd= get_block_rd(s, mb_x, mb_y, 0, obmc_edged);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3126
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3127 //FIXME chroma
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3128 if(rd < *best_rd){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3129 *best_rd= rd;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3130 return 1;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3131 }else{
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3132 *block= backup;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3133 return 0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3134 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3135 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3136
2999
bc83e7a080a5 this fixes compilation with gcc 2.95 which seems to not like array casting... special case inline of check_block which makes the array and passes it
mmu_man
parents: 2998
diff changeset
3137 /* special case for int[2] args we discard afterward, fixes compilation prob with gcc 2.95 */
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
3138 static av_always_inline int check_block_inter(SnowContext *s, int mb_x, int mb_y, int p0, int p1, const uint8_t *obmc_edged, int *best_rd){
2999
bc83e7a080a5 this fixes compilation with gcc 2.95 which seems to not like array casting... special case inline of check_block which makes the array and passes it
mmu_man
parents: 2998
diff changeset
3139 int p[2] = {p0, p1};
3197
8f53630cd24e dont pass intra flag if its always 0
michael
parents: 3194
diff changeset
3140 return check_block(s, mb_x, mb_y, p, 0, obmc_edged, best_rd);
2999
bc83e7a080a5 this fixes compilation with gcc 2.95 which seems to not like array casting... special case inline of check_block which makes the array and passes it
mmu_man
parents: 2998
diff changeset
3141 }
bc83e7a080a5 this fixes compilation with gcc 2.95 which seems to not like array casting... special case inline of check_block which makes the array and passes it
mmu_man
parents: 2998
diff changeset
3142
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
3143 static av_always_inline int check_4block_inter(SnowContext *s, int mb_x, int mb_y, int p0, int p1, int ref, int *best_rd){
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3144 const int b_stride= s->b_width << s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3145 BlockNode *block= &s->block[mb_x + mb_y * b_stride];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3146 BlockNode backup[4]= {block[0], block[1], block[b_stride], block[b_stride+1]};
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3147 int rd, index, value;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3148
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3149 assert(mb_x>=0 && mb_y>=0);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3150 assert(mb_x<b_stride);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3151 assert(((mb_x|mb_y)&1) == 0);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3152
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3153 index= (p0 + 31*p1) & (ME_CACHE_SIZE-1);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3154 value= s->me_cache_generation + (p0>>10) + (p1<<6) + (block->ref<<12);
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3155 if(s->me_cache[index] == value)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3156 return 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3157 s->me_cache[index]= value;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3158
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3159 block->mx= p0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3160 block->my= p1;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3161 block->ref= ref;
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3162 block->type &= ~BLOCK_INTRA;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3163 block[1]= block[b_stride]= block[b_stride+1]= *block;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3164
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3165 rd= get_4block_rd(s, mb_x, mb_y, 0);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3166
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3167 //FIXME chroma
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3168 if(rd < *best_rd){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3169 *best_rd= rd;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3170 return 1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3171 }else{
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3172 block[0]= backup[0];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3173 block[1]= backup[1];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3174 block[b_stride]= backup[2];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3175 block[b_stride+1]= backup[3];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3176 return 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3177 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3178 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3179
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3180 static void iterative_me(SnowContext *s){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3181 int pass, mb_x, mb_y;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3182 const int b_width = s->b_width << s->block_max_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3183 const int b_height= s->b_height << s->block_max_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3184 const int b_stride= b_width;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3185 int color[3];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3186
3194
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3187 {
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3188 RangeCoder r = s->c;
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3189 uint8_t state[sizeof(s->block_state)];
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3190 memcpy(state, s->block_state, sizeof(s->block_state));
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3191 for(mb_y= 0; mb_y<s->b_height; mb_y++)
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3192 for(mb_x= 0; mb_x<s->b_width; mb_x++)
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3193 encode_q_branch(s, 0, mb_x, mb_y);
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3194 s->c = r;
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3195 memcpy(s->block_state, state, sizeof(s->block_state));
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3196 }
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3197
3323
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3198 for(pass=0; pass<25; pass++){
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3199 int change= 0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3200
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3201 for(mb_y= 0; mb_y<b_height; mb_y++){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3202 for(mb_x= 0; mb_x<b_width; mb_x++){
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3203 int dia_change, i, j, ref;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3204 int best_rd= INT_MAX, ref_rd;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3205 BlockNode backup, ref_b;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3206 const int index= mb_x + mb_y * b_stride;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3207 BlockNode *block= &s->block[index];
3324
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3208 BlockNode *tb = mb_y ? &s->block[index-b_stride ] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3209 BlockNode *lb = mb_x ? &s->block[index -1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3210 BlockNode *rb = mb_x+1<b_width ? &s->block[index +1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3211 BlockNode *bb = mb_y+1<b_height ? &s->block[index+b_stride ] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3212 BlockNode *tlb= mb_x && mb_y ? &s->block[index-b_stride-1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3213 BlockNode *trb= mb_x+1<b_width && mb_y ? &s->block[index-b_stride+1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3214 BlockNode *blb= mb_x && mb_y+1<b_height ? &s->block[index+b_stride-1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3215 BlockNode *brb= mb_x+1<b_width && mb_y+1<b_height ? &s->block[index+b_stride+1] : NULL;
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3216 const int b_w= (MB_SIZE >> s->block_max_depth);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3217 uint8_t obmc_edged[b_w*2][b_w*2];
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3218
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3219 if(pass && (block->type & BLOCK_OPT))
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3220 continue;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3221 block->type |= BLOCK_OPT;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3222
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3223 backup= *block;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3224
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3225 if(!s->me_cache_generation)
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3226 memset(s->me_cache, 0, sizeof(s->me_cache));
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3227 s->me_cache_generation += 1<<22;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3228
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3229 //FIXME precalc
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3230 {
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3231 int x, y;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3232 memcpy(obmc_edged, obmc_tab[s->block_max_depth], b_w*b_w*4);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3233 if(mb_x==0)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3234 for(y=0; y<b_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3235 memset(obmc_edged[y], obmc_edged[y][0] + obmc_edged[y][b_w-1], b_w);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3236 if(mb_x==b_stride-1)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3237 for(y=0; y<b_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3238 memset(obmc_edged[y]+b_w, obmc_edged[y][b_w] + obmc_edged[y][b_w*2-1], b_w);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3239 if(mb_y==0){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3240 for(x=0; x<b_w*2; x++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3241 obmc_edged[0][x] += obmc_edged[b_w-1][x];
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3242 for(y=1; y<b_w; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3243 memcpy(obmc_edged[y], obmc_edged[0], b_w*2);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3244 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3245 if(mb_y==b_height-1){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3246 for(x=0; x<b_w*2; x++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3247 obmc_edged[b_w*2-1][x] += obmc_edged[b_w][x];
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3248 for(y=b_w; y<b_w*2-1; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3249 memcpy(obmc_edged[y], obmc_edged[b_w*2-1], b_w*2);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3250 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3251 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3252
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3253 //skip stuff outside the picture
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3254 if(mb_x==0 || mb_y==0 || mb_x==b_width-1 || mb_y==b_height-1)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3255 {
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3256 uint8_t *src= s-> input_picture.data[0];
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3257 uint8_t *dst= s->current_picture.data[0];
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3258 const int stride= s->current_picture.linesize[0];
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3259 const int block_w= MB_SIZE >> s->block_max_depth;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3260 const int sx= block_w*mb_x - block_w/2;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3261 const int sy= block_w*mb_y - block_w/2;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3262 const int w= s->plane[0].width;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3263 const int h= s->plane[0].height;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3264 int y;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3265
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3266 for(y=sy; y<0; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3267 memcpy(dst + sx + y*stride, src + sx + y*stride, block_w*2);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3268 for(y=h; y<sy+block_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3269 memcpy(dst + sx + y*stride, src + sx + y*stride, block_w*2);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3270 if(sx<0){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3271 for(y=sy; y<sy+block_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3272 memcpy(dst + sx + y*stride, src + sx + y*stride, -sx);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3273 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3274 if(sx+block_w*2 > w){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3275 for(y=sy; y<sy+block_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3276 memcpy(dst + w + y*stride, src + w + y*stride, sx+block_w*2 - w);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3277 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3278 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3279
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3280 // intra(black) = neighbors' contribution to the current block
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3281 for(i=0; i<3; i++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3282 color[i]= get_dc(s, mb_x, mb_y, i);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3283
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3284 // get previous score (cant be cached due to OBMC)
3057
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
3285 if(pass > 0 && (block->type&BLOCK_INTRA)){
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
3286 int color0[3]= {block->color[0], block->color[1], block->color[2]};
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
3287 check_block(s, mb_x, mb_y, color0, 1, *obmc_edged, &best_rd);
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
3288 }else
3197
8f53630cd24e dont pass intra flag if its always 0
michael
parents: 3194
diff changeset
3289 check_block_inter(s, mb_x, mb_y, block->mx, block->my, *obmc_edged, &best_rd);
8f53630cd24e dont pass intra flag if its always 0
michael
parents: 3194
diff changeset
3290
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3291 ref_b= *block;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3292 ref_rd= best_rd;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3293 for(ref=0; ref < s->ref_frames; ref++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3294 int16_t (*mvr)[2]= &s->ref_mvs[ref][index];
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3295 if(s->ref_scores[ref][index] > s->ref_scores[ref_b.ref][index]*3/2) //FIXME tune threshold
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3296 continue;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3297 block->ref= ref;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3298 best_rd= INT_MAX;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3299
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3300 check_block_inter(s, mb_x, mb_y, mvr[0][0], mvr[0][1], *obmc_edged, &best_rd);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3301 check_block_inter(s, mb_x, mb_y, 0, 0, *obmc_edged, &best_rd);
3324
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3302 if(tb)
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3303 check_block_inter(s, mb_x, mb_y, mvr[-b_stride][0], mvr[-b_stride][1], *obmc_edged, &best_rd);
3324
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3304 if(lb)
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3305 check_block_inter(s, mb_x, mb_y, mvr[-1][0], mvr[-1][1], *obmc_edged, &best_rd);
3324
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3306 if(rb)
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3307 check_block_inter(s, mb_x, mb_y, mvr[1][0], mvr[1][1], *obmc_edged, &best_rd);
3324
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3308 if(bb)
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3309 check_block_inter(s, mb_x, mb_y, mvr[b_stride][0], mvr[b_stride][1], *obmc_edged, &best_rd);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3310
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3311 /* fullpel ME */
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3312 //FIXME avoid subpel interpol / round to nearest integer
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3313 do{
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3314 dia_change=0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3315 for(i=0; i<FFMAX(s->avctx->dia_size, 1); i++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3316 for(j=0; j<i; j++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3317 dia_change |= check_block_inter(s, mb_x, mb_y, block->mx+4*(i-j), block->my+(4*j), *obmc_edged, &best_rd);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3318 dia_change |= check_block_inter(s, mb_x, mb_y, block->mx-4*(i-j), block->my-(4*j), *obmc_edged, &best_rd);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3319 dia_change |= check_block_inter(s, mb_x, mb_y, block->mx+4*(i-j), block->my-(4*j), *obmc_edged, &best_rd);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3320 dia_change |= check_block_inter(s, mb_x, mb_y, block->mx-4*(i-j), block->my+(4*j), *obmc_edged, &best_rd);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3321 }
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3322 }
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3323 }while(dia_change);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3324 /* subpel ME */
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3325 do{
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3326 static const int square[8][2]= {{+1, 0},{-1, 0},{ 0,+1},{ 0,-1},{+1,+1},{-1,-1},{+1,-1},{-1,+1},};
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3327 dia_change=0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3328 for(i=0; i<8; i++)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3329 dia_change |= check_block_inter(s, mb_x, mb_y, block->mx+square[i][0], block->my+square[i][1], *obmc_edged, &best_rd);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3330 }while(dia_change);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3331 //FIXME or try the standard 2 pass qpel or similar
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3332
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3333 mvr[0][0]= block->mx;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3334 mvr[0][1]= block->my;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3335 if(ref_rd > best_rd){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3336 ref_rd= best_rd;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3337 ref_b= *block;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3338 }
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3339 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3340 best_rd= ref_rd;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3341 *block= ref_b;
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
3342 #if 1
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3343 check_block(s, mb_x, mb_y, color, 1, *obmc_edged, &best_rd);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3344 //FIXME RD style color selection
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
3345 #endif
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3346 if(!same_block(block, &backup)){
3324
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3347 if(tb ) tb ->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3348 if(lb ) lb ->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3349 if(rb ) rb ->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3350 if(bb ) bb ->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3351 if(tlb) tlb->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3352 if(trb) trb->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3353 if(blb) blb->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3354 if(brb) brb->type &= ~BLOCK_OPT;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3355 change ++;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3356 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3357 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3358 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3359 av_log(NULL, AV_LOG_ERROR, "pass:%d changed:%d\n", pass, change);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3360 if(!change)
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3361 break;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3362 }
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3363
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3364 if(s->block_max_depth == 1){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3365 int change= 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3366 for(mb_y= 0; mb_y<b_height; mb_y+=2){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3367 for(mb_x= 0; mb_x<b_width; mb_x+=2){
3324
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3368 int i;
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3369 int best_rd, init_rd;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3370 const int index= mb_x + mb_y * b_stride;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3371 BlockNode *b[4];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3372
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3373 b[0]= &s->block[index];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3374 b[1]= b[0]+1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3375 b[2]= b[0]+b_stride;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3376 b[3]= b[2]+1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3377 if(same_block(b[0], b[1]) &&
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3378 same_block(b[0], b[2]) &&
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3379 same_block(b[0], b[3]))
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3380 continue;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3381
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3382 if(!s->me_cache_generation)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3383 memset(s->me_cache, 0, sizeof(s->me_cache));
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3384 s->me_cache_generation += 1<<22;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3385
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3386 init_rd= best_rd= get_4block_rd(s, mb_x, mb_y, 0);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3387
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3388 //FIXME more multiref search?
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3389 check_4block_inter(s, mb_x, mb_y,
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3390 (b[0]->mx + b[1]->mx + b[2]->mx + b[3]->mx + 2) >> 2,
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3391 (b[0]->my + b[1]->my + b[2]->my + b[3]->my + 2) >> 2, 0, &best_rd);
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3392
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3393 for(i=0; i<4; i++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3394 if(!(b[i]->type&BLOCK_INTRA))
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3395 check_4block_inter(s, mb_x, mb_y, b[i]->mx, b[i]->my, b[i]->ref, &best_rd);
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3396
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3397 if(init_rd != best_rd)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3398 change++;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3399 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3400 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3401 av_log(NULL, AV_LOG_ERROR, "pass:4mv changed:%d\n", change*4);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3402 }
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3403 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3404
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3405 static void quantize(SnowContext *s, SubBand *b, DWTELEM *src, int stride, int bias){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3406 const int level= b->level;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3407 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3408 const int h= b->height;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4588
diff changeset
3409 const int qlog= av_clip(s->qlog + b->qlog, 0, QROOT*16);
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3410 const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3411 int x,y, thres1, thres2;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
3412 // START_TIMER
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3413
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3414 if(s->qlog == LOSSLESS_QLOG) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3415
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3416 bias= bias ? 0 : (3*qmul)>>3;
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3417 thres1= ((qmul - bias)>>QEXPSHIFT) - 1;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3418 thres2= 2*thres1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3419
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3420 if(!bias){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3421 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3422 for(x=0; x<w; x++){
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3423 int i= src[x + y*stride];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3424
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3425 if((unsigned)(i+thres1) > thres2){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3426 if(i>=0){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3427 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3428 i/= qmul; //FIXME optimize
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3429 src[x + y*stride]= i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3430 }else{
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3431 i= -i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3432 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3433 i/= qmul; //FIXME optimize
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3434 src[x + y*stride]= -i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3435 }
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3436 }else
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3437 src[x + y*stride]= 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3438 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3439 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3440 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3441 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3442 for(x=0; x<w; x++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3443 int i= src[x + y*stride];
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3444
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3445 if((unsigned)(i+thres1) > thres2){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3446 if(i>=0){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3447 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3448 i= (i + bias) / qmul; //FIXME optimize
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3449 src[x + y*stride]= i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3450 }else{
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3451 i= -i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3452 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3453 i= (i + bias) / qmul; //FIXME optimize
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3454 src[x + y*stride]= -i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3455 }
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3456 }else
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3457 src[x + y*stride]= 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3458 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3459 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3460 }
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3461 if(level+1 == s->spatial_decomposition_count){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3462 // STOP_TIMER("quantize")
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3463 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3464 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3465
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3466 static void dequantize_slice_buffered(SnowContext *s, slice_buffer * sb, SubBand *b, DWTELEM *src, int stride, int start_y, int end_y){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3467 const int w= b->width;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4588
diff changeset
3468 const int qlog= av_clip(s->qlog + b->qlog, 0, QROOT*16);
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3469 const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3470 const int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3471 int x,y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3472 START_TIMER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3473
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3474 if(s->qlog == LOSSLESS_QLOG) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3475
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3476 for(y=start_y; y<end_y; y++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3477 // 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
3478 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
3479 for(x=0; x<w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3480 int i= line[x];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3481 if(i<0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3482 line[x]= -((-i*qmul + qadd)>>(QEXPSHIFT)); //FIXME try different bias
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3483 }else if(i>0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3484 line[x]= (( i*qmul + qadd)>>(QEXPSHIFT));
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3485 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3486 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3487 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3488 if(w > 200 /*level+1 == s->spatial_decomposition_count*/){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3489 STOP_TIMER("dquant")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3490 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3491 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3492
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3493 static void dequantize(SnowContext *s, SubBand *b, DWTELEM *src, int stride){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3494 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3495 const int h= b->height;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4588
diff changeset
3496 const int qlog= av_clip(s->qlog + b->qlog, 0, QROOT*16);
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3497 const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3498 const int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3499 int x,y;
2195
df3079d7806f merge decode_subband() and dequantize()
michael
parents: 2194
diff changeset
3500 START_TIMER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3501
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3502 if(s->qlog == LOSSLESS_QLOG) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3503
2138
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++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3506 int i= src[x + y*stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3507 if(i<0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3508 src[x + y*stride]= -((-i*qmul + qadd)>>(QEXPSHIFT)); //FIXME try different bias
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3509 }else if(i>0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3510 src[x + y*stride]= (( i*qmul + qadd)>>(QEXPSHIFT));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3511 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3512 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3513 }
2195
df3079d7806f merge decode_subband() and dequantize()
michael
parents: 2194
diff changeset
3514 if(w > 200 /*level+1 == s->spatial_decomposition_count*/){
df3079d7806f merge decode_subband() and dequantize()
michael
parents: 2194
diff changeset
3515 STOP_TIMER("dquant")
df3079d7806f merge decode_subband() and dequantize()
michael
parents: 2194
diff changeset
3516 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3517 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3518
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3519 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
3520 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3521 const int h= b->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3522 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3523
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3524 for(y=h-1; y>=0; y--){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3525 for(x=w-1; x>=0; x--){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3526 int i= x + y*stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3527
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3528 if(x){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3529 if(use_median){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3530 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
3531 else src[i] -= src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3532 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3533 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
3534 else src[i] -= src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3535 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3536 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3537 if(y) src[i] -= src[i - stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3538 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3539 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3540 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3541 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3542
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3543 static void correlate_slice_buffered(SnowContext *s, slice_buffer * sb, SubBand *b, DWTELEM *src, int stride, int inverse, int use_median, int start_y, int end_y){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3544 const int w= b->width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3545 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3546
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3547 // START_TIMER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3548
4409
1907b07173cf Silence GCC when incorrectly complaining that the "line" variable could be used
takis
parents: 4408
diff changeset
3549 DWTELEM * line=0; // silence silly "could be used without having been initialized" warning
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3550 DWTELEM * prev;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3551
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3552 if (start_y != 0)
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3553 line = slice_buffer_get_line(sb, ((start_y - 1) * b->stride_line) + b->buf_y_offset) + b->buf_x_offset;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3554
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3555 for(y=start_y; y<end_y; y++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3556 prev = line;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3557 // 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
3558 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
3559 for(x=0; x<w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3560 if(x){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3561 if(use_median){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3562 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
3563 else line[x] += line[x - 1];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3564 }else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3565 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
3566 else line[x] += line[x - 1];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3567 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3568 }else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3569 if(y) line[x] += prev[x];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3570 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3571 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3572 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3573
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3574 // STOP_TIMER("correlate")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3575 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3576
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3577 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
3578 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3579 const int h= b->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3580 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3581
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3582 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3583 for(x=0; x<w; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3584 int i= x + y*stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3585
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3586 if(x){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3587 if(use_median){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3588 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
3589 else src[i] += src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3590 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3591 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
3592 else src[i] += src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3593 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3594 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3595 if(y) src[i] += src[i - stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3596 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3597 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3598 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3599 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3600
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3601 static void encode_header(SnowContext *s){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3602 int plane_index, level, orientation;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3603 uint8_t kstate[32];
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3604
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3605 memset(kstate, MID_STATE, sizeof(kstate));
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3606
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3607 put_rac(&s->c, kstate, s->keyframe);
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3608 if(s->keyframe || s->always_reset){
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
3609 reset_contexts(s);
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3610 s->last_spatial_decomposition_type=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3611 s->last_qlog=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3612 s->last_qbias=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3613 s->last_mv_scale=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3614 s->last_block_max_depth= 0;
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3615 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3616 if(s->keyframe){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3617 put_symbol(&s->c, s->header_state, s->version, 0);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3618 put_rac(&s->c, s->header_state, s->always_reset);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3619 put_symbol(&s->c, s->header_state, s->temporal_decomposition_type, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3620 put_symbol(&s->c, s->header_state, s->temporal_decomposition_count, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3621 put_symbol(&s->c, s->header_state, s->spatial_decomposition_count, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3622 put_symbol(&s->c, s->header_state, s->colorspace_type, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3623 put_symbol(&s->c, s->header_state, s->chroma_h_shift, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3624 put_symbol(&s->c, s->header_state, s->chroma_v_shift, 0);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3625 put_rac(&s->c, s->header_state, s->spatial_scalability);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3626 // put_rac(&s->c, s->header_state, s->rate_scalability);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3627 put_symbol(&s->c, s->header_state, s->max_ref_frames-1, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3628
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3629 for(plane_index=0; plane_index<2; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3630 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3631 for(orientation=level ? 1:0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3632 if(orientation==2) continue;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3633 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
3634 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3635 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3636 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3637 }
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3638 put_symbol(&s->c, s->header_state, s->spatial_decomposition_type - s->last_spatial_decomposition_type, 1);
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3639 put_symbol(&s->c, s->header_state, s->qlog - s->last_qlog , 1);
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3640 put_symbol(&s->c, s->header_state, s->mv_scale - s->last_mv_scale, 1);
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3641 put_symbol(&s->c, s->header_state, s->qbias - s->last_qbias , 1);
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3642 put_symbol(&s->c, s->header_state, s->block_max_depth - s->last_block_max_depth, 1);
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3643
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3644 s->last_spatial_decomposition_type= s->spatial_decomposition_type;
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3645 s->last_qlog = s->qlog;
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3646 s->last_qbias = s->qbias;
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3647 s->last_mv_scale = s->mv_scale;
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3648 s->last_block_max_depth = s->block_max_depth;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3649 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3650
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3651 static int decode_header(SnowContext *s){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3652 int plane_index, level, orientation;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3653 uint8_t kstate[32];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3654
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3655 memset(kstate, MID_STATE, sizeof(kstate));
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3656
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3657 s->keyframe= get_rac(&s->c, kstate);
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3658 if(s->keyframe || s->always_reset){
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
3659 reset_contexts(s);
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3660 s->spatial_decomposition_type=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3661 s->qlog=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3662 s->qbias=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3663 s->mv_scale=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3664 s->block_max_depth= 0;
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3665 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3666 if(s->keyframe){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3667 s->version= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3668 if(s->version>0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3669 av_log(s->avctx, AV_LOG_ERROR, "version %d not supported", s->version);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3670 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3671 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3672 s->always_reset= get_rac(&s->c, s->header_state);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3673 s->temporal_decomposition_type= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3674 s->temporal_decomposition_count= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3675 s->spatial_decomposition_count= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3676 s->colorspace_type= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3677 s->chroma_h_shift= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3678 s->chroma_v_shift= get_symbol(&s->c, s->header_state, 0);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3679 s->spatial_scalability= get_rac(&s->c, s->header_state);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3680 // s->rate_scalability= get_rac(&s->c, s->header_state);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3681 s->max_ref_frames= get_symbol(&s->c, s->header_state, 0)+1;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3682
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3683 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3684 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3685 for(orientation=level ? 1:0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3686 int q;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3687 if (plane_index==2) q= s->plane[1].band[level][orientation].qlog;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3688 else if(orientation==2) q= s->plane[plane_index].band[level][1].qlog;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3689 else q= get_symbol(&s->c, s->header_state, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3690 s->plane[plane_index].band[level][orientation].qlog= q;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3691 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3692 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3693 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3694 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3695
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3696 s->spatial_decomposition_type+= get_symbol(&s->c, s->header_state, 1);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3697 if(s->spatial_decomposition_type > 2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3698 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
3699 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3700 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3701
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3702 s->qlog += get_symbol(&s->c, s->header_state, 1);
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3703 s->mv_scale += get_symbol(&s->c, s->header_state, 1);
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3704 s->qbias += get_symbol(&s->c, s->header_state, 1);
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3705 s->block_max_depth+= get_symbol(&s->c, s->header_state, 1);
3303
68721b62a528 sanity checks, some might have been exploitable ...
michael
parents: 3206
diff changeset
3706 if(s->block_max_depth > 1 || s->block_max_depth < 0){
2952
d7be13d3ef00 check block_max_depth (fixes crash)
michael
parents: 2951
diff changeset
3707 av_log(s->avctx, AV_LOG_ERROR, "block_max_depth= %d is too large", s->block_max_depth);
d7be13d3ef00 check block_max_depth (fixes crash)
michael
parents: 2951
diff changeset
3708 s->block_max_depth= 0;
d7be13d3ef00 check block_max_depth (fixes crash)
michael
parents: 2951
diff changeset
3709 return -1;
d7be13d3ef00 check block_max_depth (fixes crash)
michael
parents: 2951
diff changeset
3710 }
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
3711
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3712 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
3713 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3714
3075
961af1358c7f add static keyword to some functions
mru
parents: 3063
diff changeset
3715 static void init_qexp(void){
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3716 int i;
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3717 double v=128;
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3718
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3719 for(i=0; i<QROOT; i++){
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3720 qexp[i]= lrintf(v);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3721 v *= pow(2, 1.0 / QROOT);
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3722 }
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3723 }
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3724
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3725 static int common_init(AVCodecContext *avctx){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3726 SnowContext *s = avctx->priv_data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3727 int width, height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3728 int level, orientation, plane_index, dec;
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
3729 int i, j;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3730
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3731 s->avctx= avctx;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3732
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3733 dsputil_init(&s->dsp, avctx);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3734
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3735 #define mcf(dx,dy)\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3736 s->dsp.put_qpel_pixels_tab [0][dy+dx/4]=\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3737 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
3738 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
3739 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
3740 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
3741 s->dsp.put_h264_qpel_pixels_tab[1][dy+dx/4];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3742
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3743 mcf( 0, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3744 mcf( 4, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3745 mcf( 8, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3746 mcf(12, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3747 mcf( 0, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3748 mcf( 4, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3749 mcf( 8, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3750 mcf(12, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3751 mcf( 0, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3752 mcf( 4, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3753 mcf( 8, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3754 mcf(12, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3755 mcf( 0,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3756 mcf( 4,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3757 mcf( 8,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3758 mcf(12,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3759
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3760 #define mcfh(dx,dy)\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3761 s->dsp.put_pixels_tab [0][dy/4+dx/8]=\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3762 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
3763 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
3764 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
3765 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
3766 mc_block_hpel ## dx ## dy ## 8;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3767
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3768 mcfh(0, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3769 mcfh(8, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3770 mcfh(0, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3771 mcfh(8, 8)
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3772
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3773 if(!qexp[0])
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3774 init_qexp();
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3775
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3776 dec= s->spatial_decomposition_count= 5;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3777 s->spatial_decomposition_type= avctx->prediction_method; //FIXME add decorrelator type r transform_type
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3778
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3779 s->chroma_h_shift= 1; //FIXME XXX
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3780 s->chroma_v_shift= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3781
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3782 // dec += FFMAX(s->chroma_h_shift, s->chroma_v_shift);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3783
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
3784 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
3785 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
3786
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3787 s->spatial_dwt_buffer= av_mallocz(width*height*sizeof(DWTELEM));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3788
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3789 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
3790 s->block_max_depth= (s->avctx->flags & CODEC_FLAG_4MV) ? 1 : 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3791
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3792 for(plane_index=0; plane_index<3; plane_index++){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3793 int w= s->avctx->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3794 int h= s->avctx->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3795
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3796 if(plane_index){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3797 w>>= s->chroma_h_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3798 h>>= s->chroma_v_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3799 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3800 s->plane[plane_index].width = w;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3801 s->plane[plane_index].height= h;
2160
11e1425b3a66 cleanup
michael
parents: 2159
diff changeset
3802 //av_log(NULL, AV_LOG_DEBUG, "%d %d\n", w, h);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3803 for(level=s->spatial_decomposition_count-1; level>=0; level--){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3804 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3805 SubBand *b= &s->plane[plane_index].band[level][orientation];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3806
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3807 b->buf= s->spatial_dwt_buffer;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3808 b->level= level;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3809 b->stride= s->plane[plane_index].width << (s->spatial_decomposition_count - level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3810 b->width = (w + !(orientation&1))>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3811 b->height= (h + !(orientation>1))>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3812
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3813 b->stride_line = 1 << (s->spatial_decomposition_count - level);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3814 b->buf_x_offset = 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3815 b->buf_y_offset = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3816
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3817 if(orientation&1){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3818 b->buf += (w+1)>>1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3819 b->buf_x_offset = (w+1)>>1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3820 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3821 if(orientation>1){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3822 b->buf += b->stride>>1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3823 b->buf_y_offset = b->stride_line >> 1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3824 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3825
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3826 if(level)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3827 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
3828 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
3829 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3830 w= (w+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3831 h= (h+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3832 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3833 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3834
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
3835 for(i=0; i<MAX_REF_FRAMES; i++)
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
3836 for(j=0; j<MAX_REF_FRAMES; j++)
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
3837 scale_mv_ref[i][j] = 256*(i+1)/(j+1);
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
3838
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3839 reset_contexts(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3840 /*
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3841 width= s->width= avctx->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3842 height= s->height= avctx->height;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3843
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3844 assert(width && height);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3845 */
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3846 s->avctx->get_buffer(s->avctx, &s->mconly_picture);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3847
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3848 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3849 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3850
3322
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3851 static int qscale2qlog(int qscale){
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3852 return rint(QROOT*log(qscale / (float)FF_QP2LAMBDA)/log(2))
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3853 + 61*QROOT/8; //<64 >60
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3854 }
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3855
3661
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
3856 static int ratecontrol_1pass(SnowContext *s, AVFrame *pict)
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3857 {
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3858 /* estimate the frame's complexity as a sum of weighted dwt coefs.
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3859 * FIXME we know exact mv bits at this point,
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3860 * but ratecontrol isn't set up to include them. */
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3861 uint32_t coef_sum= 0;
3661
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
3862 int level, orientation, delta_qlog;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3863
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3864 for(level=0; level<s->spatial_decomposition_count; level++){
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3865 for(orientation=level ? 1 : 0; orientation<4; orientation++){
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3866 SubBand *b= &s->plane[0].band[level][orientation];
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3867 DWTELEM *buf= b->buf;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3868 const int w= b->width;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3869 const int h= b->height;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3870 const int stride= b->stride;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4588
diff changeset
3871 const int qlog= av_clip(2*QROOT + b->qlog, 0, QROOT*16);
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3872 const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3873 const int qdiv= (1<<16)/qmul;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3874 int x, y;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3875 if(orientation==0)
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3876 decorrelate(s, b, buf, stride, 1, 0);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3877 for(y=0; y<h; y++)
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3878 for(x=0; x<w; x++)
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3879 coef_sum+= abs(buf[x+y*stride]) * qdiv >> 16;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3880 if(orientation==0)
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3881 correlate(s, b, buf, stride, 1, 0);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3882 }
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3883 }
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3884
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3885 /* ugly, ratecontrol just takes a sqrt again */
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3886 coef_sum = (uint64_t)coef_sum * coef_sum >> 16;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3887 assert(coef_sum < INT_MAX);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3888
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3889 if(pict->pict_type == I_TYPE){
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3890 s->m.current_picture.mb_var_sum= coef_sum;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3891 s->m.current_picture.mc_mb_var_sum= 0;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3892 }else{
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3893 s->m.current_picture.mc_mb_var_sum= coef_sum;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3894 s->m.current_picture.mb_var_sum= 0;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3895 }
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3896
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3897 pict->quality= ff_rate_estimate_qscale(&s->m, 1);
3766
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
3898 if (pict->quality < 0)
4011
5bce97c30a69 -1 is a valid return value in ratecontrol_1pass() -> 100l for takis
michael
parents: 4001
diff changeset
3899 return INT_MIN;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3900 s->lambda= pict->quality * 3/2;
3661
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
3901 delta_qlog= qscale2qlog(pict->quality) - s->qlog;
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
3902 s->qlog+= delta_qlog;
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
3903 return delta_qlog;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3904 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3905
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3906 static void calculate_vissual_weight(SnowContext *s, Plane *p){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3907 int width = p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3908 int height= p->height;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
3909 int level, orientation, x, y;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3910
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3911 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3912 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3913 SubBand *b= &p->band[level][orientation];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3914 DWTELEM *buf= b->buf;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3915 int64_t error=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3916
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3917 memset(s->spatial_dwt_buffer, 0, sizeof(int)*width*height);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3918 buf[b->width/2 + b->height/2*b->stride]= 256*256;
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3919 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
3920 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3921 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3922 int64_t d= s->spatial_dwt_buffer[x + y*width];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3923 error += d*d;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3924 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3925 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3926
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3927 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
3928 // 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
3929 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3930 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3931 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3932
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3933 static int encode_init(AVCodecContext *avctx)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3934 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3935 SnowContext *s = avctx->priv_data;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
3936 int plane_index;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3937
2658
d1609cfeb1d0 #defines for strict_std_compliance and split between inofficial extensions and non standarized things
michael
parents: 2635
diff changeset
3938 if(avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL){
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2610
diff changeset
3939 av_log(avctx, AV_LOG_ERROR, "this codec is under development, files encoded with it may not be decodable with future versions!!!\n"
2658
d1609cfeb1d0 #defines for strict_std_compliance and split between inofficial extensions and non standarized things
michael
parents: 2635
diff changeset
3940 "use vstrict=-2 / -strict -2 to use it anyway\n");
2151
44c973bfec0f dont segfault without -strict -1
michael
parents: 2150
diff changeset
3941 return -1;
44c973bfec0f dont segfault without -strict -1
michael
parents: 2150
diff changeset
3942 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3943
3327
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3944 if(avctx->prediction_method == DWT_97
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3945 && (avctx->flags & CODEC_FLAG_QSCALE)
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3946 && avctx->global_quality == 0){
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3947 av_log(avctx, AV_LOG_ERROR, "the 9/7 wavelet is incompatible with lossless mode\n");
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3948 return -1;
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3949 }
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3950
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3951 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
3952 alloc_blocks(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3953
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3954 s->version=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3955
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3956 s->m.avctx = avctx;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3957 s->m.flags = avctx->flags;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3958 s->m.bit_rate= avctx->bit_rate;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3959
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3960 s->m.me.scratchpad= av_mallocz((avctx->width+64)*2*16*2*sizeof(uint8_t));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3961 s->m.me.map = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3962 s->m.me.score_map = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t));
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3963 s->m.obmc_scratchpad= av_mallocz(MB_SIZE*MB_SIZE*12*sizeof(uint32_t));
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3964 h263_encode_init(&s->m); //mv_penalty
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3965
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3966 s->max_ref_frames = FFMAX(FFMIN(avctx->refs, MAX_REF_FRAMES), 1);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3967
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3968 if(avctx->flags&CODEC_FLAG_PASS1){
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3969 if(!avctx->stats_out)
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3970 avctx->stats_out = av_mallocz(256);
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3971 }
3322
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3972 if((avctx->flags&CODEC_FLAG_PASS2) || !(avctx->flags&CODEC_FLAG_QSCALE)){
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3973 if(ff_rate_control_init(&s->m) < 0)
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3974 return -1;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3975 }
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3976 s->pass1_rc= !(avctx->flags & (CODEC_FLAG_QSCALE|CODEC_FLAG_PASS2));
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3977
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3978 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3979 calculate_vissual_weight(s, &s->plane[plane_index]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3980 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3981
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3982
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3983 avctx->coded_frame= &s->current_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3984 switch(avctx->pix_fmt){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3985 // case PIX_FMT_YUV444P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3986 // case PIX_FMT_YUV422P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3987 case PIX_FMT_YUV420P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3988 case PIX_FMT_GRAY8:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3989 // case PIX_FMT_YUV411P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3990 // case PIX_FMT_YUV410P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3991 s->colorspace_type= 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3992 break;
4494
ce643a22f049 Replace deprecated PIX_FMT names by the newer variants.
diego
parents: 4436
diff changeset
3993 /* case PIX_FMT_RGB32:
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3994 s->colorspace= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3995 break;*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3996 default:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3997 av_log(avctx, AV_LOG_ERROR, "format not supported\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3998 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3999 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4000 // 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
4001 s->chroma_h_shift= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4002 s->chroma_v_shift= 1;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4003
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4004 ff_set_cmp(&s->dsp, s->dsp.me_cmp, s->avctx->me_cmp);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4005 ff_set_cmp(&s->dsp, s->dsp.me_sub_cmp, s->avctx->me_sub_cmp);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4006
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4007 s->avctx->get_buffer(s->avctx, &s->input_picture);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4008
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4009 if(s->avctx->me_method == ME_ITER){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4010 int i;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4011 int size= s->b_width * s->b_height << 2*s->block_max_depth;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4012 for(i=0; i<s->max_ref_frames; i++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4013 s->ref_mvs[i]= av_mallocz(size*sizeof(int16_t[2]));
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4014 s->ref_scores[i]= av_mallocz(size*sizeof(uint32_t));
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4015 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4016 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4017
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4018 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4019 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4020
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4021 static int frame_start(SnowContext *s){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4022 AVFrame tmp;
2187
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4023 int w= s->avctx->width; //FIXME round up to x16 ?
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4024 int h= s->avctx->height;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4025
2187
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4026 if(s->current_picture.data[0]){
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4027 draw_edges(s->current_picture.data[0], s->current_picture.linesize[0], w , h , EDGE_WIDTH );
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4028 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
4029 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
4030 }
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4031
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4032 tmp= s->last_picture[s->max_ref_frames-1];
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4033 memmove(s->last_picture+1, s->last_picture, (s->max_ref_frames-1)*sizeof(AVFrame));
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4034 s->last_picture[0]= s->current_picture;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4035 s->current_picture= tmp;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4036
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4037 if(s->keyframe){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4038 s->ref_frames= 0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4039 }else{
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4040 int i;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4041 for(i=0; i<s->max_ref_frames && s->last_picture[i].data[0]; i++)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4042 if(i && s->last_picture[i-1].key_frame)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4043 break;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4044 s->ref_frames= i;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4045 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4046
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4047 s->current_picture.reference= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4048 if(s->avctx->get_buffer(s->avctx, &s->current_picture) < 0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4049 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4050 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4051 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4052
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4053 s->current_picture.key_frame= s->keyframe;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4054
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4055 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4056 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4057
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4058 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4059 SnowContext *s = avctx->priv_data;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4060 RangeCoder * const c= &s->c;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4061 AVFrame *pict = data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4062 const int width= s->avctx->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4063 const int height= s->avctx->height;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4064 int level, orientation, plane_index, i, y;
3661
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4065 uint8_t rc_header_bak[sizeof(s->header_state)];
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4066 uint8_t rc_block_bak[sizeof(s->block_state)];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4067
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4068 ff_init_range_encoder(c, buf, buf_size);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4069 ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4070
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4071 for(i=0; i<3; i++){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4072 int shift= !!i;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4073 for(y=0; y<(height>>shift); y++)
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4074 memcpy(&s->input_picture.data[i][y * s->input_picture.linesize[i]],
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4075 &pict->data[i][y * pict->linesize[i]],
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4076 width>>shift);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4077 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4078 s->new_picture = *pict;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4079
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4080 s->m.picture_number= avctx->frame_number;
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4081 if(avctx->flags&CODEC_FLAG_PASS2){
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4082 s->m.pict_type =
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4083 pict->pict_type= s->m.rc_context.entry[avctx->frame_number].new_pict_type;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4084 s->keyframe= pict->pict_type==FF_I_TYPE;
3766
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4085 if(!(avctx->flags&CODEC_FLAG_QSCALE)) {
3193
66116775b315 obey vqscale in 2nd pass
lorenm
parents: 3190
diff changeset
4086 pict->quality= ff_rate_estimate_qscale(&s->m, 0);
3766
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4087 if (pict->quality < 0)
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4088 return -1;
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4089 }
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4090 }else{
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4091 s->keyframe= avctx->gop_size==0 || avctx->frame_number % avctx->gop_size == 0;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4092 s->m.pict_type=
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4093 pict->pict_type= s->keyframe ? FF_I_TYPE : FF_P_TYPE;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4094 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4095
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4096 if(s->pass1_rc && avctx->frame_number == 0)
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4097 pict->quality= 2*FF_QP2LAMBDA;
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4098 if(pict->quality){
3322
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
4099 s->qlog= qscale2qlog(pict->quality);
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4100 s->lambda = pict->quality * 3/2;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4101 }
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4102 if(s->qlog < 0 || (!pict->quality && (avctx->flags & CODEC_FLAG_QSCALE))){
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4103 s->qlog= LOSSLESS_QLOG;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4104 s->lambda = 0;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4105 }//else keep previous frame's qlog until after motion est
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4106
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4107 frame_start(s);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4108
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4109 s->m.current_picture_ptr= &s->m.current_picture;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4110 if(pict->pict_type == P_TYPE){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4111 int block_width = (width +15)>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4112 int block_height= (height+15)>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4113 int stride= s->current_picture.linesize[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4114
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4115 assert(s->current_picture.data[0]);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4116 assert(s->last_picture[0].data[0]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4117
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4118 s->m.avctx= s->avctx;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4119 s->m.current_picture.data[0]= s->current_picture.data[0];
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4120 s->m. last_picture.data[0]= s->last_picture[0].data[0];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4121 s->m. new_picture.data[0]= s-> input_picture.data[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4122 s->m. last_picture_ptr= &s->m. last_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4123 s->m.linesize=
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4124 s->m. last_picture.linesize[0]=
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4125 s->m. new_picture.linesize[0]=
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4126 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
4127 s->m.uvlinesize= s->current_picture.linesize[1];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4128 s->m.width = width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4129 s->m.height= height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4130 s->m.mb_width = block_width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4131 s->m.mb_height= block_height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4132 s->m.mb_stride= s->m.mb_width+1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4133 s->m.b8_stride= 2*s->m.mb_width+1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4134 s->m.f_code=1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4135 s->m.pict_type= pict->pict_type;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4136 s->m.me_method= s->avctx->me_method;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4137 s->m.me.scene_change_score=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4138 s->m.flags= s->avctx->flags;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4139 s->m.quarter_sample= (s->avctx->flags & CODEC_FLAG_QPEL)!=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4140 s->m.out_format= FMT_H263;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4141 s->m.unrestricted_mv= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4142
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4143 s->m.lambda = s->lambda;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4144 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
4145 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
4146
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4147 s->m.dsp= s->dsp; //move
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4148 ff_init_me(&s->m);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4149 s->dsp= s->m.dsp;
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
4150 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4151
3661
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4152 if(s->pass1_rc){
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4153 memcpy(rc_header_bak, s->header_state, sizeof(s->header_state));
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4154 memcpy(rc_block_bak, s->block_state, sizeof(s->block_state));
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4155 }
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4156
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
4157 redo_frame:
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4158
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4159 s->m.pict_type = pict->pict_type;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4160 s->qbias= pict->pict_type == P_TYPE ? 2 : 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4161
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4162 encode_header(s);
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4163 s->m.misc_bits = 8*(s->c.bytestream - s->c.bytestream_start);
3661
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4164 encode_blocks(s, 1);
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4165 s->m.mv_bits = 8*(s->c.bytestream - s->c.bytestream_start) - s->m.misc_bits;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4166
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4167 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4168 Plane *p= &s->plane[plane_index];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4169 int w= p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4170 int h= p->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4171 int x, y;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
4172 // int bits= put_bits_count(&s->c.pb);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4173
3338
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4174 if(!(avctx->flags2 & CODEC_FLAG2_MEMC_ONLY)){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4175 //FIXME optimize
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4176 if(pict->data[plane_index]) //FIXME gray hack
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4177 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4178 for(x=0; x<w; x++){
2246
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
4179 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
4180 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4181 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4182 predict_plane(s, s->spatial_dwt_buffer, plane_index, 0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4183
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4184 if( plane_index==0
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4185 && pict->pict_type == P_TYPE
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4186 && !(avctx->flags&CODEC_FLAG_PASS2)
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
4187 && s->m.me.scene_change_score > s->avctx->scenechange_threshold){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4188 ff_init_range_encoder(c, buf, buf_size);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4189 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
4190 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
4191 s->keyframe=1;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4192 s->current_picture.key_frame=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
4193 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
4194 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4195
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4196 if(s->qlog == LOSSLESS_QLOG){
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4197 for(y=0; y<h; y++){
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4198 for(x=0; x<w; x++){
2595
6b385f3e07a3 fixing lossless snow
michael
parents: 2592
diff changeset
4199 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
4200 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4201 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4202 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4203
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
4204 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
4205
3661
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4206 if(s->pass1_rc && plane_index==0){
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4207 int delta_qlog = ratecontrol_1pass(s, pict);
4011
5bce97c30a69 -1 is a valid return value in ratecontrol_1pass() -> 100l for takis
michael
parents: 4001
diff changeset
4208 if (delta_qlog <= INT_MIN)
3766
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4209 return -1;
3661
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4210 if(delta_qlog){
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4211 //reordering qlog in the bitstream would eliminate this reset
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4212 ff_init_range_encoder(c, buf, buf_size);
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4213 memcpy(s->header_state, rc_header_bak, sizeof(s->header_state));
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4214 memcpy(s->block_state, rc_block_bak, sizeof(s->block_state));
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4215 encode_header(s);
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4216 encode_blocks(s, 0);
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4217 }
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4218 }
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4219
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4220 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4221 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4222 SubBand *b= &p->band[level][orientation];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4223
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4224 quantize(s, b, b->buf, b->stride, s->qbias);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4225 if(orientation==0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4226 decorrelate(s, b, b->buf, b->stride, pict->pict_type == P_TYPE, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4227 encode_subband(s, b, b->buf, b->parent ? b->parent->buf : NULL, b->stride, orientation);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4228 assert(b->parent==NULL || b->parent->stride == b->stride*2);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4229 if(orientation==0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4230 correlate(s, b, b->buf, b->stride, 1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4231 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4232 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4233 // 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
4234
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4235 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4236 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4237 SubBand *b= &p->band[level][orientation];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4238
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4239 dequantize(s, b, b->buf, b->stride);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4240 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4241 }
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4242
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
4243 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
4244 if(s->qlog == LOSSLESS_QLOG){
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4245 for(y=0; y<h; y++){
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4246 for(x=0; x<w; x++){
2246
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
4247 s->spatial_dwt_buffer[y*w + x]<<=FRAC_BITS;
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4248 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4249 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4250 }
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
4251 {START_TIMER
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4252 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
4253 STOP_TIMER("pred-conv")}
3338
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4254 }else{
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4255 //ME/MC only
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4256 if(pict->pict_type == I_TYPE){
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4257 for(y=0; y<h; y++){
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4258 for(x=0; x<w; x++){
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4259 s->current_picture.data[plane_index][y*s->current_picture.linesize[plane_index] + x]=
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4260 pict->data[plane_index][y*pict->linesize[plane_index] + x];
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4261 }
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4262 }
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4263 }else{
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4264 memset(s->spatial_dwt_buffer, 0, sizeof(DWTELEM)*w*h);
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4265 predict_plane(s, s->spatial_dwt_buffer, plane_index, 1);
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4266 }
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4267 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4268 if(s->avctx->flags&CODEC_FLAG_PSNR){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4269 int64_t error= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4270
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4271 if(pict->data[plane_index]) //FIXME gray hack
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4272 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4273 for(x=0; x<w; x++){
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4274 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
4275 error += d*d;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4276 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4277 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4278 s->avctx->error[plane_index] += error;
2232
960e3552e418 per picture psnr
michael
parents: 2224
diff changeset
4279 s->current_picture.error[plane_index] = error;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4280 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4281 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4282
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4283 if(s->last_picture[s->max_ref_frames-1].data[0])
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4284 avctx->release_buffer(avctx, &s->last_picture[s->max_ref_frames-1]);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4285
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4286 s->current_picture.coded_picture_number = avctx->frame_number;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4287 s->current_picture.pict_type = pict->pict_type;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4288 s->current_picture.quality = pict->quality;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4289 s->m.frame_bits = 8*(s->c.bytestream - s->c.bytestream_start);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4290 s->m.p_tex_bits = s->m.frame_bits - s->m.misc_bits - s->m.mv_bits;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4291 s->m.current_picture.display_picture_number =
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4292 s->m.current_picture.coded_picture_number = avctx->frame_number;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4293 s->m.current_picture.quality = pict->quality;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4294 s->m.total_bits += 8*(s->c.bytestream - s->c.bytestream_start);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4295 if(s->pass1_rc)
3766
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4296 if (ff_rate_estimate_qscale(&s->m, 0) < 0)
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4297 return -1;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4298 if(avctx->flags&CODEC_FLAG_PASS1)
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4299 ff_write_pass1_stats(&s->m);
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4300 s->m.last_pict_type = s->m.pict_type;
4123
5c86acb39889 outputs bit spent on various encoding functions (motion vectors, overhead, etc)
gpoirier
parents: 4122
diff changeset
4301 avctx->frame_bits = s->m.frame_bits;
5c86acb39889 outputs bit spent on various encoding functions (motion vectors, overhead, etc)
gpoirier
parents: 4122
diff changeset
4302 avctx->mv_bits = s->m.mv_bits;
5c86acb39889 outputs bit spent on various encoding functions (motion vectors, overhead, etc)
gpoirier
parents: 4122
diff changeset
4303 avctx->misc_bits = s->m.misc_bits;
5c86acb39889 outputs bit spent on various encoding functions (motion vectors, overhead, etc)
gpoirier
parents: 4122
diff changeset
4304 avctx->p_tex_bits = s->m.p_tex_bits;
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4305
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4306 emms_c();
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4307
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4308 return ff_rac_terminate(c);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4309 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4310
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4311 static void common_end(SnowContext *s){
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4312 int plane_index, level, orientation, i;
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4313
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4314 av_freep(&s->spatial_dwt_buffer);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4315
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4316 av_freep(&s->m.me.scratchpad);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4317 av_freep(&s->m.me.map);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4318 av_freep(&s->m.me.score_map);
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
4319 av_freep(&s->m.obmc_scratchpad);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4320
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
4321 av_freep(&s->block);
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4322
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4323 for(i=0; i<MAX_REF_FRAMES; i++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4324 av_freep(&s->ref_mvs[i]);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4325 av_freep(&s->ref_scores[i]);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4326 if(s->last_picture[i].data[0])
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4327 s->avctx->release_buffer(s->avctx, &s->last_picture[i]);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4328 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4329
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4330 for(plane_index=0; plane_index<3; plane_index++){
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4331 for(level=s->spatial_decomposition_count-1; level>=0; level--){
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4332 for(orientation=level ? 1 : 0; orientation<4; orientation++){
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4333 SubBand *b= &s->plane[plane_index].band[level][orientation];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4334
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4335 av_freep(&b->x_coeff);
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4336 }
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4337 }
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4338 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4339 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4340
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4341 static int encode_end(AVCodecContext *avctx)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4342 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4343 SnowContext *s = avctx->priv_data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4344
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4345 common_end(s);
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4346 av_free(avctx->stats_out);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4347
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4348 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4349 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4350
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4351 static int decode_init(AVCodecContext *avctx)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4352 {
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4353 SnowContext *s = avctx->priv_data;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4354 int block_size;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4355
2635
eaa57c3336fc PIX_FMT_NONE and related fixes
michael
parents: 2634
diff changeset
4356 avctx->pix_fmt= PIX_FMT_YUV420P;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4357
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4358 common_init(avctx);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4359
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4360 block_size = MB_SIZE >> s->block_max_depth;
3017
1fb6215d621b 10l (assertion failure)
michael
parents: 3012
diff changeset
4361 slice_buffer_init(&s->sb, s->plane[0].height, (block_size) + (s->spatial_decomposition_count * (s->spatial_decomposition_count + 3)) + 1, s->plane[0].width, s->spatial_dwt_buffer);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4362
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4363 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4364 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4365
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4366 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
4367 SnowContext *s = avctx->priv_data;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4368 RangeCoder * const c= &s->c;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4369 int bytes_read;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4370 AVFrame *picture = data;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
4371 int level, orientation, plane_index;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4372
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4373 ff_init_range_decoder(c, buf, buf_size);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4374 ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4375
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4376 s->current_picture.pict_type= FF_I_TYPE; //FIXME I vs. P
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4377 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
4378 if(!s->block) alloc_blocks(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4379
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4380 frame_start(s);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4381 //keyframe flag dupliaction mess FIXME
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4382 if(avctx->debug&FF_DEBUG_PICT_INFO)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4383 av_log(avctx, AV_LOG_ERROR, "keyframe:%d qlog:%d\n", s->keyframe, s->qlog);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4384
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
4385 decode_blocks(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4386
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4387 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4388 Plane *p= &s->plane[plane_index];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4389 int w= p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4390 int h= p->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4391 int x, y;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4392 int decode_state[MAX_DECOMPOSITIONS][4][1]; /* Stored state info for unpack_coeffs. 1 variable per instance. */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4393
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4394 if(s->avctx->debug&2048){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4395 memset(s->spatial_dwt_buffer, 0, sizeof(DWTELEM)*w*h);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4396 predict_plane(s, s->spatial_dwt_buffer, plane_index, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4397
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4398 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4399 for(x=0; x<w; x++){
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
4400 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
4401 s->mconly_picture.data[plane_index][y*s->mconly_picture.linesize[plane_index] + x]= v;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4402 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4403 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4404 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4405
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4406 { START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4407 for(level=0; level<s->spatial_decomposition_count; level++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4408 for(orientation=level ? 1 : 0; orientation<4; orientation++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4409 SubBand *b= &p->band[level][orientation];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4410 unpack_coeffs(s, b, b->parent, orientation);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4411 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4412 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4413 STOP_TIMER("unpack coeffs");
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4414 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4415
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4416 {START_TIMER
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4417 const int mb_h= s->b_height << s->block_max_depth;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4418 const int block_size = MB_SIZE >> s->block_max_depth;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4419 const int block_w = plane_index ? block_size/2 : block_size;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4420 int mb_y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4421 dwt_compose_t cs[MAX_DECOMPOSITIONS];
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4422 int yd=0, yq=0;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4423 int y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4424 int end_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4425
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4426 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
4427 for(mb_y=0; mb_y<=mb_h; mb_y++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4428
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4429 int slice_starty = block_w*mb_y;
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4430 int slice_h = block_w*(mb_y+1);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4431 if (!(s->keyframe || s->avctx->debug&512)){
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4432 slice_starty = FFMAX(0, slice_starty - (block_w >> 1));
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4433 slice_h -= (block_w >> 1);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4434 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4435
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4436 {
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4437 START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4438 for(level=0; level<s->spatial_decomposition_count; level++){
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4439 for(orientation=level ? 1 : 0; orientation<4; orientation++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4440 SubBand *b= &p->band[level][orientation];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4441 int start_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4442 int end_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4443 int our_mb_start = mb_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4444 int our_mb_end = (mb_y + 1);
3012
088920c095fc cleanup
michael
parents: 3000
diff changeset
4445 const int extra= 3;
088920c095fc cleanup
michael
parents: 3000
diff changeset
4446 start_y = (mb_y ? ((block_w * our_mb_start) >> (s->spatial_decomposition_count - level)) + s->spatial_decomposition_count - level + extra: 0);
088920c095fc cleanup
michael
parents: 3000
diff changeset
4447 end_y = (((block_w * our_mb_end) >> (s->spatial_decomposition_count - level)) + s->spatial_decomposition_count - level + extra);
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4448 if (!(s->keyframe || s->avctx->debug&512)){
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4449 start_y = FFMAX(0, start_y - (block_w >> (1+s->spatial_decomposition_count - level)));
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4450 end_y = FFMAX(0, end_y - (block_w >> (1+s->spatial_decomposition_count - level)));
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4451 }
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4452 start_y = FFMIN(b->height, start_y);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4453 end_y = FFMIN(b->height, end_y);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4454
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4455 if (start_y != end_y){
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4456 if (orientation == 0){
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4457 SubBand * correlate_band = &p->band[0][0];
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4458 int correlate_end_y = FFMIN(b->height, end_y + 1);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4459 int correlate_start_y = FFMIN(b->height, (start_y ? start_y + 1 : 0));
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4460 decode_subband_slice_buffered(s, correlate_band, &s->sb, correlate_start_y, correlate_end_y, decode_state[0][0]);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4461 correlate_slice_buffered(s, &s->sb, correlate_band, correlate_band->buf, correlate_band->stride, 1, 0, correlate_start_y, correlate_end_y);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4462 dequantize_slice_buffered(s, &s->sb, correlate_band, correlate_band->buf, correlate_band->stride, start_y, end_y);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4463 }
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4464 else
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4465 decode_subband_slice_buffered(s, b, &s->sb, start_y, end_y, decode_state[level][orientation]);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4466 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4467 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4468 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4469 STOP_TIMER("decode_subband_slice");
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4470 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4471
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4472 { START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4473 for(; yd<slice_h; yd+=4){
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
4474 ff_spatial_idwt_buffered_slice(&s->dsp, cs, &s->sb, w, h, 1, s->spatial_decomposition_type, s->spatial_decomposition_count, yd);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4475 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4476 STOP_TIMER("idwt slice");}
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4477
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4478
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4479 if(s->qlog == LOSSLESS_QLOG){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4480 for(; yq<slice_h && yq<h; yq++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4481 DWTELEM * line = slice_buffer_get_line(&s->sb, yq);
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4482 for(x=0; x<w; x++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4483 line[x] <<= FRAC_BITS;
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4484 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4485 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4486 }
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4487
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4488 predict_slice_buffered(s, &s->sb, s->spatial_dwt_buffer, plane_index, 1, mb_y);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4489
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4490 y = FFMIN(p->height, slice_starty);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4491 end_y = FFMIN(p->height, slice_h);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4492 while(y < end_y)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4493 slice_buffer_release(&s->sb, y++);
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4494 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4495
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4496 slice_buffer_flush(&s->sb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4497
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4498 STOP_TIMER("idwt + predict_slices")}
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4499 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4500
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4501 emms_c();
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4502
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4503 if(s->last_picture[s->max_ref_frames-1].data[0])
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4504 avctx->release_buffer(avctx, &s->last_picture[s->max_ref_frames-1]);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4505
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4506 if(!(s->avctx->debug&2048))
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4507 *picture= s->current_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4508 else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4509 *picture= s->mconly_picture;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4510
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4511 *data_size = sizeof(AVFrame);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4512
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4513 bytes_read= c->bytestream - c->bytestream_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4514 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
4515
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4516 return bytes_read;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4517 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4518
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4519 static int decode_end(AVCodecContext *avctx)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4520 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4521 SnowContext *s = avctx->priv_data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4522
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4523 slice_buffer_destroy(&s->sb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4524
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4525 common_end(s);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4526
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4527 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4528 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4529
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4530 AVCodec snow_decoder = {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4531 "snow",
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4532 CODEC_TYPE_VIDEO,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4533 CODEC_ID_SNOW,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4534 sizeof(SnowContext),
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4535 decode_init,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4536 NULL,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4537 decode_end,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4538 decode_frame,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4539 0 /*CODEC_CAP_DR1*/ /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4540 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4541 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4542
2408
a6e4da1c28ee Disable encoders patch by (Gianluigi Tiesi <mplayer netfarm it>)
michael
parents: 2368
diff changeset
4543 #ifdef CONFIG_ENCODERS
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4544 AVCodec snow_encoder = {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4545 "snow",
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4546 CODEC_TYPE_VIDEO,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4547 CODEC_ID_SNOW,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4548 sizeof(SnowContext),
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4549 encode_init,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4550 encode_frame,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4551 encode_end,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4552 };
2408
a6e4da1c28ee Disable encoders patch by (Gianluigi Tiesi <mplayer netfarm it>)
michael
parents: 2368
diff changeset
4553 #endif
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4554
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4555
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4556 #if 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4557 #undef malloc
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4558 #undef free
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4559 #undef printf
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4560
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4561 int main(){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4562 int width=256;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4563 int height=256;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4564 int buffer[2][width*height];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4565 SnowContext s;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4566 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4567 s.spatial_decomposition_count=6;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4568 s.spatial_decomposition_type=1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4569
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4570 printf("testing 5/3 DWT\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4571 for(i=0; i<width*height; i++)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4572 buffer[0][i]= buffer[1][i]= random()%54321 - 12345;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4573
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4574 ff_spatial_dwt(buffer[0], width, height, width, s.spatial_decomposition_type, s.spatial_decomposition_count);
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4575 ff_spatial_idwt(buffer[0], width, height, width, s.spatial_decomposition_type, s.spatial_decomposition_count);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4576
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4577 for(i=0; i<width*height; i++)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4578 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
4579
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4580 printf("testing 9/7 DWT\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4581 s.spatial_decomposition_type=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4582 for(i=0; i<width*height; i++)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4583 buffer[0][i]= buffer[1][i]= random()%54321 - 12345;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4584
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4585 ff_spatial_dwt(buffer[0], width, height, width, s.spatial_decomposition_type, s.spatial_decomposition_count);
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4586 ff_spatial_idwt(buffer[0], width, height, width, s.spatial_decomposition_type, s.spatial_decomposition_count);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4587
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4588 for(i=0; i<width*height; i++)
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
4589 if(FFABS(buffer[0][i] - buffer[1][i])>20) printf("fsck: %d %d %d\n",i, buffer[0][i], buffer[1][i]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4590
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4591 #if 0
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4592 printf("testing AC coder\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4593 memset(s.header_state, 0, sizeof(s.header_state));
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4594 ff_init_range_encoder(&s.c, buffer[0], 256*256);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4595 ff_init_cabac_states(&s.c, ff_h264_lps_range, ff_h264_mps_state, ff_h264_lps_state, 64);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4596
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4597 for(i=-256; i<256; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4598 START_TIMER
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
4599 put_symbol(&s.c, s.header_state, i*i*i/3*FFABS(i), 1);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4600 STOP_TIMER("put_symbol")
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4601 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4602 ff_rac_terminate(&s.c);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4603
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4604 memset(s.header_state, 0, sizeof(s.header_state));
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4605 ff_init_range_decoder(&s.c, buffer[0], 256*256);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4606 ff_init_cabac_states(&s.c, ff_h264_lps_range, ff_h264_mps_state, ff_h264_lps_state, 64);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4607
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4608 for(i=-256; i<256; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4609 int j;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4610 START_TIMER
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4611 j= get_symbol(&s.c, s.header_state, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4612 STOP_TIMER("get_symbol")
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
4613 if(j!=i*i*i/3*FFABS(i)) printf("fsck: %d != %d\n", i, j);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4614 }
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4615 #endif
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4616 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4617 int level, orientation, x, y;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4618 int64_t errors[8][4];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4619 int64_t g=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4620
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4621 memset(errors, 0, sizeof(errors));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4622 s.spatial_decomposition_count=3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4623 s.spatial_decomposition_type=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4624 for(level=0; level<s.spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4625 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4626 int w= width >> (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4627 int h= height >> (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4628 int stride= width << (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4629 DWTELEM *buf= buffer[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4630 int64_t error=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4631
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4632 if(orientation&1) buf+=w;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4633 if(orientation>1) buf+=stride>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4634
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4635 memset(buffer[0], 0, sizeof(int)*width*height);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4636 buf[w/2 + h/2*stride]= 256*256;
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4637 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
4638 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4639 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4640 int64_t d= buffer[0][x + y*width];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4641 error += d*d;
4122
daae66c03857 Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 4011
diff changeset
4642 if(FFABS(width/2-x)<9 && FFABS(height/2-y)<9 && level==2) printf("%8"PRId64" ", d);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4643 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
4644 if(FFABS(height/2-y)<9 && level==2) printf("\n");
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4645 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4646 error= (int)(sqrt(error)+0.5);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4647 errors[level][orientation]= error;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4648 if(g) g=ff_gcd(g, error);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4649 else g= error;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4650 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4651 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4652 printf("static int const visual_weight[][4]={\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4653 for(level=0; level<s.spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4654 printf(" {");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4655 for(orientation=0; orientation<4; orientation++){
4122
daae66c03857 Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 4011
diff changeset
4656 printf("%8"PRId64",", errors[level][orientation]/g);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4657 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4658 printf("},\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4659 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4660 printf("};\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4661 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4662 int level=2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4663 int orientation=3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4664 int w= width >> (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4665 int h= height >> (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4666 int stride= width << (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4667 DWTELEM *buf= buffer[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4668 int64_t error=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4669
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4670 buf+=w;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4671 buf+=stride>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4672
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4673 memset(buffer[0], 0, sizeof(int)*width*height);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4674 #if 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4675 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4676 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4677 int tab[4]={0,2,3,1};
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4678 buffer[0][x+width*y]= 256*256*tab[(x&1) + 2*(y&1)];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4679 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4680 }
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4681 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
4682 #else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4683 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4684 for(x=0; x<w; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4685 buf[x + y*stride ]=169;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4686 buf[x + y*stride-w]=64;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4687 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4688 }
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4689 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
4690 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4691 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4692 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4693 int64_t d= buffer[0][x + y*width];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4694 error += d*d;
4122
daae66c03857 Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 4011
diff changeset
4695 if(FFABS(width/2-x)<9 && FFABS(height/2-y)<9) printf("%8"PRId64" ", d);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4696 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
4697 if(FFABS(height/2-y)<9) printf("\n");
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4698 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4699 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4700
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4701 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4702 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4703 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4704 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4705