annotate snow.c @ 5651:ab023c9f03d0 libavcodec

store halfpel filter coefficients in the header as well as the flag for diagonal interpolation the primary reason for this change is that previously MC up to 1/4 pel matched H.264 exactly and that increases the risk of stumbling over patents secondly this allows 0.10 db or more quality gain by choosing a longer filter and the filter could also be chosen optimally for each frame though that of course would cause speed loss at the decoder and encoder side ...
author michael
date Sat, 08 Sep 2007 14:51:13 +0000
parents 2a25f7167c09
children 941e5deeb2a4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1 /*
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2 * Copyright (C) 2004 Michael Niedermayer <michaelni@gmx.at>
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3920
diff changeset
4 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3920
diff changeset
5 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3920
diff changeset
6 * FFmpeg is free software; you can redistribute it and/or
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
7 * modify it under the terms of the GNU Lesser General Public
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
8 * License as published by the Free Software Foundation; either
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3920
diff changeset
9 * version 2.1 of the License, or (at your option) any later version.
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
10 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3920
diff changeset
11 * FFmpeg is distributed in the hope that it will be useful,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
14 * Lesser General Public License for more details.
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
15 *
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
16 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3920
diff changeset
17 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 3035
diff changeset
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
19 */
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
20
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
21 #include "avcodec.h"
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
22 #include "dsputil.h"
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
23 #include "snow.h"
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
24
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
25 #include "rangecoder.h"
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
26
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
27 #include "mpegvideo.h"
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
28
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
29 #undef NDEBUG
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
30 #include <assert.h>
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
31
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
32 static const int8_t quant3[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
33 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
34 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
35 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
36 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
37 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
38 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
39 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
40 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
41 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
42 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
43 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
44 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
45 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
46 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
47 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
48 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
49 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
50 static const int8_t quant3b[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
51 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
52 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
53 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
54 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
55 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
56 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
57 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
58 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
59 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
60 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
61 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
62 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
63 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
64 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
65 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
66 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
67 };
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
68 static const int8_t quant3bA[256]={
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
69 0, 0, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
70 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
71 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
72 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
73 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
74 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
75 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
76 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
77 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
78 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
79 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
80 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
81 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
82 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
83 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
84 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
85 };
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
86 static const int8_t quant5[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
87 0, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
88 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
89 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
90 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
91 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
92 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
93 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
94 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
95 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
96 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
97 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
98 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
99 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
100 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
101 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
102 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
103 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
104 static const int8_t quant7[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
105 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
106 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
107 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
108 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
109 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
110 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
111 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
112 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
113 -3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
114 -3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
115 -3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
116 -3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
117 -3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
118 -3,-3,-3,-3,-3,-3,-3,-3,-3,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
119 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
120 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
121 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
122 static const int8_t quant9[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
123 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
124 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
125 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
126 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
127 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
128 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
129 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
130 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
131 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
132 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
133 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
134 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
135 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
136 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
137 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-3,-3,-3,-3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
138 -3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-2,-2,-2,-2,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
139 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
140 static const int8_t quant11[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
141 0, 1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
142 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
143 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
144 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
145 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
146 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
147 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
148 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
149 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
150 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
151 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
152 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
153 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
154 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
155 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
156 -4,-4,-4,-4,-4,-3,-3,-3,-3,-3,-3,-3,-2,-2,-2,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
157 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
158 static const int8_t quant13[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
159 0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
160 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
161 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
162 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
163 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
164 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
165 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
166 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
167 -6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
168 -6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
169 -6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
170 -6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
171 -6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
172 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
173 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
174 -4,-4,-4,-4,-4,-4,-4,-4,-4,-3,-3,-3,-3,-2,-2,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
175 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
176
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
177 #if 0 //64*cubic
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
178 static const uint8_t obmc32[1024]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
179 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
180 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
181 0, 0, 0, 1, 1, 1, 1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
182 0, 0, 1, 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 7, 8, 8, 8, 8, 7, 7, 6, 6, 5, 4, 4, 3, 2, 2, 1, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
183 0, 0, 1, 2, 2, 3, 4, 6, 7, 8, 9,10,11,12,12,12,12,12,12,11,10, 9, 8, 7, 6, 4, 3, 2, 2, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
184 0, 1, 1, 2, 3, 5, 6, 8,10,11,13,14,15,16,17,18,18,17,16,15,14,13,11,10, 8, 6, 5, 3, 2, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
185 0, 1, 1, 3, 4, 6, 8,10,13,15,17,19,20,22,22,23,23,22,22,20,19,17,15,13,10, 8, 6, 4, 3, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
186 0, 1, 2, 4, 6, 8,10,13,16,19,21,23,25,27,28,29,29,28,27,25,23,21,19,16,13,10, 8, 6, 4, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
187 0, 1, 2, 4, 7,10,13,16,19,22,25,28,31,33,34,35,35,34,33,31,28,25,22,19,16,13,10, 7, 4, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
188 0, 1, 3, 5, 8,11,15,19,22,26,30,33,36,38,40,41,41,40,38,36,33,30,26,22,19,15,11, 8, 5, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
189 0, 1, 3, 6, 9,12,17,21,25,30,34,38,41,44,45,46,46,45,44,41,38,34,30,25,21,17,12, 9, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
190 0, 1, 3, 6,10,14,19,23,28,33,38,42,45,48,51,52,52,51,48,45,42,38,33,28,23,19,14,10, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
191 0, 1, 4, 7,11,15,20,25,31,36,41,45,49,52,55,56,56,55,52,49,45,41,36,31,25,20,15,11, 7, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
192 0, 2, 4, 7,12,16,22,27,33,38,44,48,52,56,58,60,60,58,56,52,48,44,38,33,27,22,16,12, 7, 4, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
193 0, 1, 4, 8,12,17,22,28,34,40,45,51,55,58,61,62,62,61,58,55,51,45,40,34,28,22,17,12, 8, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
194 0, 2, 4, 8,12,18,23,29,35,41,46,52,56,60,62,64,64,62,60,56,52,46,41,35,29,23,18,12, 8, 4, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
195 0, 2, 4, 8,12,18,23,29,35,41,46,52,56,60,62,64,64,62,60,56,52,46,41,35,29,23,18,12, 8, 4, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
196 0, 1, 4, 8,12,17,22,28,34,40,45,51,55,58,61,62,62,61,58,55,51,45,40,34,28,22,17,12, 8, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
197 0, 2, 4, 7,12,16,22,27,33,38,44,48,52,56,58,60,60,58,56,52,48,44,38,33,27,22,16,12, 7, 4, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
198 0, 1, 4, 7,11,15,20,25,31,36,41,45,49,52,55,56,56,55,52,49,45,41,36,31,25,20,15,11, 7, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
199 0, 1, 3, 6,10,14,19,23,28,33,38,42,45,48,51,52,52,51,48,45,42,38,33,28,23,19,14,10, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
200 0, 1, 3, 6, 9,12,17,21,25,30,34,38,41,44,45,46,46,45,44,41,38,34,30,25,21,17,12, 9, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
201 0, 1, 3, 5, 8,11,15,19,22,26,30,33,36,38,40,41,41,40,38,36,33,30,26,22,19,15,11, 8, 5, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
202 0, 1, 2, 4, 7,10,13,16,19,22,25,28,31,33,34,35,35,34,33,31,28,25,22,19,16,13,10, 7, 4, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
203 0, 1, 2, 4, 6, 8,10,13,16,19,21,23,25,27,28,29,29,28,27,25,23,21,19,16,13,10, 8, 6, 4, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
204 0, 1, 1, 3, 4, 6, 8,10,13,15,17,19,20,22,22,23,23,22,22,20,19,17,15,13,10, 8, 6, 4, 3, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
205 0, 1, 1, 2, 3, 5, 6, 8,10,11,13,14,15,16,17,18,18,17,16,15,14,13,11,10, 8, 6, 5, 3, 2, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
206 0, 0, 1, 2, 2, 3, 4, 6, 7, 8, 9,10,11,12,12,12,12,12,12,11,10, 9, 8, 7, 6, 4, 3, 2, 2, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
207 0, 0, 1, 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 7, 8, 8, 8, 8, 7, 7, 6, 6, 5, 4, 4, 3, 2, 2, 1, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
208 0, 0, 0, 1, 1, 1, 1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
209 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
210 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
211 //error:0.000022
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
212 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
213 static const uint8_t obmc16[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
214 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
215 0, 1, 1, 2, 4, 5, 5, 6, 6, 5, 5, 4, 2, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
216 0, 1, 4, 6, 9,11,13,15,15,13,11, 9, 6, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
217 0, 2, 6,11,15,20,24,26,26,24,20,15,11, 6, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
218 0, 4, 9,15,23,29,34,38,38,34,29,23,15, 9, 4, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
219 0, 5,11,20,29,38,45,49,49,45,38,29,20,11, 5, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
220 1, 5,13,24,34,45,53,57,57,53,45,34,24,13, 5, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
221 1, 6,15,26,38,49,57,62,62,57,49,38,26,15, 6, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
222 1, 6,15,26,38,49,57,62,62,57,49,38,26,15, 6, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
223 1, 5,13,24,34,45,53,57,57,53,45,34,24,13, 5, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
224 0, 5,11,20,29,38,45,49,49,45,38,29,20,11, 5, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
225 0, 4, 9,15,23,29,34,38,38,34,29,23,15, 9, 4, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
226 0, 2, 6,11,15,20,24,26,26,24,20,15,11, 6, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
227 0, 1, 4, 6, 9,11,13,15,15,13,11, 9, 6, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
228 0, 1, 1, 2, 4, 5, 5, 6, 6, 5, 5, 4, 2, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
229 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
230 //error:0.000033
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
231 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
232 #elif 1 // 64*linear
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
233 static const uint8_t obmc32[1024]={
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
234 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
235 0, 4, 4, 4, 8, 8, 8, 12, 12, 16, 16, 16, 20, 20, 20, 24, 24, 20, 20, 20, 16, 16, 16, 12, 12, 8, 8, 8, 4, 4, 4, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
236 0, 4, 8, 8, 12, 12, 16, 20, 20, 24, 28, 28, 32, 32, 36, 40, 40, 36, 32, 32, 28, 28, 24, 20, 20, 16, 12, 12, 8, 8, 4, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
237 0, 4, 8, 12, 16, 20, 24, 28, 28, 32, 36, 40, 44, 48, 52, 56, 56, 52, 48, 44, 40, 36, 32, 28, 28, 24, 20, 16, 12, 8, 4, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
238 4, 8, 12, 16, 20, 24, 28, 32, 40, 44, 48, 52, 56, 60, 64, 68, 68, 64, 60, 56, 52, 48, 44, 40, 32, 28, 24, 20, 16, 12, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
239 4, 8, 12, 20, 24, 32, 36, 40, 48, 52, 56, 64, 68, 76, 80, 84, 84, 80, 76, 68, 64, 56, 52, 48, 40, 36, 32, 24, 20, 12, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
240 4, 8, 16, 24, 28, 36, 44, 48, 56, 60, 68, 76, 80, 88, 96,100,100, 96, 88, 80, 76, 68, 60, 56, 48, 44, 36, 28, 24, 16, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
241 4, 12, 20, 28, 32, 40, 48, 56, 64, 72, 80, 88, 92,100,108,116,116,108,100, 92, 88, 80, 72, 64, 56, 48, 40, 32, 28, 20, 12, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
242 4, 12, 20, 28, 40, 48, 56, 64, 72, 80, 88, 96,108,116,124,132,132,124,116,108, 96, 88, 80, 72, 64, 56, 48, 40, 28, 20, 12, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
243 4, 16, 24, 32, 44, 52, 60, 72, 80, 92,100,108,120,128,136,148,148,136,128,120,108,100, 92, 80, 72, 60, 52, 44, 32, 24, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
244 4, 16, 28, 36, 48, 56, 68, 80, 88,100,112,120,132,140,152,164,164,152,140,132,120,112,100, 88, 80, 68, 56, 48, 36, 28, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
245 4, 16, 28, 40, 52, 64, 76, 88, 96,108,120,132,144,156,168,180,180,168,156,144,132,120,108, 96, 88, 76, 64, 52, 40, 28, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
246 8, 20, 32, 44, 56, 68, 80, 92,108,120,132,144,156,168,180,192,192,180,168,156,144,132,120,108, 92, 80, 68, 56, 44, 32, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
247 8, 20, 32, 48, 60, 76, 88,100,116,128,140,156,168,184,196,208,208,196,184,168,156,140,128,116,100, 88, 76, 60, 48, 32, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
248 8, 20, 36, 52, 64, 80, 96,108,124,136,152,168,180,196,212,224,224,212,196,180,168,152,136,124,108, 96, 80, 64, 52, 36, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
249 8, 24, 40, 56, 68, 84,100,116,132,148,164,180,192,208,224,240,240,224,208,192,180,164,148,132,116,100, 84, 68, 56, 40, 24, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
250 8, 24, 40, 56, 68, 84,100,116,132,148,164,180,192,208,224,240,240,224,208,192,180,164,148,132,116,100, 84, 68, 56, 40, 24, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
251 8, 20, 36, 52, 64, 80, 96,108,124,136,152,168,180,196,212,224,224,212,196,180,168,152,136,124,108, 96, 80, 64, 52, 36, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
252 8, 20, 32, 48, 60, 76, 88,100,116,128,140,156,168,184,196,208,208,196,184,168,156,140,128,116,100, 88, 76, 60, 48, 32, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
253 8, 20, 32, 44, 56, 68, 80, 92,108,120,132,144,156,168,180,192,192,180,168,156,144,132,120,108, 92, 80, 68, 56, 44, 32, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
254 4, 16, 28, 40, 52, 64, 76, 88, 96,108,120,132,144,156,168,180,180,168,156,144,132,120,108, 96, 88, 76, 64, 52, 40, 28, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
255 4, 16, 28, 36, 48, 56, 68, 80, 88,100,112,120,132,140,152,164,164,152,140,132,120,112,100, 88, 80, 68, 56, 48, 36, 28, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
256 4, 16, 24, 32, 44, 52, 60, 72, 80, 92,100,108,120,128,136,148,148,136,128,120,108,100, 92, 80, 72, 60, 52, 44, 32, 24, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
257 4, 12, 20, 28, 40, 48, 56, 64, 72, 80, 88, 96,108,116,124,132,132,124,116,108, 96, 88, 80, 72, 64, 56, 48, 40, 28, 20, 12, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
258 4, 12, 20, 28, 32, 40, 48, 56, 64, 72, 80, 88, 92,100,108,116,116,108,100, 92, 88, 80, 72, 64, 56, 48, 40, 32, 28, 20, 12, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
259 4, 8, 16, 24, 28, 36, 44, 48, 56, 60, 68, 76, 80, 88, 96,100,100, 96, 88, 80, 76, 68, 60, 56, 48, 44, 36, 28, 24, 16, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
260 4, 8, 12, 20, 24, 32, 36, 40, 48, 52, 56, 64, 68, 76, 80, 84, 84, 80, 76, 68, 64, 56, 52, 48, 40, 36, 32, 24, 20, 12, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
261 4, 8, 12, 16, 20, 24, 28, 32, 40, 44, 48, 52, 56, 60, 64, 68, 68, 64, 60, 56, 52, 48, 44, 40, 32, 28, 24, 20, 16, 12, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
262 0, 4, 8, 12, 16, 20, 24, 28, 28, 32, 36, 40, 44, 48, 52, 56, 56, 52, 48, 44, 40, 36, 32, 28, 28, 24, 20, 16, 12, 8, 4, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
263 0, 4, 8, 8, 12, 12, 16, 20, 20, 24, 28, 28, 32, 32, 36, 40, 40, 36, 32, 32, 28, 28, 24, 20, 20, 16, 12, 12, 8, 8, 4, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
264 0, 4, 4, 4, 8, 8, 8, 12, 12, 16, 16, 16, 20, 20, 20, 24, 24, 20, 20, 20, 16, 16, 16, 12, 12, 8, 8, 8, 4, 4, 4, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
265 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
266 //error:0.000020
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
267 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
268 static const uint8_t obmc16[256]={
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
269 0, 4, 4, 8, 8, 12, 12, 16, 16, 12, 12, 8, 8, 4, 4, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
270 4, 8, 16, 20, 28, 32, 40, 44, 44, 40, 32, 28, 20, 16, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
271 4, 16, 24, 36, 44, 56, 64, 76, 76, 64, 56, 44, 36, 24, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
272 8, 20, 36, 48, 64, 76, 92,104,104, 92, 76, 64, 48, 36, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
273 8, 28, 44, 64, 80,100,116,136,136,116,100, 80, 64, 44, 28, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
274 12, 32, 56, 76,100,120,144,164,164,144,120,100, 76, 56, 32, 12,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
275 12, 40, 64, 92,116,144,168,196,196,168,144,116, 92, 64, 40, 12,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
276 16, 44, 76,104,136,164,196,224,224,196,164,136,104, 76, 44, 16,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
277 16, 44, 76,104,136,164,196,224,224,196,164,136,104, 76, 44, 16,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
278 12, 40, 64, 92,116,144,168,196,196,168,144,116, 92, 64, 40, 12,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
279 12, 32, 56, 76,100,120,144,164,164,144,120,100, 76, 56, 32, 12,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
280 8, 28, 44, 64, 80,100,116,136,136,116,100, 80, 64, 44, 28, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
281 8, 20, 36, 48, 64, 76, 92,104,104, 92, 76, 64, 48, 36, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
282 4, 16, 24, 36, 44, 56, 64, 76, 76, 64, 56, 44, 36, 24, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
283 4, 8, 16, 20, 28, 32, 40, 44, 44, 40, 32, 28, 20, 16, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
284 0, 4, 4, 8, 8, 12, 12, 16, 16, 12, 12, 8, 8, 4, 4, 0,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
285 //error:0.000015
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
286 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
287 #else //64*cos
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
288 static const uint8_t obmc32[1024]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
289 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
290 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
291 0, 0, 0, 1, 1, 1, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
292 0, 0, 1, 1, 1, 2, 2, 3, 4, 5, 5, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 5, 5, 4, 3, 2, 2, 1, 1, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
293 0, 0, 1, 1, 2, 3, 4, 5, 6, 7, 9,10,11,11,12,12,12,12,11,11,10, 9, 7, 6, 5, 4, 3, 2, 1, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
294 0, 0, 1, 2, 3, 5, 6, 8, 9,11,12,14,15,16,17,17,17,17,16,15,14,12,11, 9, 8, 6, 5, 3, 2, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
295 0, 1, 1, 2, 4, 6, 8,10,12,15,17,19,20,21,22,23,23,22,21,20,19,17,15,12,10, 8, 6, 4, 2, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
296 0, 1, 2, 3, 5, 8,10,13,16,19,21,24,26,27,28,29,29,28,27,26,24,21,19,16,13,10, 8, 5, 3, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
297 0, 1, 2, 4, 6, 9,12,16,19,23,26,29,31,33,34,35,35,34,33,31,29,26,23,19,16,12, 9, 6, 4, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
298 0, 1, 3, 5, 7,11,15,19,23,26,30,34,37,39,40,41,41,40,39,37,34,30,26,23,19,15,11, 7, 5, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
299 0, 1, 3, 5, 9,12,17,21,26,30,35,38,42,44,46,47,47,46,44,42,38,35,30,26,21,17,12, 9, 5, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
300 0, 1, 3, 6, 9,14,19,24,29,34,38,43,46,49,51,52,52,51,49,46,43,38,34,29,24,19,14, 9, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
301 0, 1, 3, 6,11,15,20,26,31,37,42,46,50,53,56,57,57,56,53,50,46,42,37,31,26,20,15,11, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
302 0, 1, 3, 7,11,16,21,27,33,39,44,49,53,57,59,60,60,59,57,53,49,44,39,33,27,21,16,11, 7, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
303 0, 1, 4, 7,12,17,22,28,34,40,46,51,56,59,61,63,63,61,59,56,51,46,40,34,28,22,17,12, 7, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
304 0, 1, 4, 7,12,17,23,29,35,41,47,52,57,60,63,64,64,63,60,57,52,47,41,35,29,23,17,12, 7, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
305 0, 1, 4, 7,12,17,23,29,35,41,47,52,57,60,63,64,64,63,60,57,52,47,41,35,29,23,17,12, 7, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
306 0, 1, 4, 7,12,17,22,28,34,40,46,51,56,59,61,63,63,61,59,56,51,46,40,34,28,22,17,12, 7, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
307 0, 1, 3, 7,11,16,21,27,33,39,44,49,53,57,59,60,60,59,57,53,49,44,39,33,27,21,16,11, 7, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
308 0, 1, 3, 6,11,15,20,26,31,37,42,46,50,53,56,57,57,56,53,50,46,42,37,31,26,20,15,11, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
309 0, 1, 3, 6, 9,14,19,24,29,34,38,43,46,49,51,52,52,51,49,46,43,38,34,29,24,19,14, 9, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
310 0, 1, 3, 5, 9,12,17,21,26,30,35,38,42,44,46,47,47,46,44,42,38,35,30,26,21,17,12, 9, 5, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
311 0, 1, 3, 5, 7,11,15,19,23,26,30,34,37,39,40,41,41,40,39,37,34,30,26,23,19,15,11, 7, 5, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
312 0, 1, 2, 4, 6, 9,12,16,19,23,26,29,31,33,34,35,35,34,33,31,29,26,23,19,16,12, 9, 6, 4, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
313 0, 1, 2, 3, 5, 8,10,13,16,19,21,24,26,27,28,29,29,28,27,26,24,21,19,16,13,10, 8, 5, 3, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
314 0, 1, 1, 2, 4, 6, 8,10,12,15,17,19,20,21,22,23,23,22,21,20,19,17,15,12,10, 8, 6, 4, 2, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
315 0, 0, 1, 2, 3, 5, 6, 8, 9,11,12,14,15,16,17,17,17,17,16,15,14,12,11, 9, 8, 6, 5, 3, 2, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
316 0, 0, 1, 1, 2, 3, 4, 5, 6, 7, 9,10,11,11,12,12,12,12,11,11,10, 9, 7, 6, 5, 4, 3, 2, 1, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
317 0, 0, 1, 1, 1, 2, 2, 3, 4, 5, 5, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 5, 5, 4, 3, 2, 2, 1, 1, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
318 0, 0, 0, 1, 1, 1, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
319 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
320 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
321 //error:0.000022
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
322 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
323 static const uint8_t obmc16[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
324 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
325 0, 0, 1, 2, 3, 4, 5, 5, 5, 5, 4, 3, 2, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
326 0, 1, 3, 6, 8,11,13,14,14,13,11, 8, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
327 0, 2, 6,10,15,20,24,26,26,24,20,15,10, 6, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
328 0, 3, 8,16,23,30,35,38,38,35,30,23,16, 8, 3, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
329 1, 4,11,20,30,39,46,49,49,46,39,30,20,11, 4, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
330 1, 5,13,24,35,46,54,58,58,54,46,35,24,13, 5, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
331 0, 5,14,26,38,49,58,63,63,58,49,38,26,14, 5, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
332 0, 5,14,26,38,49,58,63,63,58,49,38,26,14, 5, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
333 1, 5,13,24,35,46,54,58,58,54,46,35,24,13, 5, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
334 1, 4,11,20,30,39,46,49,49,46,39,30,20,11, 4, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
335 0, 3, 8,16,23,30,35,38,38,35,30,23,16, 8, 3, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
336 0, 2, 6,10,15,20,24,26,26,24,20,15,10, 6, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
337 0, 1, 3, 6, 8,11,13,14,14,13,11, 8, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
338 0, 0, 1, 2, 3, 4, 5, 5, 5, 5, 4, 3, 2, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
339 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
340 //error:0.000022
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
341 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
342 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
343
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
344 //linear *64
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
345 static const uint8_t obmc8[64]={
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
346 4, 12, 20, 28, 28, 20, 12, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
347 12, 36, 60, 84, 84, 60, 36, 12,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
348 20, 60,100,140,140,100, 60, 20,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
349 28, 84,140,196,196,140, 84, 28,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
350 28, 84,140,196,196,140, 84, 28,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
351 20, 60,100,140,140,100, 60, 20,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
352 12, 36, 60, 84, 84, 60, 36, 12,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
353 4, 12, 20, 28, 28, 20, 12, 4,
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
354 //error:0.000000
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
355 };
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
356
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
357 //linear *64
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
358 static const uint8_t obmc4[16]={
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
359 16, 48, 48, 16,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
360 48,144,144, 48,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
361 48,144,144, 48,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
362 16, 48, 48, 16,
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
363 //error:0.000000
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
364 };
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
365
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
366 static const uint8_t *obmc_tab[4]={
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
367 obmc32, obmc16, obmc8, obmc4
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
368 };
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
369
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
370 static int scale_mv_ref[MAX_REF_FRAMES][MAX_REF_FRAMES];
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
371
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
372 typedef struct BlockNode{
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
373 int16_t mx;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
374 int16_t my;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
375 uint8_t ref;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
376 uint8_t color[3];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
377 uint8_t type;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
378 //#define TYPE_SPLIT 1
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
379 #define BLOCK_INTRA 1
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
380 #define BLOCK_OPT 2
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
381 //#define TYPE_NOCOLOR 4
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
382 uint8_t level; //FIXME merge into type?
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
383 }BlockNode;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
384
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
385 static const BlockNode null_block= { //FIXME add border maybe
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
386 .color= {128,128,128},
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
387 .mx= 0,
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
388 .my= 0,
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
389 .ref= 0,
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
390 .type= 0,
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
391 .level= 0,
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
392 };
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
393
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
394 #define LOG2_MB_SIZE 4
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
395 #define MB_SIZE (1<<LOG2_MB_SIZE)
5575
a6f5ed050335 use more bits on the encoder side
michael
parents: 5572
diff changeset
396 #define ENCODER_EXTRA_BITS 4
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
397 #define HTAPS 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
398
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
399 typedef struct x_and_coeff{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
400 int16_t x;
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
401 uint16_t coeff;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
402 } x_and_coeff;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
403
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
404 typedef struct SubBand{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
405 int level;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
406 int stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
407 int width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
408 int height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
409 int qlog; ///< log(qscale)/log[2^(1/6)]
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
410 DWTELEM *buf;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
411 IDWTELEM *ibuf;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
412 int buf_x_offset;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
413 int buf_y_offset;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
414 int stride_line; ///< Stride measured in lines, not pixels.
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
415 x_and_coeff * x_coeff;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
416 struct SubBand *parent;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
417 uint8_t state[/*7*2*/ 7 + 512][32];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
418 }SubBand;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
419
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
420 typedef struct Plane{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
421 int width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
422 int height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
423 SubBand band[MAX_DECOMPOSITIONS][4];
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
424
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
425 int htaps;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
426 int8_t hcoeff[HTAPS/2];
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
427 int diag_mc;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
428 int fast_mc;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
429
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
430 int last_htaps;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
431 int8_t last_hcoeff[HTAPS/2];
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
432 int last_diag_mc;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
433 }Plane;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
434
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
435 typedef struct SnowContext{
4588
fc155ff94878 cosmetics: Fix another common typo, dependAnt --> dependEnt.
diego
parents: 4494
diff changeset
436 // MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to make the motion estimation eventually independent of MpegEncContext, so this will be removed then (FIXME/XXX)
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
437
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
438 AVCodecContext *avctx;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
439 RangeCoder c;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
440 DSPContext dsp;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
441 AVFrame new_picture;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
442 AVFrame input_picture; ///< new_picture with the internal linesizes
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
443 AVFrame current_picture;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
444 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
445 uint8_t *halfpel_plane[MAX_REF_FRAMES][4][4];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
446 AVFrame mconly_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
447 // uint8_t q_context[16];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
448 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
449 uint8_t block_state[128 + 32*128];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
450 int keyframe;
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
451 int always_reset;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
452 int version;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
453 int spatial_decomposition_type;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
454 int last_spatial_decomposition_type;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
455 int temporal_decomposition_type;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
456 int spatial_decomposition_count;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
457 int temporal_decomposition_count;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
458 int max_ref_frames;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
459 int ref_frames;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
460 int16_t (*ref_mvs[MAX_REF_FRAMES])[2];
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
461 uint32_t *ref_scores[MAX_REF_FRAMES];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
462 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
463 IDWTELEM *spatial_idwt_buffer;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
464 int colorspace_type;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
465 int chroma_h_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
466 int chroma_v_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
467 int spatial_scalability;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
468 int qlog;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
469 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
470 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
471 int lambda2;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
472 int pass1_rc;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
473 int mv_scale;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
474 int last_mv_scale;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
475 int qbias;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
476 int last_qbias;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
477 #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
478 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
479 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
480 int block_max_depth;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
481 int last_block_max_depth;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
482 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
483 BlockNode *block;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
484 #define ME_CACHE_SIZE 1024
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
485 int me_cache[ME_CACHE_SIZE];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
486 int me_cache_generation;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
487 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
488
4588
fc155ff94878 cosmetics: Fix another common typo, dependAnt --> dependEnt.
diego
parents: 4494
diff changeset
489 MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to make the motion estimation eventually independent of MpegEncContext, so this will be removed then (FIXME/XXX)
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
490 }SnowContext;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
491
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
492 typedef struct {
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
493 IDWTELEM *b0;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
494 IDWTELEM *b1;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
495 IDWTELEM *b2;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
496 IDWTELEM *b3;
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
497 int y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
498 } dwt_compose_t;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
499
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
500 #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
501 //#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
502
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
503 static void iterative_me(SnowContext *s);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
504
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
505 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
506 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
507 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
508
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
509 buf->base_buffer = base_buffer;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
510 buf->line_count = line_count;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
511 buf->line_width = line_width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
512 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
513 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
514 buf->data_stack = av_malloc (sizeof(IDWTELEM *) * max_allocated_lines);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
515
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
516 for (i = 0; i < max_allocated_lines; i++)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
517 {
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
518 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
519 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
520
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
521 buf->data_stack_top = max_allocated_lines - 1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
522 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
523
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
524 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
525 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
526 int offset;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
527 IDWTELEM * buffer;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
528
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
529 // av_log(NULL, AV_LOG_DEBUG, "Cache hit: %d\n", line);
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 offset = buf->line_width * line;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
537 buffer = buf->data_stack[buf->data_stack_top];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
538 buf->data_stack_top--;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
539 buf->line[line] = buffer;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
540
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
541 // av_log(NULL, AV_LOG_DEBUG, "slice_buffer_load_line: line: %d remaining: %d\n", line, buf->data_stack_top + 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
542
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
543 return buffer;
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
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
546 static void slice_buffer_release(slice_buffer * buf, int line)
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 int offset;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
549 IDWTELEM * buffer;
2589
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 assert(line >= 0 && line < buf->line_count);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
552 assert(buf->line[line]);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
553
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
554 offset = buf->line_width * line;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
555 buffer = buf->line[line];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
556 buf->data_stack_top++;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
557 buf->data_stack[buf->data_stack_top] = buffer;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
558 buf->line[line] = NULL;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
559
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
560 // av_log(NULL, AV_LOG_DEBUG, "slice_buffer_release: line: %d remaining: %d\n", line, buf->data_stack_top + 1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
561 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
562
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
563 static void slice_buffer_flush(slice_buffer * buf)
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 int i;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
566 for (i = 0; i < buf->line_count; i++)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
567 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
568 if (buf->line[i])
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
569 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
570 // av_log(NULL, AV_LOG_DEBUG, "slice_buffer_flush: line: %d \n", i);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
571 slice_buffer_release(buf, i);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
572 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
573 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
574 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
575
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
576 static void slice_buffer_destroy(slice_buffer * buf)
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 int i;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
579 slice_buffer_flush(buf);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
580
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
581 for (i = buf->data_count - 1; i >= 0; i--)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
582 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
583 assert(buf->data_stack[i]);
3190
e9fa3ac61966 av_free -> av_freep
michael
parents: 3189
diff changeset
584 av_freep(&buf->data_stack[i]);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
585 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
586 assert(buf->data_stack);
3190
e9fa3ac61966 av_free -> av_freep
michael
parents: 3189
diff changeset
587 av_freep(&buf->data_stack);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
588 assert(buf->line);
3190
e9fa3ac61966 av_free -> av_freep
michael
parents: 3189
diff changeset
589 av_freep(&buf->line);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
590 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
591
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2975
diff changeset
592 #ifdef __sgi
2368
a7ac68734a91 fix for build on IRIX by (Michel Bardiaux {mbardiaux peaktime be})
michael
parents: 2335
diff changeset
593 // Avoid a name clash on SGI IRIX
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2975
diff changeset
594 #undef qexp
2368
a7ac68734a91 fix for build on IRIX by (Michel Bardiaux {mbardiaux peaktime be})
michael
parents: 2335
diff changeset
595 #endif
2246
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
596 #define QEXPSHIFT (7-FRAC_BITS+8) //FIXME try to change this to 0
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
597 static uint8_t qexp[QROOT];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
598
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
599 static inline int mirror(int v, int m){
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
600 while((unsigned)v > (unsigned)m){
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
601 v=-v;
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
602 if(v<0) v+= 2*m;
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
603 }
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
604 return v;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
605 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
606
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
607 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
608 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
609
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
610 if(v){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
611 const int a= FFABS(v);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
612 const int e= av_log2(a);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
613 #if 1
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
614 const int el= FFMIN(e, 10);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
615 put_rac(c, state+0, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
616
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
617 for(i=0; i<el; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
618 put_rac(c, state+1+i, 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
619 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
620 for(; i<e; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
621 put_rac(c, state+1+9, 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
622 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
623 put_rac(c, state+1+FFMIN(i,9), 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
624
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
625 for(i=e-1; i>=el; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
626 put_rac(c, state+22+9, (a>>i)&1); //22..31
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
627 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
628 for(; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
629 put_rac(c, state+22+i, (a>>i)&1); //22..31
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
630 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
631
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
632 if(is_signed)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
633 put_rac(c, state+11 + el, v < 0); //11..21
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
634 #else
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
635
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
636 put_rac(c, state+0, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
637 if(e<=9){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
638 for(i=0; i<e; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
639 put_rac(c, state+1+i, 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
640 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
641 put_rac(c, state+1+i, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
642
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
643 for(i=e-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
644 put_rac(c, state+22+i, (a>>i)&1); //22..31
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
645 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
646
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
647 if(is_signed)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
648 put_rac(c, state+11 + e, v < 0); //11..21
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
649 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
650 for(i=0; i<e; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
651 put_rac(c, state+1+FFMIN(i,9), 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
652 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
653 put_rac(c, state+1+FFMIN(i,9), 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
654
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
655 for(i=e-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
656 put_rac(c, state+22+FFMIN(i,9), (a>>i)&1); //22..31
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
657 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
658
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
659 if(is_signed)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
660 put_rac(c, state+11 + FFMIN(e,10), v < 0); //11..21
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
661 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
662 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
663 }else{
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
664 put_rac(c, state+0, 1);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
665 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
666 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
667
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
668 static inline int get_symbol(RangeCoder *c, uint8_t *state, int is_signed){
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
669 if(get_rac(c, state+0))
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
670 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
671 else{
2240
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
672 int i, e, a;
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
673 e= 0;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
674 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
675 e++;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
676 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
677
2240
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
678 a= 1;
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
679 for(i=e-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
680 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
681 }
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
682
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
683 if(is_signed && get_rac(c, state+11 + FFMIN(e,10))) //11..21
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
684 return -a;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
685 else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
686 return a;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
687 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
688 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
689
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
690 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
691 int i;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
692 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
693
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
694 assert(v>=0);
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
695 assert(log2>=-4);
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
696
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
697 while(v >= r){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
698 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
699 v -= r;
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
700 log2++;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
701 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
702 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
703 put_rac(c, state+4+log2, 0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
704
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
705 for(i=log2-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
706 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
707 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
708 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
709
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
710 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
711 int i;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
712 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
713 int v=0;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
714
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
715 assert(log2>=-4);
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
716
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
717 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
718 v+= r;
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
719 log2++;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
720 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
721 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
722
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
723 for(i=log2-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
724 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
725 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
726
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
727 return v;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
728 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
729
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
730 static av_always_inline void
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
731 lift(DWTELEM *dst, DWTELEM *src, DWTELEM *ref,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
732 int dst_step, int src_step, int ref_step,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
733 int width, int mul, int add, int shift,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
734 int highpass, int inverse){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
735 const int mirror_left= !highpass;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
736 const int mirror_right= (width&1) ^ highpass;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
737 const int w= (width>>1) - 1 + (highpass & width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
738 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
739
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
740 #define LIFT(src, ref, inv) ((src) + ((inv) ? - (ref) : + (ref)))
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
741 if(mirror_left){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
742 dst[0] = LIFT(src[0], ((mul*2*ref[0]+add)>>shift), inverse);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
743 dst += dst_step;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
744 src += src_step;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
745 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
746
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
747 for(i=0; i<w; i++){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
748 dst[i*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
749 LIFT(src[i*src_step],
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
750 ((mul*(ref[i*ref_step] + ref[(i+1)*ref_step])+add)>>shift),
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
751 inverse);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
752 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
753
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
754 if(mirror_right){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
755 dst[w*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
756 LIFT(src[w*src_step],
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
757 ((mul*2*ref[w*ref_step]+add)>>shift),
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
758 inverse);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
759 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
760 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
761
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
762 static av_always_inline void
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
763 inv_lift(IDWTELEM *dst, IDWTELEM *src, IDWTELEM *ref,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
764 int dst_step, int src_step, int ref_step,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
765 int width, int mul, int add, int shift,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
766 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
767 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
768 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
769 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
770 int i;
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 #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
773 if(mirror_left){
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
774 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
775 dst += dst_step;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
776 src += src_step;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
777 }
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 for(i=0; i<w; i++){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
780 dst[i*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
781 LIFT(src[i*src_step],
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
782 ((mul*(ref[i*ref_step] + ref[(i+1)*ref_step])+add)>>shift),
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
783 inverse);
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
784 }
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
785
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
786 if(mirror_right){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
787 dst[w*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
788 LIFT(src[w*src_step],
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
789 ((mul*2*ref[w*ref_step]+add)>>shift),
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
790 inverse);
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
791 }
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
792 }
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
793
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
794 #ifndef liftS
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
795 static av_always_inline void
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
796 liftS(DWTELEM *dst, DWTELEM *src, DWTELEM *ref,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
797 int dst_step, int src_step, int ref_step,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
798 int width, int mul, int add, int shift,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
799 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
800 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
801 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
802 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
803 int i;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
804
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
805 assert(shift == 4);
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
806 #define LIFTS(src, ref, inv) \
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
807 ((inv) ? \
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
808 (src) + (((ref) + 4*(src))>>shift): \
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
809 -((-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
810 if(mirror_left){
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
811 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
812 dst += dst_step;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
813 src += src_step;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
814 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
815
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
816 for(i=0; i<w; i++){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
817 dst[i*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
818 LIFTS(src[i*src_step],
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
819 mul*(ref[i*ref_step] + ref[(i+1)*ref_step])+add,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
820 inverse);
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
821 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
822
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
823 if(mirror_right){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
824 dst[w*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
825 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
826 }
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
827 }
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
828 static av_always_inline void
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
829 inv_liftS(IDWTELEM *dst, IDWTELEM *src, IDWTELEM *ref,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
830 int dst_step, int src_step, int ref_step,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
831 int width, int mul, int add, int shift,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
832 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
833 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
834 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
835 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
836 int i;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
837
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
838 assert(shift == 4);
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
839 #define LIFTS(src, ref, inv) \
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
840 ((inv) ? \
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
841 (src) + (((ref) + 4*(src))>>shift): \
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
842 -((-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
843 if(mirror_left){
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
844 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
845 dst += dst_step;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
846 src += src_step;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
847 }
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
848
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
849 for(i=0; i<w; i++){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
850 dst[i*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
851 LIFTS(src[i*src_step],
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
852 mul*(ref[i*ref_step] + ref[(i+1)*ref_step])+add,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
853 inverse);
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
854 }
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
855
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
856 if(mirror_right){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
857 dst[w*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
858 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
859 }
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
860 }
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
861 #endif
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
862
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
863 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
864 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
865 const int width2= width>>1;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
866 int x;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
867 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
868
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
869 for(x=0; x<width2; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
870 temp[x ]= b[2*x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
871 temp[x+w2]= b[2*x + 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
872 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
873 if(width&1)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
874 temp[x ]= b[2*x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
875 #if 0
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
876 {
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
877 int A1,A2,A3,A4;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
878 A2= temp[1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
879 A4= temp[0 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
880 A1= temp[0+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
881 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
882 A4 += (A1 + 1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
883 b[0+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
884 b[0 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
885 for(x=1; x+1<width2; x+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
886 A3= temp[x+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
887 A4= temp[x+1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
888 A3 -= (A2 + A4)>>1;
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[x+width2] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
891 b[x ] = A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
892
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
893 A1= temp[x+1+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
894 A2= temp[x+2 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
895 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
896 A4 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
897 b[x+1+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
898 b[x+1 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
899 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
900 A3= temp[width-1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
901 A3 -= A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
902 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
903 b[width -1] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
904 b[width2-1] = A2;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
905 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
906 #else
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
907 lift(b+w2, temp+w2, temp, 1, 1, 1, width, -1, 0, 1, 1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
908 lift(b , temp , b+w2, 1, 1, 1, width, 1, 2, 2, 0, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
909 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
910 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
911
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
912 static void vertical_decompose53iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
913 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
914
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
915 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
916 b1[i] -= (b0[i] + b2[i])>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
917 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
918 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
919
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
920 static void vertical_decompose53iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
921 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
922
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
923 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
924 b1[i] += (b0[i] + b2[i] + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
925 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
926 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
927
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
928 static void spatial_decompose53i(DWTELEM *buffer, int width, int height, int stride){
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
929 int y;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
930 DWTELEM *b0= buffer + mirror(-2-1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
931 DWTELEM *b1= buffer + mirror(-2 , height-1)*stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
932
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
933 for(y=-2; y<height; y+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
934 DWTELEM *b2= buffer + mirror(y+1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
935 DWTELEM *b3= buffer + mirror(y+2, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
936
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
937 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
938 if(y+1<(unsigned)height) horizontal_decompose53i(b2, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
939 if(y+2<(unsigned)height) horizontal_decompose53i(b3, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
940 STOP_TIMER("horizontal_decompose53i")}
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
941
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
942 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
943 if(y+1<(unsigned)height) vertical_decompose53iH0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
944 if(y+0<(unsigned)height) vertical_decompose53iL0(b0, b1, b2, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
945 STOP_TIMER("vertical_decompose53i*")}
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
946
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
947 b0=b2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
948 b1=b3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
949 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
950 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
951
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
952 static void horizontal_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
953 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
954 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
955
5565
93082c591c8b Change rounding of the horizontal DWT to match the vertical one.
michael
parents: 5551
diff changeset
956 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
957 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
958 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
959 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
960 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
961
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
962
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
963 static void vertical_decompose97iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
964 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
965
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
966 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
967 b1[i] -= (W_AM*(b0[i] + b2[i])+W_AO)>>W_AS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
968 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
969 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
970
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
971 static void vertical_decompose97iH1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
972 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
973
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
974 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
975 b1[i] += (W_CM*(b0[i] + b2[i])+W_CO)>>W_CS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
976 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
977 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
978
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
979 static void vertical_decompose97iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
980 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
981
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
982 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
983 #ifdef liftS
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
984 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
985 #else
5565
93082c591c8b Change rounding of the horizontal DWT to match the vertical one.
michael
parents: 5551
diff changeset
986 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
987 #endif
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
988 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
989 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
990
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
991 static void vertical_decompose97iL1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
992 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
993
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
994 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
995 b1[i] += (W_DM*(b0[i] + b2[i])+W_DO)>>W_DS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
996 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
997 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
998
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
999 static void spatial_decompose97i(DWTELEM *buffer, int width, int height, int stride){
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
1000 int y;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1001 DWTELEM *b0= buffer + mirror(-4-1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1002 DWTELEM *b1= buffer + mirror(-4 , height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1003 DWTELEM *b2= buffer + mirror(-4+1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1004 DWTELEM *b3= buffer + mirror(-4+2, height-1)*stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1005
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1006 for(y=-4; y<height; y+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1007 DWTELEM *b4= buffer + mirror(y+3, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1008 DWTELEM *b5= buffer + mirror(y+4, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1009
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1010 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1011 if(y+3<(unsigned)height) horizontal_decompose97i(b4, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1012 if(y+4<(unsigned)height) horizontal_decompose97i(b5, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1013 if(width>400){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1014 STOP_TIMER("horizontal_decompose97i")
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1015 }}
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1016
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1017 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1018 if(y+3<(unsigned)height) vertical_decompose97iH0(b3, b4, b5, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1019 if(y+2<(unsigned)height) vertical_decompose97iL0(b2, b3, b4, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1020 if(y+1<(unsigned)height) vertical_decompose97iH1(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1021 if(y+0<(unsigned)height) vertical_decompose97iL1(b0, b1, b2, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1022
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1023 if(width>400){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1024 STOP_TIMER("vertical_decompose97i")
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1025 }}
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1026
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1027 b0=b2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1028 b1=b3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1029 b2=b4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1030 b3=b5;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1031 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1032 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1033
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1034 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
1035 int level;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1036
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
1037 for(level=0; level<decomposition_count; level++){
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
1038 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1039 case DWT_97: spatial_decompose97i(buffer, width>>level, height>>level, stride<<level); break;
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1040 case DWT_53: spatial_decompose53i(buffer, width>>level, height>>level, stride<<level); break;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1041 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1042 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1043 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1044
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1045 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
1046 IDWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1047 const int width2= width>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1048 const int w2= (width+1)>>1;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1049 int x;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1050
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1051 #if 0
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1052 int A1,A2,A3,A4;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1053 A2= temp[1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1054 A4= temp[0 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1055 A1= temp[0+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1056 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1057 A4 += (A1 + 1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1058 b[0+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1059 b[0 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1060 for(x=1; x+1<width2; x+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1061 A3= temp[x+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1062 A4= temp[x+1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1063 A3 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1064 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1065 b[x+width2] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1066 b[x ] = A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1067
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1068 A1= temp[x+1+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1069 A2= temp[x+2 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1070 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1071 A4 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1072 b[x+1+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1073 b[x+1 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1074 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1075 A3= temp[width-1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1076 A3 -= A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1077 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1078 b[width -1] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1079 b[width2-1] = A2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1080 #else
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1081 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
1082 inv_lift(temp+w2, b+w2, temp, 1, 1, 1, width, -1, 0, 1, 1, 1);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1083 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1084 for(x=0; x<width2; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1085 b[2*x ]= temp[x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1086 b[2*x + 1]= temp[x+w2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1087 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1088 if(width&1)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1089 b[2*x ]= temp[x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1090 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1091
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1092 static void vertical_compose53iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1093 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1094
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1095 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1096 b1[i] += (b0[i] + b2[i])>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1097 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1098 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1099
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1100 static void vertical_compose53iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1101 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1102
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1103 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1104 b1[i] -= (b0[i] + b2[i] + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1105 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1106 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1107
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1108 static void spatial_compose53i_buffered_init(dwt_compose_t *cs, slice_buffer * sb, int height, int stride_line){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1109 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
1110 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
1111 cs->y = -1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1112 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1113
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1114 static void spatial_compose53i_init(dwt_compose_t *cs, IDWTELEM *buffer, int height, int stride){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1115 cs->b0 = buffer + mirror(-1-1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1116 cs->b1 = buffer + mirror(-1 , height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1117 cs->y = -1;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1118 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1119
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1120 static void spatial_compose53i_dy_buffered(dwt_compose_t *cs, slice_buffer * sb, int width, int height, int stride_line){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1121 int y= cs->y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1122
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1123 IDWTELEM *b0= cs->b0;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1124 IDWTELEM *b1= cs->b1;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1125 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
1126 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
1127
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1128 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1129 if(y+1<(unsigned)height) vertical_compose53iL0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1130 if(y+0<(unsigned)height) vertical_compose53iH0(b0, b1, b2, width);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1131 STOP_TIMER("vertical_compose53i*")}
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1132
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1133 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1134 if(y-1<(unsigned)height) horizontal_compose53i(b0, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1135 if(y+0<(unsigned)height) horizontal_compose53i(b1, width);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1136 STOP_TIMER("horizontal_compose53i")}
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1137
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1138 cs->b0 = b2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1139 cs->b1 = b3;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1140 cs->y += 2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1141 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
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 static void spatial_compose53i_dy(dwt_compose_t *cs, IDWTELEM *buffer, int width, int height, int stride){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1144 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
1145 IDWTELEM *b0= cs->b0;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1146 IDWTELEM *b1= cs->b1;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1147 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
1148 IDWTELEM *b3= buffer + mirror(y+2, height-1)*stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1149
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1150 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1151 if(y+1<(unsigned)height) vertical_compose53iL0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1152 if(y+0<(unsigned)height) vertical_compose53iH0(b0, b1, b2, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1153 STOP_TIMER("vertical_compose53i*")}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1154
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1155 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1156 if(y-1<(unsigned)height) horizontal_compose53i(b0, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1157 if(y+0<(unsigned)height) horizontal_compose53i(b1, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1158 STOP_TIMER("horizontal_compose53i")}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1159
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1160 cs->b0 = b2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1161 cs->b1 = b3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1162 cs->y += 2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1163 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
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 spatial_compose53i(IDWTELEM *buffer, int width, int height, int stride){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1166 dwt_compose_t cs;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1167 spatial_compose53i_init(&cs, buffer, height, stride);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1168 while(cs.y <= height)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1169 spatial_compose53i_dy(&cs, buffer, width, height, stride);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1170 }
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1171
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1172
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1173 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
1174 IDWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1175 const int w2= (width+1)>>1;
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 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
1178 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
1179 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
1180 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
1181 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1182
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1183 static void vertical_compose97iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1184 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1185
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1186 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1187 b1[i] += (W_AM*(b0[i] + b2[i])+W_AO)>>W_AS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1188 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1189 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1190
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1191 static void vertical_compose97iH1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1192 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1193
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1194 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1195 b1[i] -= (W_CM*(b0[i] + b2[i])+W_CO)>>W_CS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1196 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1197 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1198
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1199 static void vertical_compose97iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1200 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1201
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1202 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
1203 #ifdef liftS
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1204 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
1205 #else
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1206 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
1207 #endif
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1208 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1209 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1210
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1211 static void vertical_compose97iL1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1212 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1213
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1214 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1215 b1[i] -= (W_DM*(b0[i] + b2[i])+W_DO)>>W_DS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1216 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1217 }
1ac13c350369 my experimental wavelet codec
michael
parents:
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 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
1220 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1221
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1222 for(i=0; i<width; i++){
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1223 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
1224 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
1225 #ifdef liftS
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1226 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
1227 #else
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1228 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
1229 #endif
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1230 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
1231 }
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1232 }
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1233
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1234 static void spatial_compose97i_buffered_init(dwt_compose_t *cs, slice_buffer * sb, int height, int stride_line){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1235 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
1236 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
1237 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
1238 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
1239 cs->y = -3;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1240 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1241
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1242 static void spatial_compose97i_init(dwt_compose_t *cs, IDWTELEM *buffer, int height, int stride){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1243 cs->b0 = buffer + mirror(-3-1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1244 cs->b1 = buffer + mirror(-3 , height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1245 cs->b2 = buffer + mirror(-3+1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1246 cs->b3 = buffer + mirror(-3+2, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1247 cs->y = -3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1248 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1249
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1250 static void spatial_compose97i_dy_buffered(DSPContext *dsp, dwt_compose_t *cs, slice_buffer * sb, int width, int height, int stride_line){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1251 int y = cs->y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1252
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1253 IDWTELEM *b0= cs->b0;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1254 IDWTELEM *b1= cs->b1;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1255 IDWTELEM *b2= cs->b2;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1256 IDWTELEM *b3= cs->b3;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1257 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
1258 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
1259
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1260 {START_TIMER
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1261 if(y>0 && y+4<height){
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1262 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
1263 }else{
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1264 if(y+3<(unsigned)height) vertical_compose97iL1(b3, b4, b5, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1265 if(y+2<(unsigned)height) vertical_compose97iH1(b2, b3, b4, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1266 if(y+1<(unsigned)height) vertical_compose97iL0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1267 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
1268 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1269 if(width>400){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1270 STOP_TIMER("vertical_compose97i")}}
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1271
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1272 {START_TIMER
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1273 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
1274 if(y+0<(unsigned)height) dsp->horizontal_compose97i(b1, width);
3012
088920c095fc cleanup
michael
parents: 3000
diff changeset
1275 if(width>400 && y+0<(unsigned)height){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1276 STOP_TIMER("horizontal_compose97i")}}
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1277
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1278 cs->b0=b2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1279 cs->b1=b3;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1280 cs->b2=b4;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1281 cs->b3=b5;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1282 cs->y += 2;
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
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1285 static void spatial_compose97i_dy(dwt_compose_t *cs, IDWTELEM *buffer, int width, int height, int stride){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1286 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
1287 IDWTELEM *b0= cs->b0;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1288 IDWTELEM *b1= cs->b1;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1289 IDWTELEM *b2= cs->b2;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1290 IDWTELEM *b3= cs->b3;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1291 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
1292 IDWTELEM *b5= buffer + mirror(y+4, height-1)*stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1293
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1294 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1295 if(y+3<(unsigned)height) vertical_compose97iL1(b3, b4, b5, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1296 if(y+2<(unsigned)height) vertical_compose97iH1(b2, b3, b4, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1297 if(y+1<(unsigned)height) vertical_compose97iL0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1298 if(y+0<(unsigned)height) vertical_compose97iH0(b0, b1, b2, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1299 if(width>400){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1300 STOP_TIMER("vertical_compose97i")}}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1301
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1302 {START_TIMER
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1303 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
1304 if(y+0<(unsigned)height) ff_snow_horizontal_compose97i(b1, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1305 if(width>400 && b0 <= b2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1306 STOP_TIMER("horizontal_compose97i")}}
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1307
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1308 cs->b0=b2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1309 cs->b1=b3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1310 cs->b2=b4;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1311 cs->b3=b5;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1312 cs->y += 2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1313 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1314
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1315 static void spatial_compose97i(IDWTELEM *buffer, int width, int height, int stride){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1316 dwt_compose_t cs;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1317 spatial_compose97i_init(&cs, buffer, height, stride);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1318 while(cs.y <= height)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1319 spatial_compose97i_dy(&cs, buffer, width, height, stride);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1320 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1321
3075
961af1358c7f add static keyword to some functions
mru
parents: 3063
diff changeset
1322 static void ff_spatial_idwt_buffered_init(dwt_compose_t *cs, slice_buffer * sb, int width, int height, int stride_line, int type, int decomposition_count){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1323 int level;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1324 for(level=decomposition_count-1; level>=0; level--){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1325 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1326 case DWT_97: spatial_compose97i_buffered_init(cs+level, sb, height>>level, stride_line<<level); break;
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1327 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
1328 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1329 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1330 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1331
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1332 static void ff_spatial_idwt_init(dwt_compose_t *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
1333 int level;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1334 for(level=decomposition_count-1; level>=0; level--){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1335 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1336 case DWT_97: spatial_compose97i_init(cs+level, buffer, height>>level, stride<<level); break;
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1337 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
1338 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1339 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1340 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1341
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1342 static void ff_spatial_idwt_slice(dwt_compose_t *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
1343 const int support = type==1 ? 3 : 5;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1344 int level;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1345 if(type==2) return;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1346
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1347 for(level=decomposition_count-1; level>=0; level--){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1348 while(cs[level].y <= FFMIN((y>>level)+support, height>>level)){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1349 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1350 case DWT_97: spatial_compose97i_dy(cs+level, buffer, width>>level, height>>level, stride<<level);
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1351 break;
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1352 case DWT_53: spatial_compose53i_dy(cs+level, buffer, width>>level, height>>level, stride<<level);
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1353 break;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1354 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1355 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1356 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1357 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1358
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1359 static void ff_spatial_idwt_buffered_slice(DSPContext *dsp, dwt_compose_t *cs, slice_buffer * slice_buf, int width, int height, int stride_line, int type, int decomposition_count, int y){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1360 const int support = type==1 ? 3 : 5;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1361 int level;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1362 if(type==2) return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1363
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1364 for(level=decomposition_count-1; level>=0; level--){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1365 while(cs[level].y <= FFMIN((y>>level)+support, height>>level)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1366 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1367 case DWT_97: spatial_compose97i_dy_buffered(dsp, cs+level, slice_buf, width>>level, height>>level, stride_line<<level);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1368 break;
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1369 case DWT_53: spatial_compose53i_dy_buffered(cs+level, slice_buf, width>>level, height>>level, stride_line<<level);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1370 break;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1371 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1372 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1373 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1374 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1375
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1376 static void ff_spatial_idwt(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
1377 dwt_compose_t cs[MAX_DECOMPOSITIONS];
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1378 int y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1379 ff_spatial_idwt_init(cs, buffer, width, height, stride, type, decomposition_count);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1380 for(y=0; y<height; y+=4)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1381 ff_spatial_idwt_slice(cs, buffer, width, height, stride, type, decomposition_count, y);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1382 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1383
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1384 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
1385 const int w= b->width;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1386 const int h= b->height;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1387 int x, y;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1388
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1389 if(1){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1390 int run=0;
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1391 int runs[w*h];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1392 int run_index=0;
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1393 int max_index;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1394
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1395 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1396 for(x=0; x<w; x++){
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1397 int v, p=0;
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1398 int /*ll=0, */l=0, lt=0, t=0, rt=0;
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1399 v= src[x + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1400
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1401 if(y){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1402 t= src[x + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1403 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1404 lt= src[x - 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1405 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1406 if(x + 1 < w){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1407 rt= src[x + 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1408 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1409 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1410 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1411 l= src[x - 1 + y*stride];
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1412 /*if(x > 1){
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1413 if(orientation==1) ll= src[y + (x-2)*stride];
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1414 else ll= src[x - 2 + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1415 }*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1416 }
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1417 if(parent){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1418 int px= x>>1;
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1419 int py= y>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1420 if(px<b->parent->width && py<b->parent->height)
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1421 p= parent[px + py*2*stride];
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1422 }
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1423 if(!(/*ll|*/l|lt|t|rt|p)){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1424 if(v){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1425 runs[run_index++]= run;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1426 run=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1427 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1428 run++;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1429 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1430 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1431 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1432 }
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1433 max_index= run_index;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1434 runs[run_index++]= run;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1435 run_index=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1436 run= runs[run_index++];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1437
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1438 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
1439 if(run_index <= max_index)
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1440 put_symbol2(&s->c, b->state[1], run, 3);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1441
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1442 for(y=0; y<h; y++){
2435
c89ac0e70c66 10l patch by (matthieu castet <castet.matthieu free fr>)
michael
parents: 2422
diff changeset
1443 if(s->c.bytestream_end - s->c.bytestream < w*40){
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1444 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1445 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1446 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1447 for(x=0; x<w; x++){
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1448 int v, p=0;
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1449 int /*ll=0, */l=0, lt=0, t=0, rt=0;
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1450 v= src[x + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1451
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1452 if(y){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1453 t= src[x + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1454 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1455 lt= src[x - 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1456 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1457 if(x + 1 < w){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1458 rt= src[x + 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1459 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1460 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1461 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1462 l= src[x - 1 + y*stride];
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1463 /*if(x > 1){
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1464 if(orientation==1) ll= src[y + (x-2)*stride];
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1465 else ll= src[x - 2 + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1466 }*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1467 }
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1468 if(parent){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1469 int px= x>>1;
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1470 int py= y>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1471 if(px<b->parent->width && py<b->parent->height)
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1472 p= parent[px + py*2*stride];
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1473 }
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1474 if(/*ll|*/l|lt|t|rt|p){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1475 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
1476
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1477 put_rac(&s->c, &b->state[0][context], !!v);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1478 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1479 if(!run){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1480 run= runs[run_index++];
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1481
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1482 if(run_index <= max_index)
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1483 put_symbol2(&s->c, b->state[1], run, 3);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1484 assert(v);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1485 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1486 run--;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1487 assert(!v);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1488 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1489 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1490 if(v){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1491 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
1492 int l2= 2*FFABS(l) + (l<0);
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1493 int t2= 2*FFABS(t) + (t<0);
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1494
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1495 put_symbol2(&s->c, b->state[context + 2], FFABS(v)-1, context-4);
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1496 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
1497 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1498 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1499 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1500 }
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1501 return 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1502 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1503
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1504 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
1505 // 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
1506 // encode_subband_z0run(s, b, src, parent, stride, orientation);
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1507 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
1508 // 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
1509 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1510
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1511 static inline void unpack_coeffs(SnowContext *s, SubBand *b, SubBand * parent, int orientation){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1512 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1513 const int h= b->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1514 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1515
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1516 if(1){
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1517 int run, runs;
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1518 x_and_coeff *xc= b->x_coeff;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1519 x_and_coeff *prev_xc= NULL;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1520 x_and_coeff *prev2_xc= xc;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1521 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
1522 x_and_coeff *prev_parent_xc= parent_xc;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1523
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1524 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
1525 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
1526 else run= INT_MAX;
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1527
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1528 for(y=0; y<h; y++){
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1529 int v=0;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1530 int lt=0, t=0, rt=0;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1531
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1532 if(y && prev_xc->x == 0){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1533 rt= prev_xc->coeff;
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1534 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1535 for(x=0; x<w; x++){
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1536 int p=0;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1537 const int l= v;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1538
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1539 lt= t; t= rt;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1540
2194
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1541 if(y){
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1542 if(prev_xc->x <= x)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1543 prev_xc++;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1544 if(prev_xc->x == x + 1)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1545 rt= prev_xc->coeff;
2194
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1546 else
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1547 rt=0;
d29037435955 11% faster decode_subband()
michael
parents: 2193
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){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1550 if(x>>1 > parent_xc->x){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1551 parent_xc++;
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1552 }
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1553 if(x>>1 == parent_xc->x){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1554 p= parent_xc->coeff;
2194
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1555 }
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1556 }
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1557 if(/*ll|*/l|lt|t|rt|p){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1558 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
1559
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1560 v=get_rac(&s->c, &b->state[0][context]);
2605
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1561 if(v){
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1562 v= 2*(get_symbol2(&s->c, b->state[context + 2], context-4) + 1);
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1563 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
1564
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1565 xc->x=x;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1566 (xc++)->coeff= v;
2605
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1567 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1568 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1569 if(!run){
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1570 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
1571 else run= INT_MAX;
2605
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1572 v= 2*(get_symbol2(&s->c, b->state[0 + 2], 0-4) + 1);
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1573 v+=get_rac(&s->c, &b->state[0][16 + 1 + 3]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1574
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1575 xc->x=x;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1576 (xc++)->coeff= v;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1577 }else{
2606
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1578 int max_run;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1579 run--;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1580 v=0;
2191
44afbcec70b8 50% faster decode_subband()
michael
parents: 2189
diff changeset
1581
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1582 if(y) max_run= FFMIN(run, prev_xc->x - x - 2);
2606
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1583 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
1584 if(parent_xc)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1585 max_run= FFMIN(max_run, 2*parent_xc->x - x - 1);
2606
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1586 x+= max_run;
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1587 run-= max_run;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1588 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1589 }
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1590 }
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1591 (xc++)->x= w+1; //end marker
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1592 prev_xc= prev2_xc;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1593 prev2_xc= xc;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1594
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1595 if(parent_xc){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1596 if(y&1){
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1597 while(parent_xc->x != parent->width+1)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1598 parent_xc++;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1599 parent_xc++;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1600 prev_parent_xc= parent_xc;
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1601 }else{
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1602 parent_xc= prev_parent_xc;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1603 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1604 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1605 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1606
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1607 (xc++)->x= w+1; //end marker
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1608 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1609 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1610
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1611 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
1612 const int w= b->width;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1613 int y;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4588
diff changeset
1614 const int qlog= av_clip(s->qlog + b->qlog, 0, QROOT*16);
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
1615 int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1616 int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1617 int new_index = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1618
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1619 START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1620
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1621 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
1622 qadd= 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1623 qmul= 1<<QEXPSHIFT;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1624 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1625
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1626 /* 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
1627 if (start_y != 0)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1628 new_index = save_state[0];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1629
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1630
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1631 for(y=start_y; y<h; y++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1632 int x = 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1633 int v;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1634 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
1635 memset(line, 0, b->width*sizeof(IDWTELEM));
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1636 v = b->x_coeff[new_index].coeff;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1637 x = b->x_coeff[new_index++].x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1638 while(x < w)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1639 {
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1640 register int t= ( (v>>1)*qmul + qadd)>>QEXPSHIFT;
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1641 register int u= -(v&1);
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1642 line[x] = (t^u) - u;
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1643
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1644 v = b->x_coeff[new_index].coeff;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1645 x = b->x_coeff[new_index++].x;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1646 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1647 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1648 if(w > 200 && start_y != 0/*level+1 == s->spatial_decomposition_count*/){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1649 STOP_TIMER("decode_subband")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1650 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1651
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1652 /* Save our variables for the next slice. */
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1653 save_state[0] = new_index;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1654
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1655 return;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1656 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1657
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
1658 static void reset_contexts(SnowContext *s){ //FIXME better initial contexts
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1659 int plane_index, level, orientation;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1660
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
1661 for(plane_index=0; plane_index<3; plane_index++){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1662 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1663 for(orientation=level ? 1:0; orientation<4; orientation++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1664 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
1665 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1666 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1667 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1668 memset(s->header_state, MID_STATE, sizeof(s->header_state));
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1669 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
1670 }
70b27300a496 quad 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 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
1673 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
1674 int h= -((-s->avctx->height)>>LOG2_MB_SIZE);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1675
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
1676 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
1677 s->b_height= h;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1678
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
1679 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
1680 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
1681 }
70b27300a496 quad 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
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1683 static inline void copy_rac_state(RangeCoder *d, RangeCoder *s){
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1684 uint8_t *bytestream= d->bytestream;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1685 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
1686 *d= *s;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1687 d->bytestream= bytestream;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1688 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
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
70b27300a496 quad 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 //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
1692 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
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 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
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 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
1697 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
1698 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
1699 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
1700 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
1701 }
70b27300a496 quad 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 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
1703 }
70b27300a496 quad 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 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
1705 }
70b27300a496 quad 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
70b27300a496 quad 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 //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
1708 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
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 int s, i, j;
4179
46d38e3d7038 rename squareTbl -> ff_squareTbl
mru
parents: 4123
diff changeset
1711 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
1712
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1713 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
1714 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
1715 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
1716 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
1717 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
1718 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1719 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
1720 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1721 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
1722 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1723
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1724 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
1725 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
1726 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
1727 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
1728 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
1729 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
1730 int i,j;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1731
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
1732 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
1733 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
1734 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
1735 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
1736 block.my= my;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1737 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
1738 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
1739 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
1740
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1741 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
1742 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
1743 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
1744 }
70b27300a496 quad 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 }
70b27300a496 quad 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 }
70b27300a496 quad 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
70b27300a496 quad 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 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
1749 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
1750 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
1751 ((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
1752 ((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
1753 };
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1754 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
1755 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
1756 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
1757 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
1758 }
70b27300a496 quad 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 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
1760 }
70b27300a496 quad 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
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1762 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
1763 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
1764 if(s->ref_frames == 1){
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1765 *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
1766 *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
1767 }else{
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1768 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
1769 *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
1770 (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
1771 (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
1772 *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
1773 (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
1774 (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
1775 }
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1776 }
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1777
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 //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
1779 #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
1780 #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
1781 #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
1782 #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
1783 #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
1784 #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
1785
70b27300a496 quad 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 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
1787 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
1788 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
1789 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
1790 uint8_t i_state[sizeof(s->block_state)];
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1791 RangeCoder pc, ic;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1792 uint8_t *pbbak= s->c.bytestream;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1793 uint8_t *pbbak_start= s->c.bytestream_start;
5082
176ac8353f48 fix assertion failure
michael
parents: 4962
diff changeset
1794 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
1795 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
1796 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
1797 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
1798 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
1799 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
1800 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
1801 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
1802 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
1803 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
1804 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
1805 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
1806 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
1807 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
1808 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
1809 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
1810 int pcr= left->color[2];
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1811 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
1812 int mx=0, my=0;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1813 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
1814 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
1815 const int uvstride= s->current_picture.linesize[1];
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1816 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
1817 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
1818 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
1819 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
1820 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
1821 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
1822 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
1823 MotionEstContext *c= &s->m.me;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1824 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
1825 int mx_context= av_log2(2*FFABS(left->mx - top->mx));
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1826 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
1827 int s_context= 2*left->level + 2*top->level + tl->level + tr->level;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1828 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
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 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
1831 if(s->keyframe){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1832 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
1833 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
1834 }
70b27300a496 quad 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
70b27300a496 quad 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 // 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
1837
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1838 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
1839 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
1840 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
1841 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
1842 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
1843 P_TOPRIGHT[1]= tr->my;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1844
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
1845 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
1846 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
1847 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
1848 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
1849 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
1850 last_mv[2][1]= bottom->my;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1851
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
1852 s->m.mb_stride=2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1853 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
1854 s->m.mb_y= 0;
4360
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
1855 c->skip= 0;
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
1856
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
1857 assert(c-> stride == stride);
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
1858 assert(c->uvstride == uvstride);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1859
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
1860 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
1861 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
1862 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
1863 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
1864
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
1865 c->xmin = - x*block_w - 16+2;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
1866 c->ymin = - y*block_w - 16+2;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
1867 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
1868 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
1869
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1870 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
1871 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
1872 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
1873 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
1874 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
1875 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
1876 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
1877
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1878 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
1879 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
1880
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1881 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
1882 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
1883 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
1884 } 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
1885 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
1886 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
1887 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1888
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1889 score= INT_MAX;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1890 best_ref= 0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1891 for(ref=0; ref<s->ref_frames; ref++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1892 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
1893
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1894 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
1895 (1<<16)>>shift, level-LOG2_MB_SIZE+4, block_w);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1896
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1897 assert(ref_mx >= c->xmin);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1898 assert(ref_mx <= c->xmax);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1899 assert(ref_my >= c->ymin);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1900 assert(ref_my <= c->ymax);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1901
4360
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
1902 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
1903 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
1904 ref_score+= 2*av_log2(2*ref)*c->penalty_factor;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1905 if(s->ref_mvs[ref]){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1906 s->ref_mvs[ref][index][0]= ref_mx;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1907 s->ref_mvs[ref][index][1]= ref_my;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1908 s->ref_scores[ref][index]= ref_score;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1909 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1910 if(score > ref_score){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1911 score= ref_score;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1912 best_ref= ref;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1913 mx= ref_mx;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1914 my= ref_my;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1915 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1916 }
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5085
diff changeset
1917 //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
1918
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
1919 // subpel search
5085
81bbca75ae2f fix assert() 2nd try
michael
parents: 5082
diff changeset
1920 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
1921 pc= s->c;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1922 pc.bytestream_start=
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1923 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
1924 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
1925
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1926 if(level!=s->block_max_depth)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1927 put_rac(&pc, &p_state[4 + s_context], 1);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1928 put_rac(&pc, &p_state[1 + left->type + top->type], 0);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1929 if(s->ref_frames > 1)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1930 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
1931 pred_mv(s, &pmx, &pmy, best_ref, left, top, tr);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1932 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
1933 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
1934 p_len= pc.bytestream - pc.bytestream_start;
5082
176ac8353f48 fix assertion failure
michael
parents: 4962
diff changeset
1935 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
1936
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1937 block_s= block_w*block_w;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1938 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
1939 l= (sum + block_s/2)/block_s;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1940 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
1941
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 block_s= block_w*block_w>>2;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1943 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
1944 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
1945 // 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
1946 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
1947 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
1948 // 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
1949
70b27300a496 quad 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 ic= s->c;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1951 ic.bytestream_start=
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1952 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
1953 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
1954 if(level!=s->block_max_depth)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1955 put_rac(&ic, &i_state[4 + s_context], 1);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1956 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
1957 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
1958 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
1959 put_symbol(&ic, &i_state[96], cr-pcr, 1);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1960 i_len= ic.bytestream - ic.bytestream_start;
5082
176ac8353f48 fix assertion failure
michael
parents: 4962
diff changeset
1961 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
1962
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1963 // 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
1964 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
1965 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
1966 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
1967 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
1968
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1969 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
1970 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
1971 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
1972 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
1973 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
1974 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
1975 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
1976 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1977
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
1978 if(level!=s->block_max_depth){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1979 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
1980 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
1981 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
1982 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
1983 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
1984 score2+= s->lambda2>>FF_LAMBDA_SHIFT; //FIXME exact split overhead
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1985
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
1986 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
1987 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
1988 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1989
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
1990 if(iscore < score){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1991 pred_mv(s, &pmx, &pmy, 0, left, top, tr);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1992 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
1993 s->c= ic;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1994 s->c.bytestream_start= pbbak_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1995 s->c.bytestream= pbbak + i_len;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1996 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
1997 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
1998 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
1999 }else{
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2000 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
2001 s->c= pc;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2002 s->c.bytestream_start= pbbak_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2003 s->c.bytestream= pbbak + p_len;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2004 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
2005 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
2006 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
2007 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2008 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2009
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
2010 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
2011 if((a->type&BLOCK_INTRA) && (b->type&BLOCK_INTRA)){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2012 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
2013 }else{
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2014 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
2015 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2016 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2017
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2018 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
2019 const int w= s->b_width << s->block_max_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2020 const int rem_depth= s->block_max_depth - level;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2021 const int index= (x + y*w) << rem_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2022 int trx= (x+1)<<rem_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2023 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
2024 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
2025 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
2026 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
2027 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
2028 int pl = left->color[0];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2029 int pcb= left->color[1];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2030 int pcr= left->color[2];
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2031 int pmx, pmy;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2032 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
2033 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
2034 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
2035 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
2036
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2037 if(s->keyframe){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2038 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
2039 return;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2040 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2041
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2042 if(level!=s->block_max_depth){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2043 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
2044 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
2045 }else{
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2046 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
2047 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
2048 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
2049 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
2050 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
2051 return;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2052 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2053 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2054 if(b->type & BLOCK_INTRA){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2055 pred_mv(s, &pmx, &pmy, 0, left, top, tr);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2056 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
2057 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
2058 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
2059 put_symbol(&s->c, &s->block_state[96], b->color[2]-pcr, 1);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2060 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
2061 }else{
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2062 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
2063 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
2064 if(s->ref_frames > 1)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2065 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
2066 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
2067 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
2068 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
2069 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2070 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2071
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
2072 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
2073 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
2074 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
2075 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
2076 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
2077 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
2078 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
2079 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
2080 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
2081 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
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 if(s->keyframe){
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2084 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
2085 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
2086 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2087
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2088 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
2089 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
2090 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
2091 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
2092 int cr= left->color[2];
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2093 int ref = 0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2094 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
2095 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
2096 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
2097
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2098 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
2099
70b27300a496 quad 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 if(type){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2101 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
2102 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
2103 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
2104 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
2105 }else{
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2106 if(s->ref_frames > 1)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2107 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
2108 pred_mv(s, &mx, &my, ref, left, top, tr);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2109 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
2110 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
2111 }
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2112 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
2113 }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
2114 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
2115 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
2116 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
2117 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
2118 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2119 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2120
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
2121 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
2122 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
2123 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
2124 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
2125
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
2126 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
2127 iterative_me(s);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2128
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
2129 for(y=0; y<h; y++){
2435
c89ac0e70c66 10l patch by (matthieu castet <castet.matthieu free fr>)
michael
parents: 2422
diff changeset
2130 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
2131 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
2132 return;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
2133 }
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
2134 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
2135 if(s->avctx->me_method == ME_ITER || !search)
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2136 encode_q_branch2(s, 0, x, y);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2137 else
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2138 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
2139 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2140 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2141 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2142
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2143 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
2144 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
2145 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
2146 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
2147
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2148 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
2149 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
2150 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
2151 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2152 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2153 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2154
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2155 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){
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2156 const static uint8_t weight[64]={
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2157 8,7,6,5,4,3,2,1,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2158 7,7,0,0,0,0,0,1,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2159 6,0,6,0,0,0,2,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2160 5,0,0,5,0,3,0,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2161 4,0,0,0,4,0,0,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2162 3,0,0,5,0,3,0,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2163 2,0,6,0,0,0,2,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2164 1,7,0,0,0,0,0,1,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2165 };
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2166
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2167 const static uint8_t brane[256]={
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2168 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
2169 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
2170 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
2171 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
2172 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
2173 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
2174 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
2175 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
2176 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
2177 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
2178 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
2179 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
2180 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
2181 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
2182 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
2183 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
2184 };
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2185
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2186 const static uint8_t needs[16]={
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2187 0,1,0,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2188 2,4,2,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2189 0,1,0,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2190 15
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2191 };
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2192
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2193 int x, y, b, r, l;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2194 int16_t tmpIt [64*(32+HTAPS)];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2195 uint8_t tmp2t[3][stride*(32+HTAPS)];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2196 int16_t *tmpI= tmpIt;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2197 uint8_t *tmp2= tmp2t[0];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2198 uint8_t *hpel[11];
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2199 START_TIMER
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2200 assert(dx<16 && dy<16);
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2201 r= brane[dx + 16*dy]&15;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2202 l= brane[dx + 16*dy]>>4;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2203
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2204 b= needs[l] | needs[r];
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2205 if(p && !p->diag_mc)
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2206 b= 15;
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2207
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2208 if(b&5){
5649
9fe214a99139 indention
michael
parents: 5648
diff changeset
2209 for(y=0; y < b_h+HTAPS-1; y++){
9fe214a99139 indention
michael
parents: 5648
diff changeset
2210 for(x=0; x < b_w; x++){
9fe214a99139 indention
michael
parents: 5648
diff changeset
2211 int a_1=src[x + HTAPS/2-4];
9fe214a99139 indention
michael
parents: 5648
diff changeset
2212 int a0= src[x + HTAPS/2-3];
9fe214a99139 indention
michael
parents: 5648
diff changeset
2213 int a1= src[x + HTAPS/2-2];
9fe214a99139 indention
michael
parents: 5648
diff changeset
2214 int a2= src[x + HTAPS/2-1];
9fe214a99139 indention
michael
parents: 5648
diff changeset
2215 int a3= src[x + HTAPS/2+0];
9fe214a99139 indention
michael
parents: 5648
diff changeset
2216 int a4= src[x + HTAPS/2+1];
9fe214a99139 indention
michael
parents: 5648
diff changeset
2217 int a5= src[x + HTAPS/2+2];
9fe214a99139 indention
michael
parents: 5648
diff changeset
2218 int a6= src[x + HTAPS/2+3];
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2219 int am=0;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2220 if(!p || p->fast_mc){
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2221 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
2222 tmpI[x]= am;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2223 am= (am+16)>>5;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2224 }else{
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2225 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
2226 tmpI[x]= am;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2227 am= (am+32)>>6;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2228 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2229
5649
9fe214a99139 indention
michael
parents: 5648
diff changeset
2230 if(am&(~255)) am= ~(am>>31);
9fe214a99139 indention
michael
parents: 5648
diff changeset
2231 tmp2[x]= am;
9fe214a99139 indention
michael
parents: 5648
diff changeset
2232 }
9fe214a99139 indention
michael
parents: 5648
diff changeset
2233 tmpI+= 64;
9fe214a99139 indention
michael
parents: 5648
diff changeset
2234 tmp2+= stride;
9fe214a99139 indention
michael
parents: 5648
diff changeset
2235 src += stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2236 }
5649
9fe214a99139 indention
michael
parents: 5648
diff changeset
2237 src -= stride*y;
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2238 }
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2239 src += HTAPS/2 - 1;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2240 tmp2= tmp2t[1];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2241
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2242 if(b&2){
5649
9fe214a99139 indention
michael
parents: 5648
diff changeset
2243 for(y=0; y < b_h; y++){
9fe214a99139 indention
michael
parents: 5648
diff changeset
2244 for(x=0; x < b_w+1; x++){
9fe214a99139 indention
michael
parents: 5648
diff changeset
2245 int a_1=src[x + (HTAPS/2-4)*stride];
9fe214a99139 indention
michael
parents: 5648
diff changeset
2246 int a0= src[x + (HTAPS/2-3)*stride];
9fe214a99139 indention
michael
parents: 5648
diff changeset
2247 int a1= src[x + (HTAPS/2-2)*stride];
9fe214a99139 indention
michael
parents: 5648
diff changeset
2248 int a2= src[x + (HTAPS/2-1)*stride];
9fe214a99139 indention
michael
parents: 5648
diff changeset
2249 int a3= src[x + (HTAPS/2+0)*stride];
9fe214a99139 indention
michael
parents: 5648
diff changeset
2250 int a4= src[x + (HTAPS/2+1)*stride];
9fe214a99139 indention
michael
parents: 5648
diff changeset
2251 int a5= src[x + (HTAPS/2+2)*stride];
9fe214a99139 indention
michael
parents: 5648
diff changeset
2252 int a6= src[x + (HTAPS/2+3)*stride];
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2253 int am=0;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2254 if(!p || p->fast_mc)
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2255 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
2256 else
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2257 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
2258
5649
9fe214a99139 indention
michael
parents: 5648
diff changeset
2259 if(am&(~255)) am= ~(am>>31);
9fe214a99139 indention
michael
parents: 5648
diff changeset
2260 tmp2[x]= am;
9fe214a99139 indention
michael
parents: 5648
diff changeset
2261 }
9fe214a99139 indention
michael
parents: 5648
diff changeset
2262 src += stride;
9fe214a99139 indention
michael
parents: 5648
diff changeset
2263 tmp2+= stride;
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2264 }
5649
9fe214a99139 indention
michael
parents: 5648
diff changeset
2265 src -= stride*y;
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2266 }
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2267 src += stride*(HTAPS/2 - 1);
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2268 tmp2= tmp2t[2];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2269 tmpI= tmpIt;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2270 if(b&4){
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2271 for(y=0; y < b_h; y++){
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2272 for(x=0; x < b_w; x++){
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2273 int a_1=tmpI[x + (HTAPS/2-4)*64];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2274 int a0= tmpI[x + (HTAPS/2-3)*64];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2275 int a1= tmpI[x + (HTAPS/2-2)*64];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2276 int a2= tmpI[x + (HTAPS/2-1)*64];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2277 int a3= tmpI[x + (HTAPS/2+0)*64];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2278 int a4= tmpI[x + (HTAPS/2+1)*64];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2279 int a5= tmpI[x + (HTAPS/2+2)*64];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2280 int a6= tmpI[x + (HTAPS/2+3)*64];
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2281 int am=0;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2282 if(!p || p->fast_mc)
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2283 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
2284 else
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2285 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
2286 if(am&(~255)) am= ~(am>>31);
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2287 tmp2[x]= am;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2288 }
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2289 tmpI+= 64;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2290 tmp2+= stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2291 }
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2292 }
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2293
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2294 hpel[ 0]= src;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2295 hpel[ 1]= tmp2t[0] + stride*(HTAPS/2-1);
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2296 hpel[ 2]= src + 1;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2297
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2298 hpel[ 4]= tmp2t[1];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2299 hpel[ 5]= tmp2t[2];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2300 hpel[ 6]= tmp2t[1] + 1;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2301
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2302 hpel[ 8]= src + stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2303 hpel[ 9]= hpel[1] + stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2304 hpel[10]= hpel[8] + 1;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2305
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2306 if(b==15){
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2307 uint8_t *src1= hpel[dx/8 + dy/8*4 ];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2308 uint8_t *src2= hpel[dx/8 + dy/8*4+1];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2309 uint8_t *src3= hpel[dx/8 + dy/8*4+4];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2310 uint8_t *src4= hpel[dx/8 + dy/8*4+5];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2311 dx&=7;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2312 dy&=7;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2313 for(y=0; y < b_h; y++){
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2314 for(x=0; x < b_w; x++){
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2315 dst[x]= ((8-dx)*(8-dy)*src1[x] + dx*(8-dy)*src2[x]+
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2316 (8-dx)* dy *src3[x] + dx* dy *src4[x]+32)>>6;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2317 }
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2318 src1+=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2319 src2+=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2320 src3+=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2321 src4+=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2322 dst +=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2323 }
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2324 }else{
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2325 uint8_t *src1= hpel[l];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2326 uint8_t *src2= hpel[r];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2327 int a= weight[((dx&7) + (8*(dy&7)))];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2328 int b= 8-a;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2329 for(y=0; y < b_h; y++){
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2330 for(x=0; x < b_w; x++){
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2331 dst[x]= (a*src1[x] + b*src2[x] + 4)>>3;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2332 }
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2333 src1+=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2334 src2+=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2335 dst +=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2336 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2337 }
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2338 STOP_TIMER("mc_block")
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2339 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2340
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2341 #define mca(dx,dy,b_w)\
5254
727a49c28c51 trivial warning fixes
mru
parents: 5224
diff changeset
2342 static void mc_block_hpel ## dx ## dy ## b_w(uint8_t *dst, const uint8_t *src, int stride, int h){\
5634
9960732c7d7b Replace constants by HTAPS (half pel interpolation filter taps) where appropriate.
michael
parents: 5633
diff changeset
2343 uint8_t tmp[stride*(b_w+HTAPS-1)];\
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2344 assert(h==b_w);\
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2345 mc_block(NULL, dst, src-(HTAPS/2-1)-(HTAPS/2-1)*stride, tmp, stride, b_w, b_w, dx, dy);\
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2346 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2347
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2348 mca( 0, 0,16)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2349 mca( 8, 0,16)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2350 mca( 0, 8,16)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2351 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
2352 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
2353 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
2354 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
2355 mca( 8, 8,8)
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2356
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2357 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
2358 if(block->type & BLOCK_INTRA){
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2359 int x, y;
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2360 const int color = block->color[plane_index];
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2361 const int color4= color*0x01010101;
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2362 if(b_w==32){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2363 for(y=0; y < b_h; y++){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2364 *(uint32_t*)&dst[0 + y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2365 *(uint32_t*)&dst[4 + y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2366 *(uint32_t*)&dst[8 + y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2367 *(uint32_t*)&dst[12+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2368 *(uint32_t*)&dst[16+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2369 *(uint32_t*)&dst[20+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2370 *(uint32_t*)&dst[24+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2371 *(uint32_t*)&dst[28+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2372 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2373 }else if(b_w==16){
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2374 for(y=0; y < b_h; y++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2375 *(uint32_t*)&dst[0 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2376 *(uint32_t*)&dst[4 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2377 *(uint32_t*)&dst[8 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2378 *(uint32_t*)&dst[12+ y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2379 }
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2380 }else if(b_w==8){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2381 for(y=0; y < b_h; y++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2382 *(uint32_t*)&dst[0 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2383 *(uint32_t*)&dst[4 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2384 }
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2385 }else if(b_w==4){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2386 for(y=0; y < b_h; y++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2387 *(uint32_t*)&dst[0 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2388 }
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2389 }else{
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2390 for(y=0; y < b_h; y++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2391 for(x=0; x < b_w; x++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2392 dst[x + y*stride]= color;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2393 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2394 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2395 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2396 }else{
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2397 uint8_t *src= s->last_picture[block->ref].data[plane_index];
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2398 const int scale= plane_index ? s->mv_scale : 2*s->mv_scale;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2399 int mx= block->mx*scale;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2400 int my= block->my*scale;
2223
b26474e72d6d use h264 MC code if possible
michael
parents: 2221
diff changeset
2401 const int dx= mx&15;
b26474e72d6d use h264 MC code if possible
michael
parents: 2221
diff changeset
2402 const int dy= my&15;
3020
c75fb0747e74 use h264 MC functions for 2xX Xx2 blocks in snow too
michael
parents: 3018
diff changeset
2403 const int tab_index= 3 - (b_w>>2) + (b_w>>4);
5634
9960732c7d7b Replace constants by HTAPS (half pel interpolation filter taps) where appropriate.
michael
parents: 5633
diff changeset
2404 sx += (mx>>4) - (HTAPS/2-1);
9960732c7d7b Replace constants by HTAPS (half pel interpolation filter taps) where appropriate.
michael
parents: 5633
diff changeset
2405 sy += (my>>4) - (HTAPS/2-1);
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2406 src += sx + sy*stride;
5634
9960732c7d7b Replace constants by HTAPS (half pel interpolation filter taps) where appropriate.
michael
parents: 5633
diff changeset
2407 if( (unsigned)sx >= w - b_w - (HTAPS-2)
9960732c7d7b Replace constants by HTAPS (half pel interpolation filter taps) where appropriate.
michael
parents: 5633
diff changeset
2408 || (unsigned)sy >= h - b_h - (HTAPS-2)){
9960732c7d7b Replace constants by HTAPS (half pel interpolation filter taps) where appropriate.
michael
parents: 5633
diff changeset
2409 ff_emulated_edge_mc(tmp + MB_SIZE, src, stride, b_w+HTAPS-1, b_h+HTAPS-1, sx, sy, w, h);
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2410 src= tmp + MB_SIZE;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2411 }
3189
e1cbe2635325 fix %8 != 0 w/h
michael
parents: 3075
diff changeset
2412 // 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
2413 // assert(!(b_w&(b_w-1)));
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2414 assert(b_w>1 && b_h>1);
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2415 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
2416 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
2417 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
2418 else if(b_w==32){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2419 int y;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2420 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
2421 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
2422 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
2423 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2424 }else if(b_w==b_h)
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2425 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
2426 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
2427 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
2428 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
2429 }else{
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2430 assert(2*b_w==b_h);
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2431 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
2432 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
2433 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2434 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2435 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2436
4436
d3e389536b0a Add the const specifier as needed to reduce the number of warnings.
takis
parents: 4409
diff changeset
2437 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
2438 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
2439 int y, x;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2440 IDWTELEM * dst;
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2441 for(y=0; y<b_h; y++){
5409
13d52b7647a0 Ahem, fix typos overlooked in last commit.
diego
parents: 5408
diff changeset
2442 //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
2443 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
2444 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
2445 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
2446 const uint8_t *obmc4= obmc3+ (obmc_stride>>1);
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2447 dst = slice_buffer_get_line(sb, src_y + y);
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2448 for(x=0; x<b_w; x++){
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2449 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
2450 +obmc2[x] * block[2][x + y*src_stride]
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2451 +obmc3[x] * block[1][x + y*src_stride]
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2452 +obmc4[x] * block[0][x + y*src_stride];
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2453
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2454 v <<= 8 - LOG2_OBMC_MAX;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2455 if(FRAC_BITS != 8){
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2456 v >>= 8 - FRAC_BITS;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2457 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2458 if(add){
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2459 v += dst[x + src_x];
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2460 v = (v + (1<<(FRAC_BITS-1))) >> FRAC_BITS;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2461 if(v&(~255)) v= ~(v>>31);
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2462 dst8[x + y*src_stride] = v;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2463 }else{
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2464 dst[x + src_x] -= v;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2465 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2466 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2467 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2468 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2469
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2470 //FIXME name clenup (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
2471 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
2472 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
2473 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
2474 const int b_stride= b_width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2475 BlockNode *lt= &s->block[b_x + b_y*b_stride];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2476 BlockNode *rt= lt+1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2477 BlockNode *lb= lt+b_stride;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2478 BlockNode *rb= lb+1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2479 uint8_t *block[4];
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2480 int tmp_step= src_stride >= 7*MB_SIZE ? MB_SIZE : MB_SIZE*src_stride;
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2481 uint8_t tmp[src_stride*7*MB_SIZE]; //FIXME align
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2482 uint8_t *ptmp;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2483 int x,y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2484
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2485 if(b_x<0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2486 lt= rt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2487 lb= rb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2488 }else if(b_x + 1 >= b_width){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2489 rt= lt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2490 rb= lb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2491 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2492 if(b_y<0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2493 lt= lb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2494 rt= rb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2495 }else if(b_y + 1 >= b_height){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2496 lb= lt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2497 rb= rt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2498 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2499
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2500 if(src_x<0){ //FIXME merge with prev & always round internal width upto *16
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2501 obmc -= src_x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2502 b_w += src_x;
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2503 if(!sliced && !offset_dst)
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2504 dst -= src_x;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2505 src_x=0;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2506 }else if(src_x + b_w > w){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2507 b_w = w - src_x;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2508 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2509 if(src_y<0){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2510 obmc -= src_y*obmc_stride;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2511 b_h += src_y;
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2512 if(!sliced && !offset_dst)
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2513 dst -= src_y*dst_stride;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2514 src_y=0;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2515 }else if(src_y + b_h> h){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2516 b_h = h - src_y;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2517 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2518
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2519 if(b_w<=0 || b_h<=0) return;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2520
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2521 assert(src_stride > 2*MB_SIZE + 5);
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2522 if(!sliced && offset_dst)
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2523 dst += src_x + src_y*dst_stride;
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2524 dst8+= src_x + src_y*src_stride;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2525 // src += src_x + src_y*src_stride;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2526
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2527 ptmp= tmp + 3*tmp_step;
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2528 block[0]= ptmp;
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2529 ptmp+=tmp_step;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2530 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
2531
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2532 if(same_block(lt, rt)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2533 block[1]= block[0];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2534 }else{
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2535 block[1]= ptmp;
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2536 ptmp+=tmp_step;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2537 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
2538 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2539
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2540 if(same_block(lt, lb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2541 block[2]= block[0];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2542 }else if(same_block(rt, lb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2543 block[2]= block[1];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2544 }else{
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2545 block[2]= ptmp;
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2546 ptmp+=tmp_step;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2547 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
2548 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2549
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2550 if(same_block(lt, rb) ){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2551 block[3]= block[0];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2552 }else if(same_block(rt, rb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2553 block[3]= block[1];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2554 }else if(same_block(lb, rb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2555 block[3]= block[2];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2556 }else{
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2557 block[3]= ptmp;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2558 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
2559 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2560 #if 0
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2561 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2562 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2563 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
2564 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2565 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2566 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2567 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2568 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2569 uint8_t *obmc2= obmc + (obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2570 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2571 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
2572 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2573 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2574 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2575 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2576 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2577 uint8_t *obmc3= obmc + obmc_stride*(obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2578 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2579 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
2580 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2581 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2582 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2583 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2584 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2585 uint8_t *obmc3= obmc + obmc_stride*(obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2586 uint8_t *obmc4= obmc3+ (obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2587 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2588 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
2589 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2590 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2591 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2592 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2593 #else
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2594 if(sliced){
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2595 START_TIMER
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2596
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2597 s->dsp.inner_add_yblock(obmc, obmc_stride, block, b_w, b_h, src_x,src_y, src_stride, sb, add, dst8);
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2598 STOP_TIMER("inner_add_yblock")
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2599 }else
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2600 for(y=0; y<b_h; y++){
5409
13d52b7647a0 Ahem, fix typos overlooked in last commit.
diego
parents: 5408
diff changeset
2601 //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
2602 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
2603 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
2604 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
2605 const uint8_t *obmc4= obmc3+ (obmc_stride>>1);
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2606 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2607 int v= obmc1[x] * block[3][x + y*src_stride]
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2608 +obmc2[x] * block[2][x + y*src_stride]
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2609 +obmc3[x] * block[1][x + y*src_stride]
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2610 +obmc4[x] * block[0][x + y*src_stride];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2611
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2612 v <<= 8 - LOG2_OBMC_MAX;
2246
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
2613 if(FRAC_BITS != 8){
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
2614 v >>= 8 - FRAC_BITS;
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
2615 }
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2616 if(add){
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2617 v += dst[x + y*dst_stride];
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2618 v = (v + (1<<(FRAC_BITS-1))) >> FRAC_BITS;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2619 if(v&(~255)) v= ~(v>>31);
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2620 dst8[x + y*src_stride] = v;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2621 }else{
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2622 dst[x + y*dst_stride] -= v;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2623 }
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2624 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2625 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2626 #endif
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2627 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2628
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2629 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
2630 Plane *p= &s->plane[plane_index];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2631 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
2632 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
2633 int x, y, mb_x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2634 int block_size = MB_SIZE >> s->block_max_depth;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2635 int block_w = plane_index ? block_size/2 : block_size;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2636 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
2637 int obmc_stride= plane_index ? block_size : 2*block_size;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2638 int ref_stride= s->current_picture.linesize[plane_index];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2639 uint8_t *dst8= s->current_picture.data[plane_index];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2640 int w= p->width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2641 int h= p->height;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2642 START_TIMER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2643
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2644 if(s->keyframe || (s->avctx->debug&512)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2645 if(mb_y==mb_h)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2646 return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2647
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2648 if(add){
2604
b7e6c3d31c65 Snow segfault bug in revision 1.43 patch by (Yartrebo /yartrebo earthlink net/)
michael
parents: 2602
diff changeset
2649 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
2650 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2651 // 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
2652 IDWTELEM * line = sb->line[y];
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2653 for(x=0; x<w; x++)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2654 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2655 // 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
2656 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
2657 v >>= FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2658 if(v&(~255)) v= ~(v>>31);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2659 dst8[x + y*ref_stride]= v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2660 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2661 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2662 }else{
2604
b7e6c3d31c65 Snow segfault bug in revision 1.43 patch by (Yartrebo /yartrebo earthlink net/)
michael
parents: 2602
diff changeset
2663 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
2664 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2665 // 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
2666 IDWTELEM * line = sb->line[y];
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2667 for(x=0; x<w; x++)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2668 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2669 line[x] -= 128 << FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2670 // buf[x + y*w]-= 128<<FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2671 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2672 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2673 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2674
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2675 return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2676 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2677
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2678 for(mb_x=0; mb_x<=mb_w; mb_x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2679 START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2680
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2681 add_yblock(s, 1, sb, old_buffer, dst8, obmc,
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2682 block_w*mb_x - block_w/2,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2683 block_w*mb_y - block_w/2,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2684 block_w, block_w,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2685 w, h,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2686 w, ref_stride, obmc_stride,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2687 mb_x - 1, mb_y - 1,
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2688 add, 0, plane_index);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2689
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2690 STOP_TIMER("add_yblock")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2691 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2692
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2693 STOP_TIMER("predict_slice")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2694 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2695
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2696 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
2697 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
2698 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
2699 const int mb_h= s->b_height << s->block_max_depth;
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2700 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
2701 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
2702 int block_w = plane_index ? block_size/2 : block_size;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2703 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
2704 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
2705 int ref_stride= s->current_picture.linesize[plane_index];
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2706 uint8_t *dst8= s->current_picture.data[plane_index];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2707 int w= p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2708 int h= p->height;
2197
michael
parents: 2195
diff changeset
2709 START_TIMER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2710
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2711 if(s->keyframe || (s->avctx->debug&512)){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2712 if(mb_y==mb_h)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2713 return;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2714
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2715 if(add){
2604
b7e6c3d31c65 Snow segfault bug in revision 1.43 patch by (Yartrebo /yartrebo earthlink net/)
michael
parents: 2602
diff changeset
2716 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
2717 for(x=0; x<w; x++){
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2718 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
2719 v >>= FRAC_BITS;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2720 if(v&(~255)) v= ~(v>>31);
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2721 dst8[x + y*ref_stride]= v;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2722 }
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2723 }
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2724 }else{
2604
b7e6c3d31c65 Snow segfault bug in revision 1.43 patch by (Yartrebo /yartrebo earthlink net/)
michael
parents: 2602
diff changeset
2725 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
2726 for(x=0; x<w; x++){
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2727 buf[x + y*w]-= 128<<FRAC_BITS;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2728 }
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2729 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2730 }
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2731
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2732 return;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2733 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2734
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2735 for(mb_x=0; mb_x<=mb_w; mb_x++){
2197
michael
parents: 2195
diff changeset
2736 START_TIMER
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2737
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2738 add_yblock(s, 0, NULL, buf, dst8, obmc,
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2739 block_w*mb_x - block_w/2,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2740 block_w*mb_y - block_w/2,
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2741 block_w, block_w,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2742 w, h,
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2743 w, ref_stride, obmc_stride,
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2744 mb_x - 1, mb_y - 1,
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2745 add, 1, plane_index);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2746
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2747 STOP_TIMER("add_yblock")
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2748 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2749
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2750 STOP_TIMER("predict_slice")
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2751 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2752
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2753 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
2754 const int mb_h= s->b_height << s->block_max_depth;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2755 int mb_y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2756 for(mb_y=0; mb_y<=mb_h; mb_y++)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2757 predict_slice(s, buf, plane_index, add, mb_y);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2758 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2759
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2760 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
2761 int i, x2, y2;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2762 Plane *p= &s->plane[plane_index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2763 const int block_size = MB_SIZE >> s->block_max_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2764 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
2765 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
2766 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
2767 const int ref_stride= s->current_picture.linesize[plane_index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2768 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
2769 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
2770 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
2771 const int w= p->width;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2772 const int h= p->height;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2773 int index= mb_x + mb_y*b_stride;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2774 BlockNode *b= &s->block[index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2775 BlockNode backup= *b;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2776 int ab=0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2777 int aa=0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2778
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2779 b->type|= BLOCK_INTRA;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2780 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
2781 memset(dst, 0, obmc_stride*obmc_stride*sizeof(IDWTELEM));
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2782
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2783 for(i=0; i<4; i++){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2784 int mb_x2= mb_x + (i &1) - 1;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2785 int mb_y2= mb_y + (i>>1) - 1;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2786 int x= block_w*mb_x2 + block_w/2;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2787 int y= block_w*mb_y2 + block_w/2;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2788
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2789 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
2790 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
2791
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2792 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
2793 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
2794 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
2795 int obmc_v= obmc[index];
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2796 int d;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2797 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
2798 if(x<0) obmc_v += obmc[index + block_w];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2799 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
2800 if(x+block_w>w) obmc_v += obmc[index - block_w];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2801 //FIXME precalc this or simplify it somehow else
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2802
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2803 d = -dst[index] + (1<<(FRAC_BITS-1));
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2804 dst[index] = d;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2805 ab += (src[x2 + y2*ref_stride] - (d>>FRAC_BITS)) * obmc_v;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2806 aa += obmc_v * obmc_v; //FIXME precalclate this
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2807 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2808 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2809 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2810 *b= backup;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2811
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5085
diff changeset
2812 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
2813 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2814
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2815 static inline int get_block_bits(SnowContext *s, int x, int y, int w){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2816 const int b_stride = s->b_width << s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2817 const int b_height = s->b_height<< s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2818 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
2819 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
2820 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
2821 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
2822 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
2823 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
2824 int dmx, dmy;
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2825 // int mx_context= av_log2(2*FFABS(left->mx - top->mx));
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2826 // int my_context= av_log2(2*FFABS(left->my - top->my));
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2827
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2828 if(x<0 || x>=b_stride || y>=b_height)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2829 return 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2830 /*
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2831 1 0 0
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2832 01X 1-2 1
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2833 001XX 3-6 2-3
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2834 0001XXX 7-14 4-7
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2835 00001XXXX 15-30 8-15
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2836 */
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2837 //FIXME try accurate rate
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2838 //FIXME intra and inter predictors if surrounding blocks arent the same type
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2839 if(b->type & BLOCK_INTRA){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2840 return 3+2*( av_log2(2*FFABS(left->color[0] - b->color[0]))
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2841 + av_log2(2*FFABS(left->color[1] - b->color[1]))
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2842 + 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
2843 }else{
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2844 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
2845 dmx-= b->mx;
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2846 dmy-= b->my;
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2847 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
2848 + av_log2(2*FFABS(dmy))
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2849 + av_log2(2*b->ref));
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2850 }
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2851 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2852
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2853 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
2854 Plane *p= &s->plane[plane_index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2855 const int block_size = MB_SIZE >> s->block_max_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2856 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
2857 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
2858 const int ref_stride= s->current_picture.linesize[plane_index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2859 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
2860 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
2861 IDWTELEM *pred= (IDWTELEM*)s->m.obmc_scratchpad + plane_index*block_size*block_size*4;
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2862 uint8_t cur[ref_stride*2*MB_SIZE]; //FIXME alignment
5634
9960732c7d7b Replace constants by HTAPS (half pel interpolation filter taps) where appropriate.
michael
parents: 5633
diff changeset
2863 uint8_t tmp[ref_stride*(2*MB_SIZE+HTAPS-1)];
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2864 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
2865 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
2866 const int w= p->width;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2867 const int h= p->height;
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2868 int distortion;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2869 int rate= 0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2870 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
2871 int sx= block_w*mb_x - block_w/2;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2872 int sy= block_w*mb_y - block_w/2;
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2873 int x0= FFMAX(0,-sx);
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2874 int y0= FFMAX(0,-sy);
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2875 int x1= FFMIN(block_w*2, w-sx);
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2876 int y1= FFMIN(block_w*2, h-sy);
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2877 int i,x,y;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2878
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2879 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
2880
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2881 for(y=y0; y<y1; y++){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2882 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
2883 const IDWTELEM *pred1 = pred + y*obmc_stride;
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2884 uint8_t *cur1 = cur + y*ref_stride;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2885 uint8_t *dst1 = dst + sx + (sy+y)*ref_stride;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2886 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
2887 #if FRAC_BITS >= LOG2_OBMC_MAX
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2888 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
2889 #else
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2890 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
2891 #endif
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2892 v = (v + pred1[x]) >> FRAC_BITS;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2893 if(v&(~255)) v= ~(v>>31);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2894 dst1[x] = v;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2895 }
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2896 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2897
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2898 /* copy the regions where obmc[] = (uint8_t)256 */
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2899 if(LOG2_OBMC_MAX == 8
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2900 && (mb_x == 0 || mb_x == b_stride-1)
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2901 && (mb_y == 0 || mb_y == b_height-1)){
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2902 if(mb_x == 0)
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2903 x1 = block_w;
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2904 else
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2905 x0 = block_w;
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2906 if(mb_y == 0)
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2907 y1 = block_w;
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2908 else
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2909 y0 = block_w;
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2910 for(y=y0; y<y1; y++)
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2911 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
2912 }
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2913
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2914 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
2915 /* 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
2916 /* FIXME check alignment of the cmp wavelet vs the encoding wavelet */
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
2917 /* FIXME cmps overlap but don't cover the wavelet's whole support,
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
2918 * so improving the score of one block is not strictly guaranteed to
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
2919 * improve the score of the whole frame, so iterative motion est
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
2920 * doesn't always converge. */
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
2921 if(s->avctx->me_cmp == FF_CMP_W97)
4197
bbe0bc387a19 revert bad checkin
mru
parents: 4196
diff changeset
2922 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
2923 else if(s->avctx->me_cmp == FF_CMP_W53)
4197
bbe0bc387a19 revert bad checkin
mru
parents: 4196
diff changeset
2924 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
2925 else{
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
2926 distortion = 0;
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
2927 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
2928 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
2929 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
2930 }
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2931 }
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2932 }else{
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2933 assert(block_w==8);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2934 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
2935 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2936
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2937 if(plane_index==0){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2938 for(i=0; i<4; i++){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2939 /* ..RRr
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2940 * .RXx.
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2941 * rxx..
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2942 */
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2943 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
2944 }
3057
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
2945 if(mb_x == b_stride-2)
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
2946 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
2947 }
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2948 return distortion + rate*penalty_factor;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2949 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2950
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2951 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
2952 int i, y2;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2953 Plane *p= &s->plane[plane_index];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2954 const int block_size = MB_SIZE >> s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2955 const int block_w = plane_index ? block_size/2 : block_size;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2956 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
2957 const int obmc_stride= plane_index ? block_size : 2*block_size;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2958 const int ref_stride= s->current_picture.linesize[plane_index];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2959 uint8_t *dst= s->current_picture.data[plane_index];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2960 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
2961 static const IDWTELEM zero_dst[4096]; //FIXME
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2962 const int b_stride = s->b_width << s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2963 const int w= p->width;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2964 const int h= p->height;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2965 int distortion= 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2966 int rate= 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2967 const int penalty_factor= get_penalty_factor(s->lambda, s->lambda2, s->avctx->me_cmp);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2968
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2969 for(i=0; i<9; i++){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2970 int mb_x2= mb_x + (i%3) - 1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2971 int mb_y2= mb_y + (i/3) - 1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2972 int x= block_w*mb_x2 + block_w/2;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2973 int y= block_w*mb_y2 + block_w/2;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2974
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2975 add_yblock(s, 0, NULL, zero_dst, dst, obmc,
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2976 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
2977
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2978 //FIXME find a cleaner/simpler way to skip the outside stuff
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2979 for(y2= y; y2<0; y2++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2980 memcpy(dst + x + y2*ref_stride, src + x + y2*ref_stride, block_w);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2981 for(y2= h; y2<y+block_w; y2++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2982 memcpy(dst + x + y2*ref_stride, src + x + y2*ref_stride, block_w);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2983 if(x<0){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2984 for(y2= y; y2<y+block_w; y2++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2985 memcpy(dst + x + y2*ref_stride, src + x + y2*ref_stride, -x);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2986 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2987 if(x+block_w > w){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2988 for(y2= y; y2<y+block_w; y2++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2989 memcpy(dst + w + y2*ref_stride, src + w + y2*ref_stride, x+block_w - w);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2990 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2991
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2992 assert(block_w== 8 || block_w==16);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2993 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
2994 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2995
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2996 if(plane_index==0){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2997 BlockNode *b= &s->block[mb_x+mb_y*b_stride];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2998 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
2999
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3000 /* ..RRRr
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3001 * .RXXx.
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3002 * .RXXx.
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3003 * rxxx.
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3004 */
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3005 if(merged)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3006 rate = get_block_bits(s, mb_x, mb_y, 2);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3007 for(i=merged?4:0; i<9; i++){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3008 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
3009 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
3010 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3011 }
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3012 return distortion + rate*penalty_factor;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3013 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3014
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
3015 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
3016 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
3017 BlockNode *block= &s->block[mb_x + mb_y * b_stride];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3018 BlockNode backup= *block;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3019 int rd, index, value;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3020
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3021 assert(mb_x>=0 && mb_y>=0);
2994
michael
parents: 2993
diff changeset
3022 assert(mb_x<b_stride);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3023
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3024 if(intra){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3025 block->color[0] = p[0];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3026 block->color[1] = p[1];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3027 block->color[2] = p[2];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3028 block->type |= BLOCK_INTRA;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3029 }else{
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3030 index= (p[0] + 31*p[1]) & (ME_CACHE_SIZE-1);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3031 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
3032 if(s->me_cache[index] == value)
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3033 return 0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3034 s->me_cache[index]= value;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3035
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3036 block->mx= p[0];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3037 block->my= p[1];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3038 block->type &= ~BLOCK_INTRA;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3039 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3040
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3041 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
3042
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3043 //FIXME chroma
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3044 if(rd < *best_rd){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3045 *best_rd= rd;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3046 return 1;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3047 }else{
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3048 *block= backup;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3049 return 0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3050 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3051 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3052
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
3053 /* special case for int[2] args we discard afterward, fixes compilation prob with gcc 2.95 */
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
3054 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
3055 int p[2] = {p0, p1};
3197
8f53630cd24e dont pass intra flag if its always 0
michael
parents: 3194
diff changeset
3056 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
3057 }
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
3058
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
3059 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
3060 const int b_stride= s->b_width << s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3061 BlockNode *block= &s->block[mb_x + mb_y * b_stride];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3062 BlockNode backup[4]= {block[0], block[1], block[b_stride], block[b_stride+1]};
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3063 int rd, index, value;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3064
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3065 assert(mb_x>=0 && mb_y>=0);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3066 assert(mb_x<b_stride);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3067 assert(((mb_x|mb_y)&1) == 0);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3068
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3069 index= (p0 + 31*p1) & (ME_CACHE_SIZE-1);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3070 value= s->me_cache_generation + (p0>>10) + (p1<<6) + (block->ref<<12);
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3071 if(s->me_cache[index] == value)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3072 return 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3073 s->me_cache[index]= value;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3074
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3075 block->mx= p0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3076 block->my= p1;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3077 block->ref= ref;
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3078 block->type &= ~BLOCK_INTRA;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3079 block[1]= block[b_stride]= block[b_stride+1]= *block;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3080
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3081 rd= get_4block_rd(s, mb_x, mb_y, 0);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3082
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3083 //FIXME chroma
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3084 if(rd < *best_rd){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3085 *best_rd= rd;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3086 return 1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3087 }else{
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3088 block[0]= backup[0];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3089 block[1]= backup[1];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3090 block[b_stride]= backup[2];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3091 block[b_stride+1]= backup[3];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3092 return 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3093 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3094 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3095
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3096 static void iterative_me(SnowContext *s){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3097 int pass, mb_x, mb_y;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3098 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
3099 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
3100 const int b_stride= b_width;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3101 int color[3];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3102
3194
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3103 {
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3104 RangeCoder r = s->c;
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3105 uint8_t state[sizeof(s->block_state)];
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3106 memcpy(state, s->block_state, sizeof(s->block_state));
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3107 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
3108 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
3109 encode_q_branch(s, 0, mb_x, mb_y);
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3110 s->c = r;
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3111 memcpy(s->block_state, state, sizeof(s->block_state));
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3112 }
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3113
3323
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3114 for(pass=0; pass<25; pass++){
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3115 int change= 0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3116
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3117 for(mb_y= 0; mb_y<b_height; mb_y++){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3118 for(mb_x= 0; mb_x<b_width; mb_x++){
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3119 int dia_change, i, j, ref;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3120 int best_rd= INT_MAX, ref_rd;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3121 BlockNode backup, ref_b;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3122 const int index= mb_x + mb_y * b_stride;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3123 BlockNode *block= &s->block[index];
3324
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3124 BlockNode *tb = mb_y ? &s->block[index-b_stride ] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3125 BlockNode *lb = mb_x ? &s->block[index -1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3126 BlockNode *rb = mb_x+1<b_width ? &s->block[index +1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3127 BlockNode *bb = mb_y+1<b_height ? &s->block[index+b_stride ] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3128 BlockNode *tlb= mb_x && mb_y ? &s->block[index-b_stride-1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3129 BlockNode *trb= mb_x+1<b_width && mb_y ? &s->block[index-b_stride+1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3130 BlockNode *blb= mb_x && mb_y+1<b_height ? &s->block[index+b_stride-1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3131 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
3132 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
3133 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
3134
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3135 if(pass && (block->type & BLOCK_OPT))
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3136 continue;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3137 block->type |= BLOCK_OPT;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3138
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3139 backup= *block;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3140
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3141 if(!s->me_cache_generation)
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3142 memset(s->me_cache, 0, sizeof(s->me_cache));
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3143 s->me_cache_generation += 1<<22;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3144
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3145 //FIXME precalc
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3146 {
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3147 int x, y;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3148 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
3149 if(mb_x==0)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3150 for(y=0; y<b_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3151 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
3152 if(mb_x==b_stride-1)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3153 for(y=0; y<b_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3154 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
3155 if(mb_y==0){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3156 for(x=0; x<b_w*2; x++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3157 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
3158 for(y=1; y<b_w; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3159 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
3160 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3161 if(mb_y==b_height-1){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3162 for(x=0; x<b_w*2; x++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3163 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
3164 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
3165 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
3166 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3167 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3168
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3169 //skip stuff outside the picture
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3170 if(mb_x==0 || mb_y==0 || mb_x==b_width-1 || mb_y==b_height-1)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3171 {
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3172 uint8_t *src= s-> input_picture.data[0];
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3173 uint8_t *dst= s->current_picture.data[0];
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3174 const int stride= s->current_picture.linesize[0];
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3175 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
3176 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
3177 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
3178 const int w= s->plane[0].width;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3179 const int h= s->plane[0].height;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3180 int y;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3181
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3182 for(y=sy; y<0; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3183 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
3184 for(y=h; y<sy+block_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3185 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
3186 if(sx<0){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3187 for(y=sy; y<sy+block_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3188 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
3189 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3190 if(sx+block_w*2 > w){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3191 for(y=sy; y<sy+block_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3192 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
3193 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3194 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3195
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3196 // intra(black) = neighbors' contribution to the current block
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3197 for(i=0; i<3; i++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3198 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
3199
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5085
diff changeset
3200 // get previous score (cannot be cached due to OBMC)
3057
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
3201 if(pass > 0 && (block->type&BLOCK_INTRA)){
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
3202 int color0[3]= {block->color[0], block->color[1], block->color[2]};
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
3203 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
3204 }else
3197
8f53630cd24e dont pass intra flag if its always 0
michael
parents: 3194
diff changeset
3205 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
3206
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3207 ref_b= *block;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3208 ref_rd= best_rd;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3209 for(ref=0; ref < s->ref_frames; ref++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3210 int16_t (*mvr)[2]= &s->ref_mvs[ref][index];
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3211 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
3212 continue;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3213 block->ref= ref;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3214 best_rd= INT_MAX;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3215
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3216 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
3217 check_block_inter(s, mb_x, mb_y, 0, 0, *obmc_edged, &best_rd);
3324
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3218 if(tb)
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3219 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
3220 if(lb)
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3221 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
3222 if(rb)
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3223 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
3224 if(bb)
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3225 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
3226
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3227 /* fullpel ME */
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3228 //FIXME avoid subpel interpol / round to nearest integer
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3229 do{
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3230 dia_change=0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3231 for(i=0; i<FFMAX(s->avctx->dia_size, 1); i++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3232 for(j=0; j<i; j++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3233 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
3234 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
3235 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
3236 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
3237 }
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3238 }
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3239 }while(dia_change);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3240 /* subpel ME */
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3241 do{
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3242 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
3243 dia_change=0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3244 for(i=0; i<8; i++)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3245 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
3246 }while(dia_change);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3247 //FIXME or try the standard 2 pass qpel or similar
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3248
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3249 mvr[0][0]= block->mx;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3250 mvr[0][1]= block->my;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3251 if(ref_rd > best_rd){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3252 ref_rd= best_rd;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3253 ref_b= *block;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3254 }
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3255 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3256 best_rd= ref_rd;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3257 *block= ref_b;
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
3258 #if 1
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3259 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
3260 //FIXME RD style color selection
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
3261 #endif
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3262 if(!same_block(block, &backup)){
3324
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3263 if(tb ) tb ->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3264 if(lb ) lb ->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3265 if(rb ) rb ->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3266 if(bb ) bb ->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3267 if(tlb) tlb->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3268 if(trb) trb->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3269 if(blb) blb->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3270 if(brb) brb->type &= ~BLOCK_OPT;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3271 change ++;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3272 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3273 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3274 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3275 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
3276 if(!change)
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3277 break;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3278 }
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3279
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3280 if(s->block_max_depth == 1){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3281 int change= 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3282 for(mb_y= 0; mb_y<b_height; mb_y+=2){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3283 for(mb_x= 0; mb_x<b_width; mb_x+=2){
3324
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3284 int i;
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3285 int best_rd, init_rd;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3286 const int index= mb_x + mb_y * b_stride;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3287 BlockNode *b[4];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3288
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3289 b[0]= &s->block[index];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3290 b[1]= b[0]+1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3291 b[2]= b[0]+b_stride;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3292 b[3]= b[2]+1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3293 if(same_block(b[0], b[1]) &&
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3294 same_block(b[0], b[2]) &&
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3295 same_block(b[0], b[3]))
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3296 continue;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3297
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3298 if(!s->me_cache_generation)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3299 memset(s->me_cache, 0, sizeof(s->me_cache));
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3300 s->me_cache_generation += 1<<22;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3301
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3302 init_rd= best_rd= get_4block_rd(s, mb_x, mb_y, 0);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3303
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3304 //FIXME more multiref search?
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3305 check_4block_inter(s, mb_x, mb_y,
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3306 (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
3307 (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
3308
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3309 for(i=0; i<4; i++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3310 if(!(b[i]->type&BLOCK_INTRA))
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3311 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
3312
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3313 if(init_rd != best_rd)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3314 change++;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3315 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3316 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3317 av_log(NULL, AV_LOG_ERROR, "pass:4mv changed:%d\n", change*4);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3318 }
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3319 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3320
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3321 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
3322 const int level= b->level;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3323 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3324 const int h= b->height;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4588
diff changeset
3325 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
3326 const int qmul= qexp[qlog&(QROOT-1)]<<((qlog>>QSHIFT) + ENCODER_EXTRA_BITS);
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3327 int x,y, thres1, thres2;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
3328 // START_TIMER
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3329
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3330 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
3331 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
3332 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
3333 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
3334 return;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3335 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3336
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3337 bias= bias ? 0 : (3*qmul)>>3;
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3338 thres1= ((qmul - bias)>>QEXPSHIFT) - 1;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3339 thres2= 2*thres1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3340
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3341 if(!bias){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3342 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3343 for(x=0; x<w; x++){
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3344 int i= src[x + y*stride];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3345
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3346 if((unsigned)(i+thres1) > thres2){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3347 if(i>=0){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3348 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3349 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
3350 dst[x + y*stride]= i;
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3351 }else{
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3352 i= -i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3353 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3354 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
3355 dst[x + y*stride]= -i;
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3356 }
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3357 }else
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3358 dst[x + y*stride]= 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3359 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3360 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3361 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3362 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3363 for(x=0; x<w; x++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3364 int i= src[x + y*stride];
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3365
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3366 if((unsigned)(i+thres1) > thres2){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3367 if(i>=0){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3368 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3369 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
3370 dst[x + y*stride]= i;
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3371 }else{
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3372 i= -i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3373 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3374 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
3375 dst[x + y*stride]= -i;
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3376 }
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3377 }else
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3378 dst[x + y*stride]= 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3379 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3380 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3381 }
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3382 if(level+1 == s->spatial_decomposition_count){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3383 // STOP_TIMER("quantize")
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3384 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3385 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3386
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3387 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
3388 const int w= b->width;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4588
diff changeset
3389 const int qlog= av_clip(s->qlog + b->qlog, 0, QROOT*16);
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3390 const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3391 const int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3392 int x,y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3393 START_TIMER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3394
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3395 if(s->qlog == LOSSLESS_QLOG) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3396
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3397 for(y=start_y; y<end_y; y++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3398 // 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
3399 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
3400 for(x=0; x<w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3401 int i= line[x];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3402 if(i<0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3403 line[x]= -((-i*qmul + qadd)>>(QEXPSHIFT)); //FIXME try different bias
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3404 }else if(i>0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3405 line[x]= (( i*qmul + qadd)>>(QEXPSHIFT));
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 if(w > 200 /*level+1 == s->spatial_decomposition_count*/){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3410 STOP_TIMER("dquant")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3411 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3412 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3413
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3414 static void dequantize(SnowContext *s, SubBand *b, IDWTELEM *src, int stride){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3415 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3416 const int h= b->height;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4588
diff changeset
3417 const int qlog= av_clip(s->qlog + b->qlog, 0, QROOT*16);
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3418 const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3419 const int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3420 int x,y;
2195
df3079d7806f merge decode_subband() and dequantize()
michael
parents: 2194
diff changeset
3421 START_TIMER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3422
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3423 if(s->qlog == LOSSLESS_QLOG) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3424
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3425 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3426 for(x=0; x<w; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3427 int i= src[x + y*stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3428 if(i<0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3429 src[x + y*stride]= -((-i*qmul + qadd)>>(QEXPSHIFT)); //FIXME try different bias
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3430 }else if(i>0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3431 src[x + y*stride]= (( i*qmul + qadd)>>(QEXPSHIFT));
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 }
2195
df3079d7806f merge decode_subband() and dequantize()
michael
parents: 2194
diff changeset
3435 if(w > 200 /*level+1 == s->spatial_decomposition_count*/){
df3079d7806f merge decode_subband() and dequantize()
michael
parents: 2194
diff changeset
3436 STOP_TIMER("dquant")
df3079d7806f merge decode_subband() and dequantize()
michael
parents: 2194
diff changeset
3437 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3438 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3439
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3440 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
3441 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3442 const int h= b->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3443 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3444
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3445 for(y=h-1; y>=0; y--){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3446 for(x=w-1; x>=0; x--){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3447 int i= x + y*stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3448
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3449 if(x){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3450 if(use_median){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3451 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
3452 else src[i] -= src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3453 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3454 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
3455 else src[i] -= src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3456 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3457 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3458 if(y) src[i] -= src[i - stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3459 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3460 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3461 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3462 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3463
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3464 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
3465 const int w= b->width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3466 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3467
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3468 // START_TIMER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3469
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3470 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
3471 IDWTELEM * prev;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3472
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3473 if (start_y != 0)
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3474 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
3475
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3476 for(y=start_y; y<end_y; y++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3477 prev = line;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3478 // 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
3479 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
3480 for(x=0; x<w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3481 if(x){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3482 if(use_median){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3483 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
3484 else line[x] += line[x - 1];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3485 }else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3486 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
3487 else line[x] += line[x - 1];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3488 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3489 }else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3490 if(y) line[x] += prev[x];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3491 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3492 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3493 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3494
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3495 // STOP_TIMER("correlate")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3496 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3497
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3498 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
3499 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3500 const int h= b->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3501 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3502
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3503 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3504 for(x=0; x<w; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3505 int i= x + y*stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3506
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3507 if(x){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3508 if(use_median){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3509 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
3510 else src[i] += src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3511 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3512 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
3513 else src[i] += src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3514 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3515 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3516 if(y) src[i] += src[i - stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3517 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3518 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3519 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3520 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3521
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3522 static void encode_header(SnowContext *s){
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3523 int plane_index, level, orientation, i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3524 uint8_t kstate[32];
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3525
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3526 memset(kstate, MID_STATE, sizeof(kstate));
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3527
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3528 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
3529 if(s->keyframe || s->always_reset){
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
3530 reset_contexts(s);
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3531 s->last_spatial_decomposition_type=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3532 s->last_qlog=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3533 s->last_qbias=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3534 s->last_mv_scale=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3535 s->last_block_max_depth= 0;
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3536 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
3537 Plane *p= &s->plane[plane_index];
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3538 p->last_htaps=0;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3539 p->last_diag_mc=0;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3540 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
3541 }
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3542 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3543 if(s->keyframe){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3544 put_symbol(&s->c, s->header_state, s->version, 0);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3545 put_rac(&s->c, s->header_state, s->always_reset);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3546 put_symbol(&s->c, s->header_state, s->temporal_decomposition_type, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3547 put_symbol(&s->c, s->header_state, s->temporal_decomposition_count, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3548 put_symbol(&s->c, s->header_state, s->spatial_decomposition_count, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3549 put_symbol(&s->c, s->header_state, s->colorspace_type, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3550 put_symbol(&s->c, s->header_state, s->chroma_h_shift, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3551 put_symbol(&s->c, s->header_state, s->chroma_v_shift, 0);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3552 put_rac(&s->c, s->header_state, s->spatial_scalability);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3553 // put_rac(&s->c, s->header_state, s->rate_scalability);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3554 put_symbol(&s->c, s->header_state, s->max_ref_frames-1, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3555
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3556 for(plane_index=0; plane_index<2; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3557 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3558 for(orientation=level ? 1:0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3559 if(orientation==2) continue;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3560 put_symbol(&s->c, s->header_state, s->plane[plane_index].band[level][orientation].qlog, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3561 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3562 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3563 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3564 }
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3565
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3566 if(!s->keyframe){
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3567 int update_mc=0;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3568 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
3569 Plane *p= &s->plane[plane_index];
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3570 update_mc |= p->last_htaps != p->htaps;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3571 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
3572 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
3573 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3574 if(!s->always_reset)
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3575 put_rac(&s->c, s->header_state, update_mc);
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3576 if(update_mc){
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3577 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
3578 Plane *p= &s->plane[plane_index];
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3579 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
3580 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
3581 for(i= p->htaps/2; i; i--)
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3582 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
3583
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3584 p->last_diag_mc= p->diag_mc;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3585 p->last_htaps= p->htaps;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3586 memcpy(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
3587 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3588 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3589 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3590
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3591 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
3592 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
3593 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
3594 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
3595 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
3596
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3597 s->last_spatial_decomposition_type= s->spatial_decomposition_type;
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3598 s->last_qlog = s->qlog;
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3599 s->last_qbias = s->qbias;
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3600 s->last_mv_scale = s->mv_scale;
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3601 s->last_block_max_depth = s->block_max_depth;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3602 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3603
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3604 static int decode_header(SnowContext *s){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3605 int plane_index, level, orientation;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3606 uint8_t kstate[32];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3607
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3608 memset(kstate, MID_STATE, sizeof(kstate));
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3609
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3610 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
3611 if(s->keyframe || s->always_reset){
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
3612 reset_contexts(s);
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3613 s->spatial_decomposition_type=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3614 s->qlog=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3615 s->qbias=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3616 s->mv_scale=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3617 s->block_max_depth= 0;
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3618 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3619 if(s->keyframe){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3620 s->version= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3621 if(s->version>0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3622 av_log(s->avctx, AV_LOG_ERROR, "version %d not supported", s->version);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3623 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3624 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3625 s->always_reset= get_rac(&s->c, s->header_state);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3626 s->temporal_decomposition_type= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3627 s->temporal_decomposition_count= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3628 s->spatial_decomposition_count= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3629 s->colorspace_type= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3630 s->chroma_h_shift= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3631 s->chroma_v_shift= get_symbol(&s->c, s->header_state, 0);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3632 s->spatial_scalability= get_rac(&s->c, s->header_state);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3633 // s->rate_scalability= get_rac(&s->c, s->header_state);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3634 s->max_ref_frames= get_symbol(&s->c, s->header_state, 0)+1;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3635
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3636 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3637 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3638 for(orientation=level ? 1:0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3639 int q;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3640 if (plane_index==2) q= s->plane[1].band[level][orientation].qlog;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3641 else if(orientation==2) q= s->plane[plane_index].band[level][1].qlog;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3642 else q= get_symbol(&s->c, s->header_state, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3643 s->plane[plane_index].band[level][orientation].qlog= q;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3644 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3645 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3646 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3647 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3648
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3649 if(!s->keyframe){
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3650 if(s->always_reset || get_rac(&s->c, s->header_state)){
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3651 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
3652 int htaps, i, sum=0, absum=0;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3653 Plane *p= &s->plane[plane_index];
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3654 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
3655 htaps= get_symbol(&s->c, s->header_state, 0)*2 + 2;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3656 if((unsigned)htaps > HTAPS || htaps==0)
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3657 return -1;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3658 p->htaps= htaps;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3659 for(i= htaps/2; i; i--){
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3660 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
3661 sum += p->hcoeff[i];
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3662 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3663 p->hcoeff[0]= 32-sum;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3664 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3665 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
3666 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
3667 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
3668 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3669 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3670
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3671 s->spatial_decomposition_type+= get_symbol(&s->c, s->header_state, 1);
5588
effa59ca89b3 we only have 2 wavelets, the 3rd was just for experimentation ...
michael
parents: 5587
diff changeset
3672 if(s->spatial_decomposition_type > 1){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3673 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
3674 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3675 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3676
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3677 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
3678 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
3679 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
3680 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
3681 if(s->block_max_depth > 1 || s->block_max_depth < 0){
2952
d7be13d3ef00 check block_max_depth (fixes crash)
michael
parents: 2951
diff changeset
3682 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
3683 s->block_max_depth= 0;
d7be13d3ef00 check block_max_depth (fixes crash)
michael
parents: 2951
diff changeset
3684 return -1;
d7be13d3ef00 check block_max_depth (fixes crash)
michael
parents: 2951
diff changeset
3685 }
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
3686
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3687 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
3688 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3689
3075
961af1358c7f add static keyword to some functions
mru
parents: 3063
diff changeset
3690 static void init_qexp(void){
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3691 int i;
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3692 double v=128;
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3693
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3694 for(i=0; i<QROOT; i++){
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3695 qexp[i]= lrintf(v);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3696 v *= pow(2, 1.0 / QROOT);
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3697 }
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3698 }
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3699
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3700 static int common_init(AVCodecContext *avctx){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3701 SnowContext *s = avctx->priv_data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3702 int width, height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3703 int level, orientation, plane_index, dec;
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
3704 int i, j;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3705
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3706 s->avctx= avctx;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3707
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3708 dsputil_init(&s->dsp, avctx);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3709
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3710 #define mcf(dx,dy)\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3711 s->dsp.put_qpel_pixels_tab [0][dy+dx/4]=\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3712 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
3713 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
3714 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
3715 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
3716 s->dsp.put_h264_qpel_pixels_tab[1][dy+dx/4];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3717
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3718 mcf( 0, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3719 mcf( 4, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3720 mcf( 8, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3721 mcf(12, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3722 mcf( 0, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3723 mcf( 4, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3724 mcf( 8, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3725 mcf(12, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3726 mcf( 0, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3727 mcf( 4, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3728 mcf( 8, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3729 mcf(12, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3730 mcf( 0,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3731 mcf( 4,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3732 mcf( 8,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3733 mcf(12,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3734
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3735 #define mcfh(dx,dy)\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3736 s->dsp.put_pixels_tab [0][dy/4+dx/8]=\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3737 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
3738 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
3739 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
3740 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
3741 mc_block_hpel ## dx ## dy ## 8;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3742
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3743 mcfh(0, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3744 mcfh(8, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3745 mcfh(0, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3746 mcfh(8, 8)
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3747
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3748 if(!qexp[0])
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3749 init_qexp();
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3750
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3751 dec= s->spatial_decomposition_count= 5;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3752 s->spatial_decomposition_type= avctx->prediction_method; //FIXME add decorrelator type r transform_type
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3753
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3754 s->chroma_h_shift= 1; //FIXME XXX
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3755 s->chroma_v_shift= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3756
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3757 // dec += FFMAX(s->chroma_h_shift, s->chroma_v_shift);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3758
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
3759 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
3760 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
3761
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3762 s->spatial_idwt_buffer= av_mallocz(width*height*sizeof(IDWTELEM));
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3763 s->spatial_dwt_buffer= av_mallocz(width*height*sizeof(DWTELEM)); //FIXME this doesnt belong here
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3764
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3765 s->mv_scale= (s->avctx->flags & CODEC_FLAG_QPEL) ? 2 : 4;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3766 s->block_max_depth= (s->avctx->flags & CODEC_FLAG_4MV) ? 1 : 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3767
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3768 for(plane_index=0; plane_index<3; plane_index++){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3769 int w= s->avctx->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3770 int h= s->avctx->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3771
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3772 if(plane_index){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3773 w>>= s->chroma_h_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3774 h>>= s->chroma_v_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3775 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3776 s->plane[plane_index].width = w;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3777 s->plane[plane_index].height= h;
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3778
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3779 s->plane[plane_index].diag_mc= 1;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3780 s->plane[plane_index].htaps= 6;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3781 s->plane[plane_index].hcoeff[0]= 40;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3782 s->plane[plane_index].hcoeff[1]= -10;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3783 s->plane[plane_index].hcoeff[2]= 2;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3784 s->plane[plane_index].fast_mc= 1;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3785
2160
11e1425b3a66 cleanup
michael
parents: 2159
diff changeset
3786 //av_log(NULL, AV_LOG_DEBUG, "%d %d\n", w, h);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3787 for(level=s->spatial_decomposition_count-1; level>=0; level--){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3788 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3789 SubBand *b= &s->plane[plane_index].band[level][orientation];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3790
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3791 b->buf= s->spatial_dwt_buffer;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3792 b->level= level;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3793 b->stride= s->plane[plane_index].width << (s->spatial_decomposition_count - level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3794 b->width = (w + !(orientation&1))>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3795 b->height= (h + !(orientation>1))>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3796
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3797 b->stride_line = 1 << (s->spatial_decomposition_count - level);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3798 b->buf_x_offset = 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3799 b->buf_y_offset = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3800
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3801 if(orientation&1){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3802 b->buf += (w+1)>>1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3803 b->buf_x_offset = (w+1)>>1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3804 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3805 if(orientation>1){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3806 b->buf += b->stride>>1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3807 b->buf_y_offset = b->stride_line >> 1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3808 }
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3809 b->ibuf= s->spatial_idwt_buffer + (b->buf - s->spatial_dwt_buffer);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3810
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3811 if(level)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3812 b->parent= &s->plane[plane_index].band[level-1][orientation];
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3813 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
3814 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3815 w= (w+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3816 h= (h+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3817 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3818 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3819
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
3820 for(i=0; i<MAX_REF_FRAMES; i++)
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
3821 for(j=0; j<MAX_REF_FRAMES; j++)
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
3822 scale_mv_ref[i][j] = 256*(i+1)/(j+1);
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
3823
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3824 reset_contexts(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3825 /*
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3826 width= s->width= avctx->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3827 height= s->height= avctx->height;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3828
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3829 assert(width && height);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3830 */
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3831 s->avctx->get_buffer(s->avctx, &s->mconly_picture);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3832
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3833 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3834 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3835
3322
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3836 static int qscale2qlog(int qscale){
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3837 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
3838 + 61*QROOT/8; //<64 >60
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3839 }
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3840
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
3841 static int ratecontrol_1pass(SnowContext *s, AVFrame *pict)
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3842 {
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3843 /* estimate the frame's complexity as a sum of weighted dwt coefs.
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3844 * FIXME we know exact mv bits at this point,
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3845 * but ratecontrol isn't set up to include them. */
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3846 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
3847 int level, orientation, delta_qlog;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3848
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3849 for(level=0; level<s->spatial_decomposition_count; level++){
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3850 for(orientation=level ? 1 : 0; orientation<4; orientation++){
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3851 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
3852 IDWTELEM *buf= b->ibuf;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3853 const int w= b->width;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3854 const int h= b->height;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3855 const int stride= b->stride;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4588
diff changeset
3856 const int qlog= av_clip(2*QROOT + b->qlog, 0, QROOT*16);
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3857 const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3858 const int qdiv= (1<<16)/qmul;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3859 int x, y;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3860 //FIXME this is ugly
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3861 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
3862 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
3863 buf[x+y*stride]= b->buf[x+y*stride];
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3864 if(orientation==0)
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3865 decorrelate(s, b, buf, stride, 1, 0);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3866 for(y=0; y<h; y++)
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3867 for(x=0; x<w; x++)
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3868 coef_sum+= abs(buf[x+y*stride]) * qdiv >> 16;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3869 }
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3870 }
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3871
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3872 /* ugly, ratecontrol just takes a sqrt again */
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3873 coef_sum = (uint64_t)coef_sum * coef_sum >> 16;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3874 assert(coef_sum < INT_MAX);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3875
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3876 if(pict->pict_type == I_TYPE){
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3877 s->m.current_picture.mb_var_sum= coef_sum;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3878 s->m.current_picture.mc_mb_var_sum= 0;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3879 }else{
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3880 s->m.current_picture.mc_mb_var_sum= coef_sum;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3881 s->m.current_picture.mb_var_sum= 0;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3882 }
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3883
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3884 pict->quality= ff_rate_estimate_qscale(&s->m, 1);
3766
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
3885 if (pict->quality < 0)
4011
5bce97c30a69 -1 is a valid return value in ratecontrol_1pass() -> 100l for takis
michael
parents: 4001
diff changeset
3886 return INT_MIN;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3887 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
3888 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
3889 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
3890 return delta_qlog;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3891 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3892
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3893 static void calculate_vissual_weight(SnowContext *s, Plane *p){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3894 int width = p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3895 int height= p->height;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
3896 int level, orientation, x, y;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3897
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3898 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3899 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3900 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
3901 IDWTELEM *ibuf= b->ibuf;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3902 int64_t error=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3903
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3904 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
3905 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
3906 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
3907 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3908 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
3909 int64_t d= s->spatial_idwt_buffer[x + y*width]*16;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3910 error += d*d;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3911 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3912 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3913
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3914 b->qlog= (int)(log(352256.0/sqrt(error)) / log(pow(2.0, 1.0/QROOT))+0.5);
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3915 // av_log(NULL, AV_LOG_DEBUG, "%d %d %d\n", level, orientation, b->qlog/*, sqrt(error)*/);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3916 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3917 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3918 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3919
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3920 static int encode_init(AVCodecContext *avctx)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3921 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3922 SnowContext *s = avctx->priv_data;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
3923 int plane_index;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3924
2658
d1609cfeb1d0 #defines for strict_std_compliance and split between inofficial extensions and non standarized things
michael
parents: 2635
diff changeset
3925 if(avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL){
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2610
diff changeset
3926 av_log(avctx, AV_LOG_ERROR, "this codec is under development, files encoded with it may not be decodable with future versions!!!\n"
2658
d1609cfeb1d0 #defines for strict_std_compliance and split between inofficial extensions and non standarized things
michael
parents: 2635
diff changeset
3927 "use vstrict=-2 / -strict -2 to use it anyway\n");
2151
44c973bfec0f dont segfault without -strict -1
michael
parents: 2150
diff changeset
3928 return -1;
44c973bfec0f dont segfault without -strict -1
michael
parents: 2150
diff changeset
3929 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3930
3327
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3931 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
3932 && (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
3933 && avctx->global_quality == 0){
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3934 av_log(avctx, AV_LOG_ERROR, "the 9/7 wavelet is incompatible with lossless mode\n");
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3935 return -1;
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3936 }
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3937
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3938 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
3939 alloc_blocks(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3940
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3941 s->version=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3942
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3943 s->m.avctx = avctx;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3944 s->m.flags = avctx->flags;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3945 s->m.bit_rate= avctx->bit_rate;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3946
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3947 s->m.me.scratchpad= av_mallocz((avctx->width+64)*2*16*2*sizeof(uint8_t));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3948 s->m.me.map = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3949 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
3950 s->m.obmc_scratchpad= av_mallocz(MB_SIZE*MB_SIZE*12*sizeof(uint32_t));
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3951 h263_encode_init(&s->m); //mv_penalty
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3952
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3953 s->max_ref_frames = FFMAX(FFMIN(avctx->refs, MAX_REF_FRAMES), 1);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3954
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3955 if(avctx->flags&CODEC_FLAG_PASS1){
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3956 if(!avctx->stats_out)
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3957 avctx->stats_out = av_mallocz(256);
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3958 }
3322
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3959 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
3960 if(ff_rate_control_init(&s->m) < 0)
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3961 return -1;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3962 }
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3963 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
3964
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3965 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3966 calculate_vissual_weight(s, &s->plane[plane_index]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3967 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3968
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3969
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3970 avctx->coded_frame= &s->current_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3971 switch(avctx->pix_fmt){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3972 // case PIX_FMT_YUV444P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3973 // case PIX_FMT_YUV422P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3974 case PIX_FMT_YUV420P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3975 case PIX_FMT_GRAY8:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3976 // case PIX_FMT_YUV411P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3977 // case PIX_FMT_YUV410P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3978 s->colorspace_type= 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3979 break;
4494
ce643a22f049 Replace deprecated PIX_FMT names by the newer variants.
diego
parents: 4436
diff changeset
3980 /* case PIX_FMT_RGB32:
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3981 s->colorspace= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3982 break;*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3983 default:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3984 av_log(avctx, AV_LOG_ERROR, "format not supported\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3985 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3986 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3987 // 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
3988 s->chroma_h_shift= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3989 s->chroma_v_shift= 1;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3990
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3991 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
3992 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
3993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3994 s->avctx->get_buffer(s->avctx, &s->input_picture);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3995
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3996 if(s->avctx->me_method == ME_ITER){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3997 int i;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3998 int size= s->b_width * s->b_height << 2*s->block_max_depth;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3999 for(i=0; i<s->max_ref_frames; i++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4000 s->ref_mvs[i]= av_mallocz(size*sizeof(int16_t[2]));
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4001 s->ref_scores[i]= av_mallocz(size*sizeof(uint32_t));
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4002 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4003 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4004
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4005 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4006 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4007
5633
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4008 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
4009 int p,x,y;
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4010
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4011 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
4012
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4013 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
4014 int is_chroma= !!p;
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4015 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
4016 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
4017 int ls= frame->linesize[p];
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4018 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
4019
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4020 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
4021 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
4022 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
4023
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4024 halfpel[0][p]= src;
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4025 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
4026 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
4027 int i= y*ls + x;
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4028
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4029 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
4030 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4031 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4032 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
4033 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
4034 int i= y*ls + x;
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4035
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4036 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
4037 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4038 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4039 src= halfpel[1][p];
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4040 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
4041 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
4042 int i= y*ls + x;
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4043
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4044 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
4045 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4046 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4047
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4048 //FIXME border!
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4049 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4050 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4051
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4052 static int frame_start(SnowContext *s){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4053 AVFrame tmp;
2187
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4054 int w= s->avctx->width; //FIXME round up to x16 ?
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4055 int h= s->avctx->height;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4056
2187
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4057 if(s->current_picture.data[0]){
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4058 draw_edges(s->current_picture.data[0], s->current_picture.linesize[0], w , h , EDGE_WIDTH );
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4059 draw_edges(s->current_picture.data[1], s->current_picture.linesize[1], w>>1, h>>1, EDGE_WIDTH/2);
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4060 draw_edges(s->current_picture.data[2], s->current_picture.linesize[2], w>>1, h>>1, EDGE_WIDTH/2);
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4061 }
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4062
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4063 tmp= s->last_picture[s->max_ref_frames-1];
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4064 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
4065 memmove(s->halfpel_plane+1, s->halfpel_plane, (s->max_ref_frames-1)*sizeof(void*)*4*4);
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4066 #ifdef USE_HALFPEL_PLANE
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4067 if(s->current_picture.data[0])
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4068 halfpel_interpol(s, s->halfpel_plane[0], &s->current_picture);
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4069 #endif
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4070 s->last_picture[0]= s->current_picture;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4071 s->current_picture= tmp;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4072
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4073 if(s->keyframe){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4074 s->ref_frames= 0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4075 }else{
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4076 int i;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4077 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
4078 if(i && s->last_picture[i-1].key_frame)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4079 break;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4080 s->ref_frames= i;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4081 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4082
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4083 s->current_picture.reference= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4084 if(s->avctx->get_buffer(s->avctx, &s->current_picture) < 0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4085 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4086 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4087 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4088
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4089 s->current_picture.key_frame= s->keyframe;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4090
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4091 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4092 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4093
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4094 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4095 SnowContext *s = avctx->priv_data;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4096 RangeCoder * const c= &s->c;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4097 AVFrame *pict = data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4098 const int width= s->avctx->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4099 const int height= s->avctx->height;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4100 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
4101 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
4102 uint8_t rc_block_bak[sizeof(s->block_state)];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4103
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4104 ff_init_range_encoder(c, buf, buf_size);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4105 ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4106
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4107 for(i=0; i<3; i++){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4108 int shift= !!i;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4109 for(y=0; y<(height>>shift); y++)
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4110 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
4111 &pict->data[i][y * pict->linesize[i]],
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4112 width>>shift);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4113 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4114 s->new_picture = *pict;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4115
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4116 s->m.picture_number= avctx->frame_number;
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4117 if(avctx->flags&CODEC_FLAG_PASS2){
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4118 s->m.pict_type =
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4119 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
4120 s->keyframe= pict->pict_type==FF_I_TYPE;
3766
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4121 if(!(avctx->flags&CODEC_FLAG_QSCALE)) {
3193
66116775b315 obey vqscale in 2nd pass
lorenm
parents: 3190
diff changeset
4122 pict->quality= ff_rate_estimate_qscale(&s->m, 0);
3766
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4123 if (pict->quality < 0)
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4124 return -1;
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4125 }
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4126 }else{
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4127 s->keyframe= avctx->gop_size==0 || avctx->frame_number % avctx->gop_size == 0;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4128 s->m.pict_type=
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4129 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
4130 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4131
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4132 if(s->pass1_rc && avctx->frame_number == 0)
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4133 pict->quality= 2*FF_QP2LAMBDA;
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4134 if(pict->quality){
3322
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
4135 s->qlog= qscale2qlog(pict->quality);
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4136 s->lambda = pict->quality * 3/2;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4137 }
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4138 if(s->qlog < 0 || (!pict->quality && (avctx->flags & CODEC_FLAG_QSCALE))){
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4139 s->qlog= LOSSLESS_QLOG;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4140 s->lambda = 0;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4141 }//else keep previous frame's qlog until after motion est
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4142
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4143 frame_start(s);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4144
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4145 s->m.current_picture_ptr= &s->m.current_picture;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4146 if(pict->pict_type == P_TYPE){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4147 int block_width = (width +15)>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4148 int block_height= (height+15)>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4149 int stride= s->current_picture.linesize[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4150
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4151 assert(s->current_picture.data[0]);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4152 assert(s->last_picture[0].data[0]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4153
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4154 s->m.avctx= s->avctx;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4155 s->m.current_picture.data[0]= s->current_picture.data[0];
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4156 s->m. last_picture.data[0]= s->last_picture[0].data[0];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4157 s->m. new_picture.data[0]= s-> input_picture.data[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4158 s->m. last_picture_ptr= &s->m. last_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4159 s->m.linesize=
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4160 s->m. last_picture.linesize[0]=
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4161 s->m. new_picture.linesize[0]=
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4162 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
4163 s->m.uvlinesize= s->current_picture.linesize[1];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4164 s->m.width = width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4165 s->m.height= height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4166 s->m.mb_width = block_width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4167 s->m.mb_height= block_height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4168 s->m.mb_stride= s->m.mb_width+1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4169 s->m.b8_stride= 2*s->m.mb_width+1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4170 s->m.f_code=1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4171 s->m.pict_type= pict->pict_type;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4172 s->m.me_method= s->avctx->me_method;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4173 s->m.me.scene_change_score=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4174 s->m.flags= s->avctx->flags;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4175 s->m.quarter_sample= (s->avctx->flags & CODEC_FLAG_QPEL)!=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4176 s->m.out_format= FMT_H263;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4177 s->m.unrestricted_mv= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4178
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4179 s->m.lambda = s->lambda;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4180 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
4181 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
4182
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4183 s->m.dsp= s->dsp; //move
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4184 ff_init_me(&s->m);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4185 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
4186 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4187
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
4188 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
4189 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
4190 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
4191 }
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
4192
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
4193 redo_frame:
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4194
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4195 s->m.pict_type = pict->pict_type;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4196 s->qbias= pict->pict_type == P_TYPE ? 2 : 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4197
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4198 encode_header(s);
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4199 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
4200 encode_blocks(s, 1);
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4201 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
4202
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4203 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4204 Plane *p= &s->plane[plane_index];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4205 int w= p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4206 int h= p->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4207 int x, y;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
4208 // int bits= put_bits_count(&s->c.pb);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4209
3338
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4210 if(!(avctx->flags2 & CODEC_FLAG2_MEMC_ONLY)){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4211 //FIXME optimize
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4212 if(pict->data[plane_index]) //FIXME gray hack
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4213 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4214 for(x=0; x<w; x++){
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
4215 s->spatial_idwt_buffer[y*w + x]= pict->data[plane_index][y*pict->linesize[plane_index] + x]<<FRAC_BITS;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4216 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4217 }
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
4218 predict_plane(s, s->spatial_idwt_buffer, plane_index, 0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4219
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4220 if( plane_index==0
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4221 && pict->pict_type == P_TYPE
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4222 && !(avctx->flags&CODEC_FLAG_PASS2)
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
4223 && s->m.me.scene_change_score > s->avctx->scenechange_threshold){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4224 ff_init_range_encoder(c, buf, buf_size);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4225 ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
4226 pict->pict_type= FF_I_TYPE;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
4227 s->keyframe=1;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4228 s->current_picture.key_frame=1;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
4229 goto redo_frame;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
4230 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4231
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4232 if(s->qlog == LOSSLESS_QLOG){
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4233 for(y=0; y<h; y++){
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4234 for(x=0; x<w; x++){
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
4235 s->spatial_dwt_buffer[y*w + x]= (s->spatial_idwt_buffer[y*w + x] + (1<<(FRAC_BITS-1))-1)>>FRAC_BITS;
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4236 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4237 }
5575
a6f5ed050335 use more bits on the encoder side
michael
parents: 5572
diff changeset
4238 }else{
a6f5ed050335 use more bits on the encoder side
michael
parents: 5572
diff changeset
4239 for(y=0; y<h; y++){
a6f5ed050335 use more bits on the encoder side
michael
parents: 5572
diff changeset
4240 for(x=0; x<w; x++){
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
4241 s->spatial_dwt_buffer[y*w + x]=s->spatial_idwt_buffer[y*w + x]<<ENCODER_EXTRA_BITS;
5575
a6f5ed050335 use more bits on the encoder side
michael
parents: 5572
diff changeset
4242 }
a6f5ed050335 use more bits on the encoder side
michael
parents: 5572
diff changeset
4243 }
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4244 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4245
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
4246 ff_spatial_dwt(s->spatial_dwt_buffer, w, h, w, s->spatial_decomposition_type, s->spatial_decomposition_count);
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4247
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
4248 if(s->pass1_rc && plane_index==0){
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4249 int delta_qlog = ratecontrol_1pass(s, pict);
4011
5bce97c30a69 -1 is a valid return value in ratecontrol_1pass() -> 100l for takis
michael
parents: 4001
diff changeset
4250 if (delta_qlog <= INT_MIN)
3766
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4251 return -1;
3661
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4252 if(delta_qlog){
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4253 //reordering qlog in the bitstream would eliminate this reset
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4254 ff_init_range_encoder(c, buf, buf_size);
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4255 memcpy(s->header_state, rc_header_bak, sizeof(s->header_state));
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4256 memcpy(s->block_state, rc_block_bak, sizeof(s->block_state));
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4257 encode_header(s);
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4258 encode_blocks(s, 0);
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4259 }
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
4260 }
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4261
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4262 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4263 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4264 SubBand *b= &p->band[level][orientation];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4265
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
4266 quantize(s, b, b->ibuf, b->buf, b->stride, s->qbias);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4267 if(orientation==0)
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
4268 decorrelate(s, b, b->ibuf, b->stride, pict->pict_type == P_TYPE, 0);
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
4269 encode_subband(s, b, b->ibuf, b->parent ? b->parent->ibuf : NULL, b->stride, orientation);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4270 assert(b->parent==NULL || b->parent->stride == b->stride*2);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4271 if(orientation==0)
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
4272 correlate(s, b, b->ibuf, b->stride, 1, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4273 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4274 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4275 // av_log(NULL, AV_LOG_DEBUG, "plane:%d bits:%d\n", plane_index, put_bits_count(&s->c.pb) - bits);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4276
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4277 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4278 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4279 SubBand *b= &p->band[level][orientation];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4280
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
4281 dequantize(s, b, b->ibuf, b->stride);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4282 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4283 }
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4284
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
4285 ff_spatial_idwt(s->spatial_idwt_buffer, w, h, w, s->spatial_decomposition_type, s->spatial_decomposition_count);
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4286 if(s->qlog == LOSSLESS_QLOG){
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4287 for(y=0; y<h; y++){
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4288 for(x=0; x<w; x++){
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
4289 s->spatial_idwt_buffer[y*w + x]<<=FRAC_BITS;
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4290 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4291 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4292 }
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
4293 {START_TIMER
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
4294 predict_plane(s, s->spatial_idwt_buffer, plane_index, 1);
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
4295 STOP_TIMER("pred-conv")}
3338
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4296 }else{
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4297 //ME/MC only
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4298 if(pict->pict_type == I_TYPE){
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4299 for(y=0; y<h; y++){
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4300 for(x=0; x<w; x++){
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4301 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
4302 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
4303 }
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4304 }
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4305 }else{
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
4306 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
4307 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
4308 }
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4309 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4310 if(s->avctx->flags&CODEC_FLAG_PSNR){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4311 int64_t error= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4312
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4313 if(pict->data[plane_index]) //FIXME gray hack
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4314 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4315 for(x=0; x<w; x++){
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4316 int d= s->current_picture.data[plane_index][y*s->current_picture.linesize[plane_index] + x] - pict->data[plane_index][y*pict->linesize[plane_index] + x];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4317 error += d*d;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4318 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4319 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4320 s->avctx->error[plane_index] += error;
2232
960e3552e418 per picture psnr
michael
parents: 2224
diff changeset
4321 s->current_picture.error[plane_index] = error;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4322 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4323 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4324
5633
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4325 if(s->last_picture[s->max_ref_frames-1].data[0]){
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4326 avctx->release_buffer(avctx, &s->last_picture[s->max_ref_frames-1]);
5633
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4327 for(i=0; i<9; i++)
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4328 if(s->halfpel_plane[s->max_ref_frames-1][1+i/3][i%3])
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4329 av_free(s->halfpel_plane[s->max_ref_frames-1][1+i/3][i%3] - EDGE_WIDTH*(1+s->current_picture.linesize[i%3]));
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4330 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4331
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4332 s->current_picture.coded_picture_number = avctx->frame_number;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4333 s->current_picture.pict_type = pict->pict_type;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4334 s->current_picture.quality = pict->quality;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4335 s->m.frame_bits = 8*(s->c.bytestream - s->c.bytestream_start);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4336 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
4337 s->m.current_picture.display_picture_number =
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4338 s->m.current_picture.coded_picture_number = avctx->frame_number;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4339 s->m.current_picture.quality = pict->quality;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4340 s->m.total_bits += 8*(s->c.bytestream - s->c.bytestream_start);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4341 if(s->pass1_rc)
3766
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4342 if (ff_rate_estimate_qscale(&s->m, 0) < 0)
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4343 return -1;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4344 if(avctx->flags&CODEC_FLAG_PASS1)
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4345 ff_write_pass1_stats(&s->m);
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4346 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
4347 avctx->frame_bits = s->m.frame_bits;
5c86acb39889 outputs bit spent on various encoding functions (motion vectors, overhead, etc)
gpoirier
parents: 4122
diff changeset
4348 avctx->mv_bits = s->m.mv_bits;
5c86acb39889 outputs bit spent on various encoding functions (motion vectors, overhead, etc)
gpoirier
parents: 4122
diff changeset
4349 avctx->misc_bits = s->m.misc_bits;
5c86acb39889 outputs bit spent on various encoding functions (motion vectors, overhead, etc)
gpoirier
parents: 4122
diff changeset
4350 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
4351
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4352 emms_c();
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4353
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4354 return ff_rac_terminate(c);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4355 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4356
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4357 static void common_end(SnowContext *s){
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4358 int plane_index, level, orientation, i;
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4359
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4360 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
4361 av_freep(&s->spatial_idwt_buffer);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4362
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4363 av_freep(&s->m.me.scratchpad);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4364 av_freep(&s->m.me.map);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4365 av_freep(&s->m.me.score_map);
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
4366 av_freep(&s->m.obmc_scratchpad);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4367
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
4368 av_freep(&s->block);
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4369
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4370 for(i=0; i<MAX_REF_FRAMES; i++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4371 av_freep(&s->ref_mvs[i]);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4372 av_freep(&s->ref_scores[i]);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4373 if(s->last_picture[i].data[0])
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4374 s->avctx->release_buffer(s->avctx, &s->last_picture[i]);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4375 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4376
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4377 for(plane_index=0; plane_index<3; plane_index++){
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4378 for(level=s->spatial_decomposition_count-1; level>=0; level--){
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4379 for(orientation=level ? 1 : 0; orientation<4; orientation++){
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4380 SubBand *b= &s->plane[plane_index].band[level][orientation];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4381
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4382 av_freep(&b->x_coeff);
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4383 }
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4384 }
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4385 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4386 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4387
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4388 static int encode_end(AVCodecContext *avctx)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4389 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4390 SnowContext *s = avctx->priv_data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4391
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4392 common_end(s);
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4393 av_free(avctx->stats_out);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4394
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4395 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4396 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4397
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4398 static int decode_init(AVCodecContext *avctx)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4399 {
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4400 SnowContext *s = avctx->priv_data;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4401 int block_size;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4402
2635
eaa57c3336fc PIX_FMT_NONE and related fixes
michael
parents: 2634
diff changeset
4403 avctx->pix_fmt= PIX_FMT_YUV420P;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4404
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4405 common_init(avctx);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4406
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4407 block_size = MB_SIZE >> s->block_max_depth;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
4408 slice_buffer_init(&s->sb, s->plane[0].height, (block_size) + (s->spatial_decomposition_count * (s->spatial_decomposition_count + 3)) + 1, s->plane[0].width, s->spatial_idwt_buffer);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4409
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4410 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4411 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4412
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4413 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4414 SnowContext *s = avctx->priv_data;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4415 RangeCoder * const c= &s->c;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4416 int bytes_read;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4417 AVFrame *picture = data;
5633
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4418 int level, orientation, plane_index, i;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4419
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4420 ff_init_range_decoder(c, buf, buf_size);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4421 ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4422
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4423 s->current_picture.pict_type= FF_I_TYPE; //FIXME I vs. P
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4424 decode_header(s);
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
4425
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
4426 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
4427 Plane *p= &s->plane[plane_index];
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
4428 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
4429 && p->hcoeff[1]==-10
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
4430 && p->hcoeff[2]==2;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
4431 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
4432
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
4433 if(!s->block) alloc_blocks(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4434
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4435 frame_start(s);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4436 //keyframe flag dupliaction mess FIXME
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4437 if(avctx->debug&FF_DEBUG_PICT_INFO)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4438 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
4439
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
4440 decode_blocks(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4441
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4442 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4443 Plane *p= &s->plane[plane_index];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4444 int w= p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4445 int h= p->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4446 int x, y;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4447 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
4448
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4449 if(s->avctx->debug&2048){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4450 memset(s->spatial_dwt_buffer, 0, sizeof(DWTELEM)*w*h);
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
4451 predict_plane(s, s->spatial_idwt_buffer, plane_index, 1);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4452
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4453 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4454 for(x=0; x<w; x++){
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
4455 int v= s->current_picture.data[plane_index][y*s->current_picture.linesize[plane_index] + x];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4456 s->mconly_picture.data[plane_index][y*s->mconly_picture.linesize[plane_index] + x]= v;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4457 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4458 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4459 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4460
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4461 { START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4462 for(level=0; level<s->spatial_decomposition_count; level++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4463 for(orientation=level ? 1 : 0; orientation<4; orientation++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4464 SubBand *b= &p->band[level][orientation];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4465 unpack_coeffs(s, b, b->parent, orientation);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4466 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4467 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4468 STOP_TIMER("unpack coeffs");
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4469 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4470
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4471 {START_TIMER
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4472 const int mb_h= s->b_height << s->block_max_depth;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4473 const int block_size = MB_SIZE >> s->block_max_depth;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4474 const int block_w = plane_index ? block_size/2 : block_size;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4475 int mb_y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4476 dwt_compose_t cs[MAX_DECOMPOSITIONS];
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4477 int yd=0, yq=0;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4478 int y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4479 int end_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4480
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4481 ff_spatial_idwt_buffered_init(cs, &s->sb, w, h, 1, s->spatial_decomposition_type, s->spatial_decomposition_count);
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4482 for(mb_y=0; mb_y<=mb_h; mb_y++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4483
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4484 int slice_starty = block_w*mb_y;
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4485 int slice_h = block_w*(mb_y+1);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4486 if (!(s->keyframe || s->avctx->debug&512)){
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4487 slice_starty = FFMAX(0, slice_starty - (block_w >> 1));
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4488 slice_h -= (block_w >> 1);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4489 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4490
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4491 {
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4492 START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4493 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
4494 for(orientation=level ? 1 : 0; orientation<4; orientation++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4495 SubBand *b= &p->band[level][orientation];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4496 int start_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4497 int end_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4498 int our_mb_start = mb_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4499 int our_mb_end = (mb_y + 1);
3012
088920c095fc cleanup
michael
parents: 3000
diff changeset
4500 const int extra= 3;
088920c095fc cleanup
michael
parents: 3000
diff changeset
4501 start_y = (mb_y ? ((block_w * our_mb_start) >> (s->spatial_decomposition_count - level)) + s->spatial_decomposition_count - level + extra: 0);
088920c095fc cleanup
michael
parents: 3000
diff changeset
4502 end_y = (((block_w * our_mb_end) >> (s->spatial_decomposition_count - level)) + s->spatial_decomposition_count - level + extra);
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4503 if (!(s->keyframe || s->avctx->debug&512)){
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4504 start_y = FFMAX(0, start_y - (block_w >> (1+s->spatial_decomposition_count - level)));
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4505 end_y = FFMAX(0, end_y - (block_w >> (1+s->spatial_decomposition_count - level)));
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4506 }
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4507 start_y = FFMIN(b->height, start_y);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4508 end_y = FFMIN(b->height, end_y);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4509
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4510 if (start_y != end_y){
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4511 if (orientation == 0){
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4512 SubBand * correlate_band = &p->band[0][0];
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4513 int correlate_end_y = FFMIN(b->height, end_y + 1);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4514 int correlate_start_y = FFMIN(b->height, (start_y ? start_y + 1 : 0));
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4515 decode_subband_slice_buffered(s, correlate_band, &s->sb, correlate_start_y, correlate_end_y, decode_state[0][0]);
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
4516 correlate_slice_buffered(s, &s->sb, correlate_band, correlate_band->ibuf, correlate_band->stride, 1, 0, correlate_start_y, correlate_end_y);
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
4517 dequantize_slice_buffered(s, &s->sb, correlate_band, correlate_band->ibuf, correlate_band->stride, start_y, end_y);
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4518 }
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4519 else
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4520 decode_subband_slice_buffered(s, b, &s->sb, start_y, end_y, decode_state[level][orientation]);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4521 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4522 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4523 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4524 STOP_TIMER("decode_subband_slice");
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4525 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4526
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4527 { START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4528 for(; yd<slice_h; yd+=4){
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
4529 ff_spatial_idwt_buffered_slice(&s->dsp, cs, &s->sb, w, h, 1, s->spatial_decomposition_type, s->spatial_decomposition_count, yd);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4530 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4531 STOP_TIMER("idwt slice");}
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4532
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4533
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4534 if(s->qlog == LOSSLESS_QLOG){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4535 for(; yq<slice_h && yq<h; yq++){
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
4536 IDWTELEM * line = slice_buffer_get_line(&s->sb, yq);
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4537 for(x=0; x<w; x++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4538 line[x] <<= FRAC_BITS;
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4539 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4540 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4541 }
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4542
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
4543 predict_slice_buffered(s, &s->sb, s->spatial_idwt_buffer, plane_index, 1, mb_y);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4544
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4545 y = FFMIN(p->height, slice_starty);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4546 end_y = FFMIN(p->height, slice_h);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4547 while(y < end_y)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4548 slice_buffer_release(&s->sb, y++);
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4549 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4550
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4551 slice_buffer_flush(&s->sb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4552
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4553 STOP_TIMER("idwt + predict_slices")}
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4554 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4555
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4556 emms_c();
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4557
5633
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4558 if(s->last_picture[s->max_ref_frames-1].data[0]){
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4559 avctx->release_buffer(avctx, &s->last_picture[s->max_ref_frames-1]);
5633
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4560 for(i=0; i<9; i++)
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4561 if(s->halfpel_plane[s->max_ref_frames-1][1+i/3][i%3])
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4562 av_free(s->halfpel_plane[s->max_ref_frames-1][1+i/3][i%3] - EDGE_WIDTH*(1+s->current_picture.linesize[i%3]));
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4563 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4564
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4565 if(!(s->avctx->debug&2048))
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4566 *picture= s->current_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4567 else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4568 *picture= s->mconly_picture;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4569
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4570 *data_size = sizeof(AVFrame);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4571
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4572 bytes_read= c->bytestream - c->bytestream_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4573 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
4574
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4575 return bytes_read;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4576 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4577
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4578 static int decode_end(AVCodecContext *avctx)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4579 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4580 SnowContext *s = avctx->priv_data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4581
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4582 slice_buffer_destroy(&s->sb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4583
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4584 common_end(s);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4585
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4586 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4587 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4588
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4589 AVCodec snow_decoder = {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4590 "snow",
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4591 CODEC_TYPE_VIDEO,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4592 CODEC_ID_SNOW,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4593 sizeof(SnowContext),
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4594 decode_init,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4595 NULL,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4596 decode_end,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4597 decode_frame,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4598 0 /*CODEC_CAP_DR1*/ /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4599 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4600 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4601
5224
6ced4aabe225 include snow encoder only if it is not disabled
aurel
parents: 5127
diff changeset
4602 #ifdef CONFIG_SNOW_ENCODER
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4603 AVCodec snow_encoder = {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4604 "snow",
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4605 CODEC_TYPE_VIDEO,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4606 CODEC_ID_SNOW,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4607 sizeof(SnowContext),
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4608 encode_init,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4609 encode_frame,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4610 encode_end,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4611 };
2408
a6e4da1c28ee Disable encoders patch by (Gianluigi Tiesi <mplayer netfarm it>)
michael
parents: 2368
diff changeset
4612 #endif
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4613
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4614
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4615 #if 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4616 #undef malloc
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4617 #undef free
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4618 #undef printf
5380
389366aa3458 Fix the self tests which are contained in some codecs and are using random().
takis
parents: 5254
diff changeset
4619 #undef random
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4620
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4621 int main(){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4622 int width=256;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4623 int height=256;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4624 int buffer[2][width*height];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4625 SnowContext s;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4626 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4627 s.spatial_decomposition_count=6;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4628 s.spatial_decomposition_type=1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4629
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4630 printf("testing 5/3 DWT\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4631 for(i=0; i<width*height; i++)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4632 buffer[0][i]= buffer[1][i]= random()%54321 - 12345;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4633
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4634 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
4635 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
4636
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4637 for(i=0; i<width*height; i++)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4638 if(buffer[0][i]!= buffer[1][i]) printf("fsck: %d %d %d\n",i, buffer[0][i], buffer[1][i]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4639
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4640 printf("testing 9/7 DWT\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4641 s.spatial_decomposition_type=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4642 for(i=0; i<width*height; i++)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4643 buffer[0][i]= buffer[1][i]= random()%54321 - 12345;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4644
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4645 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
4646 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
4647
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4648 for(i=0; i<width*height; i++)
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
4649 if(FFABS(buffer[0][i] - buffer[1][i])>20) printf("fsck: %d %d %d\n",i, buffer[0][i], buffer[1][i]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4650
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4651 #if 0
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4652 printf("testing AC coder\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4653 memset(s.header_state, 0, sizeof(s.header_state));
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4654 ff_init_range_encoder(&s.c, buffer[0], 256*256);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4655 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
4656
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4657 for(i=-256; i<256; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4658 START_TIMER
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
4659 put_symbol(&s.c, s.header_state, i*i*i/3*FFABS(i), 1);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4660 STOP_TIMER("put_symbol")
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4661 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4662 ff_rac_terminate(&s.c);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4663
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4664 memset(s.header_state, 0, sizeof(s.header_state));
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4665 ff_init_range_decoder(&s.c, buffer[0], 256*256);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4666 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
4667
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4668 for(i=-256; i<256; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4669 int j;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4670 START_TIMER
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4671 j= get_symbol(&s.c, s.header_state, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4672 STOP_TIMER("get_symbol")
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
4673 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
4674 }
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4675 #endif
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4676 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4677 int level, orientation, x, y;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4678 int64_t errors[8][4];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4679 int64_t g=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4680
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4681 memset(errors, 0, sizeof(errors));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4682 s.spatial_decomposition_count=3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4683 s.spatial_decomposition_type=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4684 for(level=0; level<s.spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4685 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4686 int w= width >> (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4687 int h= height >> (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4688 int stride= width << (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4689 DWTELEM *buf= buffer[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4690 int64_t error=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4691
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4692 if(orientation&1) buf+=w;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4693 if(orientation>1) buf+=stride>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4694
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4695 memset(buffer[0], 0, sizeof(int)*width*height);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4696 buf[w/2 + h/2*stride]= 256*256;
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4697 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
4698 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4699 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4700 int64_t d= buffer[0][x + y*width];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4701 error += d*d;
4122
daae66c03857 Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 4011
diff changeset
4702 if(FFABS(width/2-x)<9 && FFABS(height/2-y)<9 && level==2) printf("%8"PRId64" ", d);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4703 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
4704 if(FFABS(height/2-y)<9 && level==2) printf("\n");
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4705 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4706 error= (int)(sqrt(error)+0.5);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4707 errors[level][orientation]= error;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4708 if(g) g=ff_gcd(g, error);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4709 else g= error;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4710 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4711 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4712 printf("static int const visual_weight[][4]={\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4713 for(level=0; level<s.spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4714 printf(" {");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4715 for(orientation=0; orientation<4; orientation++){
4122
daae66c03857 Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 4011
diff changeset
4716 printf("%8"PRId64",", errors[level][orientation]/g);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4717 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4718 printf("},\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4719 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4720 printf("};\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4721 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4722 int level=2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4723 int orientation=3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4724 int w= width >> (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4725 int h= height >> (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4726 int stride= width << (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4727 DWTELEM *buf= buffer[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4728 int64_t error=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4729
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4730 buf+=w;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4731 buf+=stride>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4732
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4733 memset(buffer[0], 0, sizeof(int)*width*height);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4734 #if 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4735 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4736 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4737 int tab[4]={0,2,3,1};
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4738 buffer[0][x+width*y]= 256*256*tab[(x&1) + 2*(y&1)];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4739 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4740 }
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4741 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
4742 #else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4743 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4744 for(x=0; x<w; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4745 buf[x + y*stride ]=169;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4746 buf[x + y*stride-w]=64;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4747 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4748 }
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4749 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
4750 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4751 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4752 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4753 int64_t d= buffer[0][x + y*width];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4754 error += d*d;
4122
daae66c03857 Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 4011
diff changeset
4755 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
4756 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
4757 if(FFABS(height/2-y)<9) printf("\n");
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4758 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4759 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4760
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4761 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4762 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4763 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4764 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4765