annotate snow.c @ 9472:05663d250d5b libavcodec

Remove unused variable from wma_decode_block() found by CSA.
author michael
date Fri, 17 Apr 2009 15:35:32 +0000
parents 5c58923d47d2
children e1d76267dce8
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"
8627
d6bab465b82c moves mid_pred() into mathops.h (with arch specific code split by directory)
aurel
parents: 8611
diff changeset
26 #include "mathops.h"
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
27
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
28 #include "mpegvideo.h"
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
29
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
30 #undef NDEBUG
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
31 #include <assert.h>
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
32
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
33 static const int8_t quant3[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
34 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
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,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
49 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
50 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
51 static const int8_t quant3b[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
52 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
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 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
68 };
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
69 static const int8_t quant3bA[256]={
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
70 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
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 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
86 };
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
87 static const int8_t quant5[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
88 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
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,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
103 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
104 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
105 static const int8_t quant7[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
106 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
107 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
108 2, 2, 2, 2, 2, 2, 2, 2, 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,-3,-3,-3,-3,-3,-3,-3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
119 -3,-3,-3,-3,-3,-3,-3,-3,-3,-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,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
121 -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
122 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
123 static const int8_t quant9[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
124 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
125 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
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,-4,-4,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
138 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-3,-3,-3,-3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
139 -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
140 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
141 static const int8_t quant11[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
142 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
143 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
144 4, 4, 4, 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,-5,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
155 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
156 -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
157 -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
158 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
159 static const int8_t quant13[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
160 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
161 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
162 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
163 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
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,-6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
172 -6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-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 -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
175 -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
176 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
177
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
178 #if 0 //64*cubic
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
179 static const uint8_t obmc32[1024]={
5659
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
180 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,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
181 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
182 0, 0, 0, 4, 4, 4, 4, 8, 8, 12, 12, 12, 16, 16, 16, 16, 16, 16, 16, 16, 12, 12, 12, 8, 8, 4, 4, 4, 4, 0, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
183 0, 0, 4, 4, 8, 8, 12, 16, 16, 20, 24, 24, 28, 28, 32, 32, 32, 32, 28, 28, 24, 24, 20, 16, 16, 12, 8, 8, 4, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
184 0, 0, 4, 8, 8, 12, 16, 24, 28, 32, 36, 40, 44, 48, 48, 48, 48, 48, 48, 44, 40, 36, 32, 28, 24, 16, 12, 8, 8, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
185 0, 4, 4, 8, 12, 20, 24, 32, 40, 44, 52, 56, 60, 64, 68, 72, 72, 68, 64, 60, 56, 52, 44, 40, 32, 24, 20, 12, 8, 4, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
186 0, 4, 4, 12, 16, 24, 32, 40, 52, 60, 68, 76, 80, 88, 88, 92, 92, 88, 88, 80, 76, 68, 60, 52, 40, 32, 24, 16, 12, 4, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
187 0, 4, 8, 16, 24, 32, 40, 52, 64, 76, 84, 92,100,108,112,116,116,112,108,100, 92, 84, 76, 64, 52, 40, 32, 24, 16, 8, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
188 0, 4, 8, 16, 28, 40, 52, 64, 76, 88,100,112,124,132,136,140,140,136,132,124,112,100, 88, 76, 64, 52, 40, 28, 16, 8, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
189 0, 4, 12, 20, 32, 44, 60, 76, 88,104,120,132,144,152,160,164,164,160,152,144,132,120,104, 88, 76, 60, 44, 32, 20, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
190 0, 4, 12, 24, 36, 48, 68, 84,100,120,136,152,164,176,180,184,184,180,176,164,152,136,120,100, 84, 68, 48, 36, 24, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
191 0, 4, 12, 24, 40, 56, 76, 92,112,132,152,168,180,192,204,208,208,204,192,180,168,152,132,112, 92, 76, 56, 40, 24, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
192 0, 4, 16, 28, 44, 60, 80,100,124,144,164,180,196,208,220,224,224,220,208,196,180,164,144,124,100, 80, 60, 44, 28, 16, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
193 0, 8, 16, 28, 48, 64, 88,108,132,152,176,192,208,224,232,240,240,232,224,208,192,176,152,132,108, 88, 64, 48, 28, 16, 8, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
194 0, 4, 16, 32, 48, 68, 88,112,136,160,180,204,220,232,244,248,248,244,232,220,204,180,160,136,112, 88, 68, 48, 32, 16, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
195 1, 8, 16, 32, 48, 72, 92,116,140,164,184,208,224,240,248,255,255,248,240,224,208,184,164,140,116, 92, 72, 48, 32, 16, 8, 1,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
196 1, 8, 16, 32, 48, 72, 92,116,140,164,184,208,224,240,248,255,255,248,240,224,208,184,164,140,116, 92, 72, 48, 32, 16, 8, 1,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
197 0, 4, 16, 32, 48, 68, 88,112,136,160,180,204,220,232,244,248,248,244,232,220,204,180,160,136,112, 88, 68, 48, 32, 16, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
198 0, 8, 16, 28, 48, 64, 88,108,132,152,176,192,208,224,232,240,240,232,224,208,192,176,152,132,108, 88, 64, 48, 28, 16, 8, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
199 0, 4, 16, 28, 44, 60, 80,100,124,144,164,180,196,208,220,224,224,220,208,196,180,164,144,124,100, 80, 60, 44, 28, 16, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
200 0, 4, 12, 24, 40, 56, 76, 92,112,132,152,168,180,192,204,208,208,204,192,180,168,152,132,112, 92, 76, 56, 40, 24, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
201 0, 4, 12, 24, 36, 48, 68, 84,100,120,136,152,164,176,180,184,184,180,176,164,152,136,120,100, 84, 68, 48, 36, 24, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
202 0, 4, 12, 20, 32, 44, 60, 76, 88,104,120,132,144,152,160,164,164,160,152,144,132,120,104, 88, 76, 60, 44, 32, 20, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
203 0, 4, 8, 16, 28, 40, 52, 64, 76, 88,100,112,124,132,136,140,140,136,132,124,112,100, 88, 76, 64, 52, 40, 28, 16, 8, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
204 0, 4, 8, 16, 24, 32, 40, 52, 64, 76, 84, 92,100,108,112,116,116,112,108,100, 92, 84, 76, 64, 52, 40, 32, 24, 16, 8, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
205 0, 4, 4, 12, 16, 24, 32, 40, 52, 60, 68, 76, 80, 88, 88, 92, 92, 88, 88, 80, 76, 68, 60, 52, 40, 32, 24, 16, 12, 4, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
206 0, 4, 4, 8, 12, 20, 24, 32, 40, 44, 52, 56, 60, 64, 68, 72, 72, 68, 64, 60, 56, 52, 44, 40, 32, 24, 20, 12, 8, 4, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
207 0, 0, 4, 8, 8, 12, 16, 24, 28, 32, 36, 40, 44, 48, 48, 48, 48, 48, 48, 44, 40, 36, 32, 28, 24, 16, 12, 8, 8, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
208 0, 0, 4, 4, 8, 8, 12, 16, 16, 20, 24, 24, 28, 28, 32, 32, 32, 32, 28, 28, 24, 24, 20, 16, 16, 12, 8, 8, 4, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
209 0, 0, 0, 4, 4, 4, 4, 8, 8, 12, 12, 12, 16, 16, 16, 16, 16, 16, 16, 16, 12, 12, 12, 8, 8, 4, 4, 4, 4, 0, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
210 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
211 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,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
212 //error:0.000022
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
213 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
214 static const uint8_t obmc16[256]={
5659
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
215 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
216 0, 4, 4, 8, 16, 20, 20, 24, 24, 20, 20, 16, 8, 4, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
217 0, 4, 16, 24, 36, 44, 52, 60, 60, 52, 44, 36, 24, 16, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
218 0, 8, 24, 44, 60, 80, 96,104,104, 96, 80, 60, 44, 24, 8, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
219 0, 16, 36, 60, 92,116,136,152,152,136,116, 92, 60, 36, 16, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
220 0, 20, 44, 80,116,152,180,196,196,180,152,116, 80, 44, 20, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
221 4, 20, 52, 96,136,180,212,228,228,212,180,136, 96, 52, 20, 4,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
222 4, 24, 60,104,152,196,228,248,248,228,196,152,104, 60, 24, 4,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
223 4, 24, 60,104,152,196,228,248,248,228,196,152,104, 60, 24, 4,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
224 4, 20, 52, 96,136,180,212,228,228,212,180,136, 96, 52, 20, 4,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
225 0, 20, 44, 80,116,152,180,196,196,180,152,116, 80, 44, 20, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
226 0, 16, 36, 60, 92,116,136,152,152,136,116, 92, 60, 36, 16, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
227 0, 8, 24, 44, 60, 80, 96,104,104, 96, 80, 60, 44, 24, 8, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
228 0, 4, 16, 24, 36, 44, 52, 60, 60, 52, 44, 36, 24, 16, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
229 0, 4, 4, 8, 16, 20, 20, 24, 24, 20, 20, 16, 8, 4, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
230 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
231 //error:0.000033
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
232 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
233 #elif 1 // 64*linear
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
234 static const uint8_t obmc32[1024]={
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
235 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
236 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
237 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
238 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
239 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
240 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
241 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
242 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
243 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
244 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
245 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
246 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
247 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
248 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
249 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
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, 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
252 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
253 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
254 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
255 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
256 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
257 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
258 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
259 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
260 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
261 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
262 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
263 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
264 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
265 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
266 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
267 //error:0.000020
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
268 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
269 static const uint8_t obmc16[256]={
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
270 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
271 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
272 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
273 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
274 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
275 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
276 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
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 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
279 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
280 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
281 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
282 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
283 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
284 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
285 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
286 //error:0.000015
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
287 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
288 #else //64*cos
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
289 static const uint8_t obmc32[1024]={
5659
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
290 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,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
291 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 8, 4, 4, 8, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
292 0, 0, 0, 4, 4, 4, 4, 8, 8, 12, 12, 12, 12, 16, 16, 16, 16, 16, 16, 12, 12, 12, 12, 8, 8, 4, 4, 4, 4, 0, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
293 0, 0, 4, 4, 4, 8, 8, 12, 16, 20, 20, 24, 28, 28, 28, 28, 28, 28, 28, 28, 24, 20, 20, 16, 12, 8, 8, 4, 4, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
294 0, 0, 4, 4, 8, 12, 16, 20, 24, 28, 36, 40, 44, 44, 48, 48, 48, 48, 44, 44, 40, 36, 28, 24, 20, 16, 12, 8, 4, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
295 0, 0, 4, 8, 12, 20, 24, 32, 36, 44, 48, 56, 60, 64, 68, 68, 68, 68, 64, 60, 56, 48, 44, 36, 32, 24, 20, 12, 8, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
296 0, 4, 4, 8, 16, 24, 32, 40, 48, 60, 68, 76, 80, 84, 88, 92, 92, 88, 84, 80, 76, 68, 60, 48, 40, 32, 24, 16, 8, 4, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
297 0, 4, 8, 12, 20, 32, 40, 52, 64, 76, 84, 96,104,108,112,116,116,112,108,104, 96, 84, 76, 64, 52, 40, 32, 20, 12, 8, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
298 0, 4, 8, 16, 24, 36, 48, 64, 76, 92,104,116,124,132,136,140,140,136,132,124,116,104, 92, 76, 64, 48, 36, 24, 16, 8, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
299 0, 4, 12, 20, 28, 44, 60, 76, 92,104,120,136,148,156,160,164,164,160,156,148,136,120,104, 92, 76, 60, 44, 28, 20, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
300 0, 4, 12, 20, 36, 48, 68, 84,104,120,140,152,168,176,184,188,188,184,176,168,152,140,120,104, 84, 68, 48, 36, 20, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
301 0, 4, 12, 24, 36, 56, 76, 96,116,136,152,172,184,196,204,208,208,204,196,184,172,152,136,116, 96, 76, 56, 36, 24, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
302 0, 4, 12, 24, 44, 60, 80,104,124,148,168,184,200,212,224,228,228,224,212,200,184,168,148,124,104, 80, 60, 44, 24, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
303 0, 4, 12, 28, 44, 64, 84,108,132,156,176,196,212,228,236,240,240,236,228,212,196,176,156,132,108, 84, 64, 44, 28, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
304 0, 4, 16, 28, 48, 68, 88,112,136,160,184,204,224,236,244,252,252,244,236,224,204,184,160,136,112, 88, 68, 48, 28, 16, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
305 1, 4, 16, 28, 48, 68, 92,116,140,164,188,208,228,240,252,255,255,252,240,228,208,188,164,140,116, 92, 68, 48, 28, 16, 4, 1,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
306 1, 4, 16, 28, 48, 68, 92,116,140,164,188,208,228,240,252,255,255,252,240,228,208,188,164,140,116, 92, 68, 48, 28, 16, 4, 1,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
307 0, 4, 16, 28, 48, 68, 88,112,136,160,184,204,224,236,244,252,252,244,236,224,204,184,160,136,112, 88, 68, 48, 28, 16, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
308 0, 4, 12, 28, 44, 64, 84,108,132,156,176,196,212,228,236,240,240,236,228,212,196,176,156,132,108, 84, 64, 44, 28, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
309 0, 4, 12, 24, 44, 60, 80,104,124,148,168,184,200,212,224,228,228,224,212,200,184,168,148,124,104, 80, 60, 44, 24, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
310 0, 4, 12, 24, 36, 56, 76, 96,116,136,152,172,184,196,204,208,208,204,196,184,172,152,136,116, 96, 76, 56, 36, 24, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
311 0, 4, 12, 20, 36, 48, 68, 84,104,120,140,152,168,176,184,188,188,184,176,168,152,140,120,104, 84, 68, 48, 36, 20, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
312 0, 4, 12, 20, 28, 44, 60, 76, 92,104,120,136,148,156,160,164,164,160,156,148,136,120,104, 92, 76, 60, 44, 28, 20, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
313 0, 4, 8, 16, 24, 36, 48, 64, 76, 92,104,116,124,132,136,140,140,136,132,124,116,104, 92, 76, 64, 48, 36, 24, 16, 8, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
314 0, 4, 8, 12, 20, 32, 40, 52, 64, 76, 84, 96,104,108,112,116,116,112,108,104, 96, 84, 76, 64, 52, 40, 32, 20, 12, 8, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
315 0, 4, 4, 8, 16, 24, 32, 40, 48, 60, 68, 76, 80, 84, 88, 92, 92, 88, 84, 80, 76, 68, 60, 48, 40, 32, 24, 16, 8, 4, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
316 0, 0, 4, 8, 12, 20, 24, 32, 36, 44, 48, 56, 60, 64, 68, 68, 68, 68, 64, 60, 56, 48, 44, 36, 32, 24, 20, 12, 8, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
317 0, 0, 4, 4, 8, 12, 16, 20, 24, 28, 36, 40, 44, 44, 48, 48, 48, 48, 44, 44, 40, 36, 28, 24, 20, 16, 12, 8, 4, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
318 0, 0, 4, 4, 4, 8, 8, 12, 16, 20, 20, 24, 28, 28, 28, 28, 28, 28, 28, 28, 24, 20, 20, 16, 12, 8, 8, 4, 4, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
319 0, 0, 0, 4, 4, 4, 4, 8, 8, 12, 12, 12, 12, 16, 16, 16, 16, 16, 16, 12, 12, 12, 12, 8, 8, 4, 4, 4, 4, 0, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
320 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 8, 4, 4, 8, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
321 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,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
322 //error:0.000022
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
323 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
324 static const uint8_t obmc16[256]={
5659
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
325 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
326 0, 0, 4, 8, 12, 16, 20, 20, 20, 20, 16, 12, 8, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
327 0, 4, 12, 24, 32, 44, 52, 56, 56, 52, 44, 32, 24, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
328 0, 8, 24, 40, 60, 80, 96,104,104, 96, 80, 60, 40, 24, 8, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
329 0, 12, 32, 64, 92,120,140,152,152,140,120, 92, 64, 32, 12, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
330 4, 16, 44, 80,120,156,184,196,196,184,156,120, 80, 44, 16, 4,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
331 4, 20, 52, 96,140,184,216,232,232,216,184,140, 96, 52, 20, 4,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
332 0, 20, 56,104,152,196,232,252,252,232,196,152,104, 56, 20, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
333 0, 20, 56,104,152,196,232,252,252,232,196,152,104, 56, 20, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
334 4, 20, 52, 96,140,184,216,232,232,216,184,140, 96, 52, 20, 4,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
335 4, 16, 44, 80,120,156,184,196,196,184,156,120, 80, 44, 16, 4,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
336 0, 12, 32, 64, 92,120,140,152,152,140,120, 92, 64, 32, 12, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
337 0, 8, 24, 40, 60, 80, 96,104,104, 96, 80, 60, 40, 24, 8, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
338 0, 4, 12, 24, 32, 44, 52, 56, 56, 52, 44, 32, 24, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
339 0, 0, 4, 8, 12, 16, 20, 20, 20, 20, 16, 12, 8, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
340 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
341 //error:0.000022
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
342 };
5910
85a976d59f17 Add comments to some #endif directives.
diego
parents: 5909
diff changeset
343 #endif /* 0 */
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
344
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
345 //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
346 static const uint8_t obmc8[64]={
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
347 4, 12, 20, 28, 28, 20, 12, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
348 12, 36, 60, 84, 84, 60, 36, 12,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
349 20, 60,100,140,140,100, 60, 20,
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 28, 84,140,196,196,140, 84, 28,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
352 20, 60,100,140,140,100, 60, 20,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
353 12, 36, 60, 84, 84, 60, 36, 12,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
354 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
355 //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
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
70b27300a496 quad 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 //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
359 static const uint8_t obmc4[16]={
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
360 16, 48, 48, 16,
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 48,144,144, 48,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
363 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
364 //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
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
7129
322023e630a6 mark read-only data as const
stefang
parents: 7040
diff changeset
367 static const uint8_t * const obmc_tab[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
368 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
369 };
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
370
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
371 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
372
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
373 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
374 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
375 int16_t my;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
376 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
377 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
378 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
379 //#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
380 #define BLOCK_INTRA 1
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
381 #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
382 //#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
383 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
384 }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
385
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
386 static const BlockNode null_block= { //FIXME add border maybe
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
387 .color= {128,128,128},
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
388 .mx= 0,
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
389 .my= 0,
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
390 .ref= 0,
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
391 .type= 0,
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
392 .level= 0,
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
393 };
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
394
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
395 #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
396 #define MB_SIZE (1<<LOG2_MB_SIZE)
5575
a6f5ed050335 use more bits on the encoder side
michael
parents: 5572
diff changeset
397 #define ENCODER_EXTRA_BITS 4
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
398 #define HTAPS_MAX 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
399
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
400 typedef struct x_and_coeff{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
401 int16_t x;
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
402 uint16_t coeff;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
403 } x_and_coeff;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
404
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
405 typedef struct SubBand{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
406 int level;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
407 int stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
408 int width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
409 int height;
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
410 int qlog; ///< log(qscale)/log[2^(1/6)]
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
411 DWTELEM *buf;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
412 IDWTELEM *ibuf;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
413 int buf_x_offset;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
414 int buf_y_offset;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
415 int stride_line; ///< Stride measured in lines, not pixels.
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
416 x_and_coeff * x_coeff;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
417 struct SubBand *parent;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
418 uint8_t state[/*7*2*/ 7 + 512][32];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
419 }SubBand;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
420
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
421 typedef struct Plane{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
422 int width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
423 int height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
424 SubBand band[MAX_DECOMPOSITIONS][4];
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
425
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
426 int htaps;
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
427 int8_t hcoeff[HTAPS_MAX/2];
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
428 int diag_mc;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
429 int fast_mc;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
430
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
431 int last_htaps;
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
432 int8_t last_hcoeff[HTAPS_MAX/2];
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
433 int last_diag_mc;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
434 }Plane;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
435
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
436 typedef struct SnowContext{
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
437 // MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to eventually make the motion estimation independent of MpegEncContext, so this will be removed then (FIXME/XXX)
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
438
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
439 AVCodecContext *avctx;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
440 RangeCoder c;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
441 DSPContext dsp;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
442 AVFrame new_picture;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
443 AVFrame input_picture; ///< new_picture with the internal linesizes
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
444 AVFrame current_picture;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
445 AVFrame last_picture[MAX_REF_FRAMES];
5633
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
446 uint8_t *halfpel_plane[MAX_REF_FRAMES][4][4];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
447 AVFrame mconly_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
448 // uint8_t q_context[16];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
449 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
450 uint8_t block_state[128 + 32*128];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
451 int keyframe;
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
452 int always_reset;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
453 int version;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
454 int spatial_decomposition_type;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
455 int last_spatial_decomposition_type;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
456 int temporal_decomposition_type;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
457 int spatial_decomposition_count;
5670
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
458 int last_spatial_decomposition_count;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
459 int temporal_decomposition_count;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
460 int max_ref_frames;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
461 int ref_frames;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
462 int16_t (*ref_mvs[MAX_REF_FRAMES])[2];
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
463 uint32_t *ref_scores[MAX_REF_FRAMES];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
464 DWTELEM *spatial_dwt_buffer;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
465 IDWTELEM *spatial_idwt_buffer;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
466 int colorspace_type;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
467 int chroma_h_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
468 int chroma_v_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
469 int spatial_scalability;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
470 int qlog;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
471 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
472 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
473 int lambda2;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
474 int pass1_rc;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
475 int mv_scale;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
476 int last_mv_scale;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
477 int qbias;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
478 int last_qbias;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
479 #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
480 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
481 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
482 int block_max_depth;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
483 int last_block_max_depth;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
484 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
485 BlockNode *block;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
486 #define ME_CACHE_SIZE 1024
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
487 int me_cache[ME_CACHE_SIZE];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
488 int me_cache_generation;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
489 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
490
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
491 MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to eventually make the motion estimation independent of MpegEncContext, so this will be removed then (FIXME/XXX)
8214
c5276ad92ff8 snow: move scratch buffer from stack to malloced buffer in context
mru
parents: 7622
diff changeset
492
c5276ad92ff8 snow: move scratch buffer from stack to malloced buffer in context
mru
parents: 7622
diff changeset
493 uint8_t *scratchbuf;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
494 }SnowContext;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
495
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
496 typedef struct {
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
497 IDWTELEM *b0;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
498 IDWTELEM *b1;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
499 IDWTELEM *b2;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
500 IDWTELEM *b3;
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
501 int y;
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
502 } DWTCompose;
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
503
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
504 #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
505 //#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
506
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
507 static void iterative_me(SnowContext *s);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
508
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
509 static void slice_buffer_init(slice_buffer * buf, int line_count, int max_allocated_lines, int line_width, IDWTELEM * base_buffer)
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
510 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
511 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
512
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
513 buf->base_buffer = base_buffer;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
514 buf->line_count = line_count;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
515 buf->line_width = line_width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
516 buf->data_count = max_allocated_lines;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
517 buf->line = av_mallocz (sizeof(IDWTELEM *) * line_count);
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
518 buf->data_stack = av_malloc (sizeof(IDWTELEM *) * max_allocated_lines);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
519
6474
e6995f3fbf7f cosmetics: Normalize {} placement after for, while, if.
diego
parents: 6437
diff changeset
520 for(i = 0; i < max_allocated_lines; i++){
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
521 buf->data_stack[i] = av_malloc (sizeof(IDWTELEM) * line_width);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
522 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
523
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
524 buf->data_stack_top = max_allocated_lines - 1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
525 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
526
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
527 static IDWTELEM * slice_buffer_load_line(slice_buffer * buf, int line)
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
528 {
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
529 IDWTELEM * buffer;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
530
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
531 assert(buf->data_stack_top >= 0);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
532 // assert(!buf->line[line]);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
533 if (buf->line[line])
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
534 return buf->line[line];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
535
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
536 buffer = buf->data_stack[buf->data_stack_top];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
537 buf->data_stack_top--;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
538 buf->line[line] = buffer;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
539
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
540 return buffer;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
541 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
542
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
543 static void slice_buffer_release(slice_buffer * buf, int line)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
544 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
545 int offset;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
546 IDWTELEM * buffer;
2589
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 assert(line >= 0 && line < buf->line_count);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
549 assert(buf->line[line]);
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 offset = buf->line_width * line;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
552 buffer = buf->line[line];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
553 buf->data_stack_top++;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
554 buf->data_stack[buf->data_stack_top] = buffer;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
555 buf->line[line] = NULL;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
556 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
557
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
558 static void slice_buffer_flush(slice_buffer * buf)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
559 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
560 int i;
6474
e6995f3fbf7f cosmetics: Normalize {} placement after for, while, if.
diego
parents: 6437
diff changeset
561 for(i = 0; i < buf->line_count; i++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
562 if (buf->line[i])
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
563 slice_buffer_release(buf, i);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
564 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
565 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
566
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
567 static void slice_buffer_destroy(slice_buffer * buf)
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 int i;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
570 slice_buffer_flush(buf);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
571
6474
e6995f3fbf7f cosmetics: Normalize {} placement after for, while, if.
diego
parents: 6437
diff changeset
572 for(i = buf->data_count - 1; i >= 0; i--){
3190
e9fa3ac61966 av_free -> av_freep
michael
parents: 3189
diff changeset
573 av_freep(&buf->data_stack[i]);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
574 }
3190
e9fa3ac61966 av_free -> av_freep
michael
parents: 3189
diff changeset
575 av_freep(&buf->data_stack);
e9fa3ac61966 av_free -> av_freep
michael
parents: 3189
diff changeset
576 av_freep(&buf->line);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
577 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
578
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2975
diff changeset
579 #ifdef __sgi
2368
a7ac68734a91 fix for build on IRIX by (Michel Bardiaux {mbardiaux peaktime be})
michael
parents: 2335
diff changeset
580 // Avoid a name clash on SGI IRIX
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2975
diff changeset
581 #undef qexp
2368
a7ac68734a91 fix for build on IRIX by (Michel Bardiaux {mbardiaux peaktime be})
michael
parents: 2335
diff changeset
582 #endif
2246
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
583 #define QEXPSHIFT (7-FRAC_BITS+8) //FIXME try to change this to 0
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
584 static uint8_t qexp[QROOT];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
585
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
586 static inline int mirror(int v, int m){
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
587 while((unsigned)v > (unsigned)m){
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
588 v=-v;
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
589 if(v<0) v+= 2*m;
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
590 }
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
591 return v;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
592 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
593
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
594 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
595 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
596
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
597 if(v){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
598 const int a= FFABS(v);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
599 const int e= av_log2(a);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
600 #if 1
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
601 const int el= FFMIN(e, 10);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
602 put_rac(c, state+0, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
603
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
604 for(i=0; i<el; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
605 put_rac(c, state+1+i, 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
606 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
607 for(; i<e; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
608 put_rac(c, state+1+9, 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
609 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
610 put_rac(c, state+1+FFMIN(i,9), 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
611
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
612 for(i=e-1; i>=el; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
613 put_rac(c, state+22+9, (a>>i)&1); //22..31
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
614 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
615 for(; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
616 put_rac(c, state+22+i, (a>>i)&1); //22..31
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
617 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
618
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
619 if(is_signed)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
620 put_rac(c, state+11 + el, v < 0); //11..21
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
621 #else
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
622
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
623 put_rac(c, state+0, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
624 if(e<=9){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
625 for(i=0; i<e; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
626 put_rac(c, state+1+i, 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
627 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
628 put_rac(c, state+1+i, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
629
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
630 for(i=e-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
631 put_rac(c, state+22+i, (a>>i)&1); //22..31
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
632 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
633
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
634 if(is_signed)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
635 put_rac(c, state+11 + e, v < 0); //11..21
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
636 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
637 for(i=0; i<e; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
638 put_rac(c, state+1+FFMIN(i,9), 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
639 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
640 put_rac(c, state+1+FFMIN(i,9), 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
641
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
642 for(i=e-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
643 put_rac(c, state+22+FFMIN(i,9), (a>>i)&1); //22..31
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
644 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
645
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
646 if(is_signed)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
647 put_rac(c, state+11 + FFMIN(e,10), v < 0); //11..21
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
648 }
5910
85a976d59f17 Add comments to some #endif directives.
diego
parents: 5909
diff changeset
649 #endif /* 1 */
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
650 }else{
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
651 put_rac(c, state+0, 1);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
652 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
653 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
654
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
655 static inline int get_symbol(RangeCoder *c, uint8_t *state, int is_signed){
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
656 if(get_rac(c, state+0))
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
657 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
658 else{
2240
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
659 int i, e, a;
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
660 e= 0;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
661 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
662 e++;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
663 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
664
2240
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
665 a= 1;
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
666 for(i=e-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
667 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
668 }
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
669
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
670 if(is_signed && get_rac(c, state+11 + FFMIN(e,10))) //11..21
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
671 return -a;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
672 else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
673 return a;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
674 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
675 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
676
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
677 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
678 int i;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
679 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
680
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
681 assert(v>=0);
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
682 assert(log2>=-4);
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
683
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
684 while(v >= r){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
685 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
686 v -= r;
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
687 log2++;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
688 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
689 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
690 put_rac(c, state+4+log2, 0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
691
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
692 for(i=log2-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
693 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
694 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
695 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
696
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
697 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
698 int i;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
699 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
700 int v=0;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
701
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
702 assert(log2>=-4);
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
703
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
704 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
705 v+= r;
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
706 log2++;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
707 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
708 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
709
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
710 for(i=log2-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
711 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
712 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
713
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
714 return v;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
715 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
716
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
717 static av_always_inline void
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
718 lift(DWTELEM *dst, DWTELEM *src, DWTELEM *ref,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
719 int dst_step, int src_step, int ref_step,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
720 int width, int mul, int add, int shift,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
721 int highpass, int inverse){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
722 const int mirror_left= !highpass;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
723 const int mirror_right= (width&1) ^ highpass;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
724 const int w= (width>>1) - 1 + (highpass & width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
725 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
726
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
727 #define LIFT(src, ref, inv) ((src) + ((inv) ? - (ref) : + (ref)))
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
728 if(mirror_left){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
729 dst[0] = LIFT(src[0], ((mul*2*ref[0]+add)>>shift), inverse);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
730 dst += dst_step;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
731 src += src_step;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
732 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
733
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
734 for(i=0; i<w; i++){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
735 dst[i*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
736 LIFT(src[i*src_step],
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
737 ((mul*(ref[i*ref_step] + ref[(i+1)*ref_step])+add)>>shift),
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
738 inverse);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
739 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
740
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
741 if(mirror_right){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
742 dst[w*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
743 LIFT(src[w*src_step],
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
744 ((mul*2*ref[w*ref_step]+add)>>shift),
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
745 inverse);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
746 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
747 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
748
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
749 static av_always_inline void
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
750 inv_lift(IDWTELEM *dst, IDWTELEM *src, IDWTELEM *ref,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
751 int dst_step, int src_step, int ref_step,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
752 int width, int mul, int add, int shift,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
753 int highpass, int inverse){
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
754 const int mirror_left= !highpass;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
755 const int mirror_right= (width&1) ^ highpass;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
756 const int w= (width>>1) - 1 + (highpass & width);
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
757 int i;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
758
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
759 #define LIFT(src, ref, inv) ((src) + ((inv) ? - (ref) : + (ref)))
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
760 if(mirror_left){
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
761 dst[0] = LIFT(src[0], ((mul*2*ref[0]+add)>>shift), inverse);
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
762 dst += dst_step;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
763 src += src_step;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
764 }
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
765
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
766 for(i=0; i<w; i++){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
767 dst[i*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
768 LIFT(src[i*src_step],
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
769 ((mul*(ref[i*ref_step] + ref[(i+1)*ref_step])+add)>>shift),
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
770 inverse);
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
771 }
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
772
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
773 if(mirror_right){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
774 dst[w*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
775 LIFT(src[w*src_step],
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
776 ((mul*2*ref[w*ref_step]+add)>>shift),
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
777 inverse);
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
778 }
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
779 }
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
780
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
781 #ifndef liftS
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
782 static av_always_inline void
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
783 liftS(DWTELEM *dst, DWTELEM *src, DWTELEM *ref,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
784 int dst_step, int src_step, int ref_step,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
785 int width, int mul, int add, int shift,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
786 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
787 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
788 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
789 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
790 int i;
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 assert(shift == 4);
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
793 #define LIFTS(src, ref, inv) \
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
794 ((inv) ? \
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
795 (src) + (((ref) + 4*(src))>>shift): \
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
796 -((-16*(src) + (ref) + add/4 + 1 + (5<<25))/(5*4) - (1<<23)))
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
797 if(mirror_left){
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
798 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
799 dst += dst_step;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
800 src += src_step;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
801 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
802
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
803 for(i=0; i<w; i++){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
804 dst[i*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
805 LIFTS(src[i*src_step],
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
806 mul*(ref[i*ref_step] + ref[(i+1)*ref_step])+add,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
807 inverse);
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
808 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
809
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
810 if(mirror_right){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
811 dst[w*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
812 LIFTS(src[w*src_step], mul*2*ref[w*ref_step]+add, inverse);
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
813 }
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
814 }
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
815 static av_always_inline void
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
816 inv_liftS(IDWTELEM *dst, IDWTELEM *src, IDWTELEM *ref,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
817 int dst_step, int src_step, int ref_step,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
818 int width, int mul, int add, int shift,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
819 int highpass, int inverse){
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
820 const int mirror_left= !highpass;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
821 const int mirror_right= (width&1) ^ highpass;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
822 const int w= (width>>1) - 1 + (highpass & width);
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
823 int i;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
824
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
825 assert(shift == 4);
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
826 #define LIFTS(src, ref, inv) \
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
827 ((inv) ? \
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
828 (src) + (((ref) + 4*(src))>>shift): \
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
829 -((-16*(src) + (ref) + add/4 + 1 + (5<<25))/(5*4) - (1<<23)))
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
830 if(mirror_left){
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
831 dst[0] = LIFTS(src[0], mul*2*ref[0]+add, inverse);
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
832 dst += dst_step;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
833 src += src_step;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
834 }
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
835
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
836 for(i=0; i<w; i++){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
837 dst[i*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
838 LIFTS(src[i*src_step],
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
839 mul*(ref[i*ref_step] + ref[(i+1)*ref_step])+add,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
840 inverse);
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
841 }
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
842
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
843 if(mirror_right){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
844 dst[w*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
845 LIFTS(src[w*src_step], mul*2*ref[w*ref_step]+add, inverse);
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
846 }
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
847 }
6413
c58ea608e191 Add comments to some #endif directives.
diego
parents: 6412
diff changeset
848 #endif /* ! liftS */
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
849
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
850 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
851 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
852 const int width2= width>>1;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
853 int x;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
854 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
855
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
856 for(x=0; x<width2; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
857 temp[x ]= b[2*x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
858 temp[x+w2]= b[2*x + 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
859 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
860 if(width&1)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
861 temp[x ]= b[2*x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
862 #if 0
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
863 {
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
864 int A1,A2,A3,A4;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
865 A2= temp[1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
866 A4= temp[0 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
867 A1= temp[0+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
868 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
869 A4 += (A1 + 1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
870 b[0+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
871 b[0 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
872 for(x=1; x+1<width2; x+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
873 A3= temp[x+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
874 A4= temp[x+1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
875 A3 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
876 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
877 b[x+width2] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
878 b[x ] = A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
879
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
880 A1= temp[x+1+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
881 A2= temp[x+2 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
882 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
883 A4 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
884 b[x+1+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
885 b[x+1 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
886 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
887 A3= temp[width-1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
888 A3 -= A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
889 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
890 b[width -1] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
891 b[width2-1] = A2;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
892 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
893 #else
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
894 lift(b+w2, temp+w2, temp, 1, 1, 1, width, -1, 0, 1, 1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
895 lift(b , temp , b+w2, 1, 1, 1, width, 1, 2, 2, 0, 0);
6413
c58ea608e191 Add comments to some #endif directives.
diego
parents: 6412
diff changeset
896 #endif /* 0 */
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
897 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
898
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
899 static void vertical_decompose53iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
900 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
901
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
902 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
903 b1[i] -= (b0[i] + b2[i])>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
904 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
905 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
906
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
907 static void vertical_decompose53iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
908 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
909
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
910 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
911 b1[i] += (b0[i] + b2[i] + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
912 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
913 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
914
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
915 static void spatial_decompose53i(DWTELEM *buffer, int width, int height, int stride){
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
916 int y;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
917 DWTELEM *b0= buffer + mirror(-2-1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
918 DWTELEM *b1= buffer + mirror(-2 , height-1)*stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
919
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
920 for(y=-2; y<height; y+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
921 DWTELEM *b2= buffer + mirror(y+1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
922 DWTELEM *b3= buffer + mirror(y+2, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
923
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
924 if(y+1<(unsigned)height) horizontal_decompose53i(b2, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
925 if(y+2<(unsigned)height) horizontal_decompose53i(b3, width);
6405
7f615bfc21a2 Remove START_TIMER and STOP_TIMER macros.
diego
parents: 6402
diff changeset
926
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
927 if(y+1<(unsigned)height) vertical_decompose53iH0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
928 if(y+0<(unsigned)height) vertical_decompose53iL0(b0, b1, b2, width);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
929
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
930 b0=b2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
931 b1=b3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
932 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
933 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
934
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
935 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
936 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
937 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
938
5565
93082c591c8b Change rounding of the horizontal DWT to match the vertical one.
michael
parents: 5551
diff changeset
939 lift (temp+w2, b +1, b , 1, 2, 2, width, W_AM, W_AO, W_AS, 1, 1);
93082c591c8b Change rounding of the horizontal DWT to match the vertical one.
michael
parents: 5551
diff changeset
940 liftS(temp , b , temp+w2, 1, 2, 1, width, W_BM, W_BO, W_BS, 0, 0);
5589
946c2db0a093 cleanup (remove some old experimentation related code)
michael
parents: 5588
diff changeset
941 lift (b +w2, temp+w2, temp , 1, 1, 1, width, W_CM, W_CO, W_CS, 1, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
942 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
943 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
944
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
945
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
946 static void vertical_decompose97iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
947 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
948
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
949 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
950 b1[i] -= (W_AM*(b0[i] + b2[i])+W_AO)>>W_AS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
951 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
952 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
953
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
954 static void vertical_decompose97iH1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
955 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
956
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
957 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
958 b1[i] += (W_CM*(b0[i] + b2[i])+W_CO)>>W_CS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
959 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
960 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
961
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
962 static void vertical_decompose97iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
963 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
964
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
965 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
966 #ifdef liftS
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
967 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
968 #else
5565
93082c591c8b Change rounding of the horizontal DWT to match the vertical one.
michael
parents: 5551
diff changeset
969 b1[i] = (16*4*b1[i] - 4*(b0[i] + b2[i]) + W_BO*5 + (5<<27)) / (5*16) - (1<<23);
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
970 #endif
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
971 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
972 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
973
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
974 static void vertical_decompose97iL1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
975 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
976
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
977 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
978 b1[i] += (W_DM*(b0[i] + b2[i])+W_DO)>>W_DS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
979 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
980 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
981
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
982 static void spatial_decompose97i(DWTELEM *buffer, int width, int height, int stride){
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
983 int y;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
984 DWTELEM *b0= buffer + mirror(-4-1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
985 DWTELEM *b1= buffer + mirror(-4 , height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
986 DWTELEM *b2= buffer + mirror(-4+1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
987 DWTELEM *b3= buffer + mirror(-4+2, height-1)*stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
988
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
989 for(y=-4; y<height; y+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
990 DWTELEM *b4= buffer + mirror(y+3, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
991 DWTELEM *b5= buffer + mirror(y+4, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
992
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
993 if(y+3<(unsigned)height) horizontal_decompose97i(b4, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
994 if(y+4<(unsigned)height) horizontal_decompose97i(b5, width);
6405
7f615bfc21a2 Remove START_TIMER and STOP_TIMER macros.
diego
parents: 6402
diff changeset
995
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
996 if(y+3<(unsigned)height) vertical_decompose97iH0(b3, b4, b5, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
997 if(y+2<(unsigned)height) vertical_decompose97iL0(b2, b3, b4, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
998 if(y+1<(unsigned)height) vertical_decompose97iH1(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
999 if(y+0<(unsigned)height) vertical_decompose97iL1(b0, b1, b2, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1000
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1001 b0=b2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1002 b1=b3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1003 b2=b4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1004 b3=b5;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1005 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1006 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1007
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1008 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
1009 int level;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1010
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
1011 for(level=0; level<decomposition_count; level++){
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
1012 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1013 case DWT_97: spatial_decompose97i(buffer, width>>level, height>>level, stride<<level); break;
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1014 case DWT_53: spatial_decompose53i(buffer, width>>level, height>>level, stride<<level); break;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1015 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1016 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1017 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1018
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1019 static void horizontal_compose53i(IDWTELEM *b, int width){
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1020 IDWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1021 const int width2= width>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1022 const int w2= (width+1)>>1;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1023 int x;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1024
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1025 #if 0
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1026 int A1,A2,A3,A4;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1027 A2= temp[1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1028 A4= temp[0 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1029 A1= temp[0+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1030 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1031 A4 += (A1 + 1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1032 b[0+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1033 b[0 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1034 for(x=1; x+1<width2; x+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1035 A3= temp[x+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1036 A4= temp[x+1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1037 A3 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1038 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1039 b[x+width2] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1040 b[x ] = A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1041
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1042 A1= temp[x+1+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1043 A2= temp[x+2 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1044 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1045 A4 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1046 b[x+1+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1047 b[x+1 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1048 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1049 A3= temp[width-1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1050 A3 -= A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1051 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1052 b[width -1] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1053 b[width2-1] = A2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1054 #else
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1055 inv_lift(temp , b , b+w2, 1, 1, 1, width, 1, 2, 2, 0, 1);
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1056 inv_lift(temp+w2, b+w2, temp, 1, 1, 1, width, -1, 0, 1, 1, 1);
5910
85a976d59f17 Add comments to some #endif directives.
diego
parents: 5909
diff changeset
1057 #endif /* 0 */
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1058 for(x=0; x<width2; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1059 b[2*x ]= temp[x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1060 b[2*x + 1]= temp[x+w2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1061 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1062 if(width&1)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1063 b[2*x ]= temp[x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1064 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1065
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1066 static void vertical_compose53iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1067 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1068
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1069 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1070 b1[i] += (b0[i] + b2[i])>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1071 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1072 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1073
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1074 static void vertical_compose53iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1075 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1076
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1077 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1078 b1[i] -= (b0[i] + b2[i] + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1079 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1080 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1081
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1082 static void spatial_compose53i_buffered_init(DWTCompose *cs, slice_buffer * sb, int height, int stride_line){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1083 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
1084 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
1085 cs->y = -1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1086 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1087
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1088 static void spatial_compose53i_init(DWTCompose *cs, IDWTELEM *buffer, int height, int stride){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1089 cs->b0 = buffer + mirror(-1-1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1090 cs->b1 = buffer + mirror(-1 , height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1091 cs->y = -1;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1092 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1093
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1094 static void spatial_compose53i_dy_buffered(DWTCompose *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
1095 int y= cs->y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1096
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1097 IDWTELEM *b0= cs->b0;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1098 IDWTELEM *b1= cs->b1;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1099 IDWTELEM *b2= slice_buffer_get_line(sb, mirror(y+1, height-1) * stride_line);
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1100 IDWTELEM *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
1101
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1102 if(y+1<(unsigned)height) vertical_compose53iL0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1103 if(y+0<(unsigned)height) vertical_compose53iH0(b0, b1, b2, width);
6405
7f615bfc21a2 Remove START_TIMER and STOP_TIMER macros.
diego
parents: 6402
diff changeset
1104
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1105 if(y-1<(unsigned)height) horizontal_compose53i(b0, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1106 if(y+0<(unsigned)height) horizontal_compose53i(b1, width);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1107
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1108 cs->b0 = b2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1109 cs->b1 = b3;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1110 cs->y += 2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1111 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1112
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1113 static void spatial_compose53i_dy(DWTCompose *cs, IDWTELEM *buffer, int width, int height, int stride){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1114 int y= cs->y;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1115 IDWTELEM *b0= cs->b0;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1116 IDWTELEM *b1= cs->b1;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1117 IDWTELEM *b2= buffer + mirror(y+1, height-1)*stride;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1118 IDWTELEM *b3= buffer + mirror(y+2, height-1)*stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1119
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1120 if(y+1<(unsigned)height) vertical_compose53iL0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1121 if(y+0<(unsigned)height) vertical_compose53iH0(b0, b1, b2, width);
6405
7f615bfc21a2 Remove START_TIMER and STOP_TIMER macros.
diego
parents: 6402
diff changeset
1122
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1123 if(y-1<(unsigned)height) horizontal_compose53i(b0, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1124 if(y+0<(unsigned)height) horizontal_compose53i(b1, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1125
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1126 cs->b0 = b2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1127 cs->b1 = b3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1128 cs->y += 2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1129 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1130
5989
382aa8b243c5 prevent warnings about functions being possibly unused
michael
parents: 5988
diff changeset
1131 static void av_unused spatial_compose53i(IDWTELEM *buffer, int width, int height, int stride){
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1132 DWTCompose cs;
5988
919193c63fb8 thank you for your efforts to keep my code clean, but i would like to
michael
parents: 5934
diff changeset
1133 spatial_compose53i_init(&cs, buffer, height, stride);
919193c63fb8 thank you for your efforts to keep my code clean, but i would like to
michael
parents: 5934
diff changeset
1134 while(cs.y <= height)
919193c63fb8 thank you for your efforts to keep my code clean, but i would like to
michael
parents: 5934
diff changeset
1135 spatial_compose53i_dy(&cs, buffer, width, height, stride);
919193c63fb8 thank you for your efforts to keep my code clean, but i would like to
michael
parents: 5934
diff changeset
1136 }
919193c63fb8 thank you for your efforts to keep my code clean, but i would like to
michael
parents: 5934
diff changeset
1137
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1138
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1139 void ff_snow_horizontal_compose97i(IDWTELEM *b, int width){
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1140 IDWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1141 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1142
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1143 inv_lift (temp , b , b +w2, 1, 1, 1, width, W_DM, W_DO, W_DS, 0, 1);
5589
946c2db0a093 cleanup (remove some old experimentation related code)
michael
parents: 5588
diff changeset
1144 inv_lift (temp+w2, b +w2, temp , 1, 1, 1, width, W_CM, W_CO, W_CS, 1, 1);
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1145 inv_liftS(b , temp , temp+w2, 2, 1, 1, width, W_BM, W_BO, W_BS, 0, 1);
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1146 inv_lift (b+1 , temp+w2, b , 2, 1, 2, width, W_AM, W_AO, W_AS, 1, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1147 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1148
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1149 static void vertical_compose97iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1150 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1151
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1152 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1153 b1[i] += (W_AM*(b0[i] + b2[i])+W_AO)>>W_AS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1154 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1155 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1156
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1157 static void vertical_compose97iH1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1158 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1159
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1160 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1161 b1[i] -= (W_CM*(b0[i] + b2[i])+W_CO)>>W_CS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1162 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1163 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1164
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1165 static void vertical_compose97iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1166 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1167
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1168 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
1169 #ifdef liftS
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1170 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
1171 #else
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1172 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
1173 #endif
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1174 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1175 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1176
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1177 static void vertical_compose97iL1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1178 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1179
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1180 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1181 b1[i] -= (W_DM*(b0[i] + b2[i])+W_DO)>>W_DS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1182 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1183 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1184
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1185 void ff_snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, int width){
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1186 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1187
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1188 for(i=0; i<width; i++){
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1189 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
1190 b3[i] -= (W_CM*(b2[i] + b4[i])+W_CO)>>W_CS;
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1191 #ifdef liftS
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1192 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
1193 #else
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1194 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
1195 #endif
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1196 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
1197 }
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1198 }
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1199
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1200 static void spatial_compose97i_buffered_init(DWTCompose *cs, slice_buffer * sb, int height, int stride_line){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1201 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
1202 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
1203 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
1204 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
1205 cs->y = -3;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1206 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1207
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1208 static void spatial_compose97i_init(DWTCompose *cs, IDWTELEM *buffer, int height, int stride){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1209 cs->b0 = buffer + mirror(-3-1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1210 cs->b1 = buffer + mirror(-3 , height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1211 cs->b2 = buffer + mirror(-3+1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1212 cs->b3 = buffer + mirror(-3+2, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1213 cs->y = -3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1214 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1215
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1216 static void spatial_compose97i_dy_buffered(DSPContext *dsp, DWTCompose *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
1217 int y = cs->y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1218
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1219 IDWTELEM *b0= cs->b0;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1220 IDWTELEM *b1= cs->b1;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1221 IDWTELEM *b2= cs->b2;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1222 IDWTELEM *b3= cs->b3;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1223 IDWTELEM *b4= slice_buffer_get_line(sb, mirror(y + 3, height - 1) * stride_line);
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1224 IDWTELEM *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
1225
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1226 if(y>0 && y+4<height){
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1227 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
1228 }else{
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1229 if(y+3<(unsigned)height) vertical_compose97iL1(b3, b4, b5, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1230 if(y+2<(unsigned)height) vertical_compose97iH1(b2, b3, b4, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1231 if(y+1<(unsigned)height) vertical_compose97iL0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1232 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
1233 }
6405
7f615bfc21a2 Remove START_TIMER and STOP_TIMER macros.
diego
parents: 6402
diff changeset
1234
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1235 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
1236 if(y+0<(unsigned)height) dsp->horizontal_compose97i(b1, width);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1237
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1238 cs->b0=b2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1239 cs->b1=b3;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1240 cs->b2=b4;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1241 cs->b3=b5;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1242 cs->y += 2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1243 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1244
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1245 static void spatial_compose97i_dy(DWTCompose *cs, IDWTELEM *buffer, int width, int height, int stride){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1246 int y = cs->y;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1247 IDWTELEM *b0= cs->b0;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1248 IDWTELEM *b1= cs->b1;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1249 IDWTELEM *b2= cs->b2;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1250 IDWTELEM *b3= cs->b3;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1251 IDWTELEM *b4= buffer + mirror(y+3, height-1)*stride;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1252 IDWTELEM *b5= buffer + mirror(y+4, height-1)*stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1253
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1254 if(y+3<(unsigned)height) vertical_compose97iL1(b3, b4, b5, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1255 if(y+2<(unsigned)height) vertical_compose97iH1(b2, b3, b4, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1256 if(y+1<(unsigned)height) vertical_compose97iL0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1257 if(y+0<(unsigned)height) vertical_compose97iH0(b0, b1, b2, width);
6405
7f615bfc21a2 Remove START_TIMER and STOP_TIMER macros.
diego
parents: 6402
diff changeset
1258
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1259 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
1260 if(y+0<(unsigned)height) ff_snow_horizontal_compose97i(b1, width);
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1261
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1262 cs->b0=b2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1263 cs->b1=b3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1264 cs->b2=b4;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1265 cs->b3=b5;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1266 cs->y += 2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1267 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1268
5989
382aa8b243c5 prevent warnings about functions being possibly unused
michael
parents: 5988
diff changeset
1269 static void av_unused spatial_compose97i(IDWTELEM *buffer, int width, int height, int stride){
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1270 DWTCompose cs;
5988
919193c63fb8 thank you for your efforts to keep my code clean, but i would like to
michael
parents: 5934
diff changeset
1271 spatial_compose97i_init(&cs, buffer, height, stride);
919193c63fb8 thank you for your efforts to keep my code clean, but i would like to
michael
parents: 5934
diff changeset
1272 while(cs.y <= height)
919193c63fb8 thank you for your efforts to keep my code clean, but i would like to
michael
parents: 5934
diff changeset
1273 spatial_compose97i_dy(&cs, buffer, width, height, stride);
919193c63fb8 thank you for your efforts to keep my code clean, but i would like to
michael
parents: 5934
diff changeset
1274 }
919193c63fb8 thank you for your efforts to keep my code clean, but i would like to
michael
parents: 5934
diff changeset
1275
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1276 static void ff_spatial_idwt_buffered_init(DWTCompose *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
1277 int level;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1278 for(level=decomposition_count-1; level>=0; level--){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1279 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1280 case DWT_97: spatial_compose97i_buffered_init(cs+level, sb, height>>level, stride_line<<level); break;
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1281 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
1282 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1283 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1284 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1285
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1286 static void ff_spatial_idwt_init(DWTCompose *cs, IDWTELEM *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
1287 int level;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1288 for(level=decomposition_count-1; level>=0; level--){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1289 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1290 case DWT_97: spatial_compose97i_init(cs+level, buffer, height>>level, stride<<level); break;
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1291 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
1292 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1293 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1294 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1295
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1296 static void ff_spatial_idwt_slice(DWTCompose *cs, IDWTELEM *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
1297 const int support = type==1 ? 3 : 5;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1298 int level;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1299 if(type==2) return;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1300
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1301 for(level=decomposition_count-1; level>=0; level--){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1302 while(cs[level].y <= FFMIN((y>>level)+support, height>>level)){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1303 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1304 case DWT_97: spatial_compose97i_dy(cs+level, buffer, width>>level, height>>level, stride<<level);
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
1305 break;
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1306 case DWT_53: spatial_compose53i_dy(cs+level, buffer, width>>level, height>>level, stride<<level);
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
1307 break;
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1308 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1309 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1310 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1311 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1312
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1313 static void ff_spatial_idwt_buffered_slice(DSPContext *dsp, DWTCompose *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
1314 const int support = type==1 ? 3 : 5;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1315 int level;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1316 if(type==2) return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1317
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1318 for(level=decomposition_count-1; level>=0; level--){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1319 while(cs[level].y <= FFMIN((y>>level)+support, height>>level)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1320 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1321 case DWT_97: spatial_compose97i_dy_buffered(dsp, cs+level, slice_buf, width>>level, height>>level, stride_line<<level);
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
1322 break;
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1323 case DWT_53: spatial_compose53i_dy_buffered(cs+level, slice_buf, width>>level, height>>level, stride_line<<level);
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
1324 break;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1325 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1326 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1327 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1328 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1329
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1330 static void ff_spatial_idwt(IDWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count){
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1331 DWTCompose cs[MAX_DECOMPOSITIONS];
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1332 int y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1333 ff_spatial_idwt_init(cs, buffer, width, height, stride, type, decomposition_count);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1334 for(y=0; y<height; y+=4)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1335 ff_spatial_idwt_slice(cs, buffer, width, height, stride, type, decomposition_count, y);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1336 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1337
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1338 static int encode_subband_c0run(SnowContext *s, SubBand *b, IDWTELEM *src, IDWTELEM *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
1339 const int w= b->width;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1340 const int h= b->height;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1341 int x, y;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1342
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1343 if(1){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1344 int run=0;
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1345 int runs[w*h];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1346 int run_index=0;
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1347 int max_index;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1348
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1349 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1350 for(x=0; x<w; x++){
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1351 int v, p=0;
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1352 int /*ll=0, */l=0, lt=0, t=0, rt=0;
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1353 v= src[x + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1354
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1355 if(y){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1356 t= src[x + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1357 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1358 lt= src[x - 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1359 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1360 if(x + 1 < w){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1361 rt= src[x + 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1362 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1363 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1364 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1365 l= src[x - 1 + y*stride];
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1366 /*if(x > 1){
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1367 if(orientation==1) ll= src[y + (x-2)*stride];
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1368 else ll= src[x - 2 + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1369 }*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1370 }
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1371 if(parent){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1372 int px= x>>1;
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1373 int py= y>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1374 if(px<b->parent->width && py<b->parent->height)
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1375 p= parent[px + py*2*stride];
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1376 }
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1377 if(!(/*ll|*/l|lt|t|rt|p)){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1378 if(v){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1379 runs[run_index++]= run;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1380 run=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1381 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1382 run++;
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 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1386 }
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1387 max_index= run_index;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1388 runs[run_index++]= run;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1389 run_index=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1390 run= runs[run_index++];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1391
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1392 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
1393 if(run_index <= max_index)
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1394 put_symbol2(&s->c, b->state[1], run, 3);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1395
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1396 for(y=0; y<h; y++){
2435
c89ac0e70c66 10l patch by (matthieu castet <castet.matthieu free fr>)
michael
parents: 2422
diff changeset
1397 if(s->c.bytestream_end - s->c.bytestream < w*40){
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1398 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1399 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1400 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1401 for(x=0; x<w; x++){
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1402 int v, p=0;
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1403 int /*ll=0, */l=0, lt=0, t=0, rt=0;
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1404 v= src[x + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1405
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1406 if(y){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1407 t= src[x + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1408 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1409 lt= src[x - 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1410 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1411 if(x + 1 < w){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1412 rt= src[x + 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1413 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1414 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1415 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1416 l= src[x - 1 + y*stride];
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1417 /*if(x > 1){
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1418 if(orientation==1) ll= src[y + (x-2)*stride];
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1419 else ll= src[x - 2 + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1420 }*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1421 }
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1422 if(parent){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1423 int px= x>>1;
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1424 int py= y>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1425 if(px<b->parent->width && py<b->parent->height)
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1426 p= parent[px + py*2*stride];
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1427 }
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1428 if(/*ll|*/l|lt|t|rt|p){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1429 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
1430
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1431 put_rac(&s->c, &b->state[0][context], !!v);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1432 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1433 if(!run){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1434 run= runs[run_index++];
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1435
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1436 if(run_index <= max_index)
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1437 put_symbol2(&s->c, b->state[1], run, 3);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1438 assert(v);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1439 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1440 run--;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1441 assert(!v);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1442 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1443 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1444 if(v){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1445 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
1446 int l2= 2*FFABS(l) + (l<0);
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1447 int t2= 2*FFABS(t) + (t<0);
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1448
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1449 put_symbol2(&s->c, b->state[context + 2], FFABS(v)-1, context-4);
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1450 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
1451 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1452 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1453 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1454 }
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1455 return 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1456 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1457
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1458 static int encode_subband(SnowContext *s, SubBand *b, IDWTELEM *src, IDWTELEM *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
1459 // 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
1460 // encode_subband_z0run(s, b, src, parent, stride, orientation);
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1461 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
1462 // 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
1463 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1464
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1465 static inline void unpack_coeffs(SnowContext *s, SubBand *b, SubBand * parent, int orientation){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1466 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1467 const int h= b->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1468 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1469
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1470 if(1){
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1471 int run, runs;
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1472 x_and_coeff *xc= b->x_coeff;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1473 x_and_coeff *prev_xc= NULL;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1474 x_and_coeff *prev2_xc= xc;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1475 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
1476 x_and_coeff *prev_parent_xc= parent_xc;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1477
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1478 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
1479 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
1480 else run= INT_MAX;
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1481
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1482 for(y=0; y<h; y++){
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1483 int v=0;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1484 int lt=0, t=0, rt=0;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1485
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1486 if(y && prev_xc->x == 0){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1487 rt= prev_xc->coeff;
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1488 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1489 for(x=0; x<w; x++){
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1490 int p=0;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1491 const int l= v;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1492
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1493 lt= t; t= rt;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1494
2194
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1495 if(y){
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1496 if(prev_xc->x <= x)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1497 prev_xc++;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1498 if(prev_xc->x == x + 1)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1499 rt= prev_xc->coeff;
2194
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1500 else
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1501 rt=0;
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1502 }
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1503 if(parent_xc){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1504 if(x>>1 > parent_xc->x){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1505 parent_xc++;
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1506 }
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1507 if(x>>1 == parent_xc->x){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1508 p= parent_xc->coeff;
2194
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1509 }
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1510 }
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1511 if(/*ll|*/l|lt|t|rt|p){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1512 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
1513
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1514 v=get_rac(&s->c, &b->state[0][context]);
2605
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1515 if(v){
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1516 v= 2*(get_symbol2(&s->c, b->state[context + 2], context-4) + 1);
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1517 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
1518
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1519 xc->x=x;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1520 (xc++)->coeff= v;
2605
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1521 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1522 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1523 if(!run){
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1524 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
1525 else run= INT_MAX;
2605
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1526 v= 2*(get_symbol2(&s->c, b->state[0 + 2], 0-4) + 1);
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1527 v+=get_rac(&s->c, &b->state[0][16 + 1 + 3]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1528
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1529 xc->x=x;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1530 (xc++)->coeff= v;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1531 }else{
2606
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1532 int max_run;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1533 run--;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1534 v=0;
2191
44afbcec70b8 50% faster decode_subband()
michael
parents: 2189
diff changeset
1535
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1536 if(y) max_run= FFMIN(run, prev_xc->x - x - 2);
2606
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1537 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
1538 if(parent_xc)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1539 max_run= FFMIN(max_run, 2*parent_xc->x - x - 1);
2606
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1540 x+= max_run;
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1541 run-= max_run;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1542 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1543 }
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1544 }
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1545 (xc++)->x= w+1; //end marker
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1546 prev_xc= prev2_xc;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1547 prev2_xc= xc;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1548
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1549 if(parent_xc){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1550 if(y&1){
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1551 while(parent_xc->x != parent->width+1)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1552 parent_xc++;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1553 parent_xc++;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1554 prev_parent_xc= parent_xc;
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1555 }else{
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1556 parent_xc= prev_parent_xc;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1557 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1558 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1559 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1560
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1561 (xc++)->x= w+1; //end marker
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1562 }
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 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
1566 const int w= b->width;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1567 int y;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4588
diff changeset
1568 const int qlog= av_clip(s->qlog + b->qlog, 0, QROOT*16);
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
1569 int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1570 int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1571 int new_index = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1572
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1573 if(b->ibuf == s->spatial_idwt_buffer || s->qlog == LOSSLESS_QLOG){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1574 qadd= 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1575 qmul= 1<<QEXPSHIFT;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1576 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1577
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1578 /* 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
1579 if (start_y != 0)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1580 new_index = save_state[0];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1581
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1582
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1583 for(y=start_y; y<h; y++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1584 int x = 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1585 int v;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1586 IDWTELEM * line = slice_buffer_get_line(sb, y * b->stride_line + b->buf_y_offset) + b->buf_x_offset;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1587 memset(line, 0, b->width*sizeof(IDWTELEM));
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1588 v = b->x_coeff[new_index].coeff;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1589 x = b->x_coeff[new_index++].x;
6474
e6995f3fbf7f cosmetics: Normalize {} placement after for, while, if.
diego
parents: 6437
diff changeset
1590 while(x < w){
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1591 register int t= ( (v>>1)*qmul + qadd)>>QEXPSHIFT;
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1592 register int u= -(v&1);
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1593 line[x] = (t^u) - u;
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1594
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1595 v = b->x_coeff[new_index].coeff;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1596 x = b->x_coeff[new_index++].x;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1597 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1598 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1599
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1600 /* Save our variables for the next slice. */
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1601 save_state[0] = new_index;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1602
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1603 return;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1604 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1605
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
1606 static void reset_contexts(SnowContext *s){ //FIXME better initial contexts
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1607 int plane_index, level, orientation;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1608
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
1609 for(plane_index=0; plane_index<3; plane_index++){
5665
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
1610 for(level=0; level<MAX_DECOMPOSITIONS; level++){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1611 for(orientation=level ? 1:0; orientation<4; orientation++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1612 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
1613 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1614 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1615 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1616 memset(s->header_state, MID_STATE, sizeof(s->header_state));
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1617 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
1618 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1619
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1620 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
1621 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
1622 int h= -((-s->avctx->height)>>LOG2_MB_SIZE);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1623
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
1624 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
1625 s->b_height= h;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1626
9370
25fa07ef8e2b Make sure the block array is of the correct size.
michael
parents: 9369
diff changeset
1627 av_free(s->block);
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
1628 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
1629 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
1630 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1631
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1632 static inline void copy_rac_state(RangeCoder *d, RangeCoder *s){
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1633 uint8_t *bytestream= d->bytestream;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1634 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
1635 *d= *s;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1636 d->bytestream= bytestream;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1637 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
1638 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1639
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1640 //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
1641 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
1642 {
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1643 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
1644
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1645 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
1646 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
1647 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
1648 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
1649 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
1650 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1651 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
1652 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1653 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
1654 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1655
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1656 //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
1657 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
1658 {
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1659 int s, i, j;
4179
46d38e3d7038 rename squareTbl -> ff_squareTbl
mru
parents: 4123
diff changeset
1660 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
1661
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1662 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
1663 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
1664 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
1665 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
1666 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
1667 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1668 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
1669 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1670 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
1671 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1672
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1673 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
1674 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
1675 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
1676 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
1677 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
1678 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
1679 int i,j;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1680
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
1681 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
1682 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
1683 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
1684 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
1685 block.my= my;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1686 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
1687 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
1688 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
1689
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1690 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
1691 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
1692 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
1693 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1694 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1695 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1696
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1697 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
1698 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
1699 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
1700 ((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
1701 ((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
1702 };
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1703 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
1704 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
1705 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
1706 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
1707 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1708 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
1709 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1710
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1711 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
1712 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
1713 if(s->ref_frames == 1){
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1714 *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
1715 *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
1716 }else{
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1717 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
1718 *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
1719 (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
1720 (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
1721 *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
1722 (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
1723 (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
1724 }
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1725 }
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1726
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
1727 //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
1728 #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
1729 #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
1730 #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
1731 #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
1732 #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
1733 #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
1734
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1735 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
1736 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
1737 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
1738 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
1739 uint8_t i_state[sizeof(s->block_state)];
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1740 RangeCoder pc, ic;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1741 uint8_t *pbbak= s->c.bytestream;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1742 uint8_t *pbbak_start= s->c.bytestream_start;
5082
176ac8353f48 fix assertion failure
michael
parents: 4962
diff changeset
1743 int score, score2, iscore, i_len, p_len, block_s, sum, base_bits;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1744 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
1745 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
1746 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
1747 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
1748 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
1749 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
1750 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
1751 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
1752 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
1753 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
1754 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
1755 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
1756 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
1757 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
1758 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
1759 int pcr= left->color[2];
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1760 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
1761 int mx=0, my=0;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1762 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
1763 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
1764 const int uvstride= s->current_picture.linesize[1];
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1765 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
1766 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
1767 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
1768 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
1769 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
1770 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
1771 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
1772 MotionEstContext *c= &s->m.me;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1773 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
1774 int mx_context= av_log2(2*FFABS(left->mx - top->mx));
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1775 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
1776 int s_context= 2*left->level + 2*top->level + tl->level + tr->level;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1777 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
1778
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1779 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
1780 if(s->keyframe){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1781 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
1782 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
1783 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1784
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1785 // 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
1786
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1787 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
1788 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
1789 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
1790 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
1791 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
1792 P_TOPRIGHT[1]= tr->my;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1793
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
1794 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
1795 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
1796 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
1797 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
1798 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
1799 last_mv[2][1]= bottom->my;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1800
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
1801 s->m.mb_stride=2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1802 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
1803 s->m.mb_y= 0;
4360
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
1804 c->skip= 0;
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
1805
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
1806 assert(c-> stride == stride);
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
1807 assert(c->uvstride == uvstride);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1808
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
1809 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
1810 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
1811 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
1812 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
1813
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
1814 c->xmin = - x*block_w - 16+2;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
1815 c->ymin = - y*block_w - 16+2;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
1816 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
1817 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
1818
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1819 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
1820 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
1821 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
1822 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
1823 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
1824 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
1825 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
1826
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1827 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
1828 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
1829
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1830 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
1831 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
1832 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
1833 } 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
1834 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
1835 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
1836 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1837
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1838 score= INT_MAX;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1839 best_ref= 0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1840 for(ref=0; ref<s->ref_frames; ref++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1841 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
1842
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1843 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
1844 (1<<16)>>shift, level-LOG2_MB_SIZE+4, block_w);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1845
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1846 assert(ref_mx >= c->xmin);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1847 assert(ref_mx <= c->xmax);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1848 assert(ref_my >= c->ymin);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1849 assert(ref_my <= c->ymax);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1850
4360
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
1851 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
1852 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
1853 ref_score+= 2*av_log2(2*ref)*c->penalty_factor;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1854 if(s->ref_mvs[ref]){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1855 s->ref_mvs[ref][index][0]= ref_mx;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1856 s->ref_mvs[ref][index][1]= ref_my;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1857 s->ref_scores[ref][index]= ref_score;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1858 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1859 if(score > ref_score){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1860 score= ref_score;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1861 best_ref= ref;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1862 mx= ref_mx;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1863 my= ref_my;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1864 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1865 }
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5085
diff changeset
1866 //FIXME if mb_cmp != SSE then intra cannot be compared currently and mb_penalty vs. lambda2
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1867
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 // subpel search
5085
81bbca75ae2f fix assert() 2nd try
michael
parents: 5082
diff changeset
1869 base_bits= get_rac_count(&s->c) - 8*(s->c.bytestream - s->c.bytestream_start);
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1870 pc= s->c;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1871 pc.bytestream_start=
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1872 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
1873 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
1874
70b27300a496 quad 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 if(level!=s->block_max_depth)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1876 put_rac(&pc, &p_state[4 + s_context], 1);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1877 put_rac(&pc, &p_state[1 + left->type + top->type], 0);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1878 if(s->ref_frames > 1)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1879 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
1880 pred_mv(s, &pmx, &pmy, best_ref, left, top, tr);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1881 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
1882 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
1883 p_len= pc.bytestream - pc.bytestream_start;
5082
176ac8353f48 fix assertion failure
michael
parents: 4962
diff changeset
1884 score += (s->lambda2*(get_rac_count(&pc)-base_bits))>>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
1885
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1886 block_s= block_w*block_w;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1887 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
1888 l= (sum + block_s/2)/block_s;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1889 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
1890
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
1891 block_s= block_w*block_w>>2;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1892 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
1893 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
1894 // 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
1895 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
1896 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
1897 // 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
1898
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1899 ic= s->c;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1900 ic.bytestream_start=
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1901 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
1902 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
1903 if(level!=s->block_max_depth)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1904 put_rac(&ic, &i_state[4 + s_context], 1);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1905 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
1906 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
1907 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
1908 put_symbol(&ic, &i_state[96], cr-pcr, 1);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1909 i_len= ic.bytestream - ic.bytestream_start;
5082
176ac8353f48 fix assertion failure
michael
parents: 4962
diff changeset
1910 iscore += (s->lambda2*(get_rac_count(&ic)-base_bits))>>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
1911
70b27300a496 quad 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 // 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
1913 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
1914 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
1915 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
1916 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
1917
70b27300a496 quad 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 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
1919 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
1920 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
1921 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
1922 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
1923 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
1924 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
1925 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1926
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
1927 if(level!=s->block_max_depth){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1928 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
1929 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
1930 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
1931 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
1932 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
1933 score2+= s->lambda2>>FF_LAMBDA_SHIFT; //FIXME exact split overhead
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1934
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
1935 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
1936 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
1937 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1938
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
1939 if(iscore < score){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1940 pred_mv(s, &pmx, &pmy, 0, left, top, tr);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1941 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
1942 s->c= ic;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1943 s->c.bytestream_start= pbbak_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1944 s->c.bytestream= pbbak + i_len;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1945 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
1946 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
1947 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
1948 }else{
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1949 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
1950 s->c= pc;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1951 s->c.bytestream_start= pbbak_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1952 s->c.bytestream= pbbak + p_len;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1953 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
1954 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
1955 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
1956 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1957 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1958
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
1959 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
1960 if((a->type&BLOCK_INTRA) && (b->type&BLOCK_INTRA)){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1961 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
1962 }else{
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1963 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
1964 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1965 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1966
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1967 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
1968 const int w= s->b_width << s->block_max_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1969 const int rem_depth= s->block_max_depth - level;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1970 const int index= (x + y*w) << rem_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1971 int trx= (x+1)<<rem_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1972 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
1973 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
1974 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
1975 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
1976 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
1977 int pl = left->color[0];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1978 int pcb= left->color[1];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1979 int pcr= left->color[2];
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1980 int pmx, pmy;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1981 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
1982 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
1983 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
1984 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
1985
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1986 if(s->keyframe){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1987 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
1988 return;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1989 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1990
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1991 if(level!=s->block_max_depth){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1992 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
1993 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
1994 }else{
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1995 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
1996 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
1997 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
1998 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
1999 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
2000 return;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2001 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2002 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2003 if(b->type & BLOCK_INTRA){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2004 pred_mv(s, &pmx, &pmy, 0, left, top, tr);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2005 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
2006 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
2007 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
2008 put_symbol(&s->c, &s->block_state[96], b->color[2]-pcr, 1);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2009 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
2010 }else{
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2011 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
2012 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
2013 if(s->ref_frames > 1)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2014 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
2015 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
2016 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
2017 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
2018 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2019 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2020
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
2021 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
2022 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
2023 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
2024 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
2025 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
2026 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
2027 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
2028 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
2029 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
2030 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
2031
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
2032 if(s->keyframe){
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2033 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
2034 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
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
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2037 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
2038 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
2039 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
2040 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
2041 int cr= left->color[2];
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2042 int ref = 0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2043 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
2044 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
2045 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
2046
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2047 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
2048
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2049 if(type){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2050 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
2051 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
2052 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
2053 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
2054 }else{
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2055 if(s->ref_frames > 1)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2056 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
2057 pred_mv(s, &mx, &my, ref, left, top, tr);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2058 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
2059 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
2060 }
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2061 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
2062 }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
2063 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
2064 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
2065 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
2066 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
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 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2069
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
2070 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
2071 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
2072 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
2073 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
2074
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
2075 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
2076 iterative_me(s);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2077
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
2078 for(y=0; y<h; y++){
2435
c89ac0e70c66 10l patch by (matthieu castet <castet.matthieu free fr>)
michael
parents: 2422
diff changeset
2079 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
2080 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
2081 return;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
2082 }
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
2083 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
2084 if(s->avctx->me_method == ME_ITER || !search)
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2085 encode_q_branch2(s, 0, x, y);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2086 else
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2087 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
2088 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2089 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2090 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2091
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2092 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
2093 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
2094 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
2095 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
2096
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2097 for(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
2098 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
2099 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
2100 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2101 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2102 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2103
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2104 static void mc_block(Plane *p, uint8_t *dst, const uint8_t *src, uint8_t *tmp, int stride, int b_w, int b_h, int dx, int dy){
7622
5a3907818652 cosmetics: s/const static/static const/g
diego
parents: 7129
diff changeset
2105 static const uint8_t weight[64]={
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2106 8,7,6,5,4,3,2,1,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2107 7,7,0,0,0,0,0,1,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2108 6,0,6,0,0,0,2,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2109 5,0,0,5,0,3,0,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2110 4,0,0,0,4,0,0,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2111 3,0,0,5,0,3,0,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2112 2,0,6,0,0,0,2,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2113 1,7,0,0,0,0,0,1,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2114 };
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2115
7622
5a3907818652 cosmetics: s/const static/static const/g
diego
parents: 7129
diff changeset
2116 static const uint8_t brane[256]={
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2117 0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x11,0x12,0x12,0x12,0x12,0x12,0x12,0x12,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2118 0x04,0x05,0xcc,0xcc,0xcc,0xcc,0xcc,0x41,0x15,0x16,0xcc,0xcc,0xcc,0xcc,0xcc,0x52,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2119 0x04,0xcc,0x05,0xcc,0xcc,0xcc,0x41,0xcc,0x15,0xcc,0x16,0xcc,0xcc,0xcc,0x52,0xcc,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2120 0x04,0xcc,0xcc,0x05,0xcc,0x41,0xcc,0xcc,0x15,0xcc,0xcc,0x16,0xcc,0x52,0xcc,0xcc,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2121 0x04,0xcc,0xcc,0xcc,0x41,0xcc,0xcc,0xcc,0x15,0xcc,0xcc,0xcc,0x16,0xcc,0xcc,0xcc,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2122 0x04,0xcc,0xcc,0x41,0xcc,0x05,0xcc,0xcc,0x15,0xcc,0xcc,0x52,0xcc,0x16,0xcc,0xcc,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2123 0x04,0xcc,0x41,0xcc,0xcc,0xcc,0x05,0xcc,0x15,0xcc,0x52,0xcc,0xcc,0xcc,0x16,0xcc,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2124 0x04,0x41,0xcc,0xcc,0xcc,0xcc,0xcc,0x05,0x15,0x52,0xcc,0xcc,0xcc,0xcc,0xcc,0x16,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2125 0x44,0x45,0x45,0x45,0x45,0x45,0x45,0x45,0x55,0x56,0x56,0x56,0x56,0x56,0x56,0x56,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2126 0x48,0x49,0xcc,0xcc,0xcc,0xcc,0xcc,0x85,0x59,0x5A,0xcc,0xcc,0xcc,0xcc,0xcc,0x96,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2127 0x48,0xcc,0x49,0xcc,0xcc,0xcc,0x85,0xcc,0x59,0xcc,0x5A,0xcc,0xcc,0xcc,0x96,0xcc,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2128 0x48,0xcc,0xcc,0x49,0xcc,0x85,0xcc,0xcc,0x59,0xcc,0xcc,0x5A,0xcc,0x96,0xcc,0xcc,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2129 0x48,0xcc,0xcc,0xcc,0x49,0xcc,0xcc,0xcc,0x59,0xcc,0xcc,0xcc,0x96,0xcc,0xcc,0xcc,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2130 0x48,0xcc,0xcc,0x85,0xcc,0x49,0xcc,0xcc,0x59,0xcc,0xcc,0x96,0xcc,0x5A,0xcc,0xcc,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2131 0x48,0xcc,0x85,0xcc,0xcc,0xcc,0x49,0xcc,0x59,0xcc,0x96,0xcc,0xcc,0xcc,0x5A,0xcc,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2132 0x48,0x85,0xcc,0xcc,0xcc,0xcc,0xcc,0x49,0x59,0x96,0xcc,0xcc,0xcc,0xcc,0xcc,0x5A,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2133 };
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2134
7622
5a3907818652 cosmetics: s/const static/static const/g
diego
parents: 7129
diff changeset
2135 static const uint8_t needs[16]={
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2136 0,1,0,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2137 2,4,2,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2138 0,1,0,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2139 15
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2140 };
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2141
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2142 int x, y, b, r, l;
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2143 int16_t tmpIt [64*(32+HTAPS_MAX)];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2144 uint8_t tmp2t[3][stride*(32+HTAPS_MAX)];
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2145 int16_t *tmpI= tmpIt;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2146 uint8_t *tmp2= tmp2t[0];
6205
b329d2bf8ff5 Add const qualifier, fix warnings:
bcoudurier
parents: 6168
diff changeset
2147 const uint8_t *hpel[11];
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2148 assert(dx<16 && dy<16);
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2149 r= brane[dx + 16*dy]&15;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2150 l= brane[dx + 16*dy]>>4;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2151
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2152 b= needs[l] | needs[r];
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2153 if(p && !p->diag_mc)
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2154 b= 15;
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2155
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2156 if(b&5){
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2157 for(y=0; y < b_h+HTAPS_MAX-1; y++){
5649
9fe214a99139 indention
michael
parents: 5648
diff changeset
2158 for(x=0; x < b_w; x++){
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2159 int a_1=src[x + HTAPS_MAX/2-4];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2160 int a0= src[x + HTAPS_MAX/2-3];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2161 int a1= src[x + HTAPS_MAX/2-2];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2162 int a2= src[x + HTAPS_MAX/2-1];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2163 int a3= src[x + HTAPS_MAX/2+0];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2164 int a4= src[x + HTAPS_MAX/2+1];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2165 int a5= src[x + HTAPS_MAX/2+2];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2166 int a6= src[x + HTAPS_MAX/2+3];
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2167 int am=0;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2168 if(!p || p->fast_mc){
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2169 am= 20*(a2+a3) - 5*(a1+a4) + (a0+a5);
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2170 tmpI[x]= am;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2171 am= (am+16)>>5;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2172 }else{
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2173 am= p->hcoeff[0]*(a2+a3) + p->hcoeff[1]*(a1+a4) + p->hcoeff[2]*(a0+a5) + p->hcoeff[3]*(a_1+a6);
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2174 tmpI[x]= am;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2175 am= (am+32)>>6;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2176 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2177
5649
9fe214a99139 indention
michael
parents: 5648
diff changeset
2178 if(am&(~255)) am= ~(am>>31);
9fe214a99139 indention
michael
parents: 5648
diff changeset
2179 tmp2[x]= am;
9fe214a99139 indention
michael
parents: 5648
diff changeset
2180 }
9fe214a99139 indention
michael
parents: 5648
diff changeset
2181 tmpI+= 64;
9fe214a99139 indention
michael
parents: 5648
diff changeset
2182 tmp2+= stride;
9fe214a99139 indention
michael
parents: 5648
diff changeset
2183 src += stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2184 }
5649
9fe214a99139 indention
michael
parents: 5648
diff changeset
2185 src -= stride*y;
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2186 }
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2187 src += HTAPS_MAX/2 - 1;
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2188 tmp2= tmp2t[1];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2189
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2190 if(b&2){
5649
9fe214a99139 indention
michael
parents: 5648
diff changeset
2191 for(y=0; y < b_h; y++){
9fe214a99139 indention
michael
parents: 5648
diff changeset
2192 for(x=0; x < b_w+1; x++){
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2193 int a_1=src[x + (HTAPS_MAX/2-4)*stride];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2194 int a0= src[x + (HTAPS_MAX/2-3)*stride];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2195 int a1= src[x + (HTAPS_MAX/2-2)*stride];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2196 int a2= src[x + (HTAPS_MAX/2-1)*stride];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2197 int a3= src[x + (HTAPS_MAX/2+0)*stride];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2198 int a4= src[x + (HTAPS_MAX/2+1)*stride];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2199 int a5= src[x + (HTAPS_MAX/2+2)*stride];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2200 int a6= src[x + (HTAPS_MAX/2+3)*stride];
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2201 int am=0;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2202 if(!p || p->fast_mc)
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2203 am= (20*(a2+a3) - 5*(a1+a4) + (a0+a5) + 16)>>5;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2204 else
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2205 am= (p->hcoeff[0]*(a2+a3) + p->hcoeff[1]*(a1+a4) + p->hcoeff[2]*(a0+a5) + p->hcoeff[3]*(a_1+a6) + 32)>>6;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2206
5649
9fe214a99139 indention
michael
parents: 5648
diff changeset
2207 if(am&(~255)) am= ~(am>>31);
9fe214a99139 indention
michael
parents: 5648
diff changeset
2208 tmp2[x]= am;
9fe214a99139 indention
michael
parents: 5648
diff changeset
2209 }
9fe214a99139 indention
michael
parents: 5648
diff changeset
2210 src += stride;
9fe214a99139 indention
michael
parents: 5648
diff changeset
2211 tmp2+= stride;
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2212 }
5649
9fe214a99139 indention
michael
parents: 5648
diff changeset
2213 src -= stride*y;
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2214 }
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2215 src += stride*(HTAPS_MAX/2 - 1);
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2216 tmp2= tmp2t[2];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2217 tmpI= tmpIt;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2218 if(b&4){
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2219 for(y=0; y < b_h; y++){
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2220 for(x=0; x < b_w; x++){
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2221 int a_1=tmpI[x + (HTAPS_MAX/2-4)*64];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2222 int a0= tmpI[x + (HTAPS_MAX/2-3)*64];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2223 int a1= tmpI[x + (HTAPS_MAX/2-2)*64];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2224 int a2= tmpI[x + (HTAPS_MAX/2-1)*64];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2225 int a3= tmpI[x + (HTAPS_MAX/2+0)*64];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2226 int a4= tmpI[x + (HTAPS_MAX/2+1)*64];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2227 int a5= tmpI[x + (HTAPS_MAX/2+2)*64];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2228 int a6= tmpI[x + (HTAPS_MAX/2+3)*64];
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2229 int am=0;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2230 if(!p || p->fast_mc)
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2231 am= (20*(a2+a3) - 5*(a1+a4) + (a0+a5) + 512)>>10;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2232 else
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2233 am= (p->hcoeff[0]*(a2+a3) + p->hcoeff[1]*(a1+a4) + p->hcoeff[2]*(a0+a5) + p->hcoeff[3]*(a_1+a6) + 2048)>>12;
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2234 if(am&(~255)) am= ~(am>>31);
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2235 tmp2[x]= am;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2236 }
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2237 tmpI+= 64;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2238 tmp2+= stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2239 }
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2240 }
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2241
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2242 hpel[ 0]= src;
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2243 hpel[ 1]= tmp2t[0] + stride*(HTAPS_MAX/2-1);
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2244 hpel[ 2]= src + 1;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2245
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2246 hpel[ 4]= tmp2t[1];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2247 hpel[ 5]= tmp2t[2];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2248 hpel[ 6]= tmp2t[1] + 1;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2249
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2250 hpel[ 8]= src + stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2251 hpel[ 9]= hpel[1] + stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2252 hpel[10]= hpel[8] + 1;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2253
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2254 if(b==15){
6205
b329d2bf8ff5 Add const qualifier, fix warnings:
bcoudurier
parents: 6168
diff changeset
2255 const uint8_t *src1= hpel[dx/8 + dy/8*4 ];
b329d2bf8ff5 Add const qualifier, fix warnings:
bcoudurier
parents: 6168
diff changeset
2256 const uint8_t *src2= hpel[dx/8 + dy/8*4+1];
b329d2bf8ff5 Add const qualifier, fix warnings:
bcoudurier
parents: 6168
diff changeset
2257 const uint8_t *src3= hpel[dx/8 + dy/8*4+4];
b329d2bf8ff5 Add const qualifier, fix warnings:
bcoudurier
parents: 6168
diff changeset
2258 const uint8_t *src4= hpel[dx/8 + dy/8*4+5];
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2259 dx&=7;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2260 dy&=7;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2261 for(y=0; y < b_h; y++){
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2262 for(x=0; x < b_w; x++){
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2263 dst[x]= ((8-dx)*(8-dy)*src1[x] + dx*(8-dy)*src2[x]+
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2264 (8-dx)* dy *src3[x] + dx* dy *src4[x]+32)>>6;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2265 }
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2266 src1+=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2267 src2+=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2268 src3+=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2269 src4+=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2270 dst +=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2271 }
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2272 }else{
6205
b329d2bf8ff5 Add const qualifier, fix warnings:
bcoudurier
parents: 6168
diff changeset
2273 const uint8_t *src1= hpel[l];
b329d2bf8ff5 Add const qualifier, fix warnings:
bcoudurier
parents: 6168
diff changeset
2274 const uint8_t *src2= hpel[r];
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2275 int a= weight[((dx&7) + (8*(dy&7)))];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2276 int b= 8-a;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2277 for(y=0; y < b_h; y++){
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2278 for(x=0; x < b_w; x++){
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2279 dst[x]= (a*src1[x] + b*src2[x] + 4)>>3;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2280 }
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2281 src1+=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2282 src2+=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2283 dst +=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2284 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2285 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2286 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2287
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2288 #define mca(dx,dy,b_w)\
5254
727a49c28c51 trivial warning fixes
mru
parents: 5224
diff changeset
2289 static void mc_block_hpel ## dx ## dy ## b_w(uint8_t *dst, const uint8_t *src, int stride, int h){\
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2290 uint8_t tmp[stride*(b_w+HTAPS_MAX-1)];\
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2291 assert(h==b_w);\
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2292 mc_block(NULL, dst, src-(HTAPS_MAX/2-1)-(HTAPS_MAX/2-1)*stride, tmp, stride, b_w, b_w, dx, dy);\
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2293 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2294
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2295 mca( 0, 0,16)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2296 mca( 8, 0,16)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2297 mca( 0, 8,16)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2298 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
2299 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
2300 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
2301 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
2302 mca( 8, 8,8)
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2303
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2304 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
2305 if(block->type & BLOCK_INTRA){
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2306 int x, y;
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2307 const int color = block->color[plane_index];
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2308 const int color4= color*0x01010101;
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2309 if(b_w==32){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2310 for(y=0; y < b_h; y++){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2311 *(uint32_t*)&dst[0 + y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2312 *(uint32_t*)&dst[4 + y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2313 *(uint32_t*)&dst[8 + y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2314 *(uint32_t*)&dst[12+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2315 *(uint32_t*)&dst[16+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2316 *(uint32_t*)&dst[20+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2317 *(uint32_t*)&dst[24+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2318 *(uint32_t*)&dst[28+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2319 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2320 }else if(b_w==16){
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2321 for(y=0; y < b_h; y++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2322 *(uint32_t*)&dst[0 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2323 *(uint32_t*)&dst[4 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2324 *(uint32_t*)&dst[8 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2325 *(uint32_t*)&dst[12+ y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2326 }
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2327 }else if(b_w==8){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2328 for(y=0; y < b_h; y++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2329 *(uint32_t*)&dst[0 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2330 *(uint32_t*)&dst[4 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2331 }
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2332 }else if(b_w==4){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2333 for(y=0; y < b_h; y++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2334 *(uint32_t*)&dst[0 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2335 }
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2336 }else{
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2337 for(y=0; y < b_h; y++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2338 for(x=0; x < b_w; x++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2339 dst[x + y*stride]= color;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2340 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2341 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2342 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2343 }else{
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2344 uint8_t *src= s->last_picture[block->ref].data[plane_index];
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2345 const int scale= plane_index ? s->mv_scale : 2*s->mv_scale;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2346 int mx= block->mx*scale;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2347 int my= block->my*scale;
2223
b26474e72d6d use h264 MC code if possible
michael
parents: 2221
diff changeset
2348 const int dx= mx&15;
b26474e72d6d use h264 MC code if possible
michael
parents: 2221
diff changeset
2349 const int dy= my&15;
3020
c75fb0747e74 use h264 MC functions for 2xX Xx2 blocks in snow too
michael
parents: 3018
diff changeset
2350 const int tab_index= 3 - (b_w>>2) + (b_w>>4);
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2351 sx += (mx>>4) - (HTAPS_MAX/2-1);
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2352 sy += (my>>4) - (HTAPS_MAX/2-1);
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2353 src += sx + sy*stride;
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2354 if( (unsigned)sx >= w - b_w - (HTAPS_MAX-2)
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2355 || (unsigned)sy >= h - b_h - (HTAPS_MAX-2)){
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2356 ff_emulated_edge_mc(tmp + MB_SIZE, src, stride, b_w+HTAPS_MAX-1, b_h+HTAPS_MAX-1, sx, sy, w, h);
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2357 src= tmp + MB_SIZE;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2358 }
3189
e1cbe2635325 fix %8 != 0 w/h
michael
parents: 3075
diff changeset
2359 // 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
2360 // assert(!(b_w&(b_w-1)));
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2361 assert(b_w>1 && b_h>1);
6206
ea591bc7522a add parenthesis, fix warning: snow.c:2413: warning: suggest parentheses around && within ||
bcoudurier
parents: 6205
diff changeset
2362 assert((tab_index>=0 && tab_index<4) || b_w==32);
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2363 if((dx&3) || (dy&3) || !(b_w == b_h || 2*b_w == b_h || b_w == 2*b_h) || (b_w&(b_w-1)) || !s->plane[plane_index].fast_mc )
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2364 mc_block(&s->plane[plane_index], 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
2365 else if(b_w==32){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2366 int y;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2367 for(y=0; y<b_h; y+=16){
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2368 s->dsp.put_h264_qpel_pixels_tab[0][dy+(dx>>2)](dst + y*stride, src + 3 + (y+3)*stride,stride);
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2369 s->dsp.put_h264_qpel_pixels_tab[0][dy+(dx>>2)](dst + 16 + y*stride, src + 19 + (y+3)*stride,stride);
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2370 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2371 }else if(b_w==b_h)
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2372 s->dsp.put_h264_qpel_pixels_tab[tab_index ][dy+(dx>>2)](dst,src + 3 + 3*stride,stride);
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2373 else if(b_w==2*b_h){
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2374 s->dsp.put_h264_qpel_pixels_tab[tab_index+1][dy+(dx>>2)](dst ,src + 3 + 3*stride,stride);
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2375 s->dsp.put_h264_qpel_pixels_tab[tab_index+1][dy+(dx>>2)](dst+b_h,src + 3 + b_h + 3*stride,stride);
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2376 }else{
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2377 assert(2*b_w==b_h);
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2378 s->dsp.put_h264_qpel_pixels_tab[tab_index ][dy+(dx>>2)](dst ,src + 3 + 3*stride ,stride);
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2379 s->dsp.put_h264_qpel_pixels_tab[tab_index ][dy+(dx>>2)](dst+b_w*stride,src + 3 + 3*stride+b_w*stride,stride);
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2380 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2381 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2382 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2383
4436
d3e389536b0a Add the const specifier as needed to reduce the number of warnings.
takis
parents: 4409
diff changeset
2384 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
2385 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
2386 int y, x;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2387 IDWTELEM * dst;
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2388 for(y=0; y<b_h; y++){
5409
13d52b7647a0 Ahem, fix typos overlooked in last commit.
diego
parents: 5408
diff changeset
2389 //FIXME ugly misuse of obmc_stride
4436
d3e389536b0a Add the const specifier as needed to reduce the number of warnings.
takis
parents: 4409
diff changeset
2390 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
2391 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
2392 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
2393 const uint8_t *obmc4= obmc3+ (obmc_stride>>1);
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2394 dst = slice_buffer_get_line(sb, src_y + y);
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2395 for(x=0; x<b_w; x++){
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2396 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
2397 +obmc2[x] * block[2][x + y*src_stride]
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2398 +obmc3[x] * block[1][x + y*src_stride]
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2399 +obmc4[x] * block[0][x + y*src_stride];
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2400
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2401 v <<= 8 - LOG2_OBMC_MAX;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2402 if(FRAC_BITS != 8){
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2403 v >>= 8 - FRAC_BITS;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2404 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2405 if(add){
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2406 v += dst[x + src_x];
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2407 v = (v + (1<<(FRAC_BITS-1))) >> FRAC_BITS;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2408 if(v&(~255)) v= ~(v>>31);
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2409 dst8[x + y*src_stride] = v;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2410 }else{
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2411 dst[x + src_x] -= v;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2412 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2413 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2414 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2415 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2416
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
2417 //FIXME name cleanup (b_w, block_w, b_width stuff)
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2418 static av_always_inline void add_yblock(SnowContext *s, int sliced, slice_buffer *sb, IDWTELEM *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
2419 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
2420 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
2421 const int b_stride= b_width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2422 BlockNode *lt= &s->block[b_x + b_y*b_stride];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2423 BlockNode *rt= lt+1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2424 BlockNode *lb= lt+b_stride;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2425 BlockNode *rb= lb+1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2426 uint8_t *block[4];
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2427 int tmp_step= src_stride >= 7*MB_SIZE ? MB_SIZE : MB_SIZE*src_stride;
8214
c5276ad92ff8 snow: move scratch buffer from stack to malloced buffer in context
mru
parents: 7622
diff changeset
2428 uint8_t *tmp = s->scratchbuf;
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2429 uint8_t *ptmp;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2430 int x,y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2431
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2432 if(b_x<0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2433 lt= rt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2434 lb= rb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2435 }else if(b_x + 1 >= b_width){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2436 rt= lt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2437 rb= lb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2438 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2439 if(b_y<0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2440 lt= lb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2441 rt= rb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2442 }else if(b_y + 1 >= b_height){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2443 lb= lt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2444 rb= rt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2445 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2446
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
2447 if(src_x<0){ //FIXME merge with prev & always round internal width up to *16
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2448 obmc -= src_x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2449 b_w += src_x;
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2450 if(!sliced && !offset_dst)
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2451 dst -= src_x;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2452 src_x=0;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2453 }else if(src_x + b_w > w){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2454 b_w = w - src_x;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2455 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2456 if(src_y<0){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2457 obmc -= src_y*obmc_stride;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2458 b_h += src_y;
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2459 if(!sliced && !offset_dst)
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2460 dst -= src_y*dst_stride;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2461 src_y=0;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2462 }else if(src_y + b_h> h){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2463 b_h = h - src_y;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2464 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2465
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2466 if(b_w<=0 || b_h<=0) return;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2467
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2468 assert(src_stride > 2*MB_SIZE + 5);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2469
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2470 if(!sliced && offset_dst)
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2471 dst += src_x + src_y*dst_stride;
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2472 dst8+= src_x + src_y*src_stride;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2473 // src += src_x + src_y*src_stride;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2474
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2475 ptmp= tmp + 3*tmp_step;
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2476 block[0]= ptmp;
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2477 ptmp+=tmp_step;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2478 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
2479
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2480 if(same_block(lt, rt)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2481 block[1]= block[0];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2482 }else{
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2483 block[1]= ptmp;
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2484 ptmp+=tmp_step;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2485 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
2486 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2487
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2488 if(same_block(lt, lb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2489 block[2]= block[0];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2490 }else if(same_block(rt, lb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2491 block[2]= block[1];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2492 }else{
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2493 block[2]= ptmp;
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2494 ptmp+=tmp_step;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2495 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
2496 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2497
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2498 if(same_block(lt, rb) ){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2499 block[3]= block[0];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2500 }else if(same_block(rt, rb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2501 block[3]= block[1];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2502 }else if(same_block(lb, rb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2503 block[3]= block[2];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2504 }else{
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2505 block[3]= ptmp;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2506 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
2507 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2508 #if 0
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2509 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2510 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2511 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
2512 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2513 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2514 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2515 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2516 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2517 uint8_t *obmc2= obmc + (obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2518 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2519 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
2520 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2521 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2522 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2523 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2524 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2525 uint8_t *obmc3= obmc + obmc_stride*(obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2526 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2527 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
2528 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2529 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2530 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2531 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2532 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2533 uint8_t *obmc3= obmc + obmc_stride*(obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2534 uint8_t *obmc4= obmc3+ (obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2535 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2536 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
2537 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2538 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2539 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2540 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2541 #else
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2542 if(sliced){
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2543 s->dsp.inner_add_yblock(obmc, obmc_stride, block, b_w, b_h, src_x,src_y, src_stride, sb, add, dst8);
6475
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2544 }else{
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2545 for(y=0; y<b_h; y++){
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2546 //FIXME ugly misuse of obmc_stride
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2547 const uint8_t *obmc1= obmc + y*obmc_stride;
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2548 const uint8_t *obmc2= obmc1+ (obmc_stride>>1);
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2549 const uint8_t *obmc3= obmc1+ obmc_stride*(obmc_stride>>1);
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2550 const uint8_t *obmc4= obmc3+ (obmc_stride>>1);
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2551 for(x=0; x<b_w; x++){
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2552 int v= obmc1[x] * block[3][x + y*src_stride]
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2553 +obmc2[x] * block[2][x + y*src_stride]
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2554 +obmc3[x] * block[1][x + y*src_stride]
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2555 +obmc4[x] * block[0][x + y*src_stride];
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2556
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2557 v <<= 8 - LOG2_OBMC_MAX;
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2558 if(FRAC_BITS != 8){
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2559 v >>= 8 - FRAC_BITS;
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2560 }
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2561 if(add){
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2562 v += dst[x + y*dst_stride];
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2563 v = (v + (1<<(FRAC_BITS-1))) >> FRAC_BITS;
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2564 if(v&(~255)) v= ~(v>>31);
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2565 dst8[x + y*src_stride] = v;
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2566 }else{
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2567 dst[x + y*dst_stride] -= v;
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2568 }
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2569 }
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2570 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2571 }
5910
85a976d59f17 Add comments to some #endif directives.
diego
parents: 5909
diff changeset
2572 #endif /* 0 */
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2573 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2574
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2575 static av_always_inline void predict_slice_buffered(SnowContext *s, slice_buffer * sb, IDWTELEM * 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
2576 Plane *p= &s->plane[plane_index];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2577 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
2578 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
2579 int x, y, mb_x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2580 int block_size = MB_SIZE >> s->block_max_depth;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2581 int block_w = plane_index ? block_size/2 : block_size;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2582 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
2583 int obmc_stride= plane_index ? block_size : 2*block_size;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2584 int ref_stride= s->current_picture.linesize[plane_index];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2585 uint8_t *dst8= s->current_picture.data[plane_index];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2586 int w= p->width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2587 int h= p->height;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2588
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2589 if(s->keyframe || (s->avctx->debug&512)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2590 if(mb_y==mb_h)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2591 return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2592
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2593 if(add){
6474
e6995f3fbf7f cosmetics: Normalize {} placement after for, while, if.
diego
parents: 6437
diff changeset
2594 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
2595 // DWTELEM * line = slice_buffer_get_line(sb, y);
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2596 IDWTELEM * line = sb->line[y];
6474
e6995f3fbf7f cosmetics: Normalize {} placement after for, while, if.
diego
parents: 6437
diff changeset
2597 for(x=0; x<w; x++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2598 // 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
2599 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
2600 v >>= FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2601 if(v&(~255)) v= ~(v>>31);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2602 dst8[x + y*ref_stride]= v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2603 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2604 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2605 }else{
6474
e6995f3fbf7f cosmetics: Normalize {} placement after for, while, if.
diego
parents: 6437
diff changeset
2606 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
2607 // DWTELEM * line = slice_buffer_get_line(sb, y);
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2608 IDWTELEM * line = sb->line[y];
6474
e6995f3fbf7f cosmetics: Normalize {} placement after for, while, if.
diego
parents: 6437
diff changeset
2609 for(x=0; x<w; x++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2610 line[x] -= 128 << FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2611 // buf[x + y*w]-= 128<<FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2612 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2613 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2614 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2615
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2616 return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2617 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2618
6475
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2619 for(mb_x=0; mb_x<=mb_w; mb_x++){
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2620 add_yblock(s, 1, sb, old_buffer, dst8, obmc,
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2621 block_w*mb_x - block_w/2,
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2622 block_w*mb_y - block_w/2,
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2623 block_w, block_w,
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2624 w, h,
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2625 w, ref_stride, obmc_stride,
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2626 mb_x - 1, mb_y - 1,
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2627 add, 0, plane_index);
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2628 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2629 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2630
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2631 static av_always_inline void predict_slice(SnowContext *s, IDWTELEM *buf, int plane_index, int add, int mb_y){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2632 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
2633 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
2634 const int mb_h= s->b_height << s->block_max_depth;
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2635 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
2636 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
2637 int block_w = plane_index ? block_size/2 : block_size;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2638 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
2639 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
2640 int ref_stride= s->current_picture.linesize[plane_index];
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2641 uint8_t *dst8= s->current_picture.data[plane_index];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2642 int w= p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2643 int h= p->height;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2644
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2645 if(s->keyframe || (s->avctx->debug&512)){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2646 if(mb_y==mb_h)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2647 return;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2648
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2649 if(add){
2604
b7e6c3d31c65 Snow segfault bug in revision 1.43 patch by (Yartrebo /yartrebo earthlink net/)
michael
parents: 2602
diff changeset
2650 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
2651 for(x=0; x<w; x++){
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2652 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
2653 v >>= FRAC_BITS;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2654 if(v&(~255)) v= ~(v>>31);
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2655 dst8[x + y*ref_stride]= v;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2656 }
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2657 }
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2658 }else{
2604
b7e6c3d31c65 Snow segfault bug in revision 1.43 patch by (Yartrebo /yartrebo earthlink net/)
michael
parents: 2602
diff changeset
2659 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
2660 for(x=0; x<w; x++){
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2661 buf[x + y*w]-= 128<<FRAC_BITS;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2662 }
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2663 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2664 }
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2665
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2666 return;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2667 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2668
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2669 for(mb_x=0; mb_x<=mb_w; mb_x++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2670 add_yblock(s, 0, NULL, buf, dst8, obmc,
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2671 block_w*mb_x - block_w/2,
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2672 block_w*mb_y - block_w/2,
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2673 block_w, block_w,
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2674 w, h,
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2675 w, ref_stride, obmc_stride,
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2676 mb_x - 1, mb_y - 1,
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2677 add, 1, plane_index);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2678 }
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2679 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2680
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2681 static av_always_inline void predict_plane(SnowContext *s, IDWTELEM *buf, int plane_index, int add){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2682 const int mb_h= s->b_height << s->block_max_depth;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2683 int mb_y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2684 for(mb_y=0; mb_y<=mb_h; mb_y++)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2685 predict_slice(s, buf, plane_index, add, mb_y);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2686 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2687
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2688 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
2689 int i, x2, y2;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2690 Plane *p= &s->plane[plane_index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2691 const int block_size = MB_SIZE >> s->block_max_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2692 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
2693 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
2694 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
2695 const int ref_stride= s->current_picture.linesize[plane_index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2696 uint8_t *src= s-> input_picture.data[plane_index];
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2697 IDWTELEM *dst= (IDWTELEM*)s->m.obmc_scratchpad + plane_index*block_size*block_size*4; //FIXME change to unsigned
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2698 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
2699 const int w= p->width;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2700 const int h= p->height;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2701 int index= mb_x + mb_y*b_stride;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2702 BlockNode *b= &s->block[index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2703 BlockNode backup= *b;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2704 int ab=0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2705 int aa=0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2706
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2707 b->type|= BLOCK_INTRA;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2708 b->color[plane_index]= 0;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2709 memset(dst, 0, obmc_stride*obmc_stride*sizeof(IDWTELEM));
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2710
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2711 for(i=0; i<4; i++){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2712 int mb_x2= mb_x + (i &1) - 1;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2713 int mb_y2= mb_y + (i>>1) - 1;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2714 int x= block_w*mb_x2 + block_w/2;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2715 int y= block_w*mb_y2 + block_w/2;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2716
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2717 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
2718 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
2719
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2720 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
2721 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
2722 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
2723 int obmc_v= obmc[index];
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2724 int d;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2725 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
2726 if(x<0) obmc_v += obmc[index + block_w];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2727 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
2728 if(x+block_w>w) obmc_v += obmc[index - block_w];
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
2729 //FIXME precalculate this or simplify it somehow else
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2730
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2731 d = -dst[index] + (1<<(FRAC_BITS-1));
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2732 dst[index] = d;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2733 ab += (src[x2 + y2*ref_stride] - (d>>FRAC_BITS)) * obmc_v;
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
2734 aa += obmc_v * obmc_v; //FIXME precalculate this
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2735 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2736 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2737 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2738 *b= backup;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2739
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5085
diff changeset
2740 return av_clip(((ab<<LOG2_OBMC_MAX) + aa/2)/aa, 0, 255); //FIXME we should not need clipping
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2741 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2742
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2743 static inline int get_block_bits(SnowContext *s, int x, int y, int w){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2744 const int b_stride = s->b_width << s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2745 const int b_height = s->b_height<< s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2746 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
2747 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
2748 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
2749 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
2750 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
2751 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
2752 int dmx, dmy;
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2753 // int mx_context= av_log2(2*FFABS(left->mx - top->mx));
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2754 // int my_context= av_log2(2*FFABS(left->my - top->my));
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2755
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2756 if(x<0 || x>=b_stride || y>=b_height)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2757 return 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2758 /*
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2759 1 0 0
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2760 01X 1-2 1
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2761 001XX 3-6 2-3
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2762 0001XXX 7-14 4-7
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2763 00001XXXX 15-30 8-15
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2764 */
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2765 //FIXME try accurate rate
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
2766 //FIXME intra and inter predictors if surrounding blocks are not the same type
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2767 if(b->type & BLOCK_INTRA){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2768 return 3+2*( av_log2(2*FFABS(left->color[0] - b->color[0]))
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2769 + av_log2(2*FFABS(left->color[1] - b->color[1]))
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2770 + 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
2771 }else{
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2772 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
2773 dmx-= b->mx;
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2774 dmy-= b->my;
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2775 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
2776 + av_log2(2*FFABS(dmy))
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2777 + av_log2(2*b->ref));
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2778 }
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2779 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2780
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2781 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
2782 Plane *p= &s->plane[plane_index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2783 const int block_size = MB_SIZE >> s->block_max_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2784 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
2785 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
2786 const int ref_stride= s->current_picture.linesize[plane_index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2787 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
2788 uint8_t *src= s-> input_picture.data[plane_index];
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2789 IDWTELEM *pred= (IDWTELEM*)s->m.obmc_scratchpad + plane_index*block_size*block_size*4;
8214
c5276ad92ff8 snow: move scratch buffer from stack to malloced buffer in context
mru
parents: 7622
diff changeset
2790 uint8_t *cur = s->scratchbuf;
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2791 uint8_t tmp[ref_stride*(2*MB_SIZE+HTAPS_MAX-1)];
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2792 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
2793 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
2794 const int w= p->width;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2795 const int h= p->height;
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2796 int distortion;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2797 int rate= 0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2798 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
2799 int sx= block_w*mb_x - block_w/2;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2800 int sy= block_w*mb_y - block_w/2;
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2801 int x0= FFMAX(0,-sx);
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2802 int y0= FFMAX(0,-sy);
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2803 int x1= FFMIN(block_w*2, w-sx);
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2804 int y1= FFMIN(block_w*2, h-sy);
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2805 int i,x,y;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2806
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2807 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
2808
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2809 for(y=y0; y<y1; y++){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2810 const uint8_t *obmc1= obmc_edged + y*obmc_stride;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2811 const IDWTELEM *pred1 = pred + y*obmc_stride;
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2812 uint8_t *cur1 = cur + y*ref_stride;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2813 uint8_t *dst1 = dst + sx + (sy+y)*ref_stride;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2814 for(x=x0; x<x1; x++){
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2815 #if FRAC_BITS >= LOG2_OBMC_MAX
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2816 int v = (cur1[x] * obmc1[x]) << (FRAC_BITS - LOG2_OBMC_MAX);
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2817 #else
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2818 int v = (cur1[x] * obmc1[x] + (1<<(LOG2_OBMC_MAX - FRAC_BITS-1))) >> (LOG2_OBMC_MAX - FRAC_BITS);
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2819 #endif
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2820 v = (v + pred1[x]) >> FRAC_BITS;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2821 if(v&(~255)) v= ~(v>>31);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2822 dst1[x] = v;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2823 }
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2824 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2825
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2826 /* copy the regions where obmc[] = (uint8_t)256 */
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2827 if(LOG2_OBMC_MAX == 8
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2828 && (mb_x == 0 || mb_x == b_stride-1)
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2829 && (mb_y == 0 || mb_y == b_height-1)){
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2830 if(mb_x == 0)
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2831 x1 = block_w;
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2832 else
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2833 x0 = block_w;
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2834 if(mb_y == 0)
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2835 y1 = block_w;
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2836 else
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2837 y0 = block_w;
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2838 for(y=y0; y<y1; y++)
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2839 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
2840 }
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2841
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2842 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
2843 /* 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
2844 /* FIXME check alignment of the cmp wavelet vs the encoding wavelet */
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
2845 /* FIXME cmps overlap but do not cover the wavelet's whole support.
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
2846 * So improving the score of one block is not strictly guaranteed
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
2847 * to improve the score of the whole frame, thus iterative motion
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
2848 * estimation does not always converge. */
3323
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
2849 if(s->avctx->me_cmp == FF_CMP_W97)
4197
bbe0bc387a19 revert bad checkin
mru
parents: 4196
diff changeset
2850 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
2851 else if(s->avctx->me_cmp == FF_CMP_W53)
4197
bbe0bc387a19 revert bad checkin
mru
parents: 4196
diff changeset
2852 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
2853 else{
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
2854 distortion = 0;
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
2855 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
2856 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
2857 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
2858 }
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2859 }
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2860 }else{
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2861 assert(block_w==8);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2862 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
2863 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2864
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2865 if(plane_index==0){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2866 for(i=0; i<4; i++){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2867 /* ..RRr
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2868 * .RXx.
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2869 * rxx..
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2870 */
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2871 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
2872 }
3057
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
2873 if(mb_x == b_stride-2)
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
2874 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
2875 }
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2876 return distortion + rate*penalty_factor;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2877 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2878
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2879 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
2880 int i, y2;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2881 Plane *p= &s->plane[plane_index];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2882 const int block_size = MB_SIZE >> s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2883 const int block_w = plane_index ? block_size/2 : block_size;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2884 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
2885 const int obmc_stride= plane_index ? block_size : 2*block_size;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2886 const int ref_stride= s->current_picture.linesize[plane_index];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2887 uint8_t *dst= s->current_picture.data[plane_index];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2888 uint8_t *src= s-> input_picture.data[plane_index];
6426
fd74b42a19f4 suppress the second warning
michael
parents: 6414
diff changeset
2889 //FIXME zero_dst is const but add_yblock changes dst if add is 0 (this is never the case for dst=zero_dst
fd74b42a19f4 suppress the second warning
michael
parents: 6414
diff changeset
2890 // const has only been removed from zero_dst to suppress a warning
fd74b42a19f4 suppress the second warning
michael
parents: 6414
diff changeset
2891 static IDWTELEM zero_dst[4096]; //FIXME
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2892 const int b_stride = s->b_width << s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2893 const int w= p->width;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2894 const int h= p->height;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2895 int distortion= 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2896 int rate= 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2897 const int penalty_factor= get_penalty_factor(s->lambda, s->lambda2, s->avctx->me_cmp);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2898
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2899 for(i=0; i<9; i++){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2900 int mb_x2= mb_x + (i%3) - 1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2901 int mb_y2= mb_y + (i/3) - 1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2902 int x= block_w*mb_x2 + block_w/2;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2903 int y= block_w*mb_y2 + block_w/2;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2904
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2905 add_yblock(s, 0, NULL, zero_dst, dst, obmc,
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2906 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
2907
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2908 //FIXME find a cleaner/simpler way to skip the outside stuff
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2909 for(y2= y; y2<0; y2++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2910 memcpy(dst + x + y2*ref_stride, src + x + y2*ref_stride, block_w);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2911 for(y2= h; y2<y+block_w; y2++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2912 memcpy(dst + x + y2*ref_stride, src + x + y2*ref_stride, block_w);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2913 if(x<0){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2914 for(y2= y; y2<y+block_w; y2++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2915 memcpy(dst + x + y2*ref_stride, src + x + y2*ref_stride, -x);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2916 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2917 if(x+block_w > w){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2918 for(y2= y; y2<y+block_w; y2++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2919 memcpy(dst + w + y2*ref_stride, src + w + y2*ref_stride, x+block_w - w);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2920 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2921
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2922 assert(block_w== 8 || block_w==16);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2923 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
2924 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2925
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2926 if(plane_index==0){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2927 BlockNode *b= &s->block[mb_x+mb_y*b_stride];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2928 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
2929
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2930 /* ..RRRr
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2931 * .RXXx.
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2932 * .RXXx.
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2933 * rxxx.
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2934 */
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2935 if(merged)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2936 rate = get_block_bits(s, mb_x, mb_y, 2);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2937 for(i=merged?4:0; i<9; i++){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2938 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
2939 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
2940 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2941 }
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2942 return distortion + rate*penalty_factor;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2943 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2944
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
2945 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
2946 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
2947 BlockNode *block= &s->block[mb_x + mb_y * b_stride];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2948 BlockNode backup= *block;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2949 int rd, index, value;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2950
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2951 assert(mb_x>=0 && mb_y>=0);
2994
michael
parents: 2993
diff changeset
2952 assert(mb_x<b_stride);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2953
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2954 if(intra){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2955 block->color[0] = p[0];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2956 block->color[1] = p[1];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2957 block->color[2] = p[2];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2958 block->type |= BLOCK_INTRA;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2959 }else{
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2960 index= (p[0] + 31*p[1]) & (ME_CACHE_SIZE-1);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2961 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
2962 if(s->me_cache[index] == value)
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2963 return 0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2964 s->me_cache[index]= value;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2965
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2966 block->mx= p[0];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2967 block->my= p[1];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2968 block->type &= ~BLOCK_INTRA;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2969 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2970
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2971 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
2972
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2973 //FIXME chroma
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2974 if(rd < *best_rd){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2975 *best_rd= rd;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2976 return 1;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2977 }else{
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2978 *block= backup;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2979 return 0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2980 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2981 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2982
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
2983 /* special case for int[2] args we discard afterwards,
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
2984 * fixes compilation problem with gcc 2.95 */
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
2985 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
2986 int p[2] = {p0, p1};
3197
8f53630cd24e dont pass intra flag if its always 0
michael
parents: 3194
diff changeset
2987 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
2988 }
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
2989
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
2990 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
2991 const int b_stride= s->b_width << s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2992 BlockNode *block= &s->block[mb_x + mb_y * b_stride];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2993 BlockNode backup[4]= {block[0], block[1], block[b_stride], block[b_stride+1]};
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2994 int rd, index, value;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2995
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2996 assert(mb_x>=0 && mb_y>=0);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2997 assert(mb_x<b_stride);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2998 assert(((mb_x|mb_y)&1) == 0);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2999
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3000 index= (p0 + 31*p1) & (ME_CACHE_SIZE-1);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3001 value= s->me_cache_generation + (p0>>10) + (p1<<6) + (block->ref<<12);
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3002 if(s->me_cache[index] == value)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3003 return 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3004 s->me_cache[index]= value;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3005
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3006 block->mx= p0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3007 block->my= p1;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3008 block->ref= ref;
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3009 block->type &= ~BLOCK_INTRA;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3010 block[1]= block[b_stride]= block[b_stride+1]= *block;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3011
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3012 rd= get_4block_rd(s, mb_x, mb_y, 0);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3013
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3014 //FIXME chroma
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3015 if(rd < *best_rd){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3016 *best_rd= rd;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3017 return 1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3018 }else{
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3019 block[0]= backup[0];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3020 block[1]= backup[1];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3021 block[b_stride]= backup[2];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3022 block[b_stride+1]= backup[3];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3023 return 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3024 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3025 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3026
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3027 static void iterative_me(SnowContext *s){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3028 int pass, mb_x, mb_y;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3029 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
3030 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
3031 const int b_stride= b_width;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3032 int color[3];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3033
3194
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3034 {
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3035 RangeCoder r = s->c;
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3036 uint8_t state[sizeof(s->block_state)];
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3037 memcpy(state, s->block_state, sizeof(s->block_state));
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3038 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
3039 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
3040 encode_q_branch(s, 0, mb_x, mb_y);
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3041 s->c = r;
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3042 memcpy(s->block_state, state, sizeof(s->block_state));
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3043 }
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3044
3323
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3045 for(pass=0; pass<25; pass++){
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3046 int change= 0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3047
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3048 for(mb_y= 0; mb_y<b_height; mb_y++){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3049 for(mb_x= 0; mb_x<b_width; mb_x++){
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3050 int dia_change, i, j, ref;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3051 int best_rd= INT_MAX, ref_rd;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3052 BlockNode backup, ref_b;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3053 const int index= mb_x + mb_y * b_stride;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3054 BlockNode *block= &s->block[index];
3324
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3055 BlockNode *tb = mb_y ? &s->block[index-b_stride ] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3056 BlockNode *lb = mb_x ? &s->block[index -1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3057 BlockNode *rb = mb_x+1<b_width ? &s->block[index +1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3058 BlockNode *bb = mb_y+1<b_height ? &s->block[index+b_stride ] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3059 BlockNode *tlb= mb_x && mb_y ? &s->block[index-b_stride-1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3060 BlockNode *trb= mb_x+1<b_width && mb_y ? &s->block[index-b_stride+1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3061 BlockNode *blb= mb_x && mb_y+1<b_height ? &s->block[index+b_stride-1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3062 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
3063 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
3064 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
3065
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3066 if(pass && (block->type & BLOCK_OPT))
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3067 continue;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3068 block->type |= BLOCK_OPT;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3069
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3070 backup= *block;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3071
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3072 if(!s->me_cache_generation)
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3073 memset(s->me_cache, 0, sizeof(s->me_cache));
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3074 s->me_cache_generation += 1<<22;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3075
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
3076 //FIXME precalculate
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3077 {
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3078 int x, y;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3079 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
3080 if(mb_x==0)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3081 for(y=0; y<b_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3082 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
3083 if(mb_x==b_stride-1)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3084 for(y=0; y<b_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3085 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
3086 if(mb_y==0){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3087 for(x=0; x<b_w*2; x++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3088 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
3089 for(y=1; y<b_w; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3090 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
3091 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3092 if(mb_y==b_height-1){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3093 for(x=0; x<b_w*2; x++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3094 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
3095 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
3096 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
3097 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3098 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3099
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3100 //skip stuff outside the picture
6474
e6995f3fbf7f cosmetics: Normalize {} placement after for, while, if.
diego
parents: 6437
diff changeset
3101 if(mb_x==0 || mb_y==0 || mb_x==b_width-1 || mb_y==b_height-1){
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3102 uint8_t *src= s-> input_picture.data[0];
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3103 uint8_t *dst= s->current_picture.data[0];
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3104 const int stride= s->current_picture.linesize[0];
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3105 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
3106 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
3107 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
3108 const int w= s->plane[0].width;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3109 const int h= s->plane[0].height;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3110 int y;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3111
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3112 for(y=sy; y<0; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3113 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
3114 for(y=h; y<sy+block_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3115 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
3116 if(sx<0){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3117 for(y=sy; y<sy+block_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3118 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
3119 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3120 if(sx+block_w*2 > w){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3121 for(y=sy; y<sy+block_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3122 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
3123 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3124 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3125
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3126 // intra(black) = neighbors' contribution to the current block
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3127 for(i=0; i<3; i++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3128 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
3129
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5085
diff changeset
3130 // get previous score (cannot be cached due to OBMC)
3057
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
3131 if(pass > 0 && (block->type&BLOCK_INTRA)){
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
3132 int color0[3]= {block->color[0], block->color[1], block->color[2]};
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
3133 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
3134 }else
3197
8f53630cd24e dont pass intra flag if its always 0
michael
parents: 3194
diff changeset
3135 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
3136
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3137 ref_b= *block;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3138 ref_rd= best_rd;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3139 for(ref=0; ref < s->ref_frames; ref++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3140 int16_t (*mvr)[2]= &s->ref_mvs[ref][index];
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3141 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
3142 continue;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3143 block->ref= ref;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3144 best_rd= INT_MAX;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3145
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3146 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
3147 check_block_inter(s, mb_x, mb_y, 0, 0, *obmc_edged, &best_rd);
3324
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3148 if(tb)
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3149 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
3150 if(lb)
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3151 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
3152 if(rb)
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3153 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
3154 if(bb)
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3155 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
3156
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3157 /* fullpel ME */
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
3158 //FIXME avoid subpel interpolation / round to nearest integer
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3159 do{
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3160 dia_change=0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3161 for(i=0; i<FFMAX(s->avctx->dia_size, 1); i++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3162 for(j=0; j<i; j++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3163 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
3164 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
3165 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
3166 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
3167 }
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3168 }
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3169 }while(dia_change);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3170 /* subpel ME */
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3171 do{
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3172 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
3173 dia_change=0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3174 for(i=0; i<8; i++)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3175 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
3176 }while(dia_change);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3177 //FIXME or try the standard 2 pass qpel or similar
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3178
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3179 mvr[0][0]= block->mx;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3180 mvr[0][1]= block->my;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3181 if(ref_rd > best_rd){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3182 ref_rd= best_rd;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3183 ref_b= *block;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3184 }
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3185 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3186 best_rd= ref_rd;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3187 *block= ref_b;
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
3188 #if 1
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3189 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
3190 //FIXME RD style color selection
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
3191 #endif
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3192 if(!same_block(block, &backup)){
3324
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3193 if(tb ) tb ->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3194 if(lb ) lb ->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3195 if(rb ) rb ->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3196 if(bb ) bb ->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3197 if(tlb) tlb->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3198 if(trb) trb->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3199 if(blb) blb->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3200 if(brb) brb->type &= ~BLOCK_OPT;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3201 change ++;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3202 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3203 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3204 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3205 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
3206 if(!change)
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3207 break;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3208 }
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3209
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3210 if(s->block_max_depth == 1){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3211 int change= 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3212 for(mb_y= 0; mb_y<b_height; mb_y+=2){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3213 for(mb_x= 0; mb_x<b_width; mb_x+=2){
3324
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3214 int i;
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3215 int best_rd, init_rd;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3216 const int index= mb_x + mb_y * b_stride;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3217 BlockNode *b[4];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3218
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3219 b[0]= &s->block[index];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3220 b[1]= b[0]+1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3221 b[2]= b[0]+b_stride;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3222 b[3]= b[2]+1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3223 if(same_block(b[0], b[1]) &&
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3224 same_block(b[0], b[2]) &&
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3225 same_block(b[0], b[3]))
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3226 continue;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3227
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3228 if(!s->me_cache_generation)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3229 memset(s->me_cache, 0, sizeof(s->me_cache));
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3230 s->me_cache_generation += 1<<22;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3231
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3232 init_rd= best_rd= get_4block_rd(s, mb_x, mb_y, 0);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3233
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3234 //FIXME more multiref search?
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3235 check_4block_inter(s, mb_x, mb_y,
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3236 (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
3237 (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
3238
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3239 for(i=0; i<4; i++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3240 if(!(b[i]->type&BLOCK_INTRA))
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3241 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
3242
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3243 if(init_rd != best_rd)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3244 change++;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3245 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3246 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3247 av_log(NULL, AV_LOG_ERROR, "pass:4mv changed:%d\n", change*4);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3248 }
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3249 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3250
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3251 static void quantize(SnowContext *s, SubBand *b, IDWTELEM *dst, DWTELEM *src, int stride, int bias){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3252 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3253 const int h= b->height;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4588
diff changeset
3254 const int qlog= av_clip(s->qlog + b->qlog, 0, QROOT*16);
5575
a6f5ed050335 use more bits on the encoder side
michael
parents: 5572
diff changeset
3255 const int qmul= qexp[qlog&(QROOT-1)]<<((qlog>>QSHIFT) + ENCODER_EXTRA_BITS);
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3256 int x,y, thres1, thres2;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3257
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3258 if(s->qlog == LOSSLESS_QLOG){
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3259 for(y=0; y<h; y++)
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3260 for(x=0; x<w; x++)
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3261 dst[x + y*stride]= src[x + y*stride];
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3262 return;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3263 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3264
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3265 bias= bias ? 0 : (3*qmul)>>3;
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3266 thres1= ((qmul - bias)>>QEXPSHIFT) - 1;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3267 thres2= 2*thres1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3268
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3269 if(!bias){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3270 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3271 for(x=0; x<w; x++){
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3272 int i= src[x + y*stride];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3273
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3274 if((unsigned)(i+thres1) > thres2){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3275 if(i>=0){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3276 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3277 i/= qmul; //FIXME optimize
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3278 dst[x + y*stride]= i;
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3279 }else{
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3280 i= -i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3281 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3282 i/= qmul; //FIXME optimize
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3283 dst[x + y*stride]= -i;
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3284 }
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3285 }else
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3286 dst[x + y*stride]= 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3287 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3288 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3289 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3290 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3291 for(x=0; x<w; x++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3292 int i= src[x + y*stride];
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3293
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3294 if((unsigned)(i+thres1) > thres2){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3295 if(i>=0){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3296 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3297 i= (i + bias) / qmul; //FIXME optimize
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3298 dst[x + y*stride]= i;
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3299 }else{
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3300 i= -i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3301 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3302 i= (i + bias) / qmul; //FIXME optimize
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3303 dst[x + y*stride]= -i;
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3304 }
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3305 }else
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3306 dst[x + y*stride]= 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3307 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3308 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3309 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3310 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3311
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3312 static void dequantize_slice_buffered(SnowContext *s, slice_buffer * sb, SubBand *b, IDWTELEM *src, int stride, int start_y, int end_y){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3313 const int w= b->width;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4588
diff changeset
3314 const int qlog= av_clip(s->qlog + b->qlog, 0, QROOT*16);
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3315 const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3316 const int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3317 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3318
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3319 if(s->qlog == LOSSLESS_QLOG) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3320
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3321 for(y=start_y; y<end_y; y++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3322 // DWTELEM * line = slice_buffer_get_line_from_address(sb, src + (y * stride));
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3323 IDWTELEM * line = slice_buffer_get_line(sb, (y * b->stride_line) + b->buf_y_offset) + b->buf_x_offset;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3324 for(x=0; x<w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3325 int i= line[x];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3326 if(i<0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3327 line[x]= -((-i*qmul + qadd)>>(QEXPSHIFT)); //FIXME try different bias
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3328 }else if(i>0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3329 line[x]= (( i*qmul + qadd)>>(QEXPSHIFT));
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3330 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3331 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3332 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3333 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3334
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3335 static void dequantize(SnowContext *s, SubBand *b, IDWTELEM *src, int stride){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3336 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3337 const int h= b->height;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4588
diff changeset
3338 const int qlog= av_clip(s->qlog + b->qlog, 0, QROOT*16);
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3339 const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3340 const int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3341 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3342
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3343 if(s->qlog == LOSSLESS_QLOG) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3344
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3345 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3346 for(x=0; x<w; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3347 int i= src[x + y*stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3348 if(i<0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3349 src[x + y*stride]= -((-i*qmul + qadd)>>(QEXPSHIFT)); //FIXME try different bias
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3350 }else if(i>0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3351 src[x + y*stride]= (( i*qmul + qadd)>>(QEXPSHIFT));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3352 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3353 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3354 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3355 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3356
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3357 static void decorrelate(SnowContext *s, SubBand *b, IDWTELEM *src, int stride, int inverse, int use_median){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3358 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3359 const int h= b->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3360 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3361
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3362 for(y=h-1; y>=0; y--){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3363 for(x=w-1; x>=0; x--){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3364 int i= x + y*stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3365
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3366 if(x){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3367 if(use_median){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3368 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
3369 else src[i] -= src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3370 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3371 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
3372 else src[i] -= src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3373 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3374 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3375 if(y) src[i] -= src[i - stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3376 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3377 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3378 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3379 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3380
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3381 static void correlate_slice_buffered(SnowContext *s, slice_buffer * sb, SubBand *b, IDWTELEM *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
3382 const int w= b->width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3383 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3384
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3385 IDWTELEM * line=0; // silence silly "could be used without having been initialized" warning
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3386 IDWTELEM * prev;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3387
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3388 if (start_y != 0)
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3389 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
3390
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3391 for(y=start_y; y<end_y; y++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3392 prev = line;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3393 // 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
3394 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
3395 for(x=0; x<w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3396 if(x){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3397 if(use_median){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3398 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
3399 else line[x] += line[x - 1];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3400 }else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3401 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
3402 else line[x] += line[x - 1];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3403 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3404 }else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3405 if(y) line[x] += prev[x];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3406 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3407 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3408 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3409 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3410
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3411 static void correlate(SnowContext *s, SubBand *b, IDWTELEM *src, int stride, int inverse, int use_median){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3412 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3413 const int h= b->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3414 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3415
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3416 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3417 for(x=0; x<w; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3418 int i= x + y*stride;
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(x){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3421 if(use_median){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3422 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
3423 else src[i] += src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3424 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3425 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
3426 else src[i] += src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3427 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3428 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3429 if(y) src[i] += src[i - stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3430 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3431 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3432 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3433 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3434
5666
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3435 static void encode_qlogs(SnowContext *s){
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3436 int plane_index, level, orientation;
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3437
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3438 for(plane_index=0; plane_index<2; plane_index++){
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3439 for(level=0; level<s->spatial_decomposition_count; level++){
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3440 for(orientation=level ? 1:0; orientation<4; orientation++){
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3441 if(orientation==2) continue;
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3442 put_symbol(&s->c, s->header_state, s->plane[plane_index].band[level][orientation].qlog, 1);
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3443 }
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3444 }
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3445 }
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3446 }
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3447
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3448 static void encode_header(SnowContext *s){
5666
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3449 int plane_index, i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3450 uint8_t kstate[32];
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3451
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3452 memset(kstate, MID_STATE, sizeof(kstate));
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3453
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3454 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
3455 if(s->keyframe || s->always_reset){
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
3456 reset_contexts(s);
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3457 s->last_spatial_decomposition_type=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3458 s->last_qlog=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3459 s->last_qbias=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3460 s->last_mv_scale=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3461 s->last_block_max_depth= 0;
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3462 for(plane_index=0; plane_index<2; plane_index++){
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3463 Plane *p= &s->plane[plane_index];
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3464 p->last_htaps=0;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3465 p->last_diag_mc=0;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3466 memset(p->last_hcoeff, 0, sizeof(p->last_hcoeff));
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3467 }
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3468 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3469 if(s->keyframe){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3470 put_symbol(&s->c, s->header_state, s->version, 0);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3471 put_rac(&s->c, s->header_state, s->always_reset);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3472 put_symbol(&s->c, s->header_state, s->temporal_decomposition_type, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3473 put_symbol(&s->c, s->header_state, s->temporal_decomposition_count, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3474 put_symbol(&s->c, s->header_state, s->spatial_decomposition_count, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3475 put_symbol(&s->c, s->header_state, s->colorspace_type, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3476 put_symbol(&s->c, s->header_state, s->chroma_h_shift, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3477 put_symbol(&s->c, s->header_state, s->chroma_v_shift, 0);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3478 put_rac(&s->c, s->header_state, s->spatial_scalability);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3479 // put_rac(&s->c, s->header_state, s->rate_scalability);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3480 put_symbol(&s->c, s->header_state, s->max_ref_frames-1, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3481
5666
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3482 encode_qlogs(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3483 }
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3484
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3485 if(!s->keyframe){
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3486 int update_mc=0;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3487 for(plane_index=0; plane_index<2; plane_index++){
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3488 Plane *p= &s->plane[plane_index];
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3489 update_mc |= p->last_htaps != p->htaps;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3490 update_mc |= p->last_diag_mc != p->diag_mc;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3491 update_mc |= !!memcmp(p->last_hcoeff, p->hcoeff, sizeof(p->hcoeff));
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3492 }
5667
9242e125395f do not force the halfpel filter coeffs to be retransmitted on every frame
michael
parents: 5666
diff changeset
3493 put_rac(&s->c, s->header_state, update_mc);
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3494 if(update_mc){
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3495 for(plane_index=0; plane_index<2; plane_index++){
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3496 Plane *p= &s->plane[plane_index];
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3497 put_rac(&s->c, s->header_state, p->diag_mc);
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3498 put_symbol(&s->c, s->header_state, p->htaps/2-1, 0);
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3499 for(i= p->htaps/2; i; i--)
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3500 put_symbol(&s->c, s->header_state, FFABS(p->hcoeff[i]), 0);
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3501 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3502 }
5670
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
3503 if(s->last_spatial_decomposition_count != s->spatial_decomposition_count){
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
3504 put_rac(&s->c, s->header_state, 1);
5666
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3505 put_symbol(&s->c, s->header_state, s->spatial_decomposition_count, 0);
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3506 encode_qlogs(s);
5670
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
3507 }else
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
3508 put_rac(&s->c, s->header_state, 0);
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3509 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3510
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3511 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
3512 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
3513 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
3514 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
3515 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
3516
6144
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3517 }
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3518
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3519 static void update_last_header_values(SnowContext *s){
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3520 int plane_index;
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3521
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3522 if(!s->keyframe){
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3523 for(plane_index=0; plane_index<2; plane_index++){
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3524 Plane *p= &s->plane[plane_index];
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3525 p->last_diag_mc= p->diag_mc;
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3526 p->last_htaps = p->htaps;
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3527 memcpy(p->last_hcoeff, p->hcoeff, sizeof(p->hcoeff));
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3528 }
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3529 }
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3530
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
3531 s->last_spatial_decomposition_type = s->spatial_decomposition_type;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
3532 s->last_qlog = s->qlog;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
3533 s->last_qbias = s->qbias;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
3534 s->last_mv_scale = s->mv_scale;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
3535 s->last_block_max_depth = s->block_max_depth;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
3536 s->last_spatial_decomposition_count = s->spatial_decomposition_count;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3537 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3538
5666
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3539 static void decode_qlogs(SnowContext *s){
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3540 int plane_index, level, orientation;
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3541
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3542 for(plane_index=0; plane_index<3; plane_index++){
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3543 for(level=0; level<s->spatial_decomposition_count; level++){
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3544 for(orientation=level ? 1:0; orientation<4; orientation++){
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3545 int q;
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3546 if (plane_index==2) q= s->plane[1].band[level][orientation].qlog;
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3547 else if(orientation==2) q= s->plane[plane_index].band[level][1].qlog;
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3548 else q= get_symbol(&s->c, s->header_state, 1);
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3549 s->plane[plane_index].band[level][orientation].qlog= q;
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3550 }
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3551 }
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3552 }
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3553 }
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3554
9367
b32ece43b8a2 Factorize check of read symbols.
michael
parents: 9366
diff changeset
3555 #define GET_S(dst, check) \
b32ece43b8a2 Factorize check of read symbols.
michael
parents: 9366
diff changeset
3556 tmp= get_symbol(&s->c, s->header_state, 0);\
b32ece43b8a2 Factorize check of read symbols.
michael
parents: 9366
diff changeset
3557 if(!(check)){\
b32ece43b8a2 Factorize check of read symbols.
michael
parents: 9366
diff changeset
3558 av_log(s->avctx, AV_LOG_ERROR, "Error " #dst " is %d\n", tmp);\
b32ece43b8a2 Factorize check of read symbols.
michael
parents: 9366
diff changeset
3559 return -1;\
b32ece43b8a2 Factorize check of read symbols.
michael
parents: 9366
diff changeset
3560 }\
b32ece43b8a2 Factorize check of read symbols.
michael
parents: 9366
diff changeset
3561 dst= tmp;
b32ece43b8a2 Factorize check of read symbols.
michael
parents: 9366
diff changeset
3562
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3563 static int decode_header(SnowContext *s){
9365
48813960f5d5 Fix crash when max_ref_frames was out of range.
michael
parents: 9355
diff changeset
3564 int plane_index, tmp;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3565 uint8_t kstate[32];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3566
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3567 memset(kstate, MID_STATE, sizeof(kstate));
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3568
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3569 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
3570 if(s->keyframe || s->always_reset){
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
3571 reset_contexts(s);
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3572 s->spatial_decomposition_type=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3573 s->qlog=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3574 s->qbias=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3575 s->mv_scale=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3576 s->block_max_depth= 0;
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3577 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3578 if(s->keyframe){
9367
b32ece43b8a2 Factorize check of read symbols.
michael
parents: 9366
diff changeset
3579 GET_S(s->version, tmp <= 0U)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3580 s->always_reset= get_rac(&s->c, s->header_state);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3581 s->temporal_decomposition_type= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3582 s->temporal_decomposition_count= get_symbol(&s->c, s->header_state, 0);
9371
6de6fb68621c Make sure spatial_decomposition_count is >0.
michael
parents: 9370
diff changeset
3583 GET_S(s->spatial_decomposition_count, 0 < tmp && tmp <= MAX_DECOMPOSITIONS)
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3584 s->colorspace_type= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3585 s->chroma_h_shift= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3586 s->chroma_v_shift= get_symbol(&s->c, s->header_state, 0);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3587 s->spatial_scalability= get_rac(&s->c, s->header_state);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3588 // s->rate_scalability= get_rac(&s->c, s->header_state);
9367
b32ece43b8a2 Factorize check of read symbols.
michael
parents: 9366
diff changeset
3589 GET_S(s->max_ref_frames, tmp < (unsigned)MAX_REF_FRAMES)
b32ece43b8a2 Factorize check of read symbols.
michael
parents: 9366
diff changeset
3590 s->max_ref_frames++;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3591
5666
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3592 decode_qlogs(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3593 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3594
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3595 if(!s->keyframe){
5667
9242e125395f do not force the halfpel filter coeffs to be retransmitted on every frame
michael
parents: 5666
diff changeset
3596 if(get_rac(&s->c, s->header_state)){
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3597 for(plane_index=0; plane_index<2; plane_index++){
5807
34fac02fbc4b warning fixes:
diego
parents: 5702
diff changeset
3598 int htaps, i, sum=0;
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3599 Plane *p= &s->plane[plane_index];
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3600 p->diag_mc= get_rac(&s->c, s->header_state);
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3601 htaps= get_symbol(&s->c, s->header_state, 0)*2 + 2;
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
3602 if((unsigned)htaps > HTAPS_MAX || htaps==0)
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3603 return -1;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3604 p->htaps= htaps;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3605 for(i= htaps/2; i; i--){
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3606 p->hcoeff[i]= get_symbol(&s->c, s->header_state, 0) * (1-2*(i&1));
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3607 sum += p->hcoeff[i];
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3608 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3609 p->hcoeff[0]= 32-sum;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3610 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3611 s->plane[2].diag_mc= s->plane[1].diag_mc;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3612 s->plane[2].htaps = s->plane[1].htaps;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3613 memcpy(s->plane[2].hcoeff, s->plane[1].hcoeff, sizeof(s->plane[1].hcoeff));
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3614 }
5666
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3615 if(get_rac(&s->c, s->header_state)){
9371
6de6fb68621c Make sure spatial_decomposition_count is >0.
michael
parents: 9370
diff changeset
3616 GET_S(s->spatial_decomposition_count, 0 < tmp && tmp <= MAX_DECOMPOSITIONS)
5666
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3617 decode_qlogs(s);
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3618 }
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3619 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3620
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3621 s->spatial_decomposition_type+= get_symbol(&s->c, s->header_state, 1);
9366
48eb9ec4e318 Fix spatial_decomposition_type validity check.
michael
parents: 9365
diff changeset
3622 if(s->spatial_decomposition_type > 1U){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3623 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
3624 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3625 }
9373
78c2ddc32bed Make sure spatial_decomposition_count is not too large for picture size.
michael
parents: 9372
diff changeset
3626 if(FFMIN(s->avctx-> width>>s->chroma_h_shift,
78c2ddc32bed Make sure spatial_decomposition_count is not too large for picture size.
michael
parents: 9372
diff changeset
3627 s->avctx->height>>s->chroma_v_shift) >> (s->spatial_decomposition_count-1) <= 0){
78c2ddc32bed Make sure spatial_decomposition_count is not too large for picture size.
michael
parents: 9372
diff changeset
3628 av_log(s->avctx, AV_LOG_ERROR, "spatial_decomposition_count %d too large for size", s->spatial_decomposition_count);
78c2ddc32bed Make sure spatial_decomposition_count is not too large for picture size.
michael
parents: 9372
diff changeset
3629 return -1;
78c2ddc32bed Make sure spatial_decomposition_count is not too large for picture size.
michael
parents: 9372
diff changeset
3630 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3631
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3632 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
3633 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
3634 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
3635 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
3636 if(s->block_max_depth > 1 || s->block_max_depth < 0){
2952
d7be13d3ef00 check block_max_depth (fixes crash)
michael
parents: 2951
diff changeset
3637 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
3638 s->block_max_depth= 0;
d7be13d3ef00 check block_max_depth (fixes crash)
michael
parents: 2951
diff changeset
3639 return -1;
d7be13d3ef00 check block_max_depth (fixes crash)
michael
parents: 2951
diff changeset
3640 }
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
3641
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3642 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
3643 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3644
3075
961af1358c7f add static keyword to some functions
mru
parents: 3063
diff changeset
3645 static void init_qexp(void){
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3646 int i;
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3647 double v=128;
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3648
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3649 for(i=0; i<QROOT; i++){
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3650 qexp[i]= lrintf(v);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3651 v *= pow(2, 1.0 / QROOT);
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3652 }
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3653 }
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3654
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6481
diff changeset
3655 static av_cold int common_init(AVCodecContext *avctx){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3656 SnowContext *s = avctx->priv_data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3657 int width, height;
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
3658 int i, j;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3659
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3660 s->avctx= avctx;
9365
48813960f5d5 Fix crash when max_ref_frames was out of range.
michael
parents: 9355
diff changeset
3661 s->max_ref_frames=1; //just make sure its not an invalid value in case of no initial keyframe
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3662
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3663 dsputil_init(&s->dsp, avctx);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3664
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3665 #define mcf(dx,dy)\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3666 s->dsp.put_qpel_pixels_tab [0][dy+dx/4]=\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3667 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
3668 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
3669 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
3670 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
3671 s->dsp.put_h264_qpel_pixels_tab[1][dy+dx/4];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3672
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3673 mcf( 0, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3674 mcf( 4, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3675 mcf( 8, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3676 mcf(12, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3677 mcf( 0, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3678 mcf( 4, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3679 mcf( 8, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3680 mcf(12, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3681 mcf( 0, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3682 mcf( 4, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3683 mcf( 8, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3684 mcf(12, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3685 mcf( 0,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3686 mcf( 4,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3687 mcf( 8,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3688 mcf(12,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3689
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3690 #define mcfh(dx,dy)\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3691 s->dsp.put_pixels_tab [0][dy/4+dx/8]=\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3692 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
3693 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
3694 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
3695 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
3696 mc_block_hpel ## dx ## dy ## 8;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3697
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3698 mcfh(0, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3699 mcfh(8, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3700 mcfh(0, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3701 mcfh(8, 8)
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3702
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3703 if(!qexp[0])
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3704 init_qexp();
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3705
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3706 // dec += FFMAX(s->chroma_h_shift, s->chroma_v_shift);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3707
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
3708 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
3709 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
3710
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3711 s->spatial_idwt_buffer= av_mallocz(width*height*sizeof(IDWTELEM));
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
3712 s->spatial_dwt_buffer= av_mallocz(width*height*sizeof(DWTELEM)); //FIXME this does not belong here
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3713
5665
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3714 for(i=0; i<MAX_REF_FRAMES; i++)
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3715 for(j=0; j<MAX_REF_FRAMES; j++)
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3716 scale_mv_ref[i][j] = 256*(i+1)/(j+1);
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3717
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3718 s->avctx->get_buffer(s->avctx, &s->mconly_picture);
8214
c5276ad92ff8 snow: move scratch buffer from stack to malloced buffer in context
mru
parents: 7622
diff changeset
3719 s->scratchbuf = av_malloc(s->mconly_picture.linesize[0]*7*MB_SIZE);
5665
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3720
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3721 return 0;
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3722 }
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3723
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3724 static int common_init_after_header(AVCodecContext *avctx){
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3725 SnowContext *s = avctx->priv_data;
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3726 int plane_index, level, orientation;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3727
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3728 for(plane_index=0; plane_index<3; plane_index++){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3729 int w= s->avctx->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3730 int h= s->avctx->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3731
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3732 if(plane_index){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3733 w>>= s->chroma_h_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3734 h>>= s->chroma_v_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3735 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3736 s->plane[plane_index].width = w;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3737 s->plane[plane_index].height= h;
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3738
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3739 for(level=s->spatial_decomposition_count-1; level>=0; level--){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3740 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3741 SubBand *b= &s->plane[plane_index].band[level][orientation];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3742
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3743 b->buf= s->spatial_dwt_buffer;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3744 b->level= level;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3745 b->stride= s->plane[plane_index].width << (s->spatial_decomposition_count - level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3746 b->width = (w + !(orientation&1))>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3747 b->height= (h + !(orientation>1))>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3748
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3749 b->stride_line = 1 << (s->spatial_decomposition_count - level);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3750 b->buf_x_offset = 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3751 b->buf_y_offset = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3752
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3753 if(orientation&1){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3754 b->buf += (w+1)>>1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3755 b->buf_x_offset = (w+1)>>1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3756 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3757 if(orientation>1){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3758 b->buf += b->stride>>1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3759 b->buf_y_offset = b->stride_line >> 1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3760 }
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3761 b->ibuf= s->spatial_idwt_buffer + (b->buf - s->spatial_dwt_buffer);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3762
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3763 if(level)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3764 b->parent= &s->plane[plane_index].band[level-1][orientation];
5665
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3765 //FIXME avoid this realloc
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3766 av_freep(&b->x_coeff);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3767 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
3768 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3769 w= (w+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3770 h= (h+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3771 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3772 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3773
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3774 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3775 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3776
3322
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3777 static int qscale2qlog(int qscale){
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3778 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
3779 + 61*QROOT/8; //<64 >60
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3780 }
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3781
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
3782 static int ratecontrol_1pass(SnowContext *s, AVFrame *pict)
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3783 {
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
3784 /* Estimate the frame's complexity as a sum of weighted dwt coefficients.
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3785 * FIXME we know exact mv bits at this point,
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3786 * but ratecontrol isn't set up to include them. */
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3787 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
3788 int level, orientation, delta_qlog;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3789
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3790 for(level=0; level<s->spatial_decomposition_count; level++){
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3791 for(orientation=level ? 1 : 0; orientation<4; orientation++){
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3792 SubBand *b= &s->plane[0].band[level][orientation];
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3793 IDWTELEM *buf= b->ibuf;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3794 const int w= b->width;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3795 const int h= b->height;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3796 const int stride= b->stride;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4588
diff changeset
3797 const int qlog= av_clip(2*QROOT + b->qlog, 0, QROOT*16);
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3798 const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3799 const int qdiv= (1<<16)/qmul;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3800 int x, y;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3801 //FIXME this is ugly
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3802 for(y=0; y<h; y++)
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3803 for(x=0; x<w; x++)
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3804 buf[x+y*stride]= b->buf[x+y*stride];
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3805 if(orientation==0)
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3806 decorrelate(s, b, buf, stride, 1, 0);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3807 for(y=0; y<h; y++)
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3808 for(x=0; x<w; x++)
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3809 coef_sum+= abs(buf[x+y*stride]) * qdiv >> 16;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3810 }
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3811 }
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3812
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3813 /* ugly, ratecontrol just takes a sqrt again */
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3814 coef_sum = (uint64_t)coef_sum * coef_sum >> 16;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3815 assert(coef_sum < INT_MAX);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3816
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6475
diff changeset
3817 if(pict->pict_type == FF_I_TYPE){
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3818 s->m.current_picture.mb_var_sum= coef_sum;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3819 s->m.current_picture.mc_mb_var_sum= 0;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3820 }else{
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3821 s->m.current_picture.mc_mb_var_sum= coef_sum;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3822 s->m.current_picture.mb_var_sum= 0;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3823 }
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3824
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3825 pict->quality= ff_rate_estimate_qscale(&s->m, 1);
3766
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
3826 if (pict->quality < 0)
4011
5bce97c30a69 -1 is a valid return value in ratecontrol_1pass() -> 100l for takis
michael
parents: 4001
diff changeset
3827 return INT_MIN;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3828 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
3829 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
3830 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
3831 return delta_qlog;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3832 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3833
5909
4e3c522ca492 cosmetics: Fix vissual --> visual typo.
diego
parents: 5908
diff changeset
3834 static void calculate_visual_weight(SnowContext *s, Plane *p){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3835 int width = p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3836 int height= p->height;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
3837 int level, orientation, x, y;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3838
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3839 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3840 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3841 SubBand *b= &p->band[level][orientation];
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3842 IDWTELEM *ibuf= b->ibuf;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3843 int64_t error=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3844
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3845 memset(s->spatial_idwt_buffer, 0, sizeof(*s->spatial_idwt_buffer)*width*height);
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3846 ibuf[b->width/2 + b->height/2*b->stride]= 256*16;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3847 ff_spatial_idwt(s->spatial_idwt_buffer, width, height, width, s->spatial_decomposition_type, s->spatial_decomposition_count);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3848 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3849 for(x=0; x<width; x++){
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3850 int64_t d= s->spatial_idwt_buffer[x + y*width]*16;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3851 error += d*d;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3852 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3853 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3854
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3855 b->qlog= (int)(log(352256.0/sqrt(error)) / log(pow(2.0, 1.0/QROOT))+0.5);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3856 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3857 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3858 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3859
5702
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3860 #define QUANTIZE2 0
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3861
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3862 #if QUANTIZE2==1
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3863 #define Q2_STEP 8
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3864
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3865 static void find_sse(SnowContext *s, Plane *p, int *score, int score_stride, IDWTELEM *r0, IDWTELEM *r1, int level, int orientation){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3866 SubBand *b= &p->band[level][orientation];
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3867 int x, y;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3868 int xo=0;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3869 int yo=0;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3870 int step= 1 << (s->spatial_decomposition_count - level);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3871
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3872 if(orientation&1)
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3873 xo= step>>1;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3874 if(orientation&2)
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3875 yo= step>>1;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3876
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
3877 //FIXME bias for nonzero ?
5702
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3878 //FIXME optimize
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3879 memset(score, 0, sizeof(*score)*score_stride*((p->height + Q2_STEP-1)/Q2_STEP));
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3880 for(y=0; y<p->height; y++){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3881 for(x=0; x<p->width; x++){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3882 int sx= (x-xo + step/2) / step / Q2_STEP;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3883 int sy= (y-yo + step/2) / step / Q2_STEP;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3884 int v= r0[x + y*p->width] - r1[x + y*p->width];
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3885 assert(sx>=0 && sy>=0 && sx < score_stride);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3886 v= ((v+8)>>4)<<4;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3887 score[sx + sy*score_stride] += v*v;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3888 assert(score[sx + sy*score_stride] >= 0);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3889 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3890 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3891 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3892
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3893 static void dequantize_all(SnowContext *s, Plane *p, IDWTELEM *buffer, int width, int height){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3894 int level, orientation;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3895
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3896 for(level=0; level<s->spatial_decomposition_count; level++){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3897 for(orientation=level ? 1 : 0; orientation<4; orientation++){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3898 SubBand *b= &p->band[level][orientation];
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3899 IDWTELEM *dst= buffer + (b->ibuf - s->spatial_idwt_buffer);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3900
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3901 dequantize(s, b, dst, b->stride);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3902 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3903 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3904 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3905
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3906 static void dwt_quantize(SnowContext *s, Plane *p, DWTELEM *buffer, int width, int height, int stride, int type){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3907 int level, orientation, ys, xs, x, y, pass;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3908 IDWTELEM best_dequant[height * stride];
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3909 IDWTELEM idwt2_buffer[height * stride];
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3910 const int score_stride= (width + 10)/Q2_STEP;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3911 int best_score[(width + 10)/Q2_STEP * (height + 10)/Q2_STEP]; //FIXME size
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3912 int score[(width + 10)/Q2_STEP * (height + 10)/Q2_STEP]; //FIXME size
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3913 int threshold= (s->m.lambda * s->m.lambda) >> 6;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3914
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3915 //FIXME pass the copy cleanly ?
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3916
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3917 // memcpy(dwt_buffer, buffer, height * stride * sizeof(DWTELEM));
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3918 ff_spatial_dwt(buffer, width, height, stride, type, s->spatial_decomposition_count);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3919
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3920 for(level=0; level<s->spatial_decomposition_count; level++){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3921 for(orientation=level ? 1 : 0; orientation<4; orientation++){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3922 SubBand *b= &p->band[level][orientation];
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3923 IDWTELEM *dst= best_dequant + (b->ibuf - s->spatial_idwt_buffer);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3924 DWTELEM *src= buffer + (b-> buf - s->spatial_dwt_buffer);
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
3925 assert(src == b->buf); // code does not depend on this but it is true currently
5702
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3926
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3927 quantize(s, b, dst, src, b->stride, s->qbias);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3928 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3929 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3930 for(pass=0; pass<1; pass++){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3931 if(s->qbias == 0) //keyframe
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3932 continue;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3933 for(level=0; level<s->spatial_decomposition_count; level++){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3934 for(orientation=level ? 1 : 0; orientation<4; orientation++){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3935 SubBand *b= &p->band[level][orientation];
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3936 IDWTELEM *dst= idwt2_buffer + (b->ibuf - s->spatial_idwt_buffer);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3937 IDWTELEM *best_dst= best_dequant + (b->ibuf - s->spatial_idwt_buffer);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3938
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3939 for(ys= 0; ys<Q2_STEP; ys++){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3940 for(xs= 0; xs<Q2_STEP; xs++){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3941 memcpy(idwt2_buffer, best_dequant, height * stride * sizeof(IDWTELEM));
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3942 dequantize_all(s, p, idwt2_buffer, width, height);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3943 ff_spatial_idwt(idwt2_buffer, width, height, stride, type, s->spatial_decomposition_count);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3944 find_sse(s, p, best_score, score_stride, idwt2_buffer, s->spatial_idwt_buffer, level, orientation);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3945 memcpy(idwt2_buffer, best_dequant, height * stride * sizeof(IDWTELEM));
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3946 for(y=ys; y<b->height; y+= Q2_STEP){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3947 for(x=xs; x<b->width; x+= Q2_STEP){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3948 if(dst[x + y*b->stride]<0) dst[x + y*b->stride]++;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3949 if(dst[x + y*b->stride]>0) dst[x + y*b->stride]--;
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
3950 //FIXME try more than just --
5702
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3951 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3952 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3953 dequantize_all(s, p, idwt2_buffer, width, height);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3954 ff_spatial_idwt(idwt2_buffer, width, height, stride, type, s->spatial_decomposition_count);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3955 find_sse(s, p, score, score_stride, idwt2_buffer, s->spatial_idwt_buffer, level, orientation);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3956 for(y=ys; y<b->height; y+= Q2_STEP){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3957 for(x=xs; x<b->width; x+= Q2_STEP){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3958 int score_idx= x/Q2_STEP + (y/Q2_STEP)*score_stride;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3959 if(score[score_idx] <= best_score[score_idx] + threshold){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3960 best_score[score_idx]= score[score_idx];
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3961 if(best_dst[x + y*b->stride]<0) best_dst[x + y*b->stride]++;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3962 if(best_dst[x + y*b->stride]>0) best_dst[x + y*b->stride]--;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3963 //FIXME copy instead
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3964 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3965 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3966 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3967 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3968 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3969 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3970 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3971 }
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
3972 memcpy(s->spatial_idwt_buffer, best_dequant, height * stride * sizeof(IDWTELEM)); //FIXME work with that directly instead of copy at the end
5702
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3973 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3974
5910
85a976d59f17 Add comments to some #endif directives.
diego
parents: 5909
diff changeset
3975 #endif /* QUANTIZE2==1 */
5702
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3976
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6481
diff changeset
3977 static av_cold int encode_init(AVCodecContext *avctx)
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3978 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3979 SnowContext *s = avctx->priv_data;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
3980 int plane_index;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3981
2658
d1609cfeb1d0 #defines for strict_std_compliance and split between inofficial extensions and non standarized things
michael
parents: 2635
diff changeset
3982 if(avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL){
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
3983 av_log(avctx, AV_LOG_ERROR, "This codec is under development, files encoded with it may not be decodable with future versions!!!\n"
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
3984 "Use vstrict=-2 / -strict -2 to use it anyway.\n");
2151
44c973bfec0f dont segfault without -strict -1
michael
parents: 2150
diff changeset
3985 return -1;
44c973bfec0f dont segfault without -strict -1
michael
parents: 2150
diff changeset
3986 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3987
3327
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3988 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
3989 && (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
3990 && avctx->global_quality == 0){
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
3991 av_log(avctx, AV_LOG_ERROR, "The 9/7 wavelet is incompatible with lossless mode.\n");
3327
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3992 return -1;
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3993 }
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3994
5665
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3995 s->spatial_decomposition_type= avctx->prediction_method; //FIXME add decorrelator type r transform_type
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3996
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3997 s->chroma_h_shift= 1; //FIXME XXX
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3998 s->chroma_v_shift= 1;
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3999
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
4000 s->mv_scale = (avctx->flags & CODEC_FLAG_QPEL) ? 2 : 4;
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
4001 s->block_max_depth= (avctx->flags & CODEC_FLAG_4MV ) ? 1 : 0;
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
4002
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
4003 for(plane_index=0; plane_index<3; plane_index++){
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
4004 s->plane[plane_index].diag_mc= 1;
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
4005 s->plane[plane_index].htaps= 6;
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
4006 s->plane[plane_index].hcoeff[0]= 40;
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
4007 s->plane[plane_index].hcoeff[1]= -10;
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
4008 s->plane[plane_index].hcoeff[2]= 2;
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
4009 s->plane[plane_index].fast_mc= 1;
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
4010 }
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
4011
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4012 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
4013 alloc_blocks(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4014
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4015 s->version=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4016
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4017 s->m.avctx = avctx;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4018 s->m.flags = avctx->flags;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4019 s->m.bit_rate= avctx->bit_rate;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4020
8239
dcfdb3352dde Fix regression test failure with pthreads on multiprocessor systems.
michael
parents: 8214
diff changeset
4021 s->m.me.temp =
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4022 s->m.me.scratchpad= av_mallocz((avctx->width+64)*2*16*2*sizeof(uint8_t));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4023 s->m.me.map = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4024 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
4025 s->m.obmc_scratchpad= av_mallocz(MB_SIZE*MB_SIZE*12*sizeof(uint32_t));
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4026 h263_encode_init(&s->m); //mv_penalty
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4027
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4028 s->max_ref_frames = FFMAX(FFMIN(avctx->refs, MAX_REF_FRAMES), 1);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4029
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4030 if(avctx->flags&CODEC_FLAG_PASS1){
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4031 if(!avctx->stats_out)
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4032 avctx->stats_out = av_mallocz(256);
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4033 }
3322
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
4034 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
4035 if(ff_rate_control_init(&s->m) < 0)
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4036 return -1;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4037 }
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4038 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
4039
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4040 avctx->coded_frame= &s->current_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4041 switch(avctx->pix_fmt){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4042 // case PIX_FMT_YUV444P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4043 // case PIX_FMT_YUV422P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4044 case PIX_FMT_YUV420P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4045 case PIX_FMT_GRAY8:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4046 // case PIX_FMT_YUV411P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4047 // case PIX_FMT_YUV410P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4048 s->colorspace_type= 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4049 break;
4494
ce643a22f049 Replace deprecated PIX_FMT names by the newer variants.
diego
parents: 4436
diff changeset
4050 /* case PIX_FMT_RGB32:
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4051 s->colorspace= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4052 break;*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4053 default:
5908
4c72e41cd178 Improve unsupported (pixel) format error message.
diego
parents: 5807
diff changeset
4054 av_log(avctx, AV_LOG_ERROR, "pixel format not supported\n");
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4055 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4056 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4057 // 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
4058 s->chroma_h_shift= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4059 s->chroma_v_shift= 1;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4060
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4061 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
4062 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
4063
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4064 s->avctx->get_buffer(s->avctx, &s->input_picture);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4065
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4066 if(s->avctx->me_method == ME_ITER){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4067 int i;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4068 int size= s->b_width * s->b_height << 2*s->block_max_depth;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4069 for(i=0; i<s->max_ref_frames; i++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4070 s->ref_mvs[i]= av_mallocz(size*sizeof(int16_t[2]));
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4071 s->ref_scores[i]= av_mallocz(size*sizeof(uint32_t));
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4072 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4073 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4074
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4075 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4076 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4077
5924
cf1eed15eb87 avoid some halfpel related #ifdef
aurel
parents: 5923
diff changeset
4078 #define USE_HALFPEL_PLANE 0
cf1eed15eb87 avoid some halfpel related #ifdef
aurel
parents: 5923
diff changeset
4079
5633
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4080 static void halfpel_interpol(SnowContext *s, uint8_t *halfpel[4][4], AVFrame *frame){
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4081 int p,x,y;
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4082
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4083 assert(!(s->avctx->flags & CODEC_FLAG_EMU_EDGE));
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4084
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4085 for(p=0; p<3; p++){
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4086 int is_chroma= !!p;
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4087 int w= s->avctx->width >>is_chroma;
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4088 int h= s->avctx->height >>is_chroma;
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4089 int ls= frame->linesize[p];
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4090 uint8_t *src= frame->data[p];
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4091
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4092 halfpel[1][p]= (uint8_t*)av_malloc(ls * (h+2*EDGE_WIDTH)) + EDGE_WIDTH*(1+ls);
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4093 halfpel[2][p]= (uint8_t*)av_malloc(ls * (h+2*EDGE_WIDTH)) + EDGE_WIDTH*(1+ls);
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4094 halfpel[3][p]= (uint8_t*)av_malloc(ls * (h+2*EDGE_WIDTH)) + EDGE_WIDTH*(1+ls);
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4095
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4096 halfpel[0][p]= src;
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4097 for(y=0; y<h; y++){
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4098 for(x=0; x<w; x++){
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4099 int i= y*ls + x;
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4100
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4101 halfpel[1][p][i]= (20*(src[i] + src[i+1]) - 5*(src[i-1] + src[i+2]) + (src[i-2] + src[i+3]) + 16 )>>5;
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4102 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4103 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4104 for(y=0; y<h; y++){
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4105 for(x=0; x<w; x++){
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4106 int i= y*ls + x;
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4107
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4108 halfpel[2][p][i]= (20*(src[i] + src[i+ls]) - 5*(src[i-ls] + src[i+2*ls]) + (src[i-2*ls] + src[i+3*ls]) + 16 )>>5;
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4109 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4110 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4111 src= halfpel[1][p];
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4112 for(y=0; y<h; y++){
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4113 for(x=0; x<w; x++){
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4114 int i= y*ls + x;
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4115
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4116 halfpel[3][p][i]= (20*(src[i] + src[i+ls]) - 5*(src[i-ls] + src[i+2*ls]) + (src[i-2*ls] + src[i+3*ls]) + 16 )>>5;
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4117 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4118 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4119
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4120 //FIXME border!
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4121 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4122 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4123
9375
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4124 static void release_buffer(AVCodecContext *avctx){
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4125 SnowContext *s = avctx->priv_data;
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4126 int i;
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4127
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4128 if(s->last_picture[s->max_ref_frames-1].data[0]){
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4129 avctx->release_buffer(avctx, &s->last_picture[s->max_ref_frames-1]);
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4130 for(i=0; i<9; i++)
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4131 if(s->halfpel_plane[s->max_ref_frames-1][1+i/3][i%3])
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4132 av_free(s->halfpel_plane[s->max_ref_frames-1][1+i/3][i%3] - EDGE_WIDTH*(1+s->current_picture.linesize[i%3]));
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4133 }
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4134 }
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4135
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4136 static int frame_start(SnowContext *s){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4137 AVFrame tmp;
2187
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4138 int w= s->avctx->width; //FIXME round up to x16 ?
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4139 int h= s->avctx->height;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4140
2187
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4141 if(s->current_picture.data[0]){
6437
5154ab444372 move draw_edges() into dsputil
aurel
parents: 6426
diff changeset
4142 s->dsp.draw_edges(s->current_picture.data[0], s->current_picture.linesize[0], w , h , EDGE_WIDTH );
5154ab444372 move draw_edges() into dsputil
aurel
parents: 6426
diff changeset
4143 s->dsp.draw_edges(s->current_picture.data[1], s->current_picture.linesize[1], w>>1, h>>1, EDGE_WIDTH/2);
5154ab444372 move draw_edges() into dsputil
aurel
parents: 6426
diff changeset
4144 s->dsp.draw_edges(s->current_picture.data[2], s->current_picture.linesize[2], w>>1, h>>1, EDGE_WIDTH/2);
2187
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4145 }
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4146
9376
e376facae584 Make sure the next used frame is released so get_buffer() wont fail.
michael
parents: 9375
diff changeset
4147 release_buffer(s->avctx);
e376facae584 Make sure the next used frame is released so get_buffer() wont fail.
michael
parents: 9375
diff changeset
4148
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4149 tmp= s->last_picture[s->max_ref_frames-1];
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4150 memmove(s->last_picture+1, s->last_picture, (s->max_ref_frames-1)*sizeof(AVFrame));
5633
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4151 memmove(s->halfpel_plane+1, s->halfpel_plane, (s->max_ref_frames-1)*sizeof(void*)*4*4);
5924
cf1eed15eb87 avoid some halfpel related #ifdef
aurel
parents: 5923
diff changeset
4152 if(USE_HALFPEL_PLANE && s->current_picture.data[0])
5633
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4153 halfpel_interpol(s, s->halfpel_plane[0], &s->current_picture);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4154 s->last_picture[0]= s->current_picture;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4155 s->current_picture= tmp;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4156
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4157 if(s->keyframe){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4158 s->ref_frames= 0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4159 }else{
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4160 int i;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4161 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
4162 if(i && s->last_picture[i-1].key_frame)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4163 break;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4164 s->ref_frames= i;
9372
9bb96825fc10 Skip non intra frames that have no reference frames.
michael
parents: 9371
diff changeset
4165 if(s->ref_frames==0){
9bb96825fc10 Skip non intra frames that have no reference frames.
michael
parents: 9371
diff changeset
4166 av_log(s->avctx,AV_LOG_ERROR, "No reference frames\n");
9bb96825fc10 Skip non intra frames that have no reference frames.
michael
parents: 9371
diff changeset
4167 return -1;
9bb96825fc10 Skip non intra frames that have no reference frames.
michael
parents: 9371
diff changeset
4168 }
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4169 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4170
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4171 s->current_picture.reference= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4172 if(s->avctx->get_buffer(s->avctx, &s->current_picture) < 0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4173 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4174 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4175 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4176
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4177 s->current_picture.key_frame= s->keyframe;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4178
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4179 return 0;
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 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4183 SnowContext *s = avctx->priv_data;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4184 RangeCoder * const c= &s->c;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4185 AVFrame *pict = data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4186 const int width= s->avctx->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4187 const int height= s->avctx->height;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4188 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
4189 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
4190 uint8_t rc_block_bak[sizeof(s->block_state)];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4191
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4192 ff_init_range_encoder(c, buf, buf_size);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4193 ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4194
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4195 for(i=0; i<3; i++){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4196 int shift= !!i;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4197 for(y=0; y<(height>>shift); y++)
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4198 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
4199 &pict->data[i][y * pict->linesize[i]],
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4200 width>>shift);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4201 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4202 s->new_picture = *pict;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4203
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4204 s->m.picture_number= avctx->frame_number;
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4205 if(avctx->flags&CODEC_FLAG_PASS2){
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4206 s->m.pict_type =
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4207 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
4208 s->keyframe= pict->pict_type==FF_I_TYPE;
3766
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4209 if(!(avctx->flags&CODEC_FLAG_QSCALE)) {
3193
66116775b315 obey vqscale in 2nd pass
lorenm
parents: 3190
diff changeset
4210 pict->quality= ff_rate_estimate_qscale(&s->m, 0);
3766
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4211 if (pict->quality < 0)
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4212 return -1;
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4213 }
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4214 }else{
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4215 s->keyframe= avctx->gop_size==0 || avctx->frame_number % avctx->gop_size == 0;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4216 s->m.pict_type=
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4217 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
4218 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4219
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4220 if(s->pass1_rc && avctx->frame_number == 0)
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4221 pict->quality= 2*FF_QP2LAMBDA;
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4222 if(pict->quality){
3322
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
4223 s->qlog= qscale2qlog(pict->quality);
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4224 s->lambda = pict->quality * 3/2;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4225 }
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4226 if(s->qlog < 0 || (!pict->quality && (avctx->flags & CODEC_FLAG_QSCALE))){
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4227 s->qlog= LOSSLESS_QLOG;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4228 s->lambda = 0;
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
4229 }//else keep previous frame's qlog until after motion estimation
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4230
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4231 frame_start(s);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4232
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4233 s->m.current_picture_ptr= &s->m.current_picture;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6475
diff changeset
4234 if(pict->pict_type == FF_P_TYPE){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4235 int block_width = (width +15)>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4236 int block_height= (height+15)>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4237 int stride= s->current_picture.linesize[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4238
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4239 assert(s->current_picture.data[0]);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4240 assert(s->last_picture[0].data[0]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4241
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4242 s->m.avctx= s->avctx;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4243 s->m.current_picture.data[0]= s->current_picture.data[0];
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4244 s->m. last_picture.data[0]= s->last_picture[0].data[0];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4245 s->m. new_picture.data[0]= s-> input_picture.data[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4246 s->m. last_picture_ptr= &s->m. last_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4247 s->m.linesize=
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4248 s->m. last_picture.linesize[0]=
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4249 s->m. new_picture.linesize[0]=
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4250 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
4251 s->m.uvlinesize= s->current_picture.linesize[1];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4252 s->m.width = width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4253 s->m.height= height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4254 s->m.mb_width = block_width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4255 s->m.mb_height= block_height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4256 s->m.mb_stride= s->m.mb_width+1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4257 s->m.b8_stride= 2*s->m.mb_width+1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4258 s->m.f_code=1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4259 s->m.pict_type= pict->pict_type;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4260 s->m.me_method= s->avctx->me_method;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4261 s->m.me.scene_change_score=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4262 s->m.flags= s->avctx->flags;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4263 s->m.quarter_sample= (s->avctx->flags & CODEC_FLAG_QPEL)!=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4264 s->m.out_format= FMT_H263;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4265 s->m.unrestricted_mv= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4266
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4267 s->m.lambda = s->lambda;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4268 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
4269 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
4270
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4271 s->m.dsp= s->dsp; //move
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4272 ff_init_me(&s->m);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4273 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
4274 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4275
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
4276 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
4277 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
4278 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
4279 }
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
4280
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
4281 redo_frame:
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4282
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6475
diff changeset
4283 if(pict->pict_type == FF_I_TYPE)
5670
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
4284 s->spatial_decomposition_count= 5;
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
4285 else
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
4286 s->spatial_decomposition_count= 5;
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
4287
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4288 s->m.pict_type = pict->pict_type;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6475
diff changeset
4289 s->qbias= pict->pict_type == FF_P_TYPE ? 2 : 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4290
5670
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
4291 common_init_after_header(avctx);
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
4292
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
4293 if(s->last_spatial_decomposition_count != s->spatial_decomposition_count){
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
4294 for(plane_index=0; plane_index<3; plane_index++){
5909
4e3c522ca492 cosmetics: Fix vissual --> visual typo.
diego
parents: 5908
diff changeset
4295 calculate_visual_weight(s, &s->plane[plane_index]);
5670
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
4296 }
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
4297 }
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
4298
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4299 encode_header(s);
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4300 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
4301 encode_blocks(s, 1);
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4302 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
4303
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4304 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4305 Plane *p= &s->plane[plane_index];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4306 int w= p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4307 int h= p->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4308 int x, y;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
4309 // int bits= put_bits_count(&s->c.pb);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4310
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4311 if(!(avctx->flags2 & CODEC_FLAG2_MEMC_ONLY)){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4312 //FIXME optimize
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4313 if(pict->data[plane_index]) //FIXME gray hack
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4314 for(y=0; y<h; y++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4315 for(x=0; x<w; x++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4316 s->spatial_idwt_buffer[y*w + x]= pict->data[plane_index][y*pict->linesize[plane_index] + x]<<FRAC_BITS;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4317 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4318 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4319 predict_plane(s, s->spatial_idwt_buffer, plane_index, 0);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4320
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4321 if( plane_index==0
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6475
diff changeset
4322 && pict->pict_type == FF_P_TYPE
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4323 && !(avctx->flags&CODEC_FLAG_PASS2)
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4324 && s->m.me.scene_change_score > s->avctx->scenechange_threshold){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4325 ff_init_range_encoder(c, buf, buf_size);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4326 ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4327 pict->pict_type= FF_I_TYPE;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4328 s->keyframe=1;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4329 s->current_picture.key_frame=1;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4330 goto redo_frame;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4331 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4332
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4333 if(s->qlog == LOSSLESS_QLOG){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4334 for(y=0; y<h; y++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4335 for(x=0; x<w; x++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4336 s->spatial_dwt_buffer[y*w + x]= (s->spatial_idwt_buffer[y*w + x] + (1<<(FRAC_BITS-1))-1)>>FRAC_BITS;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4337 }
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4338 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4339 }else{
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4340 for(y=0; y<h; y++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4341 for(x=0; x<w; x++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4342 s->spatial_dwt_buffer[y*w + x]=s->spatial_idwt_buffer[y*w + x]<<ENCODER_EXTRA_BITS;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4343 }
5575
a6f5ed050335 use more bits on the encoder side
michael
parents: 5572
diff changeset
4344 }
a6f5ed050335 use more bits on the encoder side
michael
parents: 5572
diff changeset
4345 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4346
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4347 /* if(QUANTIZE2)
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4348 dwt_quantize(s, p, s->spatial_dwt_buffer, w, h, w, s->spatial_decomposition_type);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4349 else*/
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4350 ff_spatial_dwt(s->spatial_dwt_buffer, w, h, w, s->spatial_decomposition_type, s->spatial_decomposition_count);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4351
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4352 if(s->pass1_rc && plane_index==0){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4353 int delta_qlog = ratecontrol_1pass(s, pict);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4354 if (delta_qlog <= INT_MIN)
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4355 return -1;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4356 if(delta_qlog){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4357 //reordering qlog in the bitstream would eliminate this reset
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4358 ff_init_range_encoder(c, buf, buf_size);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4359 memcpy(s->header_state, rc_header_bak, sizeof(s->header_state));
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4360 memcpy(s->block_state, rc_block_bak, sizeof(s->block_state));
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4361 encode_header(s);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4362 encode_blocks(s, 0);
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4363 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4364 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4365
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4366 for(level=0; level<s->spatial_decomposition_count; level++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4367 for(orientation=level ? 1 : 0; orientation<4; orientation++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4368 SubBand *b= &p->band[level][orientation];
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4369
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4370 if(!QUANTIZE2)
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4371 quantize(s, b, b->ibuf, b->buf, b->stride, s->qbias);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4372 if(orientation==0)
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6475
diff changeset
4373 decorrelate(s, b, b->ibuf, b->stride, pict->pict_type == FF_P_TYPE, 0);
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4374 encode_subband(s, b, b->ibuf, b->parent ? b->parent->ibuf : NULL, b->stride, orientation);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4375 assert(b->parent==NULL || b->parent->stride == b->stride*2);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4376 if(orientation==0)
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4377 correlate(s, b, b->ibuf, b->stride, 1, 0);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4378 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4379 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4380
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4381 for(level=0; level<s->spatial_decomposition_count; level++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4382 for(orientation=level ? 1 : 0; orientation<4; orientation++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4383 SubBand *b= &p->band[level][orientation];
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4384
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4385 dequantize(s, b, b->ibuf, b->stride);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4386 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4387 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4388
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4389 ff_spatial_idwt(s->spatial_idwt_buffer, w, h, w, s->spatial_decomposition_type, s->spatial_decomposition_count);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4390 if(s->qlog == LOSSLESS_QLOG){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4391 for(y=0; y<h; y++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4392 for(x=0; x<w; x++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4393 s->spatial_idwt_buffer[y*w + x]<<=FRAC_BITS;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4394 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4395 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4396 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4397 predict_plane(s, s->spatial_idwt_buffer, plane_index, 1);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4398 }else{
3338
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4399 //ME/MC only
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6475
diff changeset
4400 if(pict->pict_type == FF_I_TYPE){
3338
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4401 for(y=0; y<h; y++){
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4402 for(x=0; x<w; x++){
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4403 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
4404 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
4405 }
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4406 }
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4407 }else{
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
4408 memset(s->spatial_idwt_buffer, 0, sizeof(IDWTELEM)*w*h);
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
4409 predict_plane(s, s->spatial_idwt_buffer, plane_index, 1);
3338
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4410 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4411 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4412 if(s->avctx->flags&CODEC_FLAG_PSNR){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4413 int64_t error= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4414
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4415 if(pict->data[plane_index]) //FIXME gray hack
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4416 for(y=0; y<h; y++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4417 for(x=0; x<w; x++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4418 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];
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4419 error += d*d;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4420 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4421 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4422 s->avctx->error[plane_index] += error;
2232
960e3552e418 per picture psnr
michael
parents: 2224
diff changeset
4423 s->current_picture.error[plane_index] = error;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4424 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4425
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4426 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4427
6144
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
4428 update_last_header_values(s);
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
4429
9374
c3a8ca9d0477 Factorize release_buffer()
michael
parents: 9373
diff changeset
4430 release_buffer(avctx);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4431
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4432 s->current_picture.coded_picture_number = avctx->frame_number;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4433 s->current_picture.pict_type = pict->pict_type;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4434 s->current_picture.quality = pict->quality;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4435 s->m.frame_bits = 8*(s->c.bytestream - s->c.bytestream_start);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4436 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
4437 s->m.current_picture.display_picture_number =
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4438 s->m.current_picture.coded_picture_number = avctx->frame_number;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4439 s->m.current_picture.quality = pict->quality;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4440 s->m.total_bits += 8*(s->c.bytestream - s->c.bytestream_start);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4441 if(s->pass1_rc)
3766
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4442 if (ff_rate_estimate_qscale(&s->m, 0) < 0)
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4443 return -1;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4444 if(avctx->flags&CODEC_FLAG_PASS1)
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4445 ff_write_pass1_stats(&s->m);
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4446 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
4447 avctx->frame_bits = s->m.frame_bits;
5c86acb39889 outputs bit spent on various encoding functions (motion vectors, overhead, etc)
gpoirier
parents: 4122
diff changeset
4448 avctx->mv_bits = s->m.mv_bits;
5c86acb39889 outputs bit spent on various encoding functions (motion vectors, overhead, etc)
gpoirier
parents: 4122
diff changeset
4449 avctx->misc_bits = s->m.misc_bits;
5c86acb39889 outputs bit spent on various encoding functions (motion vectors, overhead, etc)
gpoirier
parents: 4122
diff changeset
4450 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
4451
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4452 emms_c();
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4453
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4454 return ff_rac_terminate(c);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4455 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4456
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6481
diff changeset
4457 static av_cold void common_end(SnowContext *s){
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4458 int plane_index, level, orientation, i;
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4459
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4460 av_freep(&s->spatial_dwt_buffer);
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
4461 av_freep(&s->spatial_idwt_buffer);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4462
8239
dcfdb3352dde Fix regression test failure with pthreads on multiprocessor systems.
michael
parents: 8214
diff changeset
4463 s->m.me.temp= NULL;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4464 av_freep(&s->m.me.scratchpad);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4465 av_freep(&s->m.me.map);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4466 av_freep(&s->m.me.score_map);
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
4467 av_freep(&s->m.obmc_scratchpad);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4468
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
4469 av_freep(&s->block);
8214
c5276ad92ff8 snow: move scratch buffer from stack to malloced buffer in context
mru
parents: 7622
diff changeset
4470 av_freep(&s->scratchbuf);
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4471
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4472 for(i=0; i<MAX_REF_FRAMES; i++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4473 av_freep(&s->ref_mvs[i]);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4474 av_freep(&s->ref_scores[i]);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4475 if(s->last_picture[i].data[0])
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4476 s->avctx->release_buffer(s->avctx, &s->last_picture[i]);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4477 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4478
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4479 for(plane_index=0; plane_index<3; plane_index++){
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4480 for(level=s->spatial_decomposition_count-1; level>=0; level--){
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4481 for(orientation=level ? 1 : 0; orientation<4; orientation++){
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4482 SubBand *b= &s->plane[plane_index].band[level][orientation];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4483
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4484 av_freep(&b->x_coeff);
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4485 }
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4486 }
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4487 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4488 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4489
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6481
diff changeset
4490 static av_cold int encode_end(AVCodecContext *avctx)
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4491 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4492 SnowContext *s = avctx->priv_data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4493
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4494 common_end(s);
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4495 av_free(avctx->stats_out);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4496
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4497 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4498 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4499
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6481
diff changeset
4500 static av_cold int decode_init(AVCodecContext *avctx)
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4501 {
2635
eaa57c3336fc PIX_FMT_NONE and related fixes
michael
parents: 2634
diff changeset
4502 avctx->pix_fmt= PIX_FMT_YUV420P;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4503
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4504 common_init(avctx);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4505
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4506 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4507 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4508
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9291
diff changeset
4509 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt){
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9291
diff changeset
4510 const uint8_t *buf = avpkt->data;
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9291
diff changeset
4511 int buf_size = avpkt->size;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4512 SnowContext *s = avctx->priv_data;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4513 RangeCoder * const c= &s->c;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4514 int bytes_read;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4515 AVFrame *picture = data;
9374
c3a8ca9d0477 Factorize release_buffer()
michael
parents: 9373
diff changeset
4516 int level, orientation, plane_index;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4517
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4518 ff_init_range_decoder(c, buf, buf_size);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4519 ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4520
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4521 s->current_picture.pict_type= FF_I_TYPE; //FIXME I vs. P
5668
52aae8c63b30 do not ignore return of decode_header()
michael
parents: 5667
diff changeset
4522 if(decode_header(s)<0)
52aae8c63b30 do not ignore return of decode_header()
michael
parents: 5667
diff changeset
4523 return -1;
5665
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
4524 common_init_after_header(avctx);
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
4525
5662
77297fe0311c allocate slice buffer after parsing the header containing needed parameters
michael
parents: 5661
diff changeset
4526 // realloc slice buffer for the case that spatial_decomposition_count changed
77297fe0311c allocate slice buffer after parsing the header containing needed parameters
michael
parents: 5661
diff changeset
4527 slice_buffer_destroy(&s->sb);
77297fe0311c allocate slice buffer after parsing the header containing needed parameters
michael
parents: 5661
diff changeset
4528 slice_buffer_init(&s->sb, s->plane[0].height, (MB_SIZE >> s->block_max_depth) + s->spatial_decomposition_count * 8 + 1, s->plane[0].width, s->spatial_idwt_buffer);
77297fe0311c allocate slice buffer after parsing the header containing needed parameters
michael
parents: 5661
diff changeset
4529
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
4530 for(plane_index=0; plane_index<3; plane_index++){
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
4531 Plane *p= &s->plane[plane_index];
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
4532 p->fast_mc= p->diag_mc && p->htaps==6 && p->hcoeff[0]==40
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
4533 && p->hcoeff[1]==-10
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
4534 && p->hcoeff[2]==2;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
4535 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
4536
9370
25fa07ef8e2b Make sure the block array is of the correct size.
michael
parents: 9369
diff changeset
4537 alloc_blocks(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4538
9372
9bb96825fc10 Skip non intra frames that have no reference frames.
michael
parents: 9371
diff changeset
4539 if(frame_start(s) < 0)
9bb96825fc10 Skip non intra frames that have no reference frames.
michael
parents: 9371
diff changeset
4540 return -1;
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
4541 //keyframe flag duplication mess FIXME
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4542 if(avctx->debug&FF_DEBUG_PICT_INFO)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4543 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
4544
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
4545 decode_blocks(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4546
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4547 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4548 Plane *p= &s->plane[plane_index];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4549 int w= p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4550 int h= p->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4551 int x, y;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4552 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
4553
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4554 if(s->avctx->debug&2048){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4555 memset(s->spatial_dwt_buffer, 0, sizeof(DWTELEM)*w*h);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4556 predict_plane(s, s->spatial_idwt_buffer, plane_index, 1);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4557
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4558 for(y=0; y<h; y++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4559 for(x=0; x<w; x++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4560 int v= s->current_picture.data[plane_index][y*s->current_picture.linesize[plane_index] + x];
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4561 s->mconly_picture.data[plane_index][y*s->mconly_picture.linesize[plane_index] + x]= v;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4562 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4563 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4564 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4565
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4566 {
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4567 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
4568 for(orientation=level ? 1 : 0; orientation<4; orientation++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4569 SubBand *b= &p->band[level][orientation];
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4570 unpack_coeffs(s, b, b->parent, orientation);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4571 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4572 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4573 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4574
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4575 {
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4576 const int mb_h= s->b_height << s->block_max_depth;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4577 const int block_size = MB_SIZE >> s->block_max_depth;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4578 const int block_w = plane_index ? block_size/2 : block_size;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4579 int mb_y;
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
4580 DWTCompose cs[MAX_DECOMPOSITIONS];
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4581 int yd=0, yq=0;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4582 int y;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4583 int end_y;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4584
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4585 ff_spatial_idwt_buffered_init(cs, &s->sb, w, h, 1, s->spatial_decomposition_type, s->spatial_decomposition_count);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4586 for(mb_y=0; mb_y<=mb_h; mb_y++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4587
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4588 int slice_starty = block_w*mb_y;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4589 int slice_h = block_w*(mb_y+1);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4590 if (!(s->keyframe || s->avctx->debug&512)){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4591 slice_starty = FFMAX(0, slice_starty - (block_w >> 1));
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4592 slice_h -= (block_w >> 1);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4593 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4594
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4595 for(level=0; level<s->spatial_decomposition_count; level++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4596 for(orientation=level ? 1 : 0; orientation<4; orientation++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4597 SubBand *b= &p->band[level][orientation];
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4598 int start_y;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4599 int end_y;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4600 int our_mb_start = mb_y;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4601 int our_mb_end = (mb_y + 1);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4602 const int extra= 3;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4603 start_y = (mb_y ? ((block_w * our_mb_start) >> (s->spatial_decomposition_count - level)) + s->spatial_decomposition_count - level + extra: 0);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4604 end_y = (((block_w * our_mb_end) >> (s->spatial_decomposition_count - level)) + s->spatial_decomposition_count - level + extra);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4605 if (!(s->keyframe || s->avctx->debug&512)){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4606 start_y = FFMAX(0, start_y - (block_w >> (1+s->spatial_decomposition_count - level)));
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4607 end_y = FFMAX(0, end_y - (block_w >> (1+s->spatial_decomposition_count - level)));
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4608 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4609 start_y = FFMIN(b->height, start_y);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4610 end_y = FFMIN(b->height, end_y);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4611
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4612 if (start_y != end_y){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4613 if (orientation == 0){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4614 SubBand * correlate_band = &p->band[0][0];
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4615 int correlate_end_y = FFMIN(b->height, end_y + 1);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4616 int correlate_start_y = FFMIN(b->height, (start_y ? start_y + 1 : 0));
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4617 decode_subband_slice_buffered(s, correlate_band, &s->sb, correlate_start_y, correlate_end_y, decode_state[0][0]);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4618 correlate_slice_buffered(s, &s->sb, correlate_band, correlate_band->ibuf, correlate_band->stride, 1, 0, correlate_start_y, correlate_end_y);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4619 dequantize_slice_buffered(s, &s->sb, correlate_band, correlate_band->ibuf, correlate_band->stride, start_y, end_y);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4620 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4621 else
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4622 decode_subband_slice_buffered(s, b, &s->sb, start_y, end_y, decode_state[level][orientation]);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4623 }
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4624 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4625 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4626
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4627 for(; yd<slice_h; yd+=4){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4628 ff_spatial_idwt_buffered_slice(&s->dsp, cs, &s->sb, w, h, 1, s->spatial_decomposition_type, s->spatial_decomposition_count, yd);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4629 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4630
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4631 if(s->qlog == LOSSLESS_QLOG){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4632 for(; yq<slice_h && yq<h; yq++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4633 IDWTELEM * line = slice_buffer_get_line(&s->sb, yq);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4634 for(x=0; x<w; x++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4635 line[x] <<= FRAC_BITS;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4636 }
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4637 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4638 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4639
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4640 predict_slice_buffered(s, &s->sb, s->spatial_idwt_buffer, plane_index, 1, mb_y);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4641
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4642 y = FFMIN(p->height, slice_starty);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4643 end_y = FFMIN(p->height, slice_h);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4644 while(y < end_y)
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4645 slice_buffer_release(&s->sb, y++);
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4646 }
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4647
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4648 slice_buffer_flush(&s->sb);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4649 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4650
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4651 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4652
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4653 emms_c();
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4654
9374
c3a8ca9d0477 Factorize release_buffer()
michael
parents: 9373
diff changeset
4655 release_buffer(avctx);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4656
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4657 if(!(s->avctx->debug&2048))
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4658 *picture= s->current_picture;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4659 else
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4660 *picture= s->mconly_picture;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4661
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4662 *data_size = sizeof(AVFrame);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4663
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4664 bytes_read= c->bytestream - c->bytestream_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4665 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
4666
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4667 return bytes_read;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4668 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4669
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6481
diff changeset
4670 static av_cold int decode_end(AVCodecContext *avctx)
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4671 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4672 SnowContext *s = avctx->priv_data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4673
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4674 slice_buffer_destroy(&s->sb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4675
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4676 common_end(s);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4677
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4678 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4679 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4680
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4681 AVCodec snow_decoder = {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4682 "snow",
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4683 CODEC_TYPE_VIDEO,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4684 CODEC_ID_SNOW,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4685 sizeof(SnowContext),
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4686 decode_init,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4687 NULL,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4688 decode_end,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4689 decode_frame,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4690 0 /*CODEC_CAP_DR1*/ /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
6712
5b3acf9fd50a Add long names to AVCodec declarations.
diego
parents: 6517
diff changeset
4691 NULL,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6712
diff changeset
4692 .long_name = NULL_IF_CONFIG_SMALL("Snow"),
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4693 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4694
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8308
diff changeset
4695 #if CONFIG_SNOW_ENCODER
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4696 AVCodec snow_encoder = {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4697 "snow",
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4698 CODEC_TYPE_VIDEO,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4699 CODEC_ID_SNOW,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4700 sizeof(SnowContext),
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4701 encode_init,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4702 encode_frame,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4703 encode_end,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6712
diff changeset
4704 .long_name = NULL_IF_CONFIG_SMALL("Snow"),
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4705 };
2408
a6e4da1c28ee Disable encoders patch by (Gianluigi Tiesi <mplayer netfarm it>)
michael
parents: 2368
diff changeset
4706 #endif
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4707
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4708
6164
ecaf5226e9b0 Consistently use TEST as the preprocessor condition to enable test code.
diego
parents: 6144
diff changeset
4709 #ifdef TEST
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4710 #undef malloc
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4711 #undef free
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4712 #undef printf
9199
ea0e5e9a520f Replace random() usage in test programs by av_lfg_*().
diego
parents: 9197
diff changeset
4713
ea0e5e9a520f Replace random() usage in test programs by av_lfg_*().
diego
parents: 9197
diff changeset
4714 #include "libavutil/lfg.h"
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4715
5934
bd5f4dc81fbe main() --> main(void)
diego
parents: 5925
diff changeset
4716 int main(void){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4717 int width=256;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4718 int height=256;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4719 int buffer[2][width*height];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4720 SnowContext s;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4721 int i;
9388
2313bf51945b cosmetics: Rename prn variable to prng (Pseudo Random Number Generator).
diego
parents: 9376
diff changeset
4722 AVLFG prng;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4723 s.spatial_decomposition_count=6;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4724 s.spatial_decomposition_type=1;
9199
ea0e5e9a520f Replace random() usage in test programs by av_lfg_*().
diego
parents: 9197
diff changeset
4725
9388
2313bf51945b cosmetics: Rename prn variable to prng (Pseudo Random Number Generator).
diego
parents: 9376
diff changeset
4726 av_lfg_init(&prng, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4727
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4728 printf("testing 5/3 DWT\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4729 for(i=0; i<width*height; i++)
9388
2313bf51945b cosmetics: Rename prn variable to prng (Pseudo Random Number Generator).
diego
parents: 9376
diff changeset
4730 buffer[0][i] = buffer[1][i] = av_lfg_get(&prng) % 54321 - 12345;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4731
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4732 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
4733 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
4734
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4735 for(i=0; i<width*height; i++)
9197
ce32a456ce9a Align test program output columns.
diego
parents: 8627
diff changeset
4736 if(buffer[0][i]!= buffer[1][i]) printf("fsck: %6d %12d %7d\n",i, buffer[0][i], buffer[1][i]);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4737
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4738 printf("testing 9/7 DWT\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4739 s.spatial_decomposition_type=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4740 for(i=0; i<width*height; i++)
9388
2313bf51945b cosmetics: Rename prn variable to prng (Pseudo Random Number Generator).
diego
parents: 9376
diff changeset
4741 buffer[0][i] = buffer[1][i] = av_lfg_get(&prng) % 54321 - 12345;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4742
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4743 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
4744 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
4745
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4746 for(i=0; i<width*height; i++)
9197
ce32a456ce9a Align test program output columns.
diego
parents: 8627
diff changeset
4747 if(FFABS(buffer[0][i] - buffer[1][i])>20) printf("fsck: %6d %12d %7d\n",i, buffer[0][i], buffer[1][i]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4748
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4749 #if 0
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4750 printf("testing AC coder\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4751 memset(s.header_state, 0, sizeof(s.header_state));
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4752 ff_init_range_encoder(&s.c, buffer[0], 256*256);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4753 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
4754
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4755 for(i=-256; i<256; i++){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
4756 put_symbol(&s.c, s.header_state, i*i*i/3*FFABS(i), 1);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4757 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4758 ff_rac_terminate(&s.c);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4759
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4760 memset(s.header_state, 0, sizeof(s.header_state));
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4761 ff_init_range_decoder(&s.c, buffer[0], 256*256);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4762 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
4763
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4764 for(i=-256; i<256; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4765 int j;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4766 j= get_symbol(&s.c, s.header_state, 1);
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
4767 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
4768 }
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4769 #endif
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4770 {
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4771 int level, orientation, x, y;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4772 int64_t errors[8][4];
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4773 int64_t g=0;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4774
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4775 memset(errors, 0, sizeof(errors));
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4776 s.spatial_decomposition_count=3;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4777 s.spatial_decomposition_type=0;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4778 for(level=0; level<s.spatial_decomposition_count; level++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4779 for(orientation=level ? 1 : 0; orientation<4; orientation++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4780 int w= width >> (s.spatial_decomposition_count-level);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4781 int h= height >> (s.spatial_decomposition_count-level);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4782 int stride= width << (s.spatial_decomposition_count-level);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4783 DWTELEM *buf= buffer[0];
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4784 int64_t error=0;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4785
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4786 if(orientation&1) buf+=w;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4787 if(orientation>1) buf+=stride>>1;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4788
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4789 memset(buffer[0], 0, sizeof(int)*width*height);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4790 buf[w/2 + h/2*stride]= 256*256;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4791 ff_spatial_idwt(buffer[0], width, height, width, s.spatial_decomposition_type, s.spatial_decomposition_count);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4792 for(y=0; y<height; y++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4793 for(x=0; x<width; x++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4794 int64_t d= buffer[0][x + y*width];
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4795 error += d*d;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4796 if(FFABS(width/2-x)<9 && FFABS(height/2-y)<9 && level==2) printf("%8"PRId64" ", d);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4797 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4798 if(FFABS(height/2-y)<9 && level==2) printf("\n");
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4799 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4800 error= (int)(sqrt(error)+0.5);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4801 errors[level][orientation]= error;
8611
a637db9f59b1 export gcd function as av_gcd()
aurel
parents: 8590
diff changeset
4802 if(g) g=av_gcd(g, error);
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4803 else g= error;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4804 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4805 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4806 printf("static int const visual_weight[][4]={\n");
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4807 for(level=0; level<s.spatial_decomposition_count; level++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4808 printf(" {");
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4809 for(orientation=0; orientation<4; orientation++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4810 printf("%8"PRId64",", errors[level][orientation]/g);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4811 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4812 printf("},\n");
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4813 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4814 printf("};\n");
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4815 {
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4816 int level=2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4817 int w= width >> (s.spatial_decomposition_count-level);
6168
27f4e3175dac Remove unused variables in test code.
diego
parents: 6164
diff changeset
4818 //int h= height >> (s.spatial_decomposition_count-level);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4819 int stride= width << (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4820 DWTELEM *buf= buffer[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4821 int64_t error=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4822
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4823 buf+=w;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4824 buf+=stride>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4825
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4826 memset(buffer[0], 0, sizeof(int)*width*height);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4827 #if 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4828 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4829 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4830 int tab[4]={0,2,3,1};
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4831 buffer[0][x+width*y]= 256*256*tab[(x&1) + 2*(y&1)];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4832 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4833 }
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4834 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
4835 #else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4836 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4837 for(x=0; x<w; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4838 buf[x + y*stride ]=169;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4839 buf[x + y*stride-w]=64;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4840 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4841 }
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4842 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
4843 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4844 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4845 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4846 int64_t d= buffer[0][x + y*width];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4847 error += d*d;
4122
daae66c03857 Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 4011
diff changeset
4848 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
4849 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
4850 if(FFABS(height/2-y)<9) printf("\n");
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4851 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4852 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4853
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4854 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4855 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4856 }
6164
ecaf5226e9b0 Consistently use TEST as the preprocessor condition to enable test code.
diego
parents: 6144
diff changeset
4857 #endif /* TEST */