annotate snow.c @ 9578:14b9819158a8 libavcodec

Revert r18700, documentation of deprecated functions might be useful for people trying to update to the new API. Log of r18700: Remove documentation from deprecated fields, they should not be used, thus there is no sense in documenting them.
author vitor
date Mon, 27 Apr 2009 18:35:54 +0000
parents 54ddf2b7d4bd
children f4a60e47193f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1 /*
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2 * Copyright (C) 2004 Michael Niedermayer <michaelni@gmx.at>
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3920
diff changeset
4 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3920
diff changeset
5 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3920
diff changeset
6 * FFmpeg is free software; you can redistribute it and/or
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
7 * modify it under the terms of the GNU Lesser General Public
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
8 * License as published by the Free Software Foundation; either
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3920
diff changeset
9 * version 2.1 of the License, or (at your option) any later version.
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
10 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3920
diff changeset
11 * FFmpeg is distributed in the hope that it will be useful,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
14 * Lesser General Public License for more details.
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
15 *
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
16 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3920
diff changeset
17 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 3035
diff changeset
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
19 */
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
20
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
21 #include "avcodec.h"
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
22 #include "dsputil.h"
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
23 #include "snow.h"
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
24
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
25 #include "rangecoder.h"
8627
d6bab465b82c moves mid_pred() into mathops.h (with arch specific code split by directory)
aurel
parents: 8611
diff changeset
26 #include "mathops.h"
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
27
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
28 #include "mpegvideo.h"
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
29
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
30 #undef NDEBUG
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
31 #include <assert.h>
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
32
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
33 static const int8_t quant3[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
34 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
35 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
36 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
37 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
38 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
39 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
40 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
41 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
42 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
43 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
44 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
45 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
46 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
47 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
48 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
49 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
50 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
51 static const int8_t quant3b[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
52 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
53 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
54 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
55 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
56 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
57 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
58 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
59 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
60 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
61 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
62 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
63 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
64 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
65 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
66 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
67 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
68 };
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
69 static const int8_t quant3bA[256]={
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
70 0, 0, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
71 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
72 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
73 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
74 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
75 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
76 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
77 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
78 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
79 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
80 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
81 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
82 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
83 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
84 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
85 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
86 };
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
87 static const int8_t quant5[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
88 0, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
89 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
90 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
91 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
92 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
93 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
94 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
95 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
96 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
97 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
98 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
99 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
100 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
101 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
102 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
103 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-1,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
104 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
105 static const int8_t quant7[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
106 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
107 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
108 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
109 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
110 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
111 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
112 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
113 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
114 -3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
115 -3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
116 -3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
117 -3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
118 -3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
119 -3,-3,-3,-3,-3,-3,-3,-3,-3,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
120 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
121 -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
122 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
123 static const int8_t quant9[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
124 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
125 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
126 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
127 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
128 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
129 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
130 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
131 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
132 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
133 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
134 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
135 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
136 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
137 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
138 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-3,-3,-3,-3,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
139 -3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-2,-2,-2,-2,-1,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
140 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
141 static const int8_t quant11[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
142 0, 1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
143 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
144 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
145 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
146 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
147 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
148 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
149 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
150 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
151 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
152 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
153 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
154 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
155 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
156 -4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
157 -4,-4,-4,-4,-4,-3,-3,-3,-3,-3,-3,-3,-2,-2,-2,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
158 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
159 static const int8_t quant13[256]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
160 0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
161 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
162 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
163 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
164 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
165 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
166 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
167 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
168 -6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
169 -6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
170 -6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
171 -6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
172 -6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
173 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
174 -5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
175 -4,-4,-4,-4,-4,-4,-4,-4,-4,-3,-3,-3,-3,-2,-2,-1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
176 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
177
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
178 #if 0 //64*cubic
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
179 static const uint8_t obmc32[1024]={
5659
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
180 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
181 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
182 0, 0, 0, 4, 4, 4, 4, 8, 8, 12, 12, 12, 16, 16, 16, 16, 16, 16, 16, 16, 12, 12, 12, 8, 8, 4, 4, 4, 4, 0, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
183 0, 0, 4, 4, 8, 8, 12, 16, 16, 20, 24, 24, 28, 28, 32, 32, 32, 32, 28, 28, 24, 24, 20, 16, 16, 12, 8, 8, 4, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
184 0, 0, 4, 8, 8, 12, 16, 24, 28, 32, 36, 40, 44, 48, 48, 48, 48, 48, 48, 44, 40, 36, 32, 28, 24, 16, 12, 8, 8, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
185 0, 4, 4, 8, 12, 20, 24, 32, 40, 44, 52, 56, 60, 64, 68, 72, 72, 68, 64, 60, 56, 52, 44, 40, 32, 24, 20, 12, 8, 4, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
186 0, 4, 4, 12, 16, 24, 32, 40, 52, 60, 68, 76, 80, 88, 88, 92, 92, 88, 88, 80, 76, 68, 60, 52, 40, 32, 24, 16, 12, 4, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
187 0, 4, 8, 16, 24, 32, 40, 52, 64, 76, 84, 92,100,108,112,116,116,112,108,100, 92, 84, 76, 64, 52, 40, 32, 24, 16, 8, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
188 0, 4, 8, 16, 28, 40, 52, 64, 76, 88,100,112,124,132,136,140,140,136,132,124,112,100, 88, 76, 64, 52, 40, 28, 16, 8, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
189 0, 4, 12, 20, 32, 44, 60, 76, 88,104,120,132,144,152,160,164,164,160,152,144,132,120,104, 88, 76, 60, 44, 32, 20, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
190 0, 4, 12, 24, 36, 48, 68, 84,100,120,136,152,164,176,180,184,184,180,176,164,152,136,120,100, 84, 68, 48, 36, 24, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
191 0, 4, 12, 24, 40, 56, 76, 92,112,132,152,168,180,192,204,208,208,204,192,180,168,152,132,112, 92, 76, 56, 40, 24, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
192 0, 4, 16, 28, 44, 60, 80,100,124,144,164,180,196,208,220,224,224,220,208,196,180,164,144,124,100, 80, 60, 44, 28, 16, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
193 0, 8, 16, 28, 48, 64, 88,108,132,152,176,192,208,224,232,240,240,232,224,208,192,176,152,132,108, 88, 64, 48, 28, 16, 8, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
194 0, 4, 16, 32, 48, 68, 88,112,136,160,180,204,220,232,244,248,248,244,232,220,204,180,160,136,112, 88, 68, 48, 32, 16, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
195 1, 8, 16, 32, 48, 72, 92,116,140,164,184,208,224,240,248,255,255,248,240,224,208,184,164,140,116, 92, 72, 48, 32, 16, 8, 1,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
196 1, 8, 16, 32, 48, 72, 92,116,140,164,184,208,224,240,248,255,255,248,240,224,208,184,164,140,116, 92, 72, 48, 32, 16, 8, 1,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
197 0, 4, 16, 32, 48, 68, 88,112,136,160,180,204,220,232,244,248,248,244,232,220,204,180,160,136,112, 88, 68, 48, 32, 16, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
198 0, 8, 16, 28, 48, 64, 88,108,132,152,176,192,208,224,232,240,240,232,224,208,192,176,152,132,108, 88, 64, 48, 28, 16, 8, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
199 0, 4, 16, 28, 44, 60, 80,100,124,144,164,180,196,208,220,224,224,220,208,196,180,164,144,124,100, 80, 60, 44, 28, 16, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
200 0, 4, 12, 24, 40, 56, 76, 92,112,132,152,168,180,192,204,208,208,204,192,180,168,152,132,112, 92, 76, 56, 40, 24, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
201 0, 4, 12, 24, 36, 48, 68, 84,100,120,136,152,164,176,180,184,184,180,176,164,152,136,120,100, 84, 68, 48, 36, 24, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
202 0, 4, 12, 20, 32, 44, 60, 76, 88,104,120,132,144,152,160,164,164,160,152,144,132,120,104, 88, 76, 60, 44, 32, 20, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
203 0, 4, 8, 16, 28, 40, 52, 64, 76, 88,100,112,124,132,136,140,140,136,132,124,112,100, 88, 76, 64, 52, 40, 28, 16, 8, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
204 0, 4, 8, 16, 24, 32, 40, 52, 64, 76, 84, 92,100,108,112,116,116,112,108,100, 92, 84, 76, 64, 52, 40, 32, 24, 16, 8, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
205 0, 4, 4, 12, 16, 24, 32, 40, 52, 60, 68, 76, 80, 88, 88, 92, 92, 88, 88, 80, 76, 68, 60, 52, 40, 32, 24, 16, 12, 4, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
206 0, 4, 4, 8, 12, 20, 24, 32, 40, 44, 52, 56, 60, 64, 68, 72, 72, 68, 64, 60, 56, 52, 44, 40, 32, 24, 20, 12, 8, 4, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
207 0, 0, 4, 8, 8, 12, 16, 24, 28, 32, 36, 40, 44, 48, 48, 48, 48, 48, 48, 44, 40, 36, 32, 28, 24, 16, 12, 8, 8, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
208 0, 0, 4, 4, 8, 8, 12, 16, 16, 20, 24, 24, 28, 28, 32, 32, 32, 32, 28, 28, 24, 24, 20, 16, 16, 12, 8, 8, 4, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
209 0, 0, 0, 4, 4, 4, 4, 8, 8, 12, 12, 12, 16, 16, 16, 16, 16, 16, 16, 16, 12, 12, 12, 8, 8, 4, 4, 4, 4, 0, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
210 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
211 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
212 //error:0.000022
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
213 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
214 static const uint8_t obmc16[256]={
5659
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
215 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
216 0, 4, 4, 8, 16, 20, 20, 24, 24, 20, 20, 16, 8, 4, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
217 0, 4, 16, 24, 36, 44, 52, 60, 60, 52, 44, 36, 24, 16, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
218 0, 8, 24, 44, 60, 80, 96,104,104, 96, 80, 60, 44, 24, 8, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
219 0, 16, 36, 60, 92,116,136,152,152,136,116, 92, 60, 36, 16, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
220 0, 20, 44, 80,116,152,180,196,196,180,152,116, 80, 44, 20, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
221 4, 20, 52, 96,136,180,212,228,228,212,180,136, 96, 52, 20, 4,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
222 4, 24, 60,104,152,196,228,248,248,228,196,152,104, 60, 24, 4,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
223 4, 24, 60,104,152,196,228,248,248,228,196,152,104, 60, 24, 4,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
224 4, 20, 52, 96,136,180,212,228,228,212,180,136, 96, 52, 20, 4,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
225 0, 20, 44, 80,116,152,180,196,196,180,152,116, 80, 44, 20, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
226 0, 16, 36, 60, 92,116,136,152,152,136,116, 92, 60, 36, 16, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
227 0, 8, 24, 44, 60, 80, 96,104,104, 96, 80, 60, 44, 24, 8, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
228 0, 4, 16, 24, 36, 44, 52, 60, 60, 52, 44, 36, 24, 16, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
229 0, 4, 4, 8, 16, 20, 20, 24, 24, 20, 20, 16, 8, 4, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
230 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
231 //error:0.000033
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
232 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
233 #elif 1 // 64*linear
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
234 static const uint8_t obmc32[1024]={
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
235 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
236 0, 4, 4, 4, 8, 8, 8, 12, 12, 16, 16, 16, 20, 20, 20, 24, 24, 20, 20, 20, 16, 16, 16, 12, 12, 8, 8, 8, 4, 4, 4, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
237 0, 4, 8, 8, 12, 12, 16, 20, 20, 24, 28, 28, 32, 32, 36, 40, 40, 36, 32, 32, 28, 28, 24, 20, 20, 16, 12, 12, 8, 8, 4, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
238 0, 4, 8, 12, 16, 20, 24, 28, 28, 32, 36, 40, 44, 48, 52, 56, 56, 52, 48, 44, 40, 36, 32, 28, 28, 24, 20, 16, 12, 8, 4, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
239 4, 8, 12, 16, 20, 24, 28, 32, 40, 44, 48, 52, 56, 60, 64, 68, 68, 64, 60, 56, 52, 48, 44, 40, 32, 28, 24, 20, 16, 12, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
240 4, 8, 12, 20, 24, 32, 36, 40, 48, 52, 56, 64, 68, 76, 80, 84, 84, 80, 76, 68, 64, 56, 52, 48, 40, 36, 32, 24, 20, 12, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
241 4, 8, 16, 24, 28, 36, 44, 48, 56, 60, 68, 76, 80, 88, 96,100,100, 96, 88, 80, 76, 68, 60, 56, 48, 44, 36, 28, 24, 16, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
242 4, 12, 20, 28, 32, 40, 48, 56, 64, 72, 80, 88, 92,100,108,116,116,108,100, 92, 88, 80, 72, 64, 56, 48, 40, 32, 28, 20, 12, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
243 4, 12, 20, 28, 40, 48, 56, 64, 72, 80, 88, 96,108,116,124,132,132,124,116,108, 96, 88, 80, 72, 64, 56, 48, 40, 28, 20, 12, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
244 4, 16, 24, 32, 44, 52, 60, 72, 80, 92,100,108,120,128,136,148,148,136,128,120,108,100, 92, 80, 72, 60, 52, 44, 32, 24, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
245 4, 16, 28, 36, 48, 56, 68, 80, 88,100,112,120,132,140,152,164,164,152,140,132,120,112,100, 88, 80, 68, 56, 48, 36, 28, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
246 4, 16, 28, 40, 52, 64, 76, 88, 96,108,120,132,144,156,168,180,180,168,156,144,132,120,108, 96, 88, 76, 64, 52, 40, 28, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
247 8, 20, 32, 44, 56, 68, 80, 92,108,120,132,144,156,168,180,192,192,180,168,156,144,132,120,108, 92, 80, 68, 56, 44, 32, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
248 8, 20, 32, 48, 60, 76, 88,100,116,128,140,156,168,184,196,208,208,196,184,168,156,140,128,116,100, 88, 76, 60, 48, 32, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
249 8, 20, 36, 52, 64, 80, 96,108,124,136,152,168,180,196,212,224,224,212,196,180,168,152,136,124,108, 96, 80, 64, 52, 36, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
250 8, 24, 40, 56, 68, 84,100,116,132,148,164,180,192,208,224,240,240,224,208,192,180,164,148,132,116,100, 84, 68, 56, 40, 24, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
251 8, 24, 40, 56, 68, 84,100,116,132,148,164,180,192,208,224,240,240,224,208,192,180,164,148,132,116,100, 84, 68, 56, 40, 24, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
252 8, 20, 36, 52, 64, 80, 96,108,124,136,152,168,180,196,212,224,224,212,196,180,168,152,136,124,108, 96, 80, 64, 52, 36, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
253 8, 20, 32, 48, 60, 76, 88,100,116,128,140,156,168,184,196,208,208,196,184,168,156,140,128,116,100, 88, 76, 60, 48, 32, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
254 8, 20, 32, 44, 56, 68, 80, 92,108,120,132,144,156,168,180,192,192,180,168,156,144,132,120,108, 92, 80, 68, 56, 44, 32, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
255 4, 16, 28, 40, 52, 64, 76, 88, 96,108,120,132,144,156,168,180,180,168,156,144,132,120,108, 96, 88, 76, 64, 52, 40, 28, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
256 4, 16, 28, 36, 48, 56, 68, 80, 88,100,112,120,132,140,152,164,164,152,140,132,120,112,100, 88, 80, 68, 56, 48, 36, 28, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
257 4, 16, 24, 32, 44, 52, 60, 72, 80, 92,100,108,120,128,136,148,148,136,128,120,108,100, 92, 80, 72, 60, 52, 44, 32, 24, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
258 4, 12, 20, 28, 40, 48, 56, 64, 72, 80, 88, 96,108,116,124,132,132,124,116,108, 96, 88, 80, 72, 64, 56, 48, 40, 28, 20, 12, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
259 4, 12, 20, 28, 32, 40, 48, 56, 64, 72, 80, 88, 92,100,108,116,116,108,100, 92, 88, 80, 72, 64, 56, 48, 40, 32, 28, 20, 12, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
260 4, 8, 16, 24, 28, 36, 44, 48, 56, 60, 68, 76, 80, 88, 96,100,100, 96, 88, 80, 76, 68, 60, 56, 48, 44, 36, 28, 24, 16, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
261 4, 8, 12, 20, 24, 32, 36, 40, 48, 52, 56, 64, 68, 76, 80, 84, 84, 80, 76, 68, 64, 56, 52, 48, 40, 36, 32, 24, 20, 12, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
262 4, 8, 12, 16, 20, 24, 28, 32, 40, 44, 48, 52, 56, 60, 64, 68, 68, 64, 60, 56, 52, 48, 44, 40, 32, 28, 24, 20, 16, 12, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
263 0, 4, 8, 12, 16, 20, 24, 28, 28, 32, 36, 40, 44, 48, 52, 56, 56, 52, 48, 44, 40, 36, 32, 28, 28, 24, 20, 16, 12, 8, 4, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
264 0, 4, 8, 8, 12, 12, 16, 20, 20, 24, 28, 28, 32, 32, 36, 40, 40, 36, 32, 32, 28, 28, 24, 20, 20, 16, 12, 12, 8, 8, 4, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
265 0, 4, 4, 4, 8, 8, 8, 12, 12, 16, 16, 16, 20, 20, 20, 24, 24, 20, 20, 20, 16, 16, 16, 12, 12, 8, 8, 8, 4, 4, 4, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
266 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
267 //error:0.000020
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
268 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
269 static const uint8_t obmc16[256]={
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
270 0, 4, 4, 8, 8, 12, 12, 16, 16, 12, 12, 8, 8, 4, 4, 0,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
271 4, 8, 16, 20, 28, 32, 40, 44, 44, 40, 32, 28, 20, 16, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
272 4, 16, 24, 36, 44, 56, 64, 76, 76, 64, 56, 44, 36, 24, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
273 8, 20, 36, 48, 64, 76, 92,104,104, 92, 76, 64, 48, 36, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
274 8, 28, 44, 64, 80,100,116,136,136,116,100, 80, 64, 44, 28, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
275 12, 32, 56, 76,100,120,144,164,164,144,120,100, 76, 56, 32, 12,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
276 12, 40, 64, 92,116,144,168,196,196,168,144,116, 92, 64, 40, 12,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
277 16, 44, 76,104,136,164,196,224,224,196,164,136,104, 76, 44, 16,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
278 16, 44, 76,104,136,164,196,224,224,196,164,136,104, 76, 44, 16,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
279 12, 40, 64, 92,116,144,168,196,196,168,144,116, 92, 64, 40, 12,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
280 12, 32, 56, 76,100,120,144,164,164,144,120,100, 76, 56, 32, 12,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
281 8, 28, 44, 64, 80,100,116,136,136,116,100, 80, 64, 44, 28, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
282 8, 20, 36, 48, 64, 76, 92,104,104, 92, 76, 64, 48, 36, 20, 8,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
283 4, 16, 24, 36, 44, 56, 64, 76, 76, 64, 56, 44, 36, 24, 16, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
284 4, 8, 16, 20, 28, 32, 40, 44, 44, 40, 32, 28, 20, 16, 8, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
285 0, 4, 4, 8, 8, 12, 12, 16, 16, 12, 12, 8, 8, 4, 4, 0,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
286 //error:0.000015
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
287 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
288 #else //64*cos
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
289 static const uint8_t obmc32[1024]={
5659
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
290 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
291 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 8, 4, 4, 8, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
292 0, 0, 0, 4, 4, 4, 4, 8, 8, 12, 12, 12, 12, 16, 16, 16, 16, 16, 16, 12, 12, 12, 12, 8, 8, 4, 4, 4, 4, 0, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
293 0, 0, 4, 4, 4, 8, 8, 12, 16, 20, 20, 24, 28, 28, 28, 28, 28, 28, 28, 28, 24, 20, 20, 16, 12, 8, 8, 4, 4, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
294 0, 0, 4, 4, 8, 12, 16, 20, 24, 28, 36, 40, 44, 44, 48, 48, 48, 48, 44, 44, 40, 36, 28, 24, 20, 16, 12, 8, 4, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
295 0, 0, 4, 8, 12, 20, 24, 32, 36, 44, 48, 56, 60, 64, 68, 68, 68, 68, 64, 60, 56, 48, 44, 36, 32, 24, 20, 12, 8, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
296 0, 4, 4, 8, 16, 24, 32, 40, 48, 60, 68, 76, 80, 84, 88, 92, 92, 88, 84, 80, 76, 68, 60, 48, 40, 32, 24, 16, 8, 4, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
297 0, 4, 8, 12, 20, 32, 40, 52, 64, 76, 84, 96,104,108,112,116,116,112,108,104, 96, 84, 76, 64, 52, 40, 32, 20, 12, 8, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
298 0, 4, 8, 16, 24, 36, 48, 64, 76, 92,104,116,124,132,136,140,140,136,132,124,116,104, 92, 76, 64, 48, 36, 24, 16, 8, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
299 0, 4, 12, 20, 28, 44, 60, 76, 92,104,120,136,148,156,160,164,164,160,156,148,136,120,104, 92, 76, 60, 44, 28, 20, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
300 0, 4, 12, 20, 36, 48, 68, 84,104,120,140,152,168,176,184,188,188,184,176,168,152,140,120,104, 84, 68, 48, 36, 20, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
301 0, 4, 12, 24, 36, 56, 76, 96,116,136,152,172,184,196,204,208,208,204,196,184,172,152,136,116, 96, 76, 56, 36, 24, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
302 0, 4, 12, 24, 44, 60, 80,104,124,148,168,184,200,212,224,228,228,224,212,200,184,168,148,124,104, 80, 60, 44, 24, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
303 0, 4, 12, 28, 44, 64, 84,108,132,156,176,196,212,228,236,240,240,236,228,212,196,176,156,132,108, 84, 64, 44, 28, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
304 0, 4, 16, 28, 48, 68, 88,112,136,160,184,204,224,236,244,252,252,244,236,224,204,184,160,136,112, 88, 68, 48, 28, 16, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
305 1, 4, 16, 28, 48, 68, 92,116,140,164,188,208,228,240,252,255,255,252,240,228,208,188,164,140,116, 92, 68, 48, 28, 16, 4, 1,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
306 1, 4, 16, 28, 48, 68, 92,116,140,164,188,208,228,240,252,255,255,252,240,228,208,188,164,140,116, 92, 68, 48, 28, 16, 4, 1,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
307 0, 4, 16, 28, 48, 68, 88,112,136,160,184,204,224,236,244,252,252,244,236,224,204,184,160,136,112, 88, 68, 48, 28, 16, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
308 0, 4, 12, 28, 44, 64, 84,108,132,156,176,196,212,228,236,240,240,236,228,212,196,176,156,132,108, 84, 64, 44, 28, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
309 0, 4, 12, 24, 44, 60, 80,104,124,148,168,184,200,212,224,228,228,224,212,200,184,168,148,124,104, 80, 60, 44, 24, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
310 0, 4, 12, 24, 36, 56, 76, 96,116,136,152,172,184,196,204,208,208,204,196,184,172,152,136,116, 96, 76, 56, 36, 24, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
311 0, 4, 12, 20, 36, 48, 68, 84,104,120,140,152,168,176,184,188,188,184,176,168,152,140,120,104, 84, 68, 48, 36, 20, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
312 0, 4, 12, 20, 28, 44, 60, 76, 92,104,120,136,148,156,160,164,164,160,156,148,136,120,104, 92, 76, 60, 44, 28, 20, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
313 0, 4, 8, 16, 24, 36, 48, 64, 76, 92,104,116,124,132,136,140,140,136,132,124,116,104, 92, 76, 64, 48, 36, 24, 16, 8, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
314 0, 4, 8, 12, 20, 32, 40, 52, 64, 76, 84, 96,104,108,112,116,116,112,108,104, 96, 84, 76, 64, 52, 40, 32, 20, 12, 8, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
315 0, 4, 4, 8, 16, 24, 32, 40, 48, 60, 68, 76, 80, 84, 88, 92, 92, 88, 84, 80, 76, 68, 60, 48, 40, 32, 24, 16, 8, 4, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
316 0, 0, 4, 8, 12, 20, 24, 32, 36, 44, 48, 56, 60, 64, 68, 68, 68, 68, 64, 60, 56, 48, 44, 36, 32, 24, 20, 12, 8, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
317 0, 0, 4, 4, 8, 12, 16, 20, 24, 28, 36, 40, 44, 44, 48, 48, 48, 48, 44, 44, 40, 36, 28, 24, 20, 16, 12, 8, 4, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
318 0, 0, 4, 4, 4, 8, 8, 12, 16, 20, 20, 24, 28, 28, 28, 28, 28, 28, 28, 28, 24, 20, 20, 16, 12, 8, 8, 4, 4, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
319 0, 0, 0, 4, 4, 4, 4, 8, 8, 12, 12, 12, 12, 16, 16, 16, 16, 16, 16, 12, 12, 12, 12, 8, 8, 4, 4, 4, 4, 0, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
320 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 8, 4, 4, 8, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
321 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
322 //error:0.000022
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
323 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
324 static const uint8_t obmc16[256]={
5659
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
325 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
326 0, 0, 4, 8, 12, 16, 20, 20, 20, 20, 16, 12, 8, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
327 0, 4, 12, 24, 32, 44, 52, 56, 56, 52, 44, 32, 24, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
328 0, 8, 24, 40, 60, 80, 96,104,104, 96, 80, 60, 40, 24, 8, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
329 0, 12, 32, 64, 92,120,140,152,152,140,120, 92, 64, 32, 12, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
330 4, 16, 44, 80,120,156,184,196,196,184,156,120, 80, 44, 16, 4,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
331 4, 20, 52, 96,140,184,216,232,232,216,184,140, 96, 52, 20, 4,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
332 0, 20, 56,104,152,196,232,252,252,232,196,152,104, 56, 20, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
333 0, 20, 56,104,152,196,232,252,252,232,196,152,104, 56, 20, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
334 4, 20, 52, 96,140,184,216,232,232,216,184,140, 96, 52, 20, 4,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
335 4, 16, 44, 80,120,156,184,196,196,184,156,120, 80, 44, 16, 4,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
336 0, 12, 32, 64, 92,120,140,152,152,140,120, 92, 64, 32, 12, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
337 0, 8, 24, 40, 60, 80, 96,104,104, 96, 80, 60, 40, 24, 8, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
338 0, 4, 12, 24, 32, 44, 52, 56, 56, 52, 44, 32, 24, 12, 4, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
339 0, 0, 4, 8, 12, 16, 20, 20, 20, 20, 16, 12, 8, 4, 0, 0,
ff44e77914ca scaling obmc tables under #if 0 also by 4 (yes they where forgotten apparently)
michael
parents: 5652
diff changeset
340 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
341 //error:0.000022
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
342 };
5910
85a976d59f17 Add comments to some #endif directives.
diego
parents: 5909
diff changeset
343 #endif /* 0 */
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
344
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
345 //linear *64
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
346 static const uint8_t obmc8[64]={
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
347 4, 12, 20, 28, 28, 20, 12, 4,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
348 12, 36, 60, 84, 84, 60, 36, 12,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
349 20, 60,100,140,140,100, 60, 20,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
350 28, 84,140,196,196,140, 84, 28,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
351 28, 84,140,196,196,140, 84, 28,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
352 20, 60,100,140,140,100, 60, 20,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
353 12, 36, 60, 84, 84, 60, 36, 12,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
354 4, 12, 20, 28, 28, 20, 12, 4,
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
355 //error:0.000000
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
356 };
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
357
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
358 //linear *64
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
359 static const uint8_t obmc4[16]={
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
360 16, 48, 48, 16,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
361 48,144,144, 48,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
362 48,144,144, 48,
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
363 16, 48, 48, 16,
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
364 //error:0.000000
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
365 };
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
366
7129
322023e630a6 mark read-only data as const
stefang
parents: 7040
diff changeset
367 static const uint8_t * const obmc_tab[4]={
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
368 obmc32, obmc16, obmc8, obmc4
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
369 };
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
370
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
371 static int scale_mv_ref[MAX_REF_FRAMES][MAX_REF_FRAMES];
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
372
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
373 typedef struct BlockNode{
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
374 int16_t mx;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
375 int16_t my;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
376 uint8_t ref;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
377 uint8_t color[3];
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
378 uint8_t type;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
379 //#define TYPE_SPLIT 1
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
380 #define BLOCK_INTRA 1
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
381 #define BLOCK_OPT 2
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
382 //#define TYPE_NOCOLOR 4
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
383 uint8_t level; //FIXME merge into type?
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
384 }BlockNode;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
385
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
386 static const BlockNode null_block= { //FIXME add border maybe
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
387 .color= {128,128,128},
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
388 .mx= 0,
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
389 .my= 0,
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
390 .ref= 0,
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
391 .type= 0,
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
392 .level= 0,
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
393 };
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
394
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
395 #define LOG2_MB_SIZE 4
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
396 #define MB_SIZE (1<<LOG2_MB_SIZE)
5575
a6f5ed050335 use more bits on the encoder side
michael
parents: 5572
diff changeset
397 #define ENCODER_EXTRA_BITS 4
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
398 #define HTAPS_MAX 8
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
399
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
400 typedef struct x_and_coeff{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
401 int16_t x;
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
402 uint16_t coeff;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
403 } x_and_coeff;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
404
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
405 typedef struct SubBand{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
406 int level;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
407 int stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
408 int width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
409 int height;
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
410 int qlog; ///< log(qscale)/log[2^(1/6)]
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
411 DWTELEM *buf;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
412 IDWTELEM *ibuf;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
413 int buf_x_offset;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
414 int buf_y_offset;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
415 int stride_line; ///< Stride measured in lines, not pixels.
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
416 x_and_coeff * x_coeff;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
417 struct SubBand *parent;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
418 uint8_t state[/*7*2*/ 7 + 512][32];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
419 }SubBand;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
420
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
421 typedef struct Plane{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
422 int width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
423 int height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
424 SubBand band[MAX_DECOMPOSITIONS][4];
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
425
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
426 int htaps;
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
427 int8_t hcoeff[HTAPS_MAX/2];
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
428 int diag_mc;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
429 int fast_mc;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
430
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
431 int last_htaps;
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
432 int8_t last_hcoeff[HTAPS_MAX/2];
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
433 int last_diag_mc;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
434 }Plane;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
435
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
436 typedef struct SnowContext{
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
437 // MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to eventually make the motion estimation independent of MpegEncContext, so this will be removed then (FIXME/XXX)
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
438
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
439 AVCodecContext *avctx;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
440 RangeCoder c;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
441 DSPContext dsp;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
442 AVFrame new_picture;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
443 AVFrame input_picture; ///< new_picture with the internal linesizes
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
444 AVFrame current_picture;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
445 AVFrame last_picture[MAX_REF_FRAMES];
5633
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
446 uint8_t *halfpel_plane[MAX_REF_FRAMES][4][4];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
447 AVFrame mconly_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
448 // uint8_t q_context[16];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
449 uint8_t header_state[32];
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
450 uint8_t block_state[128 + 32*128];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
451 int keyframe;
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
452 int always_reset;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
453 int version;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
454 int spatial_decomposition_type;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
455 int last_spatial_decomposition_type;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
456 int temporal_decomposition_type;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
457 int spatial_decomposition_count;
5670
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
458 int last_spatial_decomposition_count;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
459 int temporal_decomposition_count;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
460 int max_ref_frames;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
461 int ref_frames;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
462 int16_t (*ref_mvs[MAX_REF_FRAMES])[2];
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
463 uint32_t *ref_scores[MAX_REF_FRAMES];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
464 DWTELEM *spatial_dwt_buffer;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
465 IDWTELEM *spatial_idwt_buffer;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
466 int colorspace_type;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
467 int chroma_h_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
468 int chroma_v_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
469 int spatial_scalability;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
470 int qlog;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
471 int last_qlog;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
472 int lambda;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
473 int lambda2;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
474 int pass1_rc;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
475 int mv_scale;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
476 int last_mv_scale;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
477 int qbias;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
478 int last_qbias;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
479 #define QBIAS_SHIFT 3
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
480 int b_width;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
481 int b_height;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
482 int block_max_depth;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
483 int last_block_max_depth;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
484 Plane plane[MAX_PLANES];
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
485 BlockNode *block;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
486 #define ME_CACHE_SIZE 1024
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
487 int me_cache[ME_CACHE_SIZE];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
488 int me_cache_generation;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
489 slice_buffer sb;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
490
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
491 MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to eventually make the motion estimation independent of MpegEncContext, so this will be removed then (FIXME/XXX)
8214
c5276ad92ff8 snow: move scratch buffer from stack to malloced buffer in context
mru
parents: 7622
diff changeset
492
c5276ad92ff8 snow: move scratch buffer from stack to malloced buffer in context
mru
parents: 7622
diff changeset
493 uint8_t *scratchbuf;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
494 }SnowContext;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
495
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
496 typedef struct {
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
497 IDWTELEM *b0;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
498 IDWTELEM *b1;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
499 IDWTELEM *b2;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
500 IDWTELEM *b3;
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
501 int y;
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
502 } DWTCompose;
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
503
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
504 #define slice_buffer_get_line(slice_buf, line_num) ((slice_buf)->line[line_num] ? (slice_buf)->line[line_num] : slice_buffer_load_line((slice_buf), (line_num)))
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
505 //#define slice_buffer_get_line(slice_buf, line_num) (slice_buffer_load_line((slice_buf), (line_num)))
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
506
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
507 static void iterative_me(SnowContext *s);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
508
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
509 static void slice_buffer_init(slice_buffer * buf, int line_count, int max_allocated_lines, int line_width, IDWTELEM * base_buffer)
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
510 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
511 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
512
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
513 buf->base_buffer = base_buffer;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
514 buf->line_count = line_count;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
515 buf->line_width = line_width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
516 buf->data_count = max_allocated_lines;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
517 buf->line = av_mallocz (sizeof(IDWTELEM *) * line_count);
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
518 buf->data_stack = av_malloc (sizeof(IDWTELEM *) * max_allocated_lines);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
519
6474
e6995f3fbf7f cosmetics: Normalize {} placement after for, while, if.
diego
parents: 6437
diff changeset
520 for(i = 0; i < max_allocated_lines; i++){
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
521 buf->data_stack[i] = av_malloc (sizeof(IDWTELEM) * line_width);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
522 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
523
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
524 buf->data_stack_top = max_allocated_lines - 1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
525 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
526
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
527 static IDWTELEM * slice_buffer_load_line(slice_buffer * buf, int line)
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
528 {
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
529 IDWTELEM * buffer;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
530
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
531 assert(buf->data_stack_top >= 0);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
532 // assert(!buf->line[line]);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
533 if (buf->line[line])
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
534 return buf->line[line];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
535
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
536 buffer = buf->data_stack[buf->data_stack_top];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
537 buf->data_stack_top--;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
538 buf->line[line] = buffer;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
539
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
540 return buffer;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
541 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
542
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
543 static void slice_buffer_release(slice_buffer * buf, int line)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
544 {
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
545 IDWTELEM * buffer;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
546
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
547 assert(line >= 0 && line < buf->line_count);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
548 assert(buf->line[line]);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
549
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
550 buffer = buf->line[line];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
551 buf->data_stack_top++;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
552 buf->data_stack[buf->data_stack_top] = buffer;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
553 buf->line[line] = NULL;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
554 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
555
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
556 static void slice_buffer_flush(slice_buffer * buf)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
557 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
558 int i;
6474
e6995f3fbf7f cosmetics: Normalize {} placement after for, while, if.
diego
parents: 6437
diff changeset
559 for(i = 0; i < buf->line_count; i++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
560 if (buf->line[i])
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
561 slice_buffer_release(buf, i);
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 }
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 static void slice_buffer_destroy(slice_buffer * buf)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
566 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
567 int i;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
568 slice_buffer_flush(buf);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
569
6474
e6995f3fbf7f cosmetics: Normalize {} placement after for, while, if.
diego
parents: 6437
diff changeset
570 for(i = buf->data_count - 1; i >= 0; i--){
3190
e9fa3ac61966 av_free -> av_freep
michael
parents: 3189
diff changeset
571 av_freep(&buf->data_stack[i]);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
572 }
3190
e9fa3ac61966 av_free -> av_freep
michael
parents: 3189
diff changeset
573 av_freep(&buf->data_stack);
e9fa3ac61966 av_free -> av_freep
michael
parents: 3189
diff changeset
574 av_freep(&buf->line);
2589
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
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2975
diff changeset
577 #ifdef __sgi
2368
a7ac68734a91 fix for build on IRIX by (Michel Bardiaux {mbardiaux peaktime be})
michael
parents: 2335
diff changeset
578 // Avoid a name clash on SGI IRIX
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2975
diff changeset
579 #undef qexp
2368
a7ac68734a91 fix for build on IRIX by (Michel Bardiaux {mbardiaux peaktime be})
michael
parents: 2335
diff changeset
580 #endif
2246
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
581 #define QEXPSHIFT (7-FRAC_BITS+8) //FIXME try to change this to 0
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
582 static uint8_t qexp[QROOT];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
583
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
584 static inline int mirror(int v, int m){
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
585 while((unsigned)v > (unsigned)m){
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
586 v=-v;
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
587 if(v<0) v+= 2*m;
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
588 }
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
589 return v;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
590 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
591
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
592 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
593 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
594
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
595 if(v){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
596 const int a= FFABS(v);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
597 const int e= av_log2(a);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
598 #if 1
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
599 const int el= FFMIN(e, 10);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
600 put_rac(c, state+0, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
601
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
602 for(i=0; i<el; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
603 put_rac(c, state+1+i, 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
604 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
605 for(; i<e; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
606 put_rac(c, state+1+9, 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
607 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
608 put_rac(c, state+1+FFMIN(i,9), 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
609
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
610 for(i=e-1; i>=el; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
611 put_rac(c, state+22+9, (a>>i)&1); //22..31
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
612 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
613 for(; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
614 put_rac(c, state+22+i, (a>>i)&1); //22..31
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
615 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
616
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
617 if(is_signed)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
618 put_rac(c, state+11 + el, v < 0); //11..21
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
619 #else
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
620
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
621 put_rac(c, state+0, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
622 if(e<=9){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
623 for(i=0; i<e; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
624 put_rac(c, state+1+i, 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
625 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
626 put_rac(c, state+1+i, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
627
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
628 for(i=e-1; 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 + e, v < 0); //11..21
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
634 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
635 for(i=0; i<e; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
636 put_rac(c, state+1+FFMIN(i,9), 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
637 }
9540
479e4d868038 Remove 2 useless FFMIN().
michael
parents: 9539
diff changeset
638 put_rac(c, state+1+9, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
639
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
640 for(i=e-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
641 put_rac(c, state+22+FFMIN(i,9), (a>>i)&1); //22..31
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
642 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
643
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
644 if(is_signed)
9540
479e4d868038 Remove 2 useless FFMIN().
michael
parents: 9539
diff changeset
645 put_rac(c, state+11 + 10, v < 0); //11..21
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
646 }
5910
85a976d59f17 Add comments to some #endif directives.
diego
parents: 5909
diff changeset
647 #endif /* 1 */
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
648 }else{
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
649 put_rac(c, state+0, 1);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
650 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
651 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
652
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
653 static inline int get_symbol(RangeCoder *c, uint8_t *state, int is_signed){
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
654 if(get_rac(c, state+0))
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
655 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
656 else{
2240
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
657 int i, e, a;
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
658 e= 0;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
659 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
660 e++;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
661 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
662
2240
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
663 a= 1;
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
664 for(i=e-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
665 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
666 }
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
667
9546
54ddf2b7d4bd Optimize sign handling in get_symbol().
michael
parents: 9540
diff changeset
668 e= -(is_signed && get_rac(c, state+11 + FFMIN(e,10))); //11..21
54ddf2b7d4bd Optimize sign handling in get_symbol().
michael
parents: 9540
diff changeset
669 return (a^e)-e;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
670 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
671 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
672
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
673 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
674 int i;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
675 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
676
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
677 assert(v>=0);
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
678 assert(log2>=-4);
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
679
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
680 while(v >= r){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
681 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
682 v -= r;
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
683 log2++;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
684 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
685 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
686 put_rac(c, state+4+log2, 0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
687
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
688 for(i=log2-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
689 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
690 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
691 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
692
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
693 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
694 int i;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
695 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
696 int v=0;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
697
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
698 assert(log2>=-4);
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
699
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
700 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
701 v+= r;
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
702 log2++;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
703 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
704 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
705
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
706 for(i=log2-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
707 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
708 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
709
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
710 return v;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
711 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
712
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
713 static av_always_inline void
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
714 lift(DWTELEM *dst, DWTELEM *src, DWTELEM *ref,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
715 int dst_step, int src_step, int ref_step,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
716 int width, int mul, int add, int shift,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
717 int highpass, int inverse){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
718 const int mirror_left= !highpass;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
719 const int mirror_right= (width&1) ^ highpass;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
720 const int w= (width>>1) - 1 + (highpass & width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
721 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
722
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
723 #define LIFT(src, ref, inv) ((src) + ((inv) ? - (ref) : + (ref)))
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
724 if(mirror_left){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
725 dst[0] = LIFT(src[0], ((mul*2*ref[0]+add)>>shift), inverse);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
726 dst += dst_step;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
727 src += src_step;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
728 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
729
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
730 for(i=0; i<w; i++){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
731 dst[i*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
732 LIFT(src[i*src_step],
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
733 ((mul*(ref[i*ref_step] + ref[(i+1)*ref_step])+add)>>shift),
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
734 inverse);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
735 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
736
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
737 if(mirror_right){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
738 dst[w*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
739 LIFT(src[w*src_step],
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
740 ((mul*2*ref[w*ref_step]+add)>>shift),
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
741 inverse);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
742 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
743 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
744
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
745 static av_always_inline void
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
746 inv_lift(IDWTELEM *dst, IDWTELEM *src, IDWTELEM *ref,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
747 int dst_step, int src_step, int ref_step,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
748 int width, int mul, int add, int shift,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
749 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
750 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
751 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
752 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
753 int i;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
754
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
755 #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
756 if(mirror_left){
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
757 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
758 dst += dst_step;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
759 src += src_step;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
760 }
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
761
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
762 for(i=0; i<w; i++){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
763 dst[i*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
764 LIFT(src[i*src_step],
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
765 ((mul*(ref[i*ref_step] + ref[(i+1)*ref_step])+add)>>shift),
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
766 inverse);
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
767 }
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
768
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
769 if(mirror_right){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
770 dst[w*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
771 LIFT(src[w*src_step],
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
772 ((mul*2*ref[w*ref_step]+add)>>shift),
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
773 inverse);
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
774 }
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
775 }
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
776
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
777 #ifndef liftS
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
778 static av_always_inline void
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
779 liftS(DWTELEM *dst, DWTELEM *src, DWTELEM *ref,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
780 int dst_step, int src_step, int ref_step,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
781 int width, int mul, int add, int shift,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
782 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
783 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
784 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
785 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
786 int i;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
787
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
788 assert(shift == 4);
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
789 #define LIFTS(src, ref, inv) \
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
790 ((inv) ? \
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
791 (src) + (((ref) + 4*(src))>>shift): \
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
792 -((-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
793 if(mirror_left){
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
794 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
795 dst += dst_step;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
796 src += src_step;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
797 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
798
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
799 for(i=0; i<w; i++){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
800 dst[i*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
801 LIFTS(src[i*src_step],
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
802 mul*(ref[i*ref_step] + ref[(i+1)*ref_step])+add,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
803 inverse);
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
804 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
805
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
806 if(mirror_right){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
807 dst[w*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
808 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
809 }
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
810 }
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
811 static av_always_inline void
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
812 inv_liftS(IDWTELEM *dst, IDWTELEM *src, IDWTELEM *ref,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
813 int dst_step, int src_step, int ref_step,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
814 int width, int mul, int add, int shift,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
815 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
816 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
817 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
818 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
819 int i;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
820
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
821 assert(shift == 4);
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
822 #define LIFTS(src, ref, inv) \
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
823 ((inv) ? \
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
824 (src) + (((ref) + 4*(src))>>shift): \
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
825 -((-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
826 if(mirror_left){
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
827 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
828 dst += dst_step;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
829 src += src_step;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
830 }
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
831
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
832 for(i=0; i<w; i++){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
833 dst[i*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
834 LIFTS(src[i*src_step],
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
835 mul*(ref[i*ref_step] + ref[(i+1)*ref_step])+add,
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
836 inverse);
5587
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
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
839 if(mirror_right){
5627
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
840 dst[w*dst_step] =
a920d9b58f19 Cosmetics
lu_zero
parents: 5589
diff changeset
841 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
842 }
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
843 }
6413
c58ea608e191 Add comments to some #endif directives.
diego
parents: 6412
diff changeset
844 #endif /* ! liftS */
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
845
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
846 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
847 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
848 const int width2= width>>1;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
849 int x;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
850 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
851
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
852 for(x=0; x<width2; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
853 temp[x ]= b[2*x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
854 temp[x+w2]= b[2*x + 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
855 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
856 if(width&1)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
857 temp[x ]= b[2*x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
858 #if 0
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
859 {
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
860 int A1,A2,A3,A4;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
861 A2= temp[1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
862 A4= temp[0 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
863 A1= temp[0+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
864 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
865 A4 += (A1 + 1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
866 b[0+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
867 b[0 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
868 for(x=1; x+1<width2; x+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
869 A3= temp[x+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
870 A4= temp[x+1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
871 A3 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
872 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
873 b[x+width2] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
874 b[x ] = A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
875
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
876 A1= temp[x+1+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
877 A2= temp[x+2 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
878 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
879 A4 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
880 b[x+1+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
881 b[x+1 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
882 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
883 A3= temp[width-1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
884 A3 -= A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
885 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
886 b[width -1] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
887 b[width2-1] = A2;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
888 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
889 #else
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
890 lift(b+w2, temp+w2, temp, 1, 1, 1, width, -1, 0, 1, 1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
891 lift(b , temp , b+w2, 1, 1, 1, width, 1, 2, 2, 0, 0);
6413
c58ea608e191 Add comments to some #endif directives.
diego
parents: 6412
diff changeset
892 #endif /* 0 */
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
893 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
894
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
895 static void vertical_decompose53iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
896 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
897
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
898 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
899 b1[i] -= (b0[i] + b2[i])>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
900 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
901 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
902
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
903 static void vertical_decompose53iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
904 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
905
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
906 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
907 b1[i] += (b0[i] + b2[i] + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
908 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
909 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
910
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
911 static void spatial_decompose53i(DWTELEM *buffer, int width, int height, int stride){
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
912 int y;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
913 DWTELEM *b0= buffer + mirror(-2-1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
914 DWTELEM *b1= buffer + mirror(-2 , height-1)*stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
915
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
916 for(y=-2; y<height; y+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
917 DWTELEM *b2= buffer + mirror(y+1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
918 DWTELEM *b3= buffer + mirror(y+2, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
919
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
920 if(y+1<(unsigned)height) horizontal_decompose53i(b2, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
921 if(y+2<(unsigned)height) horizontal_decompose53i(b3, width);
6405
7f615bfc21a2 Remove START_TIMER and STOP_TIMER macros.
diego
parents: 6402
diff changeset
922
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
923 if(y+1<(unsigned)height) vertical_decompose53iH0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
924 if(y+0<(unsigned)height) vertical_decompose53iL0(b0, b1, b2, width);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
925
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
926 b0=b2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
927 b1=b3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
928 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
929 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
930
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
931 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
932 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
933 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
934
5565
93082c591c8b Change rounding of the horizontal DWT to match the vertical one.
michael
parents: 5551
diff changeset
935 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
936 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
937 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
938 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
939 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
940
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
941
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
942 static void vertical_decompose97iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
943 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
944
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
945 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
946 b1[i] -= (W_AM*(b0[i] + b2[i])+W_AO)>>W_AS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
947 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
948 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
949
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
950 static void vertical_decompose97iH1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
951 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
952
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
953 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
954 b1[i] += (W_CM*(b0[i] + b2[i])+W_CO)>>W_CS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
955 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
956 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
957
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
958 static void vertical_decompose97iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
959 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
960
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
961 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
962 #ifdef liftS
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
963 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
964 #else
5565
93082c591c8b Change rounding of the horizontal DWT to match the vertical one.
michael
parents: 5551
diff changeset
965 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
966 #endif
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
967 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
968 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
969
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
970 static void vertical_decompose97iL1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
971 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
972
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
973 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
974 b1[i] += (W_DM*(b0[i] + b2[i])+W_DO)>>W_DS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
975 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
976 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
977
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
978 static void spatial_decompose97i(DWTELEM *buffer, int width, int height, int stride){
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
979 int y;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
980 DWTELEM *b0= buffer + mirror(-4-1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
981 DWTELEM *b1= buffer + mirror(-4 , height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
982 DWTELEM *b2= buffer + mirror(-4+1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
983 DWTELEM *b3= buffer + mirror(-4+2, height-1)*stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
984
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
985 for(y=-4; y<height; y+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
986 DWTELEM *b4= buffer + mirror(y+3, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
987 DWTELEM *b5= buffer + mirror(y+4, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
988
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
989 if(y+3<(unsigned)height) horizontal_decompose97i(b4, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
990 if(y+4<(unsigned)height) horizontal_decompose97i(b5, width);
6405
7f615bfc21a2 Remove START_TIMER and STOP_TIMER macros.
diego
parents: 6402
diff changeset
991
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
992 if(y+3<(unsigned)height) vertical_decompose97iH0(b3, b4, b5, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
993 if(y+2<(unsigned)height) vertical_decompose97iL0(b2, b3, b4, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
994 if(y+1<(unsigned)height) vertical_decompose97iH1(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
995 if(y+0<(unsigned)height) vertical_decompose97iL1(b0, b1, b2, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
996
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
997 b0=b2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
998 b1=b3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
999 b2=b4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1000 b3=b5;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1001 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1002 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1003
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1004 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
1005 int level;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1006
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
1007 for(level=0; level<decomposition_count; level++){
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
1008 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1009 case DWT_97: spatial_decompose97i(buffer, width>>level, height>>level, stride<<level); break;
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1010 case DWT_53: spatial_decompose53i(buffer, width>>level, height>>level, stride<<level); break;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1011 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1012 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1013 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1014
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1015 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
1016 IDWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1017 const int width2= width>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1018 const int w2= (width+1)>>1;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1019 int x;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1020
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1021 #if 0
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1022 int A1,A2,A3,A4;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1023 A2= temp[1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1024 A4= temp[0 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1025 A1= temp[0+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1026 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1027 A4 += (A1 + 1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1028 b[0+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1029 b[0 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1030 for(x=1; x+1<width2; x+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1031 A3= temp[x+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1032 A4= temp[x+1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1033 A3 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1034 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1035 b[x+width2] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1036 b[x ] = A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1037
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1038 A1= temp[x+1+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1039 A2= temp[x+2 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1040 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1041 A4 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1042 b[x+1+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1043 b[x+1 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1044 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1045 A3= temp[width-1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1046 A3 -= A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1047 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1048 b[width -1] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1049 b[width2-1] = A2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1050 #else
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1051 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
1052 inv_lift(temp+w2, b+w2, temp, 1, 1, 1, width, -1, 0, 1, 1, 1);
5910
85a976d59f17 Add comments to some #endif directives.
diego
parents: 5909
diff changeset
1053 #endif /* 0 */
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1054 for(x=0; x<width2; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1055 b[2*x ]= temp[x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1056 b[2*x + 1]= temp[x+w2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1057 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1058 if(width&1)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1059 b[2*x ]= temp[x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1060 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1061
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1062 static void vertical_compose53iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1063 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1064
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1065 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1066 b1[i] += (b0[i] + b2[i])>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1067 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1068 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1069
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1070 static void vertical_compose53iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1071 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1072
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1073 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1074 b1[i] -= (b0[i] + b2[i] + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1075 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1076 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1077
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1078 static void spatial_compose53i_buffered_init(DWTCompose *cs, slice_buffer * sb, int height, int stride_line){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1079 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
1080 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
1081 cs->y = -1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1082 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1083
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1084 static void spatial_compose53i_init(DWTCompose *cs, IDWTELEM *buffer, int height, int stride){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1085 cs->b0 = buffer + mirror(-1-1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1086 cs->b1 = buffer + mirror(-1 , height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1087 cs->y = -1;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1088 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1089
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1090 static void spatial_compose53i_dy_buffered(DWTCompose *cs, slice_buffer * sb, int width, int height, int stride_line){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1091 int y= cs->y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1092
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1093 IDWTELEM *b0= cs->b0;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1094 IDWTELEM *b1= cs->b1;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1095 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
1096 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
1097
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1098 if(y+1<(unsigned)height) vertical_compose53iL0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1099 if(y+0<(unsigned)height) vertical_compose53iH0(b0, b1, b2, width);
6405
7f615bfc21a2 Remove START_TIMER and STOP_TIMER macros.
diego
parents: 6402
diff changeset
1100
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1101 if(y-1<(unsigned)height) horizontal_compose53i(b0, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1102 if(y+0<(unsigned)height) horizontal_compose53i(b1, width);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1103
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1104 cs->b0 = b2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1105 cs->b1 = b3;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1106 cs->y += 2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1107 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1108
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1109 static void spatial_compose53i_dy(DWTCompose *cs, IDWTELEM *buffer, int width, int height, int stride){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1110 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
1111 IDWTELEM *b0= cs->b0;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1112 IDWTELEM *b1= cs->b1;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1113 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
1114 IDWTELEM *b3= buffer + mirror(y+2, height-1)*stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1115
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1116 if(y+1<(unsigned)height) vertical_compose53iL0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1117 if(y+0<(unsigned)height) vertical_compose53iH0(b0, b1, b2, width);
6405
7f615bfc21a2 Remove START_TIMER and STOP_TIMER macros.
diego
parents: 6402
diff changeset
1118
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1119 if(y-1<(unsigned)height) horizontal_compose53i(b0, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1120 if(y+0<(unsigned)height) horizontal_compose53i(b1, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1121
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1122 cs->b0 = b2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1123 cs->b1 = b3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1124 cs->y += 2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1125 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1126
5989
382aa8b243c5 prevent warnings about functions being possibly unused
michael
parents: 5988
diff changeset
1127 static void av_unused spatial_compose53i(IDWTELEM *buffer, int width, int height, int stride){
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1128 DWTCompose cs;
5988
919193c63fb8 thank you for your efforts to keep my code clean, but i would like to
michael
parents: 5934
diff changeset
1129 spatial_compose53i_init(&cs, buffer, height, stride);
919193c63fb8 thank you for your efforts to keep my code clean, but i would like to
michael
parents: 5934
diff changeset
1130 while(cs.y <= height)
919193c63fb8 thank you for your efforts to keep my code clean, but i would like to
michael
parents: 5934
diff changeset
1131 spatial_compose53i_dy(&cs, buffer, width, height, stride);
919193c63fb8 thank you for your efforts to keep my code clean, but i would like to
michael
parents: 5934
diff changeset
1132 }
919193c63fb8 thank you for your efforts to keep my code clean, but i would like to
michael
parents: 5934
diff changeset
1133
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1134
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1135 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
1136 IDWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1137 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1138
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1139 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
1140 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
1141 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
1142 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
1143 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1144
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1145 static void vertical_compose97iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1146 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1147
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1148 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1149 b1[i] += (W_AM*(b0[i] + b2[i])+W_AO)>>W_AS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1150 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1151 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1152
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1153 static void vertical_compose97iH1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1154 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1155
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1156 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1157 b1[i] -= (W_CM*(b0[i] + b2[i])+W_CO)>>W_CS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1158 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1159 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1160
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1161 static void vertical_compose97iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1162 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1163
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1164 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
1165 #ifdef liftS
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1166 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
1167 #else
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1168 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
1169 #endif
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1170 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1171 }
1ac13c350369 my experimental wavelet codec
michael
parents:
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 static void vertical_compose97iL1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1174 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1175
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1176 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1177 b1[i] -= (W_DM*(b0[i] + b2[i])+W_DO)>>W_DS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1178 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1179 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1180
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1181 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
1182 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1183
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1184 for(i=0; i<width; i++){
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1185 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
1186 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
1187 #ifdef liftS
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1188 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
1189 #else
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1190 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
1191 #endif
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1192 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
1193 }
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1194 }
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1195
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1196 static void spatial_compose97i_buffered_init(DWTCompose *cs, slice_buffer * sb, int height, int stride_line){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1197 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
1198 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
1199 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
1200 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
1201 cs->y = -3;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1202 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1203
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1204 static void spatial_compose97i_init(DWTCompose *cs, IDWTELEM *buffer, int height, int stride){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1205 cs->b0 = buffer + mirror(-3-1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1206 cs->b1 = buffer + mirror(-3 , height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1207 cs->b2 = buffer + mirror(-3+1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1208 cs->b3 = buffer + mirror(-3+2, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1209 cs->y = -3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1210 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1211
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1212 static void spatial_compose97i_dy_buffered(DSPContext *dsp, DWTCompose *cs, slice_buffer * sb, int width, int height, int stride_line){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1213 int y = cs->y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1214
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1215 IDWTELEM *b0= cs->b0;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1216 IDWTELEM *b1= cs->b1;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1217 IDWTELEM *b2= cs->b2;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1218 IDWTELEM *b3= cs->b3;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1219 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
1220 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
1221
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1222 if(y>0 && y+4<height){
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1223 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
1224 }else{
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1225 if(y+3<(unsigned)height) vertical_compose97iL1(b3, b4, b5, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1226 if(y+2<(unsigned)height) vertical_compose97iH1(b2, b3, b4, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1227 if(y+1<(unsigned)height) vertical_compose97iL0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1228 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
1229 }
6405
7f615bfc21a2 Remove START_TIMER and STOP_TIMER macros.
diego
parents: 6402
diff changeset
1230
9495
fc15a3b977bf Fix indention, patch by Lars T«£uber.
michael
parents: 9474
diff changeset
1231 if(y-1<(unsigned)height) dsp->horizontal_compose97i(b0, width);
fc15a3b977bf Fix indention, patch by Lars T«£uber.
michael
parents: 9474
diff changeset
1232 if(y+0<(unsigned)height) dsp->horizontal_compose97i(b1, width);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1233
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1234 cs->b0=b2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1235 cs->b1=b3;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1236 cs->b2=b4;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1237 cs->b3=b5;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1238 cs->y += 2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1239 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1240
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1241 static void spatial_compose97i_dy(DWTCompose *cs, IDWTELEM *buffer, int width, int height, int stride){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1242 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
1243 IDWTELEM *b0= cs->b0;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1244 IDWTELEM *b1= cs->b1;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1245 IDWTELEM *b2= cs->b2;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1246 IDWTELEM *b3= cs->b3;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1247 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
1248 IDWTELEM *b5= buffer + mirror(y+4, height-1)*stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1249
9495
fc15a3b977bf Fix indention, patch by Lars T«£uber.
michael
parents: 9474
diff changeset
1250 if(y+3<(unsigned)height) vertical_compose97iL1(b3, b4, b5, width);
fc15a3b977bf Fix indention, patch by Lars T«£uber.
michael
parents: 9474
diff changeset
1251 if(y+2<(unsigned)height) vertical_compose97iH1(b2, b3, b4, width);
fc15a3b977bf Fix indention, patch by Lars T«£uber.
michael
parents: 9474
diff changeset
1252 if(y+1<(unsigned)height) vertical_compose97iL0(b1, b2, b3, width);
fc15a3b977bf Fix indention, patch by Lars T«£uber.
michael
parents: 9474
diff changeset
1253 if(y+0<(unsigned)height) vertical_compose97iH0(b0, b1, b2, width);
fc15a3b977bf Fix indention, patch by Lars T«£uber.
michael
parents: 9474
diff changeset
1254
fc15a3b977bf Fix indention, patch by Lars T«£uber.
michael
parents: 9474
diff changeset
1255 if(y-1<(unsigned)height) ff_snow_horizontal_compose97i(b0, width);
fc15a3b977bf Fix indention, patch by Lars T«£uber.
michael
parents: 9474
diff changeset
1256 if(y+0<(unsigned)height) ff_snow_horizontal_compose97i(b1, width);
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1257
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1258 cs->b0=b2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1259 cs->b1=b3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1260 cs->b2=b4;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1261 cs->b3=b5;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1262 cs->y += 2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1263 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1264
5989
382aa8b243c5 prevent warnings about functions being possibly unused
michael
parents: 5988
diff changeset
1265 static void av_unused spatial_compose97i(IDWTELEM *buffer, int width, int height, int stride){
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1266 DWTCompose cs;
5988
919193c63fb8 thank you for your efforts to keep my code clean, but i would like to
michael
parents: 5934
diff changeset
1267 spatial_compose97i_init(&cs, buffer, height, stride);
919193c63fb8 thank you for your efforts to keep my code clean, but i would like to
michael
parents: 5934
diff changeset
1268 while(cs.y <= height)
919193c63fb8 thank you for your efforts to keep my code clean, but i would like to
michael
parents: 5934
diff changeset
1269 spatial_compose97i_dy(&cs, buffer, width, height, stride);
919193c63fb8 thank you for your efforts to keep my code clean, but i would like to
michael
parents: 5934
diff changeset
1270 }
919193c63fb8 thank you for your efforts to keep my code clean, but i would like to
michael
parents: 5934
diff changeset
1271
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1272 static void ff_spatial_idwt_buffered_init(DWTCompose *cs, slice_buffer * sb, int width, int height, int stride_line, int type, int decomposition_count){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1273 int level;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1274 for(level=decomposition_count-1; level>=0; level--){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1275 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1276 case DWT_97: spatial_compose97i_buffered_init(cs+level, sb, height>>level, stride_line<<level); break;
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1277 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
1278 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1279 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1280 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1281
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1282 static void ff_spatial_idwt_init(DWTCompose *cs, IDWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1283 int level;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1284 for(level=decomposition_count-1; level>=0; level--){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1285 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1286 case DWT_97: spatial_compose97i_init(cs+level, buffer, height>>level, stride<<level); break;
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1287 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
1288 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1289 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1290 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1291
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1292 static void ff_spatial_idwt_slice(DWTCompose *cs, IDWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count, int y){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1293 const int support = type==1 ? 3 : 5;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1294 int level;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1295 if(type==2) return;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1296
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1297 for(level=decomposition_count-1; level>=0; level--){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1298 while(cs[level].y <= FFMIN((y>>level)+support, height>>level)){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1299 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1300 case DWT_97: spatial_compose97i_dy(cs+level, buffer, width>>level, height>>level, stride<<level);
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
1301 break;
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1302 case DWT_53: spatial_compose53i_dy(cs+level, buffer, width>>level, height>>level, stride<<level);
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
1303 break;
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1304 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1305 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1306 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1307 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1308
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1309 static void ff_spatial_idwt_buffered_slice(DSPContext *dsp, DWTCompose *cs, slice_buffer * slice_buf, int width, int height, int stride_line, int type, int decomposition_count, int y){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1310 const int support = type==1 ? 3 : 5;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1311 int level;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1312 if(type==2) return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1313
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1314 for(level=decomposition_count-1; level>=0; level--){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1315 while(cs[level].y <= FFMIN((y>>level)+support, height>>level)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1316 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1317 case DWT_97: spatial_compose97i_dy_buffered(dsp, cs+level, slice_buf, width>>level, height>>level, stride_line<<level);
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
1318 break;
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1319 case DWT_53: spatial_compose53i_dy_buffered(cs+level, slice_buf, width>>level, height>>level, stride_line<<level);
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
1320 break;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1321 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1322 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1323 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1324 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1325
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1326 static void ff_spatial_idwt(IDWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count){
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
1327 DWTCompose cs[MAX_DECOMPOSITIONS];
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1328 int y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1329 ff_spatial_idwt_init(cs, buffer, width, height, stride, type, decomposition_count);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1330 for(y=0; y<height; y+=4)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1331 ff_spatial_idwt_slice(cs, buffer, width, height, stride, type, decomposition_count, y);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1332 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1333
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1334 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
1335 const int w= b->width;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1336 const int h= b->height;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1337 int x, y;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1338
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1339 if(1){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1340 int run=0;
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1341 int runs[w*h];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1342 int run_index=0;
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1343 int max_index;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1344
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1345 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1346 for(x=0; x<w; x++){
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1347 int v, p=0;
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1348 int /*ll=0, */l=0, lt=0, t=0, rt=0;
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1349 v= src[x + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1350
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1351 if(y){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1352 t= src[x + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1353 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1354 lt= src[x - 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1355 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1356 if(x + 1 < w){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1357 rt= src[x + 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1358 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1359 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1360 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1361 l= src[x - 1 + y*stride];
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1362 /*if(x > 1){
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1363 if(orientation==1) ll= src[y + (x-2)*stride];
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1364 else ll= src[x - 2 + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1365 }*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1366 }
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1367 if(parent){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1368 int px= x>>1;
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1369 int py= y>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1370 if(px<b->parent->width && py<b->parent->height)
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1371 p= parent[px + py*2*stride];
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1372 }
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1373 if(!(/*ll|*/l|lt|t|rt|p)){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1374 if(v){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1375 runs[run_index++]= run;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1376 run=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1377 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1378 run++;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1379 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1380 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1381 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1382 }
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1383 max_index= run_index;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1384 runs[run_index++]= run;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1385 run_index=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1386 run= runs[run_index++];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1387
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1388 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
1389 if(run_index <= max_index)
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1390 put_symbol2(&s->c, b->state[1], run, 3);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1391
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1392 for(y=0; y<h; y++){
2435
c89ac0e70c66 10l patch by (matthieu castet <castet.matthieu free fr>)
michael
parents: 2422
diff changeset
1393 if(s->c.bytestream_end - s->c.bytestream < w*40){
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1394 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1395 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1396 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1397 for(x=0; x<w; x++){
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1398 int v, p=0;
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1399 int /*ll=0, */l=0, lt=0, t=0, rt=0;
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1400 v= src[x + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1401
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1402 if(y){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1403 t= src[x + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1404 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1405 lt= src[x - 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1406 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1407 if(x + 1 < w){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1408 rt= src[x + 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1409 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1410 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1411 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1412 l= src[x - 1 + y*stride];
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1413 /*if(x > 1){
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1414 if(orientation==1) ll= src[y + (x-2)*stride];
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1415 else ll= src[x - 2 + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1416 }*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1417 }
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1418 if(parent){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1419 int px= x>>1;
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1420 int py= y>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1421 if(px<b->parent->width && py<b->parent->height)
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1422 p= parent[px + py*2*stride];
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1423 }
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1424 if(/*ll|*/l|lt|t|rt|p){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1425 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
1426
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1427 put_rac(&s->c, &b->state[0][context], !!v);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1428 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1429 if(!run){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1430 run= runs[run_index++];
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1431
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1432 if(run_index <= max_index)
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1433 put_symbol2(&s->c, b->state[1], run, 3);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1434 assert(v);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1435 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1436 run--;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1437 assert(!v);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1438 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1439 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1440 if(v){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1441 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
1442 int l2= 2*FFABS(l) + (l<0);
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1443 int t2= 2*FFABS(t) + (t<0);
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1444
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1445 put_symbol2(&s->c, b->state[context + 2], FFABS(v)-1, context-4);
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1446 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
1447 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1448 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1449 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1450 }
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1451 return 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1452 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1453
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1454 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
1455 // 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
1456 // encode_subband_z0run(s, b, src, parent, stride, orientation);
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1457 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
1458 // 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
1459 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1460
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1461 static inline void unpack_coeffs(SnowContext *s, SubBand *b, SubBand * parent, int orientation){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1462 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1463 const int h= b->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1464 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1465
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1466 if(1){
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1467 int run, runs;
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1468 x_and_coeff *xc= b->x_coeff;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1469 x_and_coeff *prev_xc= NULL;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1470 x_and_coeff *prev2_xc= xc;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1471 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
1472 x_and_coeff *prev_parent_xc= parent_xc;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1473
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1474 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
1475 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
1476 else run= INT_MAX;
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1477
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1478 for(y=0; y<h; y++){
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1479 int v=0;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1480 int lt=0, t=0, rt=0;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1481
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1482 if(y && prev_xc->x == 0){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1483 rt= prev_xc->coeff;
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1484 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1485 for(x=0; x<w; x++){
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1486 int p=0;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1487 const int l= v;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1488
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1489 lt= t; t= rt;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1490
2194
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1491 if(y){
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1492 if(prev_xc->x <= x)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1493 prev_xc++;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1494 if(prev_xc->x == x + 1)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1495 rt= prev_xc->coeff;
2194
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1496 else
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1497 rt=0;
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1498 }
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1499 if(parent_xc){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1500 if(x>>1 > parent_xc->x){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1501 parent_xc++;
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1502 }
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1503 if(x>>1 == parent_xc->x){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1504 p= parent_xc->coeff;
2194
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1505 }
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1506 }
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1507 if(/*ll|*/l|lt|t|rt|p){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1508 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
1509
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1510 v=get_rac(&s->c, &b->state[0][context]);
2605
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1511 if(v){
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1512 v= 2*(get_symbol2(&s->c, b->state[context + 2], context-4) + 1);
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1513 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
1514
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1515 xc->x=x;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1516 (xc++)->coeff= v;
2605
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1517 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1518 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1519 if(!run){
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1520 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
1521 else run= INT_MAX;
2605
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1522 v= 2*(get_symbol2(&s->c, b->state[0 + 2], 0-4) + 1);
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1523 v+=get_rac(&s->c, &b->state[0][16 + 1 + 3]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1524
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1525 xc->x=x;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1526 (xc++)->coeff= v;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1527 }else{
2606
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1528 int max_run;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1529 run--;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1530 v=0;
2191
44afbcec70b8 50% faster decode_subband()
michael
parents: 2189
diff changeset
1531
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1532 if(y) max_run= FFMIN(run, prev_xc->x - x - 2);
2606
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1533 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
1534 if(parent_xc)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1535 max_run= FFMIN(max_run, 2*parent_xc->x - x - 1);
2606
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1536 x+= max_run;
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1537 run-= max_run;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1538 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1539 }
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1540 }
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1541 (xc++)->x= w+1; //end marker
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1542 prev_xc= prev2_xc;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1543 prev2_xc= xc;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1544
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1545 if(parent_xc){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1546 if(y&1){
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1547 while(parent_xc->x != parent->width+1)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1548 parent_xc++;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1549 parent_xc++;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1550 prev_parent_xc= parent_xc;
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1551 }else{
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1552 parent_xc= prev_parent_xc;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1553 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1554 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1555 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1556
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1557 (xc++)->x= w+1; //end marker
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1558 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1559 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1560
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1561 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
1562 const int w= b->width;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1563 int y;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4588
diff changeset
1564 const int qlog= av_clip(s->qlog + b->qlog, 0, QROOT*16);
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
1565 int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1566 int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1567 int new_index = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1568
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1569 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
1570 qadd= 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1571 qmul= 1<<QEXPSHIFT;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1572 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1573
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1574 /* 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
1575 if (start_y != 0)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1576 new_index = save_state[0];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1577
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1578
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1579 for(y=start_y; y<h; y++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1580 int x = 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1581 int v;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
1582 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
1583 memset(line, 0, b->width*sizeof(IDWTELEM));
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1584 v = b->x_coeff[new_index].coeff;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1585 x = b->x_coeff[new_index++].x;
6474
e6995f3fbf7f cosmetics: Normalize {} placement after for, while, if.
diego
parents: 6437
diff changeset
1586 while(x < w){
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1587 register int t= ( (v>>1)*qmul + qadd)>>QEXPSHIFT;
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1588 register int u= -(v&1);
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1589 line[x] = (t^u) - u;
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1590
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1591 v = b->x_coeff[new_index].coeff;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1592 x = b->x_coeff[new_index++].x;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1593 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1594 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1595
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1596 /* Save our variables for the next slice. */
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1597 save_state[0] = new_index;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1598
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1599 return;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1600 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1601
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
1602 static void reset_contexts(SnowContext *s){ //FIXME better initial contexts
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1603 int plane_index, level, orientation;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1604
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
1605 for(plane_index=0; plane_index<3; plane_index++){
5665
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
1606 for(level=0; level<MAX_DECOMPOSITIONS; level++){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1607 for(orientation=level ? 1:0; orientation<4; orientation++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1608 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
1609 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1610 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1611 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1612 memset(s->header_state, MID_STATE, sizeof(s->header_state));
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1613 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
1614 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1615
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1616 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
1617 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
1618 int h= -((-s->avctx->height)>>LOG2_MB_SIZE);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1619
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1620 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
1621 s->b_height= h;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1622
9370
25fa07ef8e2b Make sure the block array is of the correct size.
michael
parents: 9369
diff changeset
1623 av_free(s->block);
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1624 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
1625 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
1626 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1627
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1628 static inline void copy_rac_state(RangeCoder *d, RangeCoder *s){
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1629 uint8_t *bytestream= d->bytestream;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1630 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
1631 *d= *s;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1632 d->bytestream= bytestream;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1633 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
1634 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1635
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1636 //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
1637 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
1638 {
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1639 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
1640
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1641 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
1642 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
1643 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
1644 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
1645 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
1646 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1647 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
1648 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1649 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
1650 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1651
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1652 //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
1653 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
1654 {
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1655 int s, i, j;
4179
46d38e3d7038 rename squareTbl -> ff_squareTbl
mru
parents: 4123
diff changeset
1656 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
1657
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1658 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
1659 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
1660 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
1661 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
1662 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
1663 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1664 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
1665 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1666 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
1667 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1668
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1669 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
1670 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
1671 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
1672 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
1673 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
1674 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
1675 int i,j;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1676
2189
70b27300a496 quad 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 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
1678 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
1679 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
1680 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
1681 block.my= my;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1682 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
1683 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
1684 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
1685
70b27300a496 quad 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 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
1687 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
1688 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
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 }
70b27300a496 quad 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
70b27300a496 quad 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 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
1694 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
1695 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
1696 ((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
1697 ((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
1698 };
70b27300a496 quad 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 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
1700 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
1701 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
1702 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
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 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
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
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1707 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
1708 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
1709 if(s->ref_frames == 1){
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1710 *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
1711 *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
1712 }else{
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1713 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
1714 *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
1715 (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
1716 (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
1717 *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
1718 (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
1719 (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
1720 }
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1721 }
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1722
2189
70b27300a496 quad 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 //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
1724 #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
1725 #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
1726 #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
1727 #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
1728 #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
1729 #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
1730
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1731 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
1732 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
1733 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
1734 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
1735 uint8_t i_state[sizeof(s->block_state)];
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1736 RangeCoder pc, ic;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1737 uint8_t *pbbak= s->c.bytestream;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1738 uint8_t *pbbak_start= s->c.bytestream_start;
5082
176ac8353f48 fix assertion failure
michael
parents: 4962
diff changeset
1739 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
1740 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
1741 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
1742 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
1743 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
1744 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
1745 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
1746 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
1747 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
1748 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
1749 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
1750 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
1751 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
1752 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
1753 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
1754 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
1755 int pcr= left->color[2];
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1756 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
1757 int mx=0, my=0;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1758 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
1759 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
1760 const int uvstride= s->current_picture.linesize[1];
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1761 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
1762 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
1763 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
1764 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
1765 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
1766 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
1767 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
1768 MotionEstContext *c= &s->m.me;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1769 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
1770 int mx_context= av_log2(2*FFABS(left->mx - top->mx));
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1771 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
1772 int s_context= 2*left->level + 2*top->level + tl->level + tr->level;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1773 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
1774
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1775 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
1776 if(s->keyframe){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1777 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
1778 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
1779 }
70b27300a496 quad 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
70b27300a496 quad 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 // 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
1782
70b27300a496 quad 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 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
1784 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
1785 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
1786 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
1787 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
1788 P_TOPRIGHT[1]= tr->my;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1789
2189
70b27300a496 quad 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 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
1791 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
1792 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
1793 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
1794 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
1795 last_mv[2][1]= bottom->my;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1796
2189
70b27300a496 quad 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 s->m.mb_stride=2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1798 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
1799 s->m.mb_y= 0;
4360
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
1800 c->skip= 0;
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
1801
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
1802 assert(c-> stride == stride);
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
1803 assert(c->uvstride == uvstride);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1804
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1805 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
1806 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
1807 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
1808 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
1809
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
1810 c->xmin = - x*block_w - 16+2;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
1811 c->ymin = - y*block_w - 16+2;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
1812 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
1813 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
1814
70b27300a496 quad 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 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
1816 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
1817 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
1818 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
1819 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
1820 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
1821 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
1822
70b27300a496 quad 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 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
1824 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
1825
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1826 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
1827 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
1828 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
1829 } 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
1830 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
1831 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
1832 }
70b27300a496 quad 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
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1834 score= INT_MAX;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1835 best_ref= 0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1836 for(ref=0; ref<s->ref_frames; ref++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1837 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
1838
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1839 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
1840 (1<<16)>>shift, level-LOG2_MB_SIZE+4, block_w);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1841
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1842 assert(ref_mx >= c->xmin);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1843 assert(ref_mx <= c->xmax);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1844 assert(ref_my >= c->ymin);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1845 assert(ref_my <= c->ymax);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1846
4360
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
1847 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
1848 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
1849 ref_score+= 2*av_log2(2*ref)*c->penalty_factor;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1850 if(s->ref_mvs[ref]){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1851 s->ref_mvs[ref][index][0]= ref_mx;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1852 s->ref_mvs[ref][index][1]= ref_my;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1853 s->ref_scores[ref][index]= ref_score;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1854 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1855 if(score > ref_score){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1856 score= ref_score;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1857 best_ref= ref;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1858 mx= ref_mx;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1859 my= ref_my;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1860 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1861 }
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5085
diff changeset
1862 //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
1863
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1864 // subpel search
5085
81bbca75ae2f fix assert() 2nd try
michael
parents: 5082
diff changeset
1865 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
1866 pc= s->c;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1867 pc.bytestream_start=
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1868 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
1869 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
1870
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1871 if(level!=s->block_max_depth)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1872 put_rac(&pc, &p_state[4 + s_context], 1);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1873 put_rac(&pc, &p_state[1 + left->type + top->type], 0);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1874 if(s->ref_frames > 1)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1875 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
1876 pred_mv(s, &pmx, &pmy, best_ref, left, top, tr);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1877 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
1878 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
1879 p_len= pc.bytestream - pc.bytestream_start;
5082
176ac8353f48 fix assertion failure
michael
parents: 4962
diff changeset
1880 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
1881
70b27300a496 quad 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 block_s= block_w*block_w;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1883 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
1884 l= (sum + block_s/2)/block_s;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1885 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
1886
2189
70b27300a496 quad 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 block_s= block_w*block_w>>2;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1888 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
1889 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
1890 // 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
1891 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
1892 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
1893 // 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
1894
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1895 ic= s->c;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1896 ic.bytestream_start=
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1897 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
1898 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
1899 if(level!=s->block_max_depth)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1900 put_rac(&ic, &i_state[4 + s_context], 1);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1901 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
1902 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
1903 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
1904 put_symbol(&ic, &i_state[96], cr-pcr, 1);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1905 i_len= ic.bytestream - ic.bytestream_start;
5082
176ac8353f48 fix assertion failure
michael
parents: 4962
diff changeset
1906 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
1907
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1908 // 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
1909 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
1910 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
1911 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
1912 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
1913
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1914 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
1915 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
1916 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
1917 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
1918 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
1919 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
1920 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
1921 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1922
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1923 if(level!=s->block_max_depth){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1924 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
1925 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
1926 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
1927 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
1928 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
1929 score2+= s->lambda2>>FF_LAMBDA_SHIFT; //FIXME exact split overhead
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1930
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1931 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
1932 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
1933 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1934
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1935 if(iscore < score){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1936 pred_mv(s, &pmx, &pmy, 0, left, top, tr);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1937 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
1938 s->c= ic;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1939 s->c.bytestream_start= pbbak_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1940 s->c.bytestream= pbbak + i_len;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1941 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
1942 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
1943 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
1944 }else{
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1945 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
1946 s->c= pc;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1947 s->c.bytestream_start= pbbak_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1948 s->c.bytestream= pbbak + p_len;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1949 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
1950 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
1951 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
1952 }
70b27300a496 quad 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 }
70b27300a496 quad 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
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
1955 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
1956 if((a->type&BLOCK_INTRA) && (b->type&BLOCK_INTRA)){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1957 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
1958 }else{
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1959 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
1960 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1961 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1962
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1963 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
1964 const int w= s->b_width << s->block_max_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1965 const int rem_depth= s->block_max_depth - level;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1966 const int index= (x + y*w) << rem_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1967 int trx= (x+1)<<rem_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1968 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
1969 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
1970 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
1971 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
1972 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
1973 int pl = left->color[0];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1974 int pcb= left->color[1];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1975 int pcr= left->color[2];
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1976 int pmx, pmy;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1977 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
1978 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
1979 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
1980 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
1981
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1982 if(s->keyframe){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1983 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
1984 return;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1985 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1986
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1987 if(level!=s->block_max_depth){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1988 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
1989 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
1990 }else{
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1991 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
1992 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
1993 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
1994 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
1995 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
1996 return;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1997 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1998 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
1999 if(b->type & BLOCK_INTRA){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2000 pred_mv(s, &pmx, &pmy, 0, left, top, tr);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2001 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
2002 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
2003 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
2004 put_symbol(&s->c, &s->block_state[96], b->color[2]-pcr, 1);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2005 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
2006 }else{
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2007 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
2008 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
2009 if(s->ref_frames > 1)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2010 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
2011 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
2012 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
2013 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
2014 }
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
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2017 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
2018 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
2019 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
2020 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
2021 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
2022 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
2023 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
2024 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
2025 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
2026 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
2027
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2028 if(s->keyframe){
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2029 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
2030 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
2031 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2032
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2033 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
2034 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
2035 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
2036 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
2037 int cr= left->color[2];
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2038 int ref = 0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2039 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
2040 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
2041 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
2042
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2043 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
2044
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2045 if(type){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2046 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
2047 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
2048 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
2049 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
2050 }else{
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2051 if(s->ref_frames > 1)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2052 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
2053 pred_mv(s, &mx, &my, ref, left, top, tr);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2054 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
2055 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
2056 }
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2057 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
2058 }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
2059 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
2060 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
2061 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
2062 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
2063 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2064 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2065
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
2066 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
2067 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
2068 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
2069 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
2070
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
2071 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
2072 iterative_me(s);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2073
2189
70b27300a496 quad 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 for(y=0; y<h; y++){
2435
c89ac0e70c66 10l patch by (matthieu castet <castet.matthieu free fr>)
michael
parents: 2422
diff changeset
2075 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
2076 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
2077 return;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
2078 }
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2079 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
2080 if(s->avctx->me_method == ME_ITER || !search)
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2081 encode_q_branch2(s, 0, x, y);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2082 else
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2083 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
2084 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2085 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2086 }
70b27300a496 quad 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
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2088 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
2089 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
2090 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
2091 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
2092
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2093 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
2094 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
2095 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
2096 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2097 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2098 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2099
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2100 static void mc_block(Plane *p, uint8_t *dst, const uint8_t *src, uint8_t *tmp, int stride, int b_w, int b_h, int dx, int dy){
7622
5a3907818652 cosmetics: s/const static/static const/g
diego
parents: 7129
diff changeset
2101 static const uint8_t weight[64]={
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2102 8,7,6,5,4,3,2,1,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2103 7,7,0,0,0,0,0,1,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2104 6,0,6,0,0,0,2,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2105 5,0,0,5,0,3,0,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2106 4,0,0,0,4,0,0,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2107 3,0,0,5,0,3,0,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2108 2,0,6,0,0,0,2,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2109 1,7,0,0,0,0,0,1,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2110 };
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2111
7622
5a3907818652 cosmetics: s/const static/static const/g
diego
parents: 7129
diff changeset
2112 static const uint8_t brane[256]={
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2113 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
2114 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
2115 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
2116 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
2117 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
2118 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
2119 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
2120 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
2121 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
2122 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
2123 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
2124 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
2125 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
2126 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
2127 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
2128 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
2129 };
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2130
7622
5a3907818652 cosmetics: s/const static/static const/g
diego
parents: 7129
diff changeset
2131 static const uint8_t needs[16]={
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2132 0,1,0,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2133 2,4,2,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2134 0,1,0,0,
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2135 15
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2136 };
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2137
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2138 int x, y, b, r, l;
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2139 int16_t tmpIt [64*(32+HTAPS_MAX)];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2140 uint8_t tmp2t[3][stride*(32+HTAPS_MAX)];
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2141 int16_t *tmpI= tmpIt;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2142 uint8_t *tmp2= tmp2t[0];
6205
b329d2bf8ff5 Add const qualifier, fix warnings:
bcoudurier
parents: 6168
diff changeset
2143 const uint8_t *hpel[11];
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2144 assert(dx<16 && dy<16);
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2145 r= brane[dx + 16*dy]&15;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2146 l= brane[dx + 16*dy]>>4;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2147
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2148 b= needs[l] | needs[r];
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2149 if(p && !p->diag_mc)
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2150 b= 15;
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2151
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2152 if(b&5){
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2153 for(y=0; y < b_h+HTAPS_MAX-1; y++){
5649
9fe214a99139 indention
michael
parents: 5648
diff changeset
2154 for(x=0; x < b_w; x++){
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2155 int a_1=src[x + HTAPS_MAX/2-4];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2156 int a0= src[x + HTAPS_MAX/2-3];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2157 int a1= src[x + HTAPS_MAX/2-2];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2158 int a2= src[x + HTAPS_MAX/2-1];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2159 int a3= src[x + HTAPS_MAX/2+0];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2160 int a4= src[x + HTAPS_MAX/2+1];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2161 int a5= src[x + HTAPS_MAX/2+2];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2162 int a6= src[x + HTAPS_MAX/2+3];
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2163 int am=0;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2164 if(!p || p->fast_mc){
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2165 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
2166 tmpI[x]= am;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2167 am= (am+16)>>5;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2168 }else{
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2169 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
2170 tmpI[x]= am;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2171 am= (am+32)>>6;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2172 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2173
5649
9fe214a99139 indention
michael
parents: 5648
diff changeset
2174 if(am&(~255)) am= ~(am>>31);
9fe214a99139 indention
michael
parents: 5648
diff changeset
2175 tmp2[x]= am;
9fe214a99139 indention
michael
parents: 5648
diff changeset
2176 }
9fe214a99139 indention
michael
parents: 5648
diff changeset
2177 tmpI+= 64;
9fe214a99139 indention
michael
parents: 5648
diff changeset
2178 tmp2+= stride;
9fe214a99139 indention
michael
parents: 5648
diff changeset
2179 src += stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2180 }
5649
9fe214a99139 indention
michael
parents: 5648
diff changeset
2181 src -= stride*y;
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2182 }
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2183 src += HTAPS_MAX/2 - 1;
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2184 tmp2= tmp2t[1];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2185
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2186 if(b&2){
5649
9fe214a99139 indention
michael
parents: 5648
diff changeset
2187 for(y=0; y < b_h; y++){
9fe214a99139 indention
michael
parents: 5648
diff changeset
2188 for(x=0; x < b_w+1; x++){
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2189 int a_1=src[x + (HTAPS_MAX/2-4)*stride];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2190 int a0= src[x + (HTAPS_MAX/2-3)*stride];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2191 int a1= src[x + (HTAPS_MAX/2-2)*stride];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2192 int a2= src[x + (HTAPS_MAX/2-1)*stride];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2193 int a3= src[x + (HTAPS_MAX/2+0)*stride];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2194 int a4= src[x + (HTAPS_MAX/2+1)*stride];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2195 int a5= src[x + (HTAPS_MAX/2+2)*stride];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2196 int a6= src[x + (HTAPS_MAX/2+3)*stride];
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2197 int am=0;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2198 if(!p || p->fast_mc)
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2199 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
2200 else
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2201 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
2202
5649
9fe214a99139 indention
michael
parents: 5648
diff changeset
2203 if(am&(~255)) am= ~(am>>31);
9fe214a99139 indention
michael
parents: 5648
diff changeset
2204 tmp2[x]= am;
9fe214a99139 indention
michael
parents: 5648
diff changeset
2205 }
9fe214a99139 indention
michael
parents: 5648
diff changeset
2206 src += stride;
9fe214a99139 indention
michael
parents: 5648
diff changeset
2207 tmp2+= stride;
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2208 }
5649
9fe214a99139 indention
michael
parents: 5648
diff changeset
2209 src -= stride*y;
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2210 }
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2211 src += stride*(HTAPS_MAX/2 - 1);
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2212 tmp2= tmp2t[2];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2213 tmpI= tmpIt;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2214 if(b&4){
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2215 for(y=0; y < b_h; y++){
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2216 for(x=0; x < b_w; x++){
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2217 int a_1=tmpI[x + (HTAPS_MAX/2-4)*64];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2218 int a0= tmpI[x + (HTAPS_MAX/2-3)*64];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2219 int a1= tmpI[x + (HTAPS_MAX/2-2)*64];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2220 int a2= tmpI[x + (HTAPS_MAX/2-1)*64];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2221 int a3= tmpI[x + (HTAPS_MAX/2+0)*64];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2222 int a4= tmpI[x + (HTAPS_MAX/2+1)*64];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2223 int a5= tmpI[x + (HTAPS_MAX/2+2)*64];
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2224 int a6= tmpI[x + (HTAPS_MAX/2+3)*64];
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2225 int am=0;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2226 if(!p || p->fast_mc)
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2227 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
2228 else
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2229 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
2230 if(am&(~255)) am= ~(am>>31);
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2231 tmp2[x]= am;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2232 }
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2233 tmpI+= 64;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2234 tmp2+= stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2235 }
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2236 }
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2237
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2238 hpel[ 0]= src;
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2239 hpel[ 1]= tmp2t[0] + stride*(HTAPS_MAX/2-1);
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2240 hpel[ 2]= src + 1;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2241
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2242 hpel[ 4]= tmp2t[1];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2243 hpel[ 5]= tmp2t[2];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2244 hpel[ 6]= tmp2t[1] + 1;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2245
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2246 hpel[ 8]= src + stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2247 hpel[ 9]= hpel[1] + stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2248 hpel[10]= hpel[8] + 1;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2249
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2250 if(b==15){
6205
b329d2bf8ff5 Add const qualifier, fix warnings:
bcoudurier
parents: 6168
diff changeset
2251 const uint8_t *src1= hpel[dx/8 + dy/8*4 ];
b329d2bf8ff5 Add const qualifier, fix warnings:
bcoudurier
parents: 6168
diff changeset
2252 const uint8_t *src2= hpel[dx/8 + dy/8*4+1];
b329d2bf8ff5 Add const qualifier, fix warnings:
bcoudurier
parents: 6168
diff changeset
2253 const uint8_t *src3= hpel[dx/8 + dy/8*4+4];
b329d2bf8ff5 Add const qualifier, fix warnings:
bcoudurier
parents: 6168
diff changeset
2254 const uint8_t *src4= hpel[dx/8 + dy/8*4+5];
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2255 dx&=7;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2256 dy&=7;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2257 for(y=0; y < b_h; y++){
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2258 for(x=0; x < b_w; x++){
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2259 dst[x]= ((8-dx)*(8-dy)*src1[x] + dx*(8-dy)*src2[x]+
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2260 (8-dx)* dy *src3[x] + dx* dy *src4[x]+32)>>6;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2261 }
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2262 src1+=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2263 src2+=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2264 src3+=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2265 src4+=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2266 dst +=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2267 }
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2268 }else{
6205
b329d2bf8ff5 Add const qualifier, fix warnings:
bcoudurier
parents: 6168
diff changeset
2269 const uint8_t *src1= hpel[l];
b329d2bf8ff5 Add const qualifier, fix warnings:
bcoudurier
parents: 6168
diff changeset
2270 const uint8_t *src2= hpel[r];
5648
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2271 int a= weight[((dx&7) + (8*(dy&7)))];
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2272 int b= 8-a;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2273 for(y=0; y < b_h; y++){
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2274 for(x=0; x < b_w; x++){
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2275 dst[x]= (a*src1[x] + b*src2[x] + 4)>>3;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2276 }
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2277 src1+=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2278 src2+=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2279 dst +=stride;
cd26ab6e3953 cleanup mc_block()
michael
parents: 5637
diff changeset
2280 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2281 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2282 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2283
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2284 #define mca(dx,dy,b_w)\
5254
727a49c28c51 trivial warning fixes
mru
parents: 5224
diff changeset
2285 static void mc_block_hpel ## dx ## dy ## b_w(uint8_t *dst, const uint8_t *src, int stride, int h){\
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2286 uint8_t tmp[stride*(b_w+HTAPS_MAX-1)];\
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2287 assert(h==b_w);\
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2288 mc_block(NULL, dst, src-(HTAPS_MAX/2-1)-(HTAPS_MAX/2-1)*stride, tmp, stride, b_w, b_w, dx, dy);\
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2289 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2290
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2291 mca( 0, 0,16)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2292 mca( 8, 0,16)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2293 mca( 0, 8,16)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2294 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
2295 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
2296 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
2297 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
2298 mca( 8, 8,8)
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2299
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2300 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
2301 if(block->type & BLOCK_INTRA){
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2302 int x, y;
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2303 const int color = block->color[plane_index];
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2304 const int color4= color*0x01010101;
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2305 if(b_w==32){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2306 for(y=0; y < b_h; y++){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2307 *(uint32_t*)&dst[0 + y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2308 *(uint32_t*)&dst[4 + y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2309 *(uint32_t*)&dst[8 + y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2310 *(uint32_t*)&dst[12+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2311 *(uint32_t*)&dst[16+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2312 *(uint32_t*)&dst[20+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2313 *(uint32_t*)&dst[24+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2314 *(uint32_t*)&dst[28+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2315 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2316 }else if(b_w==16){
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2317 for(y=0; y < b_h; y++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2318 *(uint32_t*)&dst[0 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2319 *(uint32_t*)&dst[4 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2320 *(uint32_t*)&dst[8 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2321 *(uint32_t*)&dst[12+ y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2322 }
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2323 }else if(b_w==8){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2324 for(y=0; y < b_h; y++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2325 *(uint32_t*)&dst[0 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2326 *(uint32_t*)&dst[4 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2327 }
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2328 }else if(b_w==4){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2329 for(y=0; y < b_h; y++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2330 *(uint32_t*)&dst[0 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2331 }
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2332 }else{
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2333 for(y=0; y < b_h; y++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2334 for(x=0; x < b_w; x++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2335 dst[x + y*stride]= color;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2336 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2337 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2338 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2339 }else{
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2340 uint8_t *src= s->last_picture[block->ref].data[plane_index];
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2341 const int scale= plane_index ? s->mv_scale : 2*s->mv_scale;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2342 int mx= block->mx*scale;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2343 int my= block->my*scale;
2223
b26474e72d6d use h264 MC code if possible
michael
parents: 2221
diff changeset
2344 const int dx= mx&15;
b26474e72d6d use h264 MC code if possible
michael
parents: 2221
diff changeset
2345 const int dy= my&15;
3020
c75fb0747e74 use h264 MC functions for 2xX Xx2 blocks in snow too
michael
parents: 3018
diff changeset
2346 const int tab_index= 3 - (b_w>>2) + (b_w>>4);
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2347 sx += (mx>>4) - (HTAPS_MAX/2-1);
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2348 sy += (my>>4) - (HTAPS_MAX/2-1);
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2349 src += sx + sy*stride;
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2350 if( (unsigned)sx >= w - b_w - (HTAPS_MAX-2)
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2351 || (unsigned)sy >= h - b_h - (HTAPS_MAX-2)){
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2352 ff_emulated_edge_mc(tmp + MB_SIZE, src, stride, b_w+HTAPS_MAX-1, b_h+HTAPS_MAX-1, sx, sy, w, h);
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2353 src= tmp + MB_SIZE;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2354 }
3189
e1cbe2635325 fix %8 != 0 w/h
michael
parents: 3075
diff changeset
2355 // 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
2356 // assert(!(b_w&(b_w-1)));
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2357 assert(b_w>1 && b_h>1);
6206
ea591bc7522a add parenthesis, fix warning: snow.c:2413: warning: suggest parentheses around && within ||
bcoudurier
parents: 6205
diff changeset
2358 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
2359 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
2360 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
2361 else if(b_w==32){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2362 int y;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2363 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
2364 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
2365 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
2366 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2367 }else if(b_w==b_h)
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2368 s->dsp.put_h264_qpel_pixels_tab[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
2369 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
2370 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
2371 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
2372 }else{
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2373 assert(2*b_w==b_h);
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2374 s->dsp.put_h264_qpel_pixels_tab[tab_index ][dy+(dx>>2)](dst ,src + 3 + 3*stride ,stride);
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
2375 s->dsp.put_h264_qpel_pixels_tab[tab_index ][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
2376 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2377 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2378 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2379
4436
d3e389536b0a Add the const specifier as needed to reduce the number of warnings.
takis
parents: 4409
diff changeset
2380 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
2381 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
2382 int y, x;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2383 IDWTELEM * dst;
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2384 for(y=0; y<b_h; y++){
5409
13d52b7647a0 Ahem, fix typos overlooked in last commit.
diego
parents: 5408
diff changeset
2385 //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
2386 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
2387 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
2388 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
2389 const uint8_t *obmc4= obmc3+ (obmc_stride>>1);
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2390 dst = slice_buffer_get_line(sb, src_y + y);
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2391 for(x=0; x<b_w; x++){
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2392 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
2393 +obmc2[x] * block[2][x + y*src_stride]
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2394 +obmc3[x] * block[1][x + y*src_stride]
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2395 +obmc4[x] * block[0][x + y*src_stride];
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2396
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2397 v <<= 8 - LOG2_OBMC_MAX;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2398 if(FRAC_BITS != 8){
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2399 v >>= 8 - FRAC_BITS;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2400 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2401 if(add){
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2402 v += dst[x + src_x];
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2403 v = (v + (1<<(FRAC_BITS-1))) >> FRAC_BITS;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2404 if(v&(~255)) v= ~(v>>31);
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2405 dst8[x + y*src_stride] = v;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2406 }else{
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2407 dst[x + src_x] -= v;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2408 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2409 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2410 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2411 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2412
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
2413 //FIXME name cleanup (b_w, block_w, b_width stuff)
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2414 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
2415 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
2416 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
2417 const int b_stride= b_width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2418 BlockNode *lt= &s->block[b_x + b_y*b_stride];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2419 BlockNode *rt= lt+1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2420 BlockNode *lb= lt+b_stride;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2421 BlockNode *rb= lb+1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2422 uint8_t *block[4];
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2423 int tmp_step= src_stride >= 7*MB_SIZE ? MB_SIZE : MB_SIZE*src_stride;
8214
c5276ad92ff8 snow: move scratch buffer from stack to malloced buffer in context
mru
parents: 7622
diff changeset
2424 uint8_t *tmp = s->scratchbuf;
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2425 uint8_t *ptmp;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2426 int x,y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2427
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2428 if(b_x<0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2429 lt= rt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2430 lb= rb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2431 }else if(b_x + 1 >= b_width){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2432 rt= lt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2433 rb= lb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2434 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2435 if(b_y<0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2436 lt= lb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2437 rt= rb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2438 }else if(b_y + 1 >= b_height){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2439 lb= lt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2440 rb= rt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2441 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2442
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
2443 if(src_x<0){ //FIXME merge with prev & always round internal width up to *16
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2444 obmc -= src_x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2445 b_w += src_x;
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2446 if(!sliced && !offset_dst)
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2447 dst -= src_x;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2448 src_x=0;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2449 }else if(src_x + b_w > w){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2450 b_w = w - src_x;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2451 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2452 if(src_y<0){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2453 obmc -= src_y*obmc_stride;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2454 b_h += src_y;
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2455 if(!sliced && !offset_dst)
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2456 dst -= src_y*dst_stride;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2457 src_y=0;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2458 }else if(src_y + b_h> h){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2459 b_h = h - src_y;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2460 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2461
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2462 if(b_w<=0 || b_h<=0) return;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2463
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2464 assert(src_stride > 2*MB_SIZE + 5);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2465
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2466 if(!sliced && offset_dst)
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2467 dst += src_x + src_y*dst_stride;
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2468 dst8+= src_x + src_y*src_stride;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2469 // src += src_x + src_y*src_stride;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2470
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2471 ptmp= tmp + 3*tmp_step;
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2472 block[0]= ptmp;
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2473 ptmp+=tmp_step;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2474 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
2475
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2476 if(same_block(lt, rt)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2477 block[1]= block[0];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2478 }else{
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2479 block[1]= ptmp;
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2480 ptmp+=tmp_step;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2481 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
2482 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2483
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2484 if(same_block(lt, lb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2485 block[2]= block[0];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2486 }else if(same_block(rt, lb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2487 block[2]= block[1];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2488 }else{
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2489 block[2]= ptmp;
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2490 ptmp+=tmp_step;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2491 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
2492 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2493
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2494 if(same_block(lt, rb) ){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2495 block[3]= block[0];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2496 }else if(same_block(rt, rb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2497 block[3]= block[1];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2498 }else if(same_block(lb, rb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2499 block[3]= block[2];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2500 }else{
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2501 block[3]= ptmp;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2502 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
2503 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2504 #if 0
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2505 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2506 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2507 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
2508 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2509 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2510 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2511 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2512 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2513 uint8_t *obmc2= obmc + (obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2514 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2515 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
2516 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2517 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2518 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2519 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2520 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2521 uint8_t *obmc3= obmc + obmc_stride*(obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2522 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2523 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
2524 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2525 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2526 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2527 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2528 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2529 uint8_t *obmc3= obmc + obmc_stride*(obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2530 uint8_t *obmc4= obmc3+ (obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2531 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2532 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
2533 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2534 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2535 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2536 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2537 #else
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2538 if(sliced){
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2539 s->dsp.inner_add_yblock(obmc, obmc_stride, block, b_w, b_h, src_x,src_y, src_stride, sb, add, dst8);
6475
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2540 }else{
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2541 for(y=0; y<b_h; y++){
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2542 //FIXME ugly misuse of obmc_stride
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2543 const uint8_t *obmc1= obmc + y*obmc_stride;
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2544 const uint8_t *obmc2= obmc1+ (obmc_stride>>1);
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2545 const uint8_t *obmc3= obmc1+ obmc_stride*(obmc_stride>>1);
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2546 const uint8_t *obmc4= obmc3+ (obmc_stride>>1);
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2547 for(x=0; x<b_w; x++){
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2548 int v= obmc1[x] * block[3][x + y*src_stride]
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2549 +obmc2[x] * block[2][x + y*src_stride]
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2550 +obmc3[x] * block[1][x + y*src_stride]
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2551 +obmc4[x] * block[0][x + y*src_stride];
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2552
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2553 v <<= 8 - LOG2_OBMC_MAX;
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2554 if(FRAC_BITS != 8){
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2555 v >>= 8 - FRAC_BITS;
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2556 }
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2557 if(add){
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2558 v += dst[x + y*dst_stride];
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2559 v = (v + (1<<(FRAC_BITS-1))) >> FRAC_BITS;
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2560 if(v&(~255)) v= ~(v>>31);
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2561 dst8[x + y*src_stride] = v;
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2562 }else{
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2563 dst[x + y*dst_stride] -= v;
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2564 }
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2565 }
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2566 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2567 }
5910
85a976d59f17 Add comments to some #endif directives.
diego
parents: 5909
diff changeset
2568 #endif /* 0 */
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2569 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2570
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2571 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
2572 Plane *p= &s->plane[plane_index];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2573 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
2574 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
2575 int x, y, mb_x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2576 int block_size = MB_SIZE >> s->block_max_depth;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2577 int block_w = plane_index ? block_size/2 : block_size;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2578 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
2579 int obmc_stride= plane_index ? block_size : 2*block_size;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2580 int ref_stride= s->current_picture.linesize[plane_index];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2581 uint8_t *dst8= s->current_picture.data[plane_index];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2582 int w= p->width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2583 int h= p->height;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2584
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2585 if(s->keyframe || (s->avctx->debug&512)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2586 if(mb_y==mb_h)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2587 return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2588
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2589 if(add){
6474
e6995f3fbf7f cosmetics: Normalize {} placement after for, while, if.
diego
parents: 6437
diff changeset
2590 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
2591 // 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
2592 IDWTELEM * line = sb->line[y];
6474
e6995f3fbf7f cosmetics: Normalize {} placement after for, while, if.
diego
parents: 6437
diff changeset
2593 for(x=0; x<w; x++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2594 // 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
2595 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
2596 v >>= FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2597 if(v&(~255)) v= ~(v>>31);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2598 dst8[x + y*ref_stride]= v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2599 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2600 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2601 }else{
6474
e6995f3fbf7f cosmetics: Normalize {} placement after for, while, if.
diego
parents: 6437
diff changeset
2602 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
2603 // 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
2604 IDWTELEM * line = sb->line[y];
6474
e6995f3fbf7f cosmetics: Normalize {} placement after for, while, if.
diego
parents: 6437
diff changeset
2605 for(x=0; x<w; x++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2606 line[x] -= 128 << FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2607 // buf[x + y*w]-= 128<<FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2608 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2609 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2610 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2611
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2612 return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2613 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2614
6475
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2615 for(mb_x=0; mb_x<=mb_w; mb_x++){
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2616 add_yblock(s, 1, sb, old_buffer, dst8, obmc,
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2617 block_w*mb_x - block_w/2,
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2618 block_w*mb_y - block_w/2,
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2619 block_w, block_w,
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2620 w, h,
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2621 w, ref_stride, obmc_stride,
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2622 mb_x - 1, mb_y - 1,
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2623 add, 0, plane_index);
e9431bea10dc cosmetics: Fix indentation in a few more places.
diego
parents: 6474
diff changeset
2624 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2625 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2626
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2627 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
2628 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
2629 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
2630 const int mb_h= s->b_height << s->block_max_depth;
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2631 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
2632 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
2633 int block_w = plane_index ? block_size/2 : block_size;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2634 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
2635 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
2636 int ref_stride= s->current_picture.linesize[plane_index];
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2637 uint8_t *dst8= s->current_picture.data[plane_index];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2638 int w= p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2639 int h= p->height;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2640
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2641 if(s->keyframe || (s->avctx->debug&512)){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2642 if(mb_y==mb_h)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2643 return;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2644
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2645 if(add){
2604
b7e6c3d31c65 Snow segfault bug in revision 1.43 patch by (Yartrebo /yartrebo earthlink net/)
michael
parents: 2602
diff changeset
2646 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
2647 for(x=0; x<w; x++){
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2648 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
2649 v >>= FRAC_BITS;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2650 if(v&(~255)) v= ~(v>>31);
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2651 dst8[x + y*ref_stride]= v;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2652 }
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2653 }
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2654 }else{
2604
b7e6c3d31c65 Snow segfault bug in revision 1.43 patch by (Yartrebo /yartrebo earthlink net/)
michael
parents: 2602
diff changeset
2655 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
2656 for(x=0; x<w; x++){
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2657 buf[x + y*w]-= 128<<FRAC_BITS;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2658 }
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2659 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2660 }
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2661
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2662 return;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2663 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2664
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2665 for(mb_x=0; mb_x<=mb_w; mb_x++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2666 add_yblock(s, 0, NULL, buf, dst8, obmc,
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2667 block_w*mb_x - block_w/2,
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2668 block_w*mb_y - block_w/2,
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2669 block_w, block_w,
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2670 w, h,
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2671 w, ref_stride, obmc_stride,
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2672 mb_x - 1, mb_y - 1,
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2673 add, 1, plane_index);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
2674 }
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2675 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2676
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2677 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
2678 const int mb_h= s->b_height << s->block_max_depth;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2679 int mb_y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2680 for(mb_y=0; mb_y<=mb_h; mb_y++)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2681 predict_slice(s, buf, plane_index, add, mb_y);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2682 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2683
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2684 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
2685 int i, x2, y2;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2686 Plane *p= &s->plane[plane_index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2687 const int block_size = MB_SIZE >> s->block_max_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2688 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
2689 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
2690 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
2691 const int ref_stride= s->current_picture.linesize[plane_index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2692 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
2693 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
2694 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
2695 const int w= p->width;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2696 const int h= p->height;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2697 int index= mb_x + mb_y*b_stride;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2698 BlockNode *b= &s->block[index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2699 BlockNode backup= *b;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2700 int ab=0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2701 int aa=0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2702
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2703 b->type|= BLOCK_INTRA;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2704 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
2705 memset(dst, 0, obmc_stride*obmc_stride*sizeof(IDWTELEM));
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2706
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2707 for(i=0; i<4; i++){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2708 int mb_x2= mb_x + (i &1) - 1;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2709 int mb_y2= mb_y + (i>>1) - 1;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2710 int x= block_w*mb_x2 + block_w/2;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2711 int y= block_w*mb_y2 + block_w/2;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2712
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2713 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
2714 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
2715
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2716 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
2717 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
2718 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
2719 int obmc_v= obmc[index];
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2720 int d;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2721 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
2722 if(x<0) obmc_v += obmc[index + block_w];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2723 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
2724 if(x+block_w>w) obmc_v += obmc[index - block_w];
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
2725 //FIXME precalculate this or simplify it somehow else
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2726
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2727 d = -dst[index] + (1<<(FRAC_BITS-1));
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2728 dst[index] = d;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2729 ab += (src[x2 + y2*ref_stride] - (d>>FRAC_BITS)) * obmc_v;
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
2730 aa += obmc_v * obmc_v; //FIXME precalculate this
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2731 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2732 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2733 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2734 *b= backup;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2735
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5085
diff changeset
2736 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
2737 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2738
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2739 static inline int get_block_bits(SnowContext *s, int x, int y, int w){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2740 const int b_stride = s->b_width << s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2741 const int b_height = s->b_height<< s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2742 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
2743 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
2744 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
2745 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
2746 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
2747 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
2748 int dmx, dmy;
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2749 // int mx_context= av_log2(2*FFABS(left->mx - top->mx));
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2750 // int my_context= av_log2(2*FFABS(left->my - top->my));
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2751
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2752 if(x<0 || x>=b_stride || y>=b_height)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2753 return 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2754 /*
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2755 1 0 0
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2756 01X 1-2 1
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2757 001XX 3-6 2-3
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2758 0001XXX 7-14 4-7
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2759 00001XXXX 15-30 8-15
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2760 */
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2761 //FIXME try accurate rate
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
2762 //FIXME intra and inter predictors if surrounding blocks are not the same type
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2763 if(b->type & BLOCK_INTRA){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2764 return 3+2*( av_log2(2*FFABS(left->color[0] - b->color[0]))
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2765 + av_log2(2*FFABS(left->color[1] - b->color[1]))
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2766 + 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
2767 }else{
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2768 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
2769 dmx-= b->mx;
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2770 dmy-= b->my;
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2771 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
2772 + av_log2(2*FFABS(dmy))
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2773 + av_log2(2*b->ref));
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2774 }
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2775 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2776
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2777 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
2778 Plane *p= &s->plane[plane_index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2779 const int block_size = MB_SIZE >> s->block_max_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2780 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
2781 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
2782 const int ref_stride= s->current_picture.linesize[plane_index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2783 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
2784 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
2785 IDWTELEM *pred= (IDWTELEM*)s->m.obmc_scratchpad + plane_index*block_size*block_size*4;
8214
c5276ad92ff8 snow: move scratch buffer from stack to malloced buffer in context
mru
parents: 7622
diff changeset
2786 uint8_t *cur = s->scratchbuf;
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
2787 uint8_t tmp[ref_stride*(2*MB_SIZE+HTAPS_MAX-1)];
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2788 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
2789 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
2790 const int w= p->width;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2791 const int h= p->height;
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2792 int distortion;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2793 int rate= 0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2794 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
2795 int sx= block_w*mb_x - block_w/2;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2796 int sy= block_w*mb_y - block_w/2;
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2797 int x0= FFMAX(0,-sx);
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2798 int y0= FFMAX(0,-sy);
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2799 int x1= FFMIN(block_w*2, w-sx);
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2800 int y1= FFMIN(block_w*2, h-sy);
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2801 int i,x,y;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2802
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2803 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
2804
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2805 for(y=y0; y<y1; y++){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2806 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
2807 const IDWTELEM *pred1 = pred + y*obmc_stride;
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2808 uint8_t *cur1 = cur + y*ref_stride;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2809 uint8_t *dst1 = dst + sx + (sy+y)*ref_stride;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2810 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
2811 #if FRAC_BITS >= LOG2_OBMC_MAX
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2812 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
2813 #else
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
2814 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
2815 #endif
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2816 v = (v + pred1[x]) >> FRAC_BITS;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2817 if(v&(~255)) v= ~(v>>31);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2818 dst1[x] = v;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2819 }
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2820 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2821
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2822 /* copy the regions where obmc[] = (uint8_t)256 */
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2823 if(LOG2_OBMC_MAX == 8
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2824 && (mb_x == 0 || mb_x == b_stride-1)
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2825 && (mb_y == 0 || mb_y == b_height-1)){
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2826 if(mb_x == 0)
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2827 x1 = block_w;
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2828 else
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2829 x0 = block_w;
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2830 if(mb_y == 0)
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2831 y1 = block_w;
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2832 else
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2833 y0 = block_w;
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2834 for(y=y0; y<y1; y++)
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2835 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
2836 }
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2837
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2838 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
2839 /* 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
2840 /* FIXME check alignment of the cmp wavelet vs the encoding wavelet */
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
2841 /* FIXME cmps overlap but do not cover the wavelet's whole support.
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
2842 * So improving the score of one block is not strictly guaranteed
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
2843 * to improve the score of the whole frame, thus iterative motion
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
2844 * estimation does not always converge. */
3323
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
2845 if(s->avctx->me_cmp == FF_CMP_W97)
4197
bbe0bc387a19 revert bad checkin
mru
parents: 4196
diff changeset
2846 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
2847 else if(s->avctx->me_cmp == FF_CMP_W53)
4197
bbe0bc387a19 revert bad checkin
mru
parents: 4196
diff changeset
2848 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
2849 else{
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
2850 distortion = 0;
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
2851 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
2852 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
2853 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
2854 }
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2855 }
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2856 }else{
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2857 assert(block_w==8);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2858 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
2859 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2860
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2861 if(plane_index==0){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2862 for(i=0; i<4; i++){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2863 /* ..RRr
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2864 * .RXx.
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2865 * rxx..
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2866 */
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2867 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
2868 }
3057
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
2869 if(mb_x == b_stride-2)
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
2870 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
2871 }
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2872 return distortion + rate*penalty_factor;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2873 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2874
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2875 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
2876 int i, y2;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2877 Plane *p= &s->plane[plane_index];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2878 const int block_size = MB_SIZE >> s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2879 const int block_w = plane_index ? block_size/2 : block_size;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2880 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
2881 const int obmc_stride= plane_index ? block_size : 2*block_size;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2882 const int ref_stride= s->current_picture.linesize[plane_index];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2883 uint8_t *dst= s->current_picture.data[plane_index];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2884 uint8_t *src= s-> input_picture.data[plane_index];
6426
fd74b42a19f4 suppress the second warning
michael
parents: 6414
diff changeset
2885 //FIXME zero_dst is const but add_yblock changes dst if add is 0 (this is never the case for dst=zero_dst
fd74b42a19f4 suppress the second warning
michael
parents: 6414
diff changeset
2886 // const has only been removed from zero_dst to suppress a warning
fd74b42a19f4 suppress the second warning
michael
parents: 6414
diff changeset
2887 static IDWTELEM zero_dst[4096]; //FIXME
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2888 const int b_stride = s->b_width << s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2889 const int w= p->width;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2890 const int h= p->height;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2891 int distortion= 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2892 int rate= 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2893 const int penalty_factor= get_penalty_factor(s->lambda, s->lambda2, s->avctx->me_cmp);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2894
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2895 for(i=0; i<9; i++){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2896 int mb_x2= mb_x + (i%3) - 1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2897 int mb_y2= mb_y + (i/3) - 1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2898 int x= block_w*mb_x2 + block_w/2;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2899 int y= block_w*mb_y2 + block_w/2;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2900
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2901 add_yblock(s, 0, NULL, zero_dst, dst, obmc,
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2902 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
2903
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2904 //FIXME find a cleaner/simpler way to skip the outside stuff
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2905 for(y2= y; y2<0; y2++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2906 memcpy(dst + x + y2*ref_stride, src + x + y2*ref_stride, block_w);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2907 for(y2= h; y2<y+block_w; y2++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2908 memcpy(dst + x + y2*ref_stride, src + x + y2*ref_stride, block_w);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2909 if(x<0){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2910 for(y2= y; y2<y+block_w; y2++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2911 memcpy(dst + x + y2*ref_stride, src + x + y2*ref_stride, -x);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2912 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2913 if(x+block_w > w){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2914 for(y2= y; y2<y+block_w; y2++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2915 memcpy(dst + w + y2*ref_stride, src + w + y2*ref_stride, x+block_w - w);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2916 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2917
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2918 assert(block_w== 8 || block_w==16);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2919 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
2920 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2921
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2922 if(plane_index==0){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2923 BlockNode *b= &s->block[mb_x+mb_y*b_stride];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2924 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
2925
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2926 /* ..RRRr
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2927 * .RXXx.
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2928 * .RXXx.
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2929 * rxxx.
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2930 */
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2931 if(merged)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2932 rate = get_block_bits(s, mb_x, mb_y, 2);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2933 for(i=merged?4:0; i<9; i++){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2934 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
2935 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
2936 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2937 }
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2938 return distortion + rate*penalty_factor;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2939 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2940
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
2941 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
2942 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
2943 BlockNode *block= &s->block[mb_x + mb_y * b_stride];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2944 BlockNode backup= *block;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2945 int rd, index, value;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2946
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2947 assert(mb_x>=0 && mb_y>=0);
2994
michael
parents: 2993
diff changeset
2948 assert(mb_x<b_stride);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2949
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2950 if(intra){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2951 block->color[0] = p[0];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2952 block->color[1] = p[1];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2953 block->color[2] = p[2];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2954 block->type |= BLOCK_INTRA;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2955 }else{
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2956 index= (p[0] + 31*p[1]) & (ME_CACHE_SIZE-1);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2957 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
2958 if(s->me_cache[index] == value)
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2959 return 0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2960 s->me_cache[index]= value;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2961
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2962 block->mx= p[0];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2963 block->my= p[1];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2964 block->type &= ~BLOCK_INTRA;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2965 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2966
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2967 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
2968
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2969 //FIXME chroma
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2970 if(rd < *best_rd){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2971 *best_rd= rd;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2972 return 1;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2973 }else{
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2974 *block= backup;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2975 return 0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2976 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2977 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2978
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
2979 /* special case for int[2] args we discard afterwards,
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
2980 * fixes compilation problem with gcc 2.95 */
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
2981 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
2982 int p[2] = {p0, p1};
3197
8f53630cd24e dont pass intra flag if its always 0
michael
parents: 3194
diff changeset
2983 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
2984 }
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
2985
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
2986 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
2987 const int b_stride= s->b_width << s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2988 BlockNode *block= &s->block[mb_x + mb_y * b_stride];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2989 BlockNode backup[4]= {block[0], block[1], block[b_stride], block[b_stride+1]};
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2990 int rd, index, value;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2991
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2992 assert(mb_x>=0 && mb_y>=0);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2993 assert(mb_x<b_stride);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2994 assert(((mb_x|mb_y)&1) == 0);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2995
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2996 index= (p0 + 31*p1) & (ME_CACHE_SIZE-1);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2997 value= s->me_cache_generation + (p0>>10) + (p1<<6) + (block->ref<<12);
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2998 if(s->me_cache[index] == value)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2999 return 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3000 s->me_cache[index]= value;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3001
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3002 block->mx= p0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3003 block->my= p1;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3004 block->ref= ref;
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3005 block->type &= ~BLOCK_INTRA;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3006 block[1]= block[b_stride]= block[b_stride+1]= *block;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3007
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3008 rd= get_4block_rd(s, mb_x, mb_y, 0);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3009
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3010 //FIXME chroma
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3011 if(rd < *best_rd){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3012 *best_rd= rd;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3013 return 1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3014 }else{
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3015 block[0]= backup[0];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3016 block[1]= backup[1];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3017 block[b_stride]= backup[2];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3018 block[b_stride+1]= backup[3];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3019 return 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3020 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3021 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3022
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3023 static void iterative_me(SnowContext *s){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3024 int pass, mb_x, mb_y;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3025 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
3026 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
3027 const int b_stride= b_width;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3028 int color[3];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3029
3194
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3030 {
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3031 RangeCoder r = s->c;
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3032 uint8_t state[sizeof(s->block_state)];
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3033 memcpy(state, s->block_state, sizeof(s->block_state));
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3034 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
3035 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
3036 encode_q_branch(s, 0, mb_x, mb_y);
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3037 s->c = r;
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3038 memcpy(s->block_state, state, sizeof(s->block_state));
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3039 }
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3040
3323
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3041 for(pass=0; pass<25; pass++){
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3042 int change= 0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3043
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3044 for(mb_y= 0; mb_y<b_height; mb_y++){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3045 for(mb_x= 0; mb_x<b_width; mb_x++){
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3046 int dia_change, i, j, ref;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3047 int best_rd= INT_MAX, ref_rd;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3048 BlockNode backup, ref_b;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3049 const int index= mb_x + mb_y * b_stride;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3050 BlockNode *block= &s->block[index];
3324
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3051 BlockNode *tb = mb_y ? &s->block[index-b_stride ] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3052 BlockNode *lb = mb_x ? &s->block[index -1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3053 BlockNode *rb = mb_x+1<b_width ? &s->block[index +1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3054 BlockNode *bb = mb_y+1<b_height ? &s->block[index+b_stride ] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3055 BlockNode *tlb= mb_x && mb_y ? &s->block[index-b_stride-1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3056 BlockNode *trb= mb_x+1<b_width && mb_y ? &s->block[index-b_stride+1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3057 BlockNode *blb= mb_x && mb_y+1<b_height ? &s->block[index+b_stride-1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3058 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
3059 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
3060 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
3061
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3062 if(pass && (block->type & BLOCK_OPT))
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3063 continue;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3064 block->type |= BLOCK_OPT;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3065
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3066 backup= *block;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3067
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3068 if(!s->me_cache_generation)
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3069 memset(s->me_cache, 0, sizeof(s->me_cache));
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3070 s->me_cache_generation += 1<<22;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3071
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
3072 //FIXME precalculate
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3073 {
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3074 int x, y;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3075 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
3076 if(mb_x==0)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3077 for(y=0; y<b_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3078 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
3079 if(mb_x==b_stride-1)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3080 for(y=0; y<b_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3081 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
3082 if(mb_y==0){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3083 for(x=0; x<b_w*2; x++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3084 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
3085 for(y=1; y<b_w; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3086 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
3087 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3088 if(mb_y==b_height-1){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3089 for(x=0; x<b_w*2; x++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3090 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
3091 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
3092 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
3093 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3094 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3095
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3096 //skip stuff outside the picture
6474
e6995f3fbf7f cosmetics: Normalize {} placement after for, while, if.
diego
parents: 6437
diff changeset
3097 if(mb_x==0 || mb_y==0 || mb_x==b_width-1 || mb_y==b_height-1){
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3098 uint8_t *src= s-> input_picture.data[0];
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3099 uint8_t *dst= s->current_picture.data[0];
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3100 const int stride= s->current_picture.linesize[0];
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3101 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
3102 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
3103 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
3104 const int w= s->plane[0].width;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3105 const int h= s->plane[0].height;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3106 int y;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3107
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3108 for(y=sy; y<0; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3109 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
3110 for(y=h; y<sy+block_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3111 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
3112 if(sx<0){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3113 for(y=sy; y<sy+block_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3114 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
3115 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3116 if(sx+block_w*2 > w){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3117 for(y=sy; y<sy+block_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3118 memcpy(dst + 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
3119 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3120 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3121
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3122 // intra(black) = neighbors' contribution to the current block
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3123 for(i=0; i<3; i++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3124 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
3125
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5085
diff changeset
3126 // get previous score (cannot be cached due to OBMC)
3057
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
3127 if(pass > 0 && (block->type&BLOCK_INTRA)){
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
3128 int color0[3]= {block->color[0], block->color[1], block->color[2]};
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
3129 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
3130 }else
3197
8f53630cd24e dont pass intra flag if its always 0
michael
parents: 3194
diff changeset
3131 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
3132
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3133 ref_b= *block;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3134 ref_rd= best_rd;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3135 for(ref=0; ref < s->ref_frames; ref++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3136 int16_t (*mvr)[2]= &s->ref_mvs[ref][index];
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3137 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
3138 continue;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3139 block->ref= ref;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3140 best_rd= INT_MAX;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3141
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3142 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
3143 check_block_inter(s, mb_x, mb_y, 0, 0, *obmc_edged, &best_rd);
3324
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3144 if(tb)
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3145 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
3146 if(lb)
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3147 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
3148 if(rb)
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3149 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
3150 if(bb)
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3151 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
3152
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3153 /* fullpel ME */
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
3154 //FIXME avoid subpel interpolation / round to nearest integer
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3155 do{
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3156 dia_change=0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3157 for(i=0; i<FFMAX(s->avctx->dia_size, 1); i++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3158 for(j=0; j<i; j++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3159 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
3160 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
3161 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
3162 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
3163 }
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3164 }
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3165 }while(dia_change);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3166 /* subpel ME */
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3167 do{
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3168 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
3169 dia_change=0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3170 for(i=0; i<8; i++)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3171 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
3172 }while(dia_change);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3173 //FIXME or try the standard 2 pass qpel or similar
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3174
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3175 mvr[0][0]= block->mx;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3176 mvr[0][1]= block->my;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3177 if(ref_rd > best_rd){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3178 ref_rd= best_rd;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3179 ref_b= *block;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3180 }
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3181 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3182 best_rd= ref_rd;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3183 *block= ref_b;
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
3184 #if 1
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3185 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
3186 //FIXME RD style color selection
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
3187 #endif
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3188 if(!same_block(block, &backup)){
3324
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3189 if(tb ) tb ->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3190 if(lb ) lb ->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3191 if(rb ) rb ->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3192 if(bb ) bb ->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3193 if(tlb) tlb->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3194 if(trb) trb->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3195 if(blb) blb->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3196 if(brb) brb->type &= ~BLOCK_OPT;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3197 change ++;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3198 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3199 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3200 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3201 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
3202 if(!change)
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3203 break;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3204 }
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3205
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3206 if(s->block_max_depth == 1){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3207 int change= 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3208 for(mb_y= 0; mb_y<b_height; mb_y+=2){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3209 for(mb_x= 0; mb_x<b_width; mb_x+=2){
3324
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3210 int i;
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3211 int best_rd, init_rd;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3212 const int index= mb_x + mb_y * b_stride;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3213 BlockNode *b[4];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3214
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3215 b[0]= &s->block[index];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3216 b[1]= b[0]+1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3217 b[2]= b[0]+b_stride;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3218 b[3]= b[2]+1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3219 if(same_block(b[0], b[1]) &&
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3220 same_block(b[0], b[2]) &&
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3221 same_block(b[0], b[3]))
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3222 continue;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3223
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3224 if(!s->me_cache_generation)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3225 memset(s->me_cache, 0, sizeof(s->me_cache));
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3226 s->me_cache_generation += 1<<22;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3227
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3228 init_rd= best_rd= get_4block_rd(s, mb_x, mb_y, 0);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3229
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3230 //FIXME more multiref search?
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3231 check_4block_inter(s, mb_x, mb_y,
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3232 (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
3233 (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
3234
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3235 for(i=0; i<4; i++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3236 if(!(b[i]->type&BLOCK_INTRA))
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3237 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
3238
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3239 if(init_rd != best_rd)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3240 change++;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3241 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3242 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3243 av_log(NULL, AV_LOG_ERROR, "pass:4mv changed:%d\n", change*4);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3244 }
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3245 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3246
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3247 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
3248 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3249 const int h= b->height;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4588
diff changeset
3250 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
3251 const int qmul= qexp[qlog&(QROOT-1)]<<((qlog>>QSHIFT) + ENCODER_EXTRA_BITS);
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3252 int x,y, thres1, thres2;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3253
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3254 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
3255 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
3256 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
3257 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
3258 return;
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3259 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3260
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3261 bias= bias ? 0 : (3*qmul)>>3;
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3262 thres1= ((qmul - bias)>>QEXPSHIFT) - 1;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3263 thres2= 2*thres1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3264
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3265 if(!bias){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3266 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3267 for(x=0; x<w; x++){
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3268 int i= src[x + y*stride];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3269
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3270 if((unsigned)(i+thres1) > thres2){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3271 if(i>=0){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3272 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3273 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
3274 dst[x + y*stride]= i;
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3275 }else{
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3276 i= -i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3277 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3278 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
3279 dst[x + y*stride]= -i;
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3280 }
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3281 }else
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3282 dst[x + y*stride]= 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3283 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3284 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3285 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3286 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3287 for(x=0; x<w; x++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3288 int i= src[x + y*stride];
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3289
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3290 if((unsigned)(i+thres1) > thres2){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3291 if(i>=0){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3292 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3293 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
3294 dst[x + y*stride]= i;
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3295 }else{
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3296 i= -i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3297 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3298 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
3299 dst[x + y*stride]= -i;
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3300 }
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3301 }else
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3302 dst[x + y*stride]= 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3303 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3304 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3305 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3306 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3307
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3308 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
3309 const int w= b->width;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4588
diff changeset
3310 const int qlog= av_clip(s->qlog + b->qlog, 0, QROOT*16);
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3311 const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3312 const int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3313 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3314
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3315 if(s->qlog == LOSSLESS_QLOG) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3316
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3317 for(y=start_y; y<end_y; y++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3318 // 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
3319 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
3320 for(x=0; x<w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3321 int i= line[x];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3322 if(i<0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3323 line[x]= -((-i*qmul + qadd)>>(QEXPSHIFT)); //FIXME try different bias
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3324 }else if(i>0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3325 line[x]= (( i*qmul + qadd)>>(QEXPSHIFT));
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3326 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3327 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3328 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3329 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3330
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3331 static void dequantize(SnowContext *s, SubBand *b, IDWTELEM *src, int stride){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3332 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3333 const int h= b->height;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4588
diff changeset
3334 const int qlog= av_clip(s->qlog + b->qlog, 0, QROOT*16);
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3335 const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3336 const int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3337 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3338
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3339 if(s->qlog == LOSSLESS_QLOG) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3340
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3341 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3342 for(x=0; x<w; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3343 int i= src[x + y*stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3344 if(i<0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3345 src[x + y*stride]= -((-i*qmul + qadd)>>(QEXPSHIFT)); //FIXME try different bias
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3346 }else if(i>0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3347 src[x + y*stride]= (( i*qmul + qadd)>>(QEXPSHIFT));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3348 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3349 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3350 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3351 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3352
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3353 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
3354 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3355 const int h= b->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3356 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3357
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3358 for(y=h-1; y>=0; y--){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3359 for(x=w-1; x>=0; x--){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3360 int i= x + y*stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3361
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3362 if(x){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3363 if(use_median){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3364 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
3365 else src[i] -= src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3366 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3367 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
3368 else src[i] -= src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3369 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3370 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3371 if(y) src[i] -= src[i - stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3372 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3373 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3374 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3375 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3376
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3377 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
3378 const int w= b->width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3379 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3380
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3381 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
3382 IDWTELEM * prev;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3383
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3384 if (start_y != 0)
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3385 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
3386
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3387 for(y=start_y; y<end_y; y++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3388 prev = line;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3389 // 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
3390 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
3391 for(x=0; x<w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3392 if(x){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3393 if(use_median){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3394 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
3395 else line[x] += line[x - 1];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3396 }else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3397 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
3398 else line[x] += line[x - 1];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3399 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3400 }else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3401 if(y) line[x] += prev[x];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3402 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3403 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3404 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3405 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3406
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3407 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
3408 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3409 const int h= b->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3410 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3411
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3412 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3413 for(x=0; x<w; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3414 int i= x + y*stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3415
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3416 if(x){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3417 if(use_median){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3418 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
3419 else src[i] += src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3420 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3421 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
3422 else src[i] += src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3423 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3424 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3425 if(y) src[i] += src[i - stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3426 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3427 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3428 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3429 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3430
5666
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3431 static void encode_qlogs(SnowContext *s){
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3432 int plane_index, level, orientation;
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3433
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3434 for(plane_index=0; plane_index<2; plane_index++){
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3435 for(level=0; level<s->spatial_decomposition_count; level++){
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3436 for(orientation=level ? 1:0; orientation<4; orientation++){
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3437 if(orientation==2) continue;
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3438 put_symbol(&s->c, s->header_state, s->plane[plane_index].band[level][orientation].qlog, 1);
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3439 }
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3440 }
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3441 }
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3442 }
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3443
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3444 static void encode_header(SnowContext *s){
5666
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3445 int plane_index, i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3446 uint8_t kstate[32];
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3447
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3448 memset(kstate, MID_STATE, sizeof(kstate));
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3449
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3450 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
3451 if(s->keyframe || s->always_reset){
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
3452 reset_contexts(s);
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3453 s->last_spatial_decomposition_type=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3454 s->last_qlog=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3455 s->last_qbias=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3456 s->last_mv_scale=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3457 s->last_block_max_depth= 0;
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3458 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
3459 Plane *p= &s->plane[plane_index];
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3460 p->last_htaps=0;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3461 p->last_diag_mc=0;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3462 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
3463 }
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3464 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3465 if(s->keyframe){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3466 put_symbol(&s->c, s->header_state, s->version, 0);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3467 put_rac(&s->c, s->header_state, s->always_reset);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3468 put_symbol(&s->c, s->header_state, s->temporal_decomposition_type, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3469 put_symbol(&s->c, s->header_state, s->temporal_decomposition_count, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3470 put_symbol(&s->c, s->header_state, s->spatial_decomposition_count, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3471 put_symbol(&s->c, s->header_state, s->colorspace_type, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3472 put_symbol(&s->c, s->header_state, s->chroma_h_shift, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3473 put_symbol(&s->c, s->header_state, s->chroma_v_shift, 0);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3474 put_rac(&s->c, s->header_state, s->spatial_scalability);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3475 // put_rac(&s->c, s->header_state, s->rate_scalability);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3476 put_symbol(&s->c, s->header_state, s->max_ref_frames-1, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3477
5666
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3478 encode_qlogs(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3479 }
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3480
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3481 if(!s->keyframe){
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3482 int update_mc=0;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3483 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
3484 Plane *p= &s->plane[plane_index];
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3485 update_mc |= p->last_htaps != p->htaps;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3486 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
3487 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
3488 }
5667
9242e125395f do not force the halfpel filter coeffs to be retransmitted on every frame
michael
parents: 5666
diff changeset
3489 put_rac(&s->c, s->header_state, update_mc);
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3490 if(update_mc){
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3491 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
3492 Plane *p= &s->plane[plane_index];
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3493 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
3494 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
3495 for(i= p->htaps/2; i; i--)
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3496 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
3497 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3498 }
5670
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
3499 if(s->last_spatial_decomposition_count != s->spatial_decomposition_count){
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
3500 put_rac(&s->c, s->header_state, 1);
5666
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3501 put_symbol(&s->c, s->header_state, s->spatial_decomposition_count, 0);
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3502 encode_qlogs(s);
5670
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
3503 }else
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
3504 put_rac(&s->c, s->header_state, 0);
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3505 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3506
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3507 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
3508 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
3509 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
3510 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
3511 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
3512
6144
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3513 }
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3514
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3515 static void update_last_header_values(SnowContext *s){
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3516 int plane_index;
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3517
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3518 if(!s->keyframe){
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3519 for(plane_index=0; plane_index<2; plane_index++){
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3520 Plane *p= &s->plane[plane_index];
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3521 p->last_diag_mc= p->diag_mc;
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3522 p->last_htaps = p->htaps;
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3523 memcpy(p->last_hcoeff, p->hcoeff, sizeof(p->hcoeff));
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3524 }
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3525 }
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
3526
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
3527 s->last_spatial_decomposition_type = s->spatial_decomposition_type;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
3528 s->last_qlog = s->qlog;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
3529 s->last_qbias = s->qbias;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
3530 s->last_mv_scale = s->mv_scale;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
3531 s->last_block_max_depth = s->block_max_depth;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
3532 s->last_spatial_decomposition_count = s->spatial_decomposition_count;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3533 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3534
5666
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3535 static void decode_qlogs(SnowContext *s){
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3536 int plane_index, level, orientation;
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3537
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3538 for(plane_index=0; plane_index<3; plane_index++){
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3539 for(level=0; level<s->spatial_decomposition_count; level++){
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3540 for(orientation=level ? 1:0; orientation<4; orientation++){
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3541 int q;
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3542 if (plane_index==2) q= s->plane[1].band[level][orientation].qlog;
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3543 else if(orientation==2) q= s->plane[plane_index].band[level][1].qlog;
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3544 else q= get_symbol(&s->c, s->header_state, 1);
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3545 s->plane[plane_index].band[level][orientation].qlog= q;
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3546 }
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3547 }
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3548 }
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3549 }
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3550
9367
b32ece43b8a2 Factorize check of read symbols.
michael
parents: 9366
diff changeset
3551 #define GET_S(dst, check) \
b32ece43b8a2 Factorize check of read symbols.
michael
parents: 9366
diff changeset
3552 tmp= get_symbol(&s->c, s->header_state, 0);\
b32ece43b8a2 Factorize check of read symbols.
michael
parents: 9366
diff changeset
3553 if(!(check)){\
b32ece43b8a2 Factorize check of read symbols.
michael
parents: 9366
diff changeset
3554 av_log(s->avctx, AV_LOG_ERROR, "Error " #dst " is %d\n", tmp);\
b32ece43b8a2 Factorize check of read symbols.
michael
parents: 9366
diff changeset
3555 return -1;\
b32ece43b8a2 Factorize check of read symbols.
michael
parents: 9366
diff changeset
3556 }\
b32ece43b8a2 Factorize check of read symbols.
michael
parents: 9366
diff changeset
3557 dst= tmp;
b32ece43b8a2 Factorize check of read symbols.
michael
parents: 9366
diff changeset
3558
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3559 static int decode_header(SnowContext *s){
9365
48813960f5d5 Fix crash when max_ref_frames was out of range.
michael
parents: 9355
diff changeset
3560 int plane_index, tmp;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3561 uint8_t kstate[32];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3562
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3563 memset(kstate, MID_STATE, sizeof(kstate));
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3564
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3565 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
3566 if(s->keyframe || s->always_reset){
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
3567 reset_contexts(s);
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3568 s->spatial_decomposition_type=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3569 s->qlog=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3570 s->qbias=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3571 s->mv_scale=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3572 s->block_max_depth= 0;
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3573 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3574 if(s->keyframe){
9367
b32ece43b8a2 Factorize check of read symbols.
michael
parents: 9366
diff changeset
3575 GET_S(s->version, tmp <= 0U)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3576 s->always_reset= get_rac(&s->c, s->header_state);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3577 s->temporal_decomposition_type= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3578 s->temporal_decomposition_count= get_symbol(&s->c, s->header_state, 0);
9371
6de6fb68621c Make sure spatial_decomposition_count is >0.
michael
parents: 9370
diff changeset
3579 GET_S(s->spatial_decomposition_count, 0 < tmp && tmp <= MAX_DECOMPOSITIONS)
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3580 s->colorspace_type= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3581 s->chroma_h_shift= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3582 s->chroma_v_shift= get_symbol(&s->c, s->header_state, 0);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3583 s->spatial_scalability= get_rac(&s->c, s->header_state);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3584 // s->rate_scalability= get_rac(&s->c, s->header_state);
9367
b32ece43b8a2 Factorize check of read symbols.
michael
parents: 9366
diff changeset
3585 GET_S(s->max_ref_frames, tmp < (unsigned)MAX_REF_FRAMES)
b32ece43b8a2 Factorize check of read symbols.
michael
parents: 9366
diff changeset
3586 s->max_ref_frames++;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3587
5666
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3588 decode_qlogs(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3589 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3590
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3591 if(!s->keyframe){
5667
9242e125395f do not force the halfpel filter coeffs to be retransmitted on every frame
michael
parents: 5666
diff changeset
3592 if(get_rac(&s->c, s->header_state)){
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3593 for(plane_index=0; plane_index<2; plane_index++){
5807
34fac02fbc4b warning fixes:
diego
parents: 5702
diff changeset
3594 int htaps, i, sum=0;
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3595 Plane *p= &s->plane[plane_index];
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3596 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
3597 htaps= get_symbol(&s->c, s->header_state, 0)*2 + 2;
5652
941e5deeb2a4 rename HTAPS -> HTAPS_MAX (later is correct after the previous change)
michael
parents: 5651
diff changeset
3598 if((unsigned)htaps > HTAPS_MAX || htaps==0)
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3599 return -1;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3600 p->htaps= htaps;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3601 for(i= htaps/2; i; i--){
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3602 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
3603 sum += p->hcoeff[i];
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3604 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3605 p->hcoeff[0]= 32-sum;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3606 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3607 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
3608 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
3609 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
3610 }
5666
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3611 if(get_rac(&s->c, s->header_state)){
9371
6de6fb68621c Make sure spatial_decomposition_count is >0.
michael
parents: 9370
diff changeset
3612 GET_S(s->spatial_decomposition_count, 0 < tmp && tmp <= MAX_DECOMPOSITIONS)
5666
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3613 decode_qlogs(s);
b5c137f3f53a allow changing of the spatial_decomposition_count and quantization tables
michael
parents: 5665
diff changeset
3614 }
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3615 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3616
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3617 s->spatial_decomposition_type+= get_symbol(&s->c, s->header_state, 1);
9366
48eb9ec4e318 Fix spatial_decomposition_type validity check.
michael
parents: 9365
diff changeset
3618 if(s->spatial_decomposition_type > 1U){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3619 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
3620 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3621 }
9373
78c2ddc32bed Make sure spatial_decomposition_count is not too large for picture size.
michael
parents: 9372
diff changeset
3622 if(FFMIN(s->avctx-> width>>s->chroma_h_shift,
78c2ddc32bed Make sure spatial_decomposition_count is not too large for picture size.
michael
parents: 9372
diff changeset
3623 s->avctx->height>>s->chroma_v_shift) >> (s->spatial_decomposition_count-1) <= 0){
78c2ddc32bed Make sure spatial_decomposition_count is not too large for picture size.
michael
parents: 9372
diff changeset
3624 av_log(s->avctx, AV_LOG_ERROR, "spatial_decomposition_count %d too large for size", s->spatial_decomposition_count);
78c2ddc32bed Make sure spatial_decomposition_count is not too large for picture size.
michael
parents: 9372
diff changeset
3625 return -1;
78c2ddc32bed Make sure spatial_decomposition_count is not too large for picture size.
michael
parents: 9372
diff changeset
3626 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3627
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3628 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
3629 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
3630 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
3631 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
3632 if(s->block_max_depth > 1 || s->block_max_depth < 0){
2952
d7be13d3ef00 check block_max_depth (fixes crash)
michael
parents: 2951
diff changeset
3633 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
3634 s->block_max_depth= 0;
d7be13d3ef00 check block_max_depth (fixes crash)
michael
parents: 2951
diff changeset
3635 return -1;
d7be13d3ef00 check block_max_depth (fixes crash)
michael
parents: 2951
diff changeset
3636 }
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3637
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3638 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
3639 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3640
3075
961af1358c7f add static keyword to some functions
mru
parents: 3063
diff changeset
3641 static void init_qexp(void){
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3642 int i;
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3643 double v=128;
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3644
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3645 for(i=0; i<QROOT; i++){
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3646 qexp[i]= lrintf(v);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3647 v *= pow(2, 1.0 / QROOT);
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3648 }
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3649 }
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3650
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6481
diff changeset
3651 static av_cold int common_init(AVCodecContext *avctx){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3652 SnowContext *s = avctx->priv_data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3653 int width, height;
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
3654 int i, j;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3655
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3656 s->avctx= avctx;
9365
48813960f5d5 Fix crash when max_ref_frames was out of range.
michael
parents: 9355
diff changeset
3657 s->max_ref_frames=1; //just make sure its not an invalid value in case of no initial keyframe
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3658
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3659 dsputil_init(&s->dsp, avctx);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3660
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3661 #define mcf(dx,dy)\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3662 s->dsp.put_qpel_pixels_tab [0][dy+dx/4]=\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3663 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
3664 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
3665 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
3666 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
3667 s->dsp.put_h264_qpel_pixels_tab[1][dy+dx/4];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3668
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3669 mcf( 0, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3670 mcf( 4, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3671 mcf( 8, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3672 mcf(12, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3673 mcf( 0, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3674 mcf( 4, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3675 mcf( 8, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3676 mcf(12, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3677 mcf( 0, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3678 mcf( 4, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3679 mcf( 8, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3680 mcf(12, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3681 mcf( 0,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3682 mcf( 4,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3683 mcf( 8,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3684 mcf(12,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3685
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3686 #define mcfh(dx,dy)\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3687 s->dsp.put_pixels_tab [0][dy/4+dx/8]=\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3688 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
3689 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
3690 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
3691 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
3692 mc_block_hpel ## dx ## dy ## 8;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3693
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3694 mcfh(0, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3695 mcfh(8, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3696 mcfh(0, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3697 mcfh(8, 8)
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3698
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3699 if(!qexp[0])
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3700 init_qexp();
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3701
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3702 // dec += FFMAX(s->chroma_h_shift, s->chroma_v_shift);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3703
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3704 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
3705 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
3706
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3707 s->spatial_idwt_buffer= av_mallocz(width*height*sizeof(IDWTELEM));
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
3708 s->spatial_dwt_buffer= av_mallocz(width*height*sizeof(DWTELEM)); //FIXME this does not belong here
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3709
5665
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3710 for(i=0; i<MAX_REF_FRAMES; i++)
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3711 for(j=0; j<MAX_REF_FRAMES; j++)
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3712 scale_mv_ref[i][j] = 256*(i+1)/(j+1);
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3713
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3714 s->avctx->get_buffer(s->avctx, &s->mconly_picture);
8214
c5276ad92ff8 snow: move scratch buffer from stack to malloced buffer in context
mru
parents: 7622
diff changeset
3715 s->scratchbuf = av_malloc(s->mconly_picture.linesize[0]*7*MB_SIZE);
5665
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3716
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3717 return 0;
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3718 }
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3719
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3720 static int common_init_after_header(AVCodecContext *avctx){
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3721 SnowContext *s = avctx->priv_data;
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3722 int plane_index, level, orientation;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3723
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3724 for(plane_index=0; plane_index<3; plane_index++){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3725 int w= s->avctx->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3726 int h= s->avctx->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3727
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3728 if(plane_index){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3729 w>>= s->chroma_h_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3730 h>>= s->chroma_v_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3731 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3732 s->plane[plane_index].width = w;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3733 s->plane[plane_index].height= h;
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
3734
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3735 for(level=s->spatial_decomposition_count-1; level>=0; level--){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3736 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3737 SubBand *b= &s->plane[plane_index].band[level][orientation];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3738
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3739 b->buf= s->spatial_dwt_buffer;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3740 b->level= level;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3741 b->stride= s->plane[plane_index].width << (s->spatial_decomposition_count - level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3742 b->width = (w + !(orientation&1))>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3743 b->height= (h + !(orientation>1))>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3744
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3745 b->stride_line = 1 << (s->spatial_decomposition_count - level);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3746 b->buf_x_offset = 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3747 b->buf_y_offset = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3748
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3749 if(orientation&1){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3750 b->buf += (w+1)>>1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3751 b->buf_x_offset = (w+1)>>1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3752 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3753 if(orientation>1){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3754 b->buf += b->stride>>1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3755 b->buf_y_offset = b->stride_line >> 1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3756 }
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3757 b->ibuf= s->spatial_idwt_buffer + (b->buf - s->spatial_dwt_buffer);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3758
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3759 if(level)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3760 b->parent= &s->plane[plane_index].band[level-1][orientation];
5665
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3761 //FIXME avoid this realloc
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3762 av_freep(&b->x_coeff);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3763 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
3764 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3765 w= (w+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3766 h= (h+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3767 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3768 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3769
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3770 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3771 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3772
3322
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3773 static int qscale2qlog(int qscale){
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3774 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
3775 + 61*QROOT/8; //<64 >60
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3776 }
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3777
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
3778 static int ratecontrol_1pass(SnowContext *s, AVFrame *pict)
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3779 {
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
3780 /* Estimate the frame's complexity as a sum of weighted dwt coefficients.
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3781 * FIXME we know exact mv bits at this point,
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3782 * but ratecontrol isn't set up to include them. */
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3783 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
3784 int level, orientation, delta_qlog;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3785
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3786 for(level=0; level<s->spatial_decomposition_count; level++){
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3787 for(orientation=level ? 1 : 0; orientation<4; orientation++){
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3788 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
3789 IDWTELEM *buf= b->ibuf;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3790 const int w= b->width;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3791 const int h= b->height;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3792 const int stride= b->stride;
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4588
diff changeset
3793 const int qlog= av_clip(2*QROOT + b->qlog, 0, QROOT*16);
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3794 const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3795 const int qdiv= (1<<16)/qmul;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3796 int x, y;
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3797 //FIXME this is ugly
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3798 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
3799 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
3800 buf[x+y*stride]= b->buf[x+y*stride];
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3801 if(orientation==0)
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3802 decorrelate(s, b, buf, stride, 1, 0);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3803 for(y=0; y<h; y++)
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3804 for(x=0; x<w; x++)
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3805 coef_sum+= abs(buf[x+y*stride]) * qdiv >> 16;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3806 }
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3807 }
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3808
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3809 /* ugly, ratecontrol just takes a sqrt again */
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3810 coef_sum = (uint64_t)coef_sum * coef_sum >> 16;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3811 assert(coef_sum < INT_MAX);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3812
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6475
diff changeset
3813 if(pict->pict_type == FF_I_TYPE){
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3814 s->m.current_picture.mb_var_sum= coef_sum;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3815 s->m.current_picture.mc_mb_var_sum= 0;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3816 }else{
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3817 s->m.current_picture.mc_mb_var_sum= coef_sum;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3818 s->m.current_picture.mb_var_sum= 0;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3819 }
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3820
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3821 pict->quality= ff_rate_estimate_qscale(&s->m, 1);
3766
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
3822 if (pict->quality < 0)
4011
5bce97c30a69 -1 is a valid return value in ratecontrol_1pass() -> 100l for takis
michael
parents: 4001
diff changeset
3823 return INT_MIN;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3824 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
3825 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
3826 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
3827 return delta_qlog;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3828 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3829
5909
4e3c522ca492 cosmetics: Fix vissual --> visual typo.
diego
parents: 5908
diff changeset
3830 static void calculate_visual_weight(SnowContext *s, Plane *p){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3831 int width = p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3832 int height= p->height;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
3833 int level, orientation, x, y;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3834
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3835 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3836 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3837 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
3838 IDWTELEM *ibuf= b->ibuf;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3839 int64_t error=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3840
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
3841 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
3842 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
3843 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
3844 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3845 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
3846 int64_t d= s->spatial_idwt_buffer[x + y*width]*16;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3847 error += d*d;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3848 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3849 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3850
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3851 b->qlog= (int)(log(352256.0/sqrt(error)) / log(pow(2.0, 1.0/QROOT))+0.5);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3852 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3853 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3854 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3855
5702
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3856 #define QUANTIZE2 0
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3857
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3858 #if QUANTIZE2==1
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3859 #define Q2_STEP 8
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3860
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3861 static void find_sse(SnowContext *s, Plane *p, int *score, int score_stride, IDWTELEM *r0, IDWTELEM *r1, int level, int orientation){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3862 SubBand *b= &p->band[level][orientation];
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3863 int x, y;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3864 int xo=0;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3865 int yo=0;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3866 int step= 1 << (s->spatial_decomposition_count - level);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3867
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3868 if(orientation&1)
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3869 xo= step>>1;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3870 if(orientation&2)
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3871 yo= step>>1;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3872
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
3873 //FIXME bias for nonzero ?
5702
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3874 //FIXME optimize
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3875 memset(score, 0, sizeof(*score)*score_stride*((p->height + Q2_STEP-1)/Q2_STEP));
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3876 for(y=0; y<p->height; y++){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3877 for(x=0; x<p->width; x++){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3878 int sx= (x-xo + step/2) / step / Q2_STEP;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3879 int sy= (y-yo + step/2) / step / Q2_STEP;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3880 int v= r0[x + y*p->width] - r1[x + y*p->width];
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3881 assert(sx>=0 && sy>=0 && sx < score_stride);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3882 v= ((v+8)>>4)<<4;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3883 score[sx + sy*score_stride] += v*v;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3884 assert(score[sx + sy*score_stride] >= 0);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3885 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3886 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3887 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3888
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3889 static void dequantize_all(SnowContext *s, Plane *p, IDWTELEM *buffer, int width, int height){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3890 int level, orientation;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3891
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3892 for(level=0; level<s->spatial_decomposition_count; level++){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3893 for(orientation=level ? 1 : 0; orientation<4; orientation++){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3894 SubBand *b= &p->band[level][orientation];
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3895 IDWTELEM *dst= buffer + (b->ibuf - s->spatial_idwt_buffer);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3896
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3897 dequantize(s, b, dst, b->stride);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3898 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3899 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3900 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3901
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3902 static void dwt_quantize(SnowContext *s, Plane *p, DWTELEM *buffer, int width, int height, int stride, int type){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3903 int level, orientation, ys, xs, x, y, pass;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3904 IDWTELEM best_dequant[height * stride];
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3905 IDWTELEM idwt2_buffer[height * stride];
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3906 const int score_stride= (width + 10)/Q2_STEP;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3907 int best_score[(width + 10)/Q2_STEP * (height + 10)/Q2_STEP]; //FIXME size
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3908 int score[(width + 10)/Q2_STEP * (height + 10)/Q2_STEP]; //FIXME size
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3909 int threshold= (s->m.lambda * s->m.lambda) >> 6;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3910
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3911 //FIXME pass the copy cleanly ?
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3912
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3913 // memcpy(dwt_buffer, buffer, height * stride * sizeof(DWTELEM));
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3914 ff_spatial_dwt(buffer, width, height, stride, type, s->spatial_decomposition_count);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3915
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3916 for(level=0; level<s->spatial_decomposition_count; level++){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3917 for(orientation=level ? 1 : 0; orientation<4; orientation++){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3918 SubBand *b= &p->band[level][orientation];
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3919 IDWTELEM *dst= best_dequant + (b->ibuf - s->spatial_idwt_buffer);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3920 DWTELEM *src= buffer + (b-> buf - s->spatial_dwt_buffer);
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
3921 assert(src == b->buf); // code does not depend on this but it is true currently
5702
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3922
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3923 quantize(s, b, dst, src, b->stride, s->qbias);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3924 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3925 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3926 for(pass=0; pass<1; pass++){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3927 if(s->qbias == 0) //keyframe
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3928 continue;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3929 for(level=0; level<s->spatial_decomposition_count; level++){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3930 for(orientation=level ? 1 : 0; orientation<4; orientation++){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3931 SubBand *b= &p->band[level][orientation];
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3932 IDWTELEM *dst= idwt2_buffer + (b->ibuf - s->spatial_idwt_buffer);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3933 IDWTELEM *best_dst= best_dequant + (b->ibuf - s->spatial_idwt_buffer);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3934
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3935 for(ys= 0; ys<Q2_STEP; ys++){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3936 for(xs= 0; xs<Q2_STEP; xs++){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3937 memcpy(idwt2_buffer, best_dequant, height * stride * sizeof(IDWTELEM));
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3938 dequantize_all(s, p, idwt2_buffer, width, height);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3939 ff_spatial_idwt(idwt2_buffer, width, height, stride, type, s->spatial_decomposition_count);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3940 find_sse(s, p, best_score, score_stride, idwt2_buffer, s->spatial_idwt_buffer, level, orientation);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3941 memcpy(idwt2_buffer, best_dequant, height * stride * sizeof(IDWTELEM));
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3942 for(y=ys; y<b->height; y+= Q2_STEP){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3943 for(x=xs; x<b->width; x+= Q2_STEP){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3944 if(dst[x + y*b->stride]<0) dst[x + y*b->stride]++;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3945 if(dst[x + y*b->stride]>0) dst[x + y*b->stride]--;
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
3946 //FIXME try more than just --
5702
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3947 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3948 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3949 dequantize_all(s, p, idwt2_buffer, width, height);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3950 ff_spatial_idwt(idwt2_buffer, width, height, stride, type, s->spatial_decomposition_count);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3951 find_sse(s, p, score, score_stride, idwt2_buffer, s->spatial_idwt_buffer, level, orientation);
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3952 for(y=ys; y<b->height; y+= Q2_STEP){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3953 for(x=xs; x<b->width; x+= Q2_STEP){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3954 int score_idx= x/Q2_STEP + (y/Q2_STEP)*score_stride;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3955 if(score[score_idx] <= best_score[score_idx] + threshold){
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3956 best_score[score_idx]= score[score_idx];
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3957 if(best_dst[x + y*b->stride]<0) best_dst[x + y*b->stride]++;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3958 if(best_dst[x + y*b->stride]>0) best_dst[x + y*b->stride]--;
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3959 //FIXME copy instead
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3960 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3961 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3962 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3963 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3964 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3965 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3966 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3967 }
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
3968 memcpy(s->spatial_idwt_buffer, best_dequant, height * stride * sizeof(IDWTELEM)); //FIXME work with that directly instead of copy at the end
5702
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3969 }
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3970
5910
85a976d59f17 Add comments to some #endif directives.
diego
parents: 5909
diff changeset
3971 #endif /* QUANTIZE2==1 */
5702
72c65bca55db some experimental iterative quantization code
michael
parents: 5670
diff changeset
3972
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6481
diff changeset
3973 static av_cold int encode_init(AVCodecContext *avctx)
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3974 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3975 SnowContext *s = avctx->priv_data;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
3976 int plane_index;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3977
2658
d1609cfeb1d0 #defines for strict_std_compliance and split between inofficial extensions and non standarized things
michael
parents: 2635
diff changeset
3978 if(avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL){
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
3979 av_log(avctx, AV_LOG_ERROR, "This codec is under development, files encoded with it may not be decodable with future versions!!!\n"
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
3980 "Use vstrict=-2 / -strict -2 to use it anyway.\n");
2151
44c973bfec0f dont segfault without -strict -1
michael
parents: 2150
diff changeset
3981 return -1;
44c973bfec0f dont segfault without -strict -1
michael
parents: 2150
diff changeset
3982 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3983
3327
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3984 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
3985 && (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
3986 && avctx->global_quality == 0){
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
3987 av_log(avctx, AV_LOG_ERROR, "The 9/7 wavelet is incompatible with lossless mode.\n");
3327
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3988 return -1;
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3989 }
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3990
5665
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3991 s->spatial_decomposition_type= avctx->prediction_method; //FIXME add decorrelator type r transform_type
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3992
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3993 s->mv_scale = (avctx->flags & CODEC_FLAG_QPEL) ? 2 : 4;
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3994 s->block_max_depth= (avctx->flags & CODEC_FLAG_4MV ) ? 1 : 0;
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3995
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3996 for(plane_index=0; plane_index<3; plane_index++){
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3997 s->plane[plane_index].diag_mc= 1;
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3998 s->plane[plane_index].htaps= 6;
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
3999 s->plane[plane_index].hcoeff[0]= 40;
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
4000 s->plane[plane_index].hcoeff[1]= -10;
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
4001 s->plane[plane_index].hcoeff[2]= 2;
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
4002 s->plane[plane_index].fast_mc= 1;
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
4003 }
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
4004
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4005 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
4006 alloc_blocks(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4007
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4008 s->version=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4009
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4010 s->m.avctx = avctx;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4011 s->m.flags = avctx->flags;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4012 s->m.bit_rate= avctx->bit_rate;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4013
8239
dcfdb3352dde Fix regression test failure with pthreads on multiprocessor systems.
michael
parents: 8214
diff changeset
4014 s->m.me.temp =
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4015 s->m.me.scratchpad= av_mallocz((avctx->width+64)*2*16*2*sizeof(uint8_t));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4016 s->m.me.map = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4017 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
4018 s->m.obmc_scratchpad= av_mallocz(MB_SIZE*MB_SIZE*12*sizeof(uint32_t));
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4019 h263_encode_init(&s->m); //mv_penalty
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4020
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4021 s->max_ref_frames = FFMAX(FFMIN(avctx->refs, MAX_REF_FRAMES), 1);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4022
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4023 if(avctx->flags&CODEC_FLAG_PASS1){
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4024 if(!avctx->stats_out)
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4025 avctx->stats_out = av_mallocz(256);
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4026 }
3322
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
4027 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
4028 if(ff_rate_control_init(&s->m) < 0)
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4029 return -1;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4030 }
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4031 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
4032
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4033 avctx->coded_frame= &s->current_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4034 switch(avctx->pix_fmt){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4035 // case PIX_FMT_YUV444P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4036 // case PIX_FMT_YUV422P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4037 case PIX_FMT_YUV420P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4038 case PIX_FMT_GRAY8:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4039 // case PIX_FMT_YUV411P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4040 // case PIX_FMT_YUV410P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4041 s->colorspace_type= 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4042 break;
4494
ce643a22f049 Replace deprecated PIX_FMT names by the newer variants.
diego
parents: 4436
diff changeset
4043 /* case PIX_FMT_RGB32:
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4044 s->colorspace= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4045 break;*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4046 default:
5908
4c72e41cd178 Improve unsupported (pixel) format error message.
diego
parents: 5807
diff changeset
4047 av_log(avctx, AV_LOG_ERROR, "pixel format not supported\n");
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4048 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4049 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4050 // 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
4051 s->chroma_h_shift= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4052 s->chroma_v_shift= 1;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4053
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4054 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
4055 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
4056
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4057 s->avctx->get_buffer(s->avctx, &s->input_picture);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4058
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4059 if(s->avctx->me_method == ME_ITER){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4060 int i;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4061 int size= s->b_width * s->b_height << 2*s->block_max_depth;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4062 for(i=0; i<s->max_ref_frames; i++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4063 s->ref_mvs[i]= av_mallocz(size*sizeof(int16_t[2]));
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4064 s->ref_scores[i]= av_mallocz(size*sizeof(uint32_t));
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4065 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4066 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4067
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4068 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4069 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4070
5924
cf1eed15eb87 avoid some halfpel related #ifdef
aurel
parents: 5923
diff changeset
4071 #define USE_HALFPEL_PLANE 0
cf1eed15eb87 avoid some halfpel related #ifdef
aurel
parents: 5923
diff changeset
4072
5633
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4073 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
4074 int p,x,y;
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4075
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4076 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
4077
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4078 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
4079 int is_chroma= !!p;
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4080 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
4081 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
4082 int ls= frame->linesize[p];
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4083 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
4084
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4085 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
4086 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
4087 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
4088
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4089 halfpel[0][p]= src;
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4090 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
4091 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
4092 int i= y*ls + x;
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4093
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4094 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
4095 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4096 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4097 for(y=0; y<h; y++){
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4098 for(x=0; x<w; x++){
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4099 int i= y*ls + x;
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4100
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4101 halfpel[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
4102 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4103 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4104 src= halfpel[1][p];
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4105 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
4106 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
4107 int i= y*ls + x;
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4108
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4109 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
4110 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4111 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4112
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4113 //FIXME border!
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4114 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4115 }
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4116
9375
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4117 static void release_buffer(AVCodecContext *avctx){
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4118 SnowContext *s = avctx->priv_data;
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4119 int i;
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4120
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4121 if(s->last_picture[s->max_ref_frames-1].data[0]){
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4122 avctx->release_buffer(avctx, &s->last_picture[s->max_ref_frames-1]);
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4123 for(i=0; i<9; i++)
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4124 if(s->halfpel_plane[s->max_ref_frames-1][1+i/3][i%3])
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4125 av_free(s->halfpel_plane[s->max_ref_frames-1][1+i/3][i%3] - EDGE_WIDTH*(1+s->current_picture.linesize[i%3]));
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4126 }
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4127 }
2f04b571d69b Move release_buffer() up so it is prior to a future call to it.
michael
parents: 9374
diff changeset
4128
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4129 static int frame_start(SnowContext *s){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4130 AVFrame tmp;
2187
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4131 int w= s->avctx->width; //FIXME round up to x16 ?
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4132 int h= s->avctx->height;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4133
2187
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4134 if(s->current_picture.data[0]){
6437
5154ab444372 move draw_edges() into dsputil
aurel
parents: 6426
diff changeset
4135 s->dsp.draw_edges(s->current_picture.data[0], s->current_picture.linesize[0], w , h , EDGE_WIDTH );
5154ab444372 move draw_edges() into dsputil
aurel
parents: 6426
diff changeset
4136 s->dsp.draw_edges(s->current_picture.data[1], s->current_picture.linesize[1], w>>1, h>>1, EDGE_WIDTH/2);
5154ab444372 move draw_edges() into dsputil
aurel
parents: 6426
diff changeset
4137 s->dsp.draw_edges(s->current_picture.data[2], s->current_picture.linesize[2], w>>1, h>>1, EDGE_WIDTH/2);
2187
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4138 }
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4139
9376
e376facae584 Make sure the next used frame is released so get_buffer() wont fail.
michael
parents: 9375
diff changeset
4140 release_buffer(s->avctx);
e376facae584 Make sure the next used frame is released so get_buffer() wont fail.
michael
parents: 9375
diff changeset
4141
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4142 tmp= s->last_picture[s->max_ref_frames-1];
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4143 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
4144 memmove(s->halfpel_plane+1, s->halfpel_plane, (s->max_ref_frames-1)*sizeof(void*)*4*4);
5924
cf1eed15eb87 avoid some halfpel related #ifdef
aurel
parents: 5923
diff changeset
4145 if(USE_HALFPEL_PLANE && s->current_picture.data[0])
5633
873ea64637d9 code to do halfpel interpolation per frame (unfinished and under ifdef but it
michael
parents: 5627
diff changeset
4146 halfpel_interpol(s, s->halfpel_plane[0], &s->current_picture);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4147 s->last_picture[0]= s->current_picture;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4148 s->current_picture= tmp;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4149
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4150 if(s->keyframe){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4151 s->ref_frames= 0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4152 }else{
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4153 int i;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4154 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
4155 if(i && s->last_picture[i-1].key_frame)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4156 break;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4157 s->ref_frames= i;
9372
9bb96825fc10 Skip non intra frames that have no reference frames.
michael
parents: 9371
diff changeset
4158 if(s->ref_frames==0){
9bb96825fc10 Skip non intra frames that have no reference frames.
michael
parents: 9371
diff changeset
4159 av_log(s->avctx,AV_LOG_ERROR, "No reference frames\n");
9bb96825fc10 Skip non intra frames that have no reference frames.
michael
parents: 9371
diff changeset
4160 return -1;
9bb96825fc10 Skip non intra frames that have no reference frames.
michael
parents: 9371
diff changeset
4161 }
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4162 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4163
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4164 s->current_picture.reference= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4165 if(s->avctx->get_buffer(s->avctx, &s->current_picture) < 0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4166 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4167 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4168 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4169
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4170 s->current_picture.key_frame= s->keyframe;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4171
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4172 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4173 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4174
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4175 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4176 SnowContext *s = avctx->priv_data;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4177 RangeCoder * const c= &s->c;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4178 AVFrame *pict = data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4179 const int width= s->avctx->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4180 const int height= s->avctx->height;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4181 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
4182 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
4183 uint8_t rc_block_bak[sizeof(s->block_state)];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4184
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4185 ff_init_range_encoder(c, buf, buf_size);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4186 ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4187
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4188 for(i=0; i<3; i++){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4189 int shift= !!i;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4190 for(y=0; y<(height>>shift); y++)
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4191 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
4192 &pict->data[i][y * pict->linesize[i]],
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4193 width>>shift);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4194 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4195 s->new_picture = *pict;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4196
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4197 s->m.picture_number= avctx->frame_number;
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4198 if(avctx->flags&CODEC_FLAG_PASS2){
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4199 s->m.pict_type =
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4200 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
4201 s->keyframe= pict->pict_type==FF_I_TYPE;
3766
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4202 if(!(avctx->flags&CODEC_FLAG_QSCALE)) {
3193
66116775b315 obey vqscale in 2nd pass
lorenm
parents: 3190
diff changeset
4203 pict->quality= ff_rate_estimate_qscale(&s->m, 0);
3766
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4204 if (pict->quality < 0)
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4205 return -1;
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4206 }
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4207 }else{
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4208 s->keyframe= avctx->gop_size==0 || avctx->frame_number % avctx->gop_size == 0;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4209 s->m.pict_type=
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4210 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
4211 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4212
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4213 if(s->pass1_rc && avctx->frame_number == 0)
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4214 pict->quality= 2*FF_QP2LAMBDA;
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4215 if(pict->quality){
3322
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
4216 s->qlog= qscale2qlog(pict->quality);
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4217 s->lambda = pict->quality * 3/2;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4218 }
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4219 if(s->qlog < 0 || (!pict->quality && (avctx->flags & CODEC_FLAG_QSCALE))){
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4220 s->qlog= LOSSLESS_QLOG;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4221 s->lambda = 0;
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
4222 }//else keep previous frame's qlog until after motion estimation
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4223
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4224 frame_start(s);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4225
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4226 s->m.current_picture_ptr= &s->m.current_picture;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6475
diff changeset
4227 if(pict->pict_type == FF_P_TYPE){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4228 int block_width = (width +15)>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4229 int block_height= (height+15)>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4230 int stride= s->current_picture.linesize[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4231
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4232 assert(s->current_picture.data[0]);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4233 assert(s->last_picture[0].data[0]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4234
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4235 s->m.avctx= s->avctx;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4236 s->m.current_picture.data[0]= s->current_picture.data[0];
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4237 s->m. last_picture.data[0]= s->last_picture[0].data[0];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4238 s->m. new_picture.data[0]= s-> input_picture.data[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4239 s->m. last_picture_ptr= &s->m. last_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4240 s->m.linesize=
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4241 s->m. last_picture.linesize[0]=
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4242 s->m. new_picture.linesize[0]=
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4243 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
4244 s->m.uvlinesize= s->current_picture.linesize[1];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4245 s->m.width = width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4246 s->m.height= height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4247 s->m.mb_width = block_width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4248 s->m.mb_height= block_height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4249 s->m.mb_stride= s->m.mb_width+1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4250 s->m.b8_stride= 2*s->m.mb_width+1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4251 s->m.f_code=1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4252 s->m.pict_type= pict->pict_type;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4253 s->m.me_method= s->avctx->me_method;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4254 s->m.me.scene_change_score=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4255 s->m.flags= s->avctx->flags;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4256 s->m.quarter_sample= (s->avctx->flags & CODEC_FLAG_QPEL)!=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4257 s->m.out_format= FMT_H263;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4258 s->m.unrestricted_mv= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4259
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4260 s->m.lambda = s->lambda;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4261 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
4262 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
4263
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4264 s->m.dsp= s->dsp; //move
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4265 ff_init_me(&s->m);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4266 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
4267 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4268
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
4269 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
4270 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
4271 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
4272 }
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
4273
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
4274 redo_frame:
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4275
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6475
diff changeset
4276 if(pict->pict_type == FF_I_TYPE)
5670
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
4277 s->spatial_decomposition_count= 5;
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
4278 else
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
4279 s->spatial_decomposition_count= 5;
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
4280
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4281 s->m.pict_type = pict->pict_type;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6475
diff changeset
4282 s->qbias= pict->pict_type == FF_P_TYPE ? 2 : 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4283
5670
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
4284 common_init_after_header(avctx);
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
4285
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
4286 if(s->last_spatial_decomposition_count != s->spatial_decomposition_count){
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
4287 for(plane_index=0; plane_index<3; plane_index++){
5909
4e3c522ca492 cosmetics: Fix vissual --> visual typo.
diego
parents: 5908
diff changeset
4288 calculate_visual_weight(s, &s->plane[plane_index]);
5670
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
4289 }
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
4290 }
2f3431b34f0f make changing spatial_decomposition_count per frame work
michael
parents: 5668
diff changeset
4291
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4292 encode_header(s);
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4293 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
4294 encode_blocks(s, 1);
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4295 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
4296
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4297 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4298 Plane *p= &s->plane[plane_index];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4299 int w= p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4300 int h= p->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4301 int x, y;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
4302 // int bits= put_bits_count(&s->c.pb);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4303
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4304 if(!(avctx->flags2 & CODEC_FLAG2_MEMC_ONLY)){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4305 //FIXME optimize
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4306 if(pict->data[plane_index]) //FIXME gray hack
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4307 for(y=0; y<h; y++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4308 for(x=0; x<w; x++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4309 s->spatial_idwt_buffer[y*w + x]= pict->data[plane_index][y*pict->linesize[plane_index] + x]<<FRAC_BITS;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4310 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4311 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4312 predict_plane(s, s->spatial_idwt_buffer, plane_index, 0);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4313
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4314 if( plane_index==0
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6475
diff changeset
4315 && pict->pict_type == FF_P_TYPE
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4316 && !(avctx->flags&CODEC_FLAG_PASS2)
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4317 && s->m.me.scene_change_score > s->avctx->scenechange_threshold){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4318 ff_init_range_encoder(c, buf, buf_size);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4319 ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4320 pict->pict_type= FF_I_TYPE;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4321 s->keyframe=1;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4322 s->current_picture.key_frame=1;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4323 goto redo_frame;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4324 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4325
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4326 if(s->qlog == LOSSLESS_QLOG){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4327 for(y=0; y<h; y++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4328 for(x=0; x<w; x++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4329 s->spatial_dwt_buffer[y*w + x]= (s->spatial_idwt_buffer[y*w + x] + (1<<(FRAC_BITS-1))-1)>>FRAC_BITS;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4330 }
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4331 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4332 }else{
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4333 for(y=0; y<h; y++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4334 for(x=0; x<w; x++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4335 s->spatial_dwt_buffer[y*w + x]=s->spatial_idwt_buffer[y*w + x]<<ENCODER_EXTRA_BITS;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4336 }
5575
a6f5ed050335 use more bits on the encoder side
michael
parents: 5572
diff changeset
4337 }
a6f5ed050335 use more bits on the encoder side
michael
parents: 5572
diff changeset
4338 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4339
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4340 /* if(QUANTIZE2)
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4341 dwt_quantize(s, p, s->spatial_dwt_buffer, w, h, w, s->spatial_decomposition_type);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4342 else*/
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4343 ff_spatial_dwt(s->spatial_dwt_buffer, w, h, w, s->spatial_decomposition_type, s->spatial_decomposition_count);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4344
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4345 if(s->pass1_rc && plane_index==0){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4346 int delta_qlog = ratecontrol_1pass(s, pict);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4347 if (delta_qlog <= INT_MIN)
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4348 return -1;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4349 if(delta_qlog){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4350 //reordering qlog in the bitstream would eliminate this reset
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4351 ff_init_range_encoder(c, buf, buf_size);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4352 memcpy(s->header_state, rc_header_bak, sizeof(s->header_state));
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4353 memcpy(s->block_state, rc_block_bak, sizeof(s->block_state));
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4354 encode_header(s);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4355 encode_blocks(s, 0);
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4356 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4357 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4358
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4359 for(level=0; level<s->spatial_decomposition_count; level++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4360 for(orientation=level ? 1 : 0; orientation<4; orientation++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4361 SubBand *b= &p->band[level][orientation];
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4362
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4363 if(!QUANTIZE2)
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4364 quantize(s, b, b->ibuf, b->buf, b->stride, s->qbias);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4365 if(orientation==0)
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6475
diff changeset
4366 decorrelate(s, b, b->ibuf, b->stride, pict->pict_type == FF_P_TYPE, 0);
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4367 encode_subband(s, b, b->ibuf, b->parent ? b->parent->ibuf : NULL, b->stride, orientation);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4368 assert(b->parent==NULL || b->parent->stride == b->stride*2);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4369 if(orientation==0)
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4370 correlate(s, b, b->ibuf, b->stride, 1, 0);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4371 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4372 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4373
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4374 for(level=0; level<s->spatial_decomposition_count; level++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4375 for(orientation=level ? 1 : 0; orientation<4; orientation++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4376 SubBand *b= &p->band[level][orientation];
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4377
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4378 dequantize(s, b, b->ibuf, b->stride);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4379 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4380 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4381
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4382 ff_spatial_idwt(s->spatial_idwt_buffer, w, h, w, s->spatial_decomposition_type, s->spatial_decomposition_count);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4383 if(s->qlog == LOSSLESS_QLOG){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4384 for(y=0; y<h; y++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4385 for(x=0; x<w; x++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4386 s->spatial_idwt_buffer[y*w + x]<<=FRAC_BITS;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4387 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4388 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4389 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4390 predict_plane(s, s->spatial_idwt_buffer, plane_index, 1);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4391 }else{
3338
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4392 //ME/MC only
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6475
diff changeset
4393 if(pict->pict_type == FF_I_TYPE){
3338
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4394 for(y=0; y<h; y++){
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4395 for(x=0; x<w; x++){
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4396 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
4397 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
4398 }
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4399 }
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4400 }else{
5587
3ae03eacbe9f use 16bit IDWT (a SIMD implementation of it should be >2x faster then with
michael
parents: 5575
diff changeset
4401 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
4402 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
4403 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4404 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4405 if(s->avctx->flags&CODEC_FLAG_PSNR){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4406 int64_t error= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4407
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4408 if(pict->data[plane_index]) //FIXME gray hack
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4409 for(y=0; y<h; y++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4410 for(x=0; x<w; x++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4411 int d= s->current_picture.data[plane_index][y*s->current_picture.linesize[plane_index] + x] - pict->data[plane_index][y*pict->linesize[plane_index] + x];
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4412 error += d*d;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4413 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4414 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4415 s->avctx->error[plane_index] += error;
2232
960e3552e418 per picture psnr
michael
parents: 2224
diff changeset
4416 s->current_picture.error[plane_index] = error;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4417 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4418
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4419 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4420
6144
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
4421 update_last_header_values(s);
f0efd4254164 Remove green clouds.
michael
parents: 5989
diff changeset
4422
9374
c3a8ca9d0477 Factorize release_buffer()
michael
parents: 9373
diff changeset
4423 release_buffer(avctx);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4424
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4425 s->current_picture.coded_picture_number = avctx->frame_number;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4426 s->current_picture.pict_type = pict->pict_type;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4427 s->current_picture.quality = pict->quality;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4428 s->m.frame_bits = 8*(s->c.bytestream - s->c.bytestream_start);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4429 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
4430 s->m.current_picture.display_picture_number =
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4431 s->m.current_picture.coded_picture_number = avctx->frame_number;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4432 s->m.current_picture.quality = pict->quality;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4433 s->m.total_bits += 8*(s->c.bytestream - s->c.bytestream_start);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4434 if(s->pass1_rc)
3766
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4435 if (ff_rate_estimate_qscale(&s->m, 0) < 0)
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4436 return -1;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4437 if(avctx->flags&CODEC_FLAG_PASS1)
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4438 ff_write_pass1_stats(&s->m);
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4439 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
4440 avctx->frame_bits = s->m.frame_bits;
5c86acb39889 outputs bit spent on various encoding functions (motion vectors, overhead, etc)
gpoirier
parents: 4122
diff changeset
4441 avctx->mv_bits = s->m.mv_bits;
5c86acb39889 outputs bit spent on various encoding functions (motion vectors, overhead, etc)
gpoirier
parents: 4122
diff changeset
4442 avctx->misc_bits = s->m.misc_bits;
5c86acb39889 outputs bit spent on various encoding functions (motion vectors, overhead, etc)
gpoirier
parents: 4122
diff changeset
4443 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
4444
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4445 emms_c();
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4446
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4447 return ff_rac_terminate(c);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4448 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4449
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6481
diff changeset
4450 static av_cold void common_end(SnowContext *s){
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4451 int plane_index, level, orientation, i;
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4452
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4453 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
4454 av_freep(&s->spatial_idwt_buffer);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4455
8239
dcfdb3352dde Fix regression test failure with pthreads on multiprocessor systems.
michael
parents: 8214
diff changeset
4456 s->m.me.temp= NULL;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4457 av_freep(&s->m.me.scratchpad);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4458 av_freep(&s->m.me.map);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4459 av_freep(&s->m.me.score_map);
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
4460 av_freep(&s->m.obmc_scratchpad);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4461
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
4462 av_freep(&s->block);
8214
c5276ad92ff8 snow: move scratch buffer from stack to malloced buffer in context
mru
parents: 7622
diff changeset
4463 av_freep(&s->scratchbuf);
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4464
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4465 for(i=0; i<MAX_REF_FRAMES; i++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4466 av_freep(&s->ref_mvs[i]);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4467 av_freep(&s->ref_scores[i]);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4468 if(s->last_picture[i].data[0])
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4469 s->avctx->release_buffer(s->avctx, &s->last_picture[i]);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4470 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4471
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4472 for(plane_index=0; plane_index<3; plane_index++){
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4473 for(level=s->spatial_decomposition_count-1; level>=0; level--){
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4474 for(orientation=level ? 1 : 0; orientation<4; orientation++){
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4475 SubBand *b= &s->plane[plane_index].band[level][orientation];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4476
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4477 av_freep(&b->x_coeff);
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4478 }
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4479 }
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4480 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4481 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4482
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6481
diff changeset
4483 static av_cold int encode_end(AVCodecContext *avctx)
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4484 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4485 SnowContext *s = avctx->priv_data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4486
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4487 common_end(s);
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4488 av_free(avctx->stats_out);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4489
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4490 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4491 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4492
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6481
diff changeset
4493 static av_cold int decode_init(AVCodecContext *avctx)
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4494 {
2635
eaa57c3336fc PIX_FMT_NONE and related fixes
michael
parents: 2634
diff changeset
4495 avctx->pix_fmt= PIX_FMT_YUV420P;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4496
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4497 common_init(avctx);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4498
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4499 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4500 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4501
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9291
diff changeset
4502 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt){
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9291
diff changeset
4503 const uint8_t *buf = avpkt->data;
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9291
diff changeset
4504 int buf_size = avpkt->size;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4505 SnowContext *s = avctx->priv_data;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4506 RangeCoder * const c= &s->c;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4507 int bytes_read;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4508 AVFrame *picture = data;
9374
c3a8ca9d0477 Factorize release_buffer()
michael
parents: 9373
diff changeset
4509 int level, orientation, plane_index;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4510
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4511 ff_init_range_decoder(c, buf, buf_size);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4512 ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4513
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4514 s->current_picture.pict_type= FF_I_TYPE; //FIXME I vs. P
5668
52aae8c63b30 do not ignore return of decode_header()
michael
parents: 5667
diff changeset
4515 if(decode_header(s)<0)
52aae8c63b30 do not ignore return of decode_header()
michael
parents: 5667
diff changeset
4516 return -1;
5665
834f359e7257 perform init after reading the values needed for init
michael
parents: 5664
diff changeset
4517 common_init_after_header(avctx);
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
4518
5662
77297fe0311c allocate slice buffer after parsing the header containing needed parameters
michael
parents: 5661
diff changeset
4519 // realloc slice buffer for the case that spatial_decomposition_count changed
77297fe0311c allocate slice buffer after parsing the header containing needed parameters
michael
parents: 5661
diff changeset
4520 slice_buffer_destroy(&s->sb);
77297fe0311c allocate slice buffer after parsing the header containing needed parameters
michael
parents: 5661
diff changeset
4521 slice_buffer_init(&s->sb, s->plane[0].height, (MB_SIZE >> s->block_max_depth) + s->spatial_decomposition_count * 8 + 1, s->plane[0].width, s->spatial_idwt_buffer);
77297fe0311c allocate slice buffer after parsing the header containing needed parameters
michael
parents: 5661
diff changeset
4522
5651
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
4523 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
4524 Plane *p= &s->plane[plane_index];
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
4525 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
4526 && p->hcoeff[1]==-10
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
4527 && p->hcoeff[2]==2;
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
4528 }
ab023c9f03d0 store halfpel filter coefficients in the header as well as the
michael
parents: 5650
diff changeset
4529
9370
25fa07ef8e2b Make sure the block array is of the correct size.
michael
parents: 9369
diff changeset
4530 alloc_blocks(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4531
9372
9bb96825fc10 Skip non intra frames that have no reference frames.
michael
parents: 9371
diff changeset
4532 if(frame_start(s) < 0)
9bb96825fc10 Skip non intra frames that have no reference frames.
michael
parents: 9371
diff changeset
4533 return -1;
6412
1f70d64c00bc cosmetics: spelling/grammar
diego
parents: 6405
diff changeset
4534 //keyframe flag duplication mess FIXME
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4535 if(avctx->debug&FF_DEBUG_PICT_INFO)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4536 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
4537
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
4538 decode_blocks(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4539
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4540 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4541 Plane *p= &s->plane[plane_index];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4542 int w= p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4543 int h= p->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4544 int x, y;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4545 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
4546
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4547 if(s->avctx->debug&2048){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4548 memset(s->spatial_dwt_buffer, 0, sizeof(DWTELEM)*w*h);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4549 predict_plane(s, s->spatial_idwt_buffer, plane_index, 1);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4550
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4551 for(y=0; y<h; y++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4552 for(x=0; x<w; x++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4553 int v= s->current_picture.data[plane_index][y*s->current_picture.linesize[plane_index] + x];
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4554 s->mconly_picture.data[plane_index][y*s->mconly_picture.linesize[plane_index] + x]= v;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4555 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4556 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4557 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4558
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4559 {
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4560 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
4561 for(orientation=level ? 1 : 0; orientation<4; orientation++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4562 SubBand *b= &p->band[level][orientation];
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4563 unpack_coeffs(s, b, b->parent, orientation);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4564 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4565 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4566 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4567
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4568 {
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4569 const int mb_h= s->b_height << s->block_max_depth;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4570 const int block_size = MB_SIZE >> s->block_max_depth;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4571 const int block_w = plane_index ? block_size/2 : block_size;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4572 int mb_y;
8308
61cfb1dcfae5 More POSIX _t namespace cleanup.
michael
parents: 8239
diff changeset
4573 DWTCompose cs[MAX_DECOMPOSITIONS];
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4574 int yd=0, yq=0;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4575 int y;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4576 int end_y;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4577
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4578 ff_spatial_idwt_buffered_init(cs, &s->sb, w, h, 1, s->spatial_decomposition_type, s->spatial_decomposition_count);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4579 for(mb_y=0; mb_y<=mb_h; mb_y++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4580
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4581 int slice_starty = block_w*mb_y;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4582 int slice_h = block_w*(mb_y+1);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4583 if (!(s->keyframe || s->avctx->debug&512)){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4584 slice_starty = FFMAX(0, slice_starty - (block_w >> 1));
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4585 slice_h -= (block_w >> 1);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4586 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4587
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4588 for(level=0; level<s->spatial_decomposition_count; level++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4589 for(orientation=level ? 1 : 0; orientation<4; orientation++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4590 SubBand *b= &p->band[level][orientation];
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4591 int start_y;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4592 int end_y;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4593 int our_mb_start = mb_y;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4594 int our_mb_end = (mb_y + 1);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4595 const int extra= 3;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4596 start_y = (mb_y ? ((block_w * our_mb_start) >> (s->spatial_decomposition_count - level)) + s->spatial_decomposition_count - level + extra: 0);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4597 end_y = (((block_w * our_mb_end) >> (s->spatial_decomposition_count - level)) + s->spatial_decomposition_count - level + extra);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4598 if (!(s->keyframe || s->avctx->debug&512)){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4599 start_y = FFMAX(0, start_y - (block_w >> (1+s->spatial_decomposition_count - level)));
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4600 end_y = FFMAX(0, end_y - (block_w >> (1+s->spatial_decomposition_count - level)));
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4601 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4602 start_y = FFMIN(b->height, start_y);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4603 end_y = FFMIN(b->height, end_y);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4604
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4605 if (start_y != end_y){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4606 if (orientation == 0){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4607 SubBand * correlate_band = &p->band[0][0];
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4608 int correlate_end_y = FFMIN(b->height, end_y + 1);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4609 int correlate_start_y = FFMIN(b->height, (start_y ? start_y + 1 : 0));
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4610 decode_subband_slice_buffered(s, correlate_band, &s->sb, correlate_start_y, correlate_end_y, decode_state[0][0]);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4611 correlate_slice_buffered(s, &s->sb, correlate_band, correlate_band->ibuf, correlate_band->stride, 1, 0, correlate_start_y, correlate_end_y);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4612 dequantize_slice_buffered(s, &s->sb, correlate_band, correlate_band->ibuf, correlate_band->stride, start_y, end_y);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4613 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4614 else
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4615 decode_subband_slice_buffered(s, b, &s->sb, start_y, end_y, decode_state[level][orientation]);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4616 }
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4617 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4618 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4619
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4620 for(; yd<slice_h; yd+=4){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4621 ff_spatial_idwt_buffered_slice(&s->dsp, cs, &s->sb, w, h, 1, s->spatial_decomposition_type, s->spatial_decomposition_count, yd);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4622 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4623
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4624 if(s->qlog == LOSSLESS_QLOG){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4625 for(; yq<slice_h && yq<h; yq++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4626 IDWTELEM * line = slice_buffer_get_line(&s->sb, yq);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4627 for(x=0; x<w; x++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4628 line[x] <<= FRAC_BITS;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4629 }
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4630 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4631 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4632
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4633 predict_slice_buffered(s, &s->sb, s->spatial_idwt_buffer, plane_index, 1, mb_y);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4634
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4635 y = FFMIN(p->height, slice_starty);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4636 end_y = FFMIN(p->height, slice_h);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4637 while(y < end_y)
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4638 slice_buffer_release(&s->sb, y++);
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4639 }
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4640
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4641 slice_buffer_flush(&s->sb);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4642 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4643
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4644 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4645
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4646 emms_c();
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4647
9374
c3a8ca9d0477 Factorize release_buffer()
michael
parents: 9373
diff changeset
4648 release_buffer(avctx);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4649
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4650 if(!(s->avctx->debug&2048))
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4651 *picture= s->current_picture;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4652 else
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4653 *picture= s->mconly_picture;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4654
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4655 *data_size = sizeof(AVFrame);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4656
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4657 bytes_read= c->bytestream - c->bytestream_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4658 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
4659
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4660 return bytes_read;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4661 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4662
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6481
diff changeset
4663 static av_cold int decode_end(AVCodecContext *avctx)
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4664 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4665 SnowContext *s = avctx->priv_data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4666
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4667 slice_buffer_destroy(&s->sb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4668
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4669 common_end(s);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4670
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4671 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4672 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4673
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4674 AVCodec snow_decoder = {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4675 "snow",
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4676 CODEC_TYPE_VIDEO,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4677 CODEC_ID_SNOW,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4678 sizeof(SnowContext),
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4679 decode_init,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4680 NULL,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4681 decode_end,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4682 decode_frame,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4683 0 /*CODEC_CAP_DR1*/ /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
6712
5b3acf9fd50a Add long names to AVCodec declarations.
diego
parents: 6517
diff changeset
4684 NULL,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6712
diff changeset
4685 .long_name = NULL_IF_CONFIG_SMALL("Snow"),
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4686 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4687
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8308
diff changeset
4688 #if CONFIG_SNOW_ENCODER
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4689 AVCodec snow_encoder = {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4690 "snow",
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4691 CODEC_TYPE_VIDEO,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4692 CODEC_ID_SNOW,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4693 sizeof(SnowContext),
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4694 encode_init,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4695 encode_frame,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4696 encode_end,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6712
diff changeset
4697 .long_name = NULL_IF_CONFIG_SMALL("Snow"),
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4698 };
2408
a6e4da1c28ee Disable encoders patch by (Gianluigi Tiesi <mplayer netfarm it>)
michael
parents: 2368
diff changeset
4699 #endif
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4700
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4701
6164
ecaf5226e9b0 Consistently use TEST as the preprocessor condition to enable test code.
diego
parents: 6144
diff changeset
4702 #ifdef TEST
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4703 #undef malloc
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4704 #undef free
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4705 #undef printf
9199
ea0e5e9a520f Replace random() usage in test programs by av_lfg_*().
diego
parents: 9197
diff changeset
4706
ea0e5e9a520f Replace random() usage in test programs by av_lfg_*().
diego
parents: 9197
diff changeset
4707 #include "libavutil/lfg.h"
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4708
5934
bd5f4dc81fbe main() --> main(void)
diego
parents: 5925
diff changeset
4709 int main(void){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4710 int width=256;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4711 int height=256;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4712 int buffer[2][width*height];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4713 SnowContext s;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4714 int i;
9388
2313bf51945b cosmetics: Rename prn variable to prng (Pseudo Random Number Generator).
diego
parents: 9376
diff changeset
4715 AVLFG prng;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4716 s.spatial_decomposition_count=6;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4717 s.spatial_decomposition_type=1;
9199
ea0e5e9a520f Replace random() usage in test programs by av_lfg_*().
diego
parents: 9197
diff changeset
4718
9388
2313bf51945b cosmetics: Rename prn variable to prng (Pseudo Random Number Generator).
diego
parents: 9376
diff changeset
4719 av_lfg_init(&prng, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4720
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4721 printf("testing 5/3 DWT\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4722 for(i=0; i<width*height; i++)
9388
2313bf51945b cosmetics: Rename prn variable to prng (Pseudo Random Number Generator).
diego
parents: 9376
diff changeset
4723 buffer[0][i] = buffer[1][i] = av_lfg_get(&prng) % 54321 - 12345;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4724
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4725 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
4726 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
4727
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4728 for(i=0; i<width*height; i++)
9197
ce32a456ce9a Align test program output columns.
diego
parents: 8627
diff changeset
4729 if(buffer[0][i]!= buffer[1][i]) printf("fsck: %6d %12d %7d\n",i, buffer[0][i], buffer[1][i]);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4730
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4731 printf("testing 9/7 DWT\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4732 s.spatial_decomposition_type=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4733 for(i=0; i<width*height; i++)
9388
2313bf51945b cosmetics: Rename prn variable to prng (Pseudo Random Number Generator).
diego
parents: 9376
diff changeset
4734 buffer[0][i] = buffer[1][i] = av_lfg_get(&prng) % 54321 - 12345;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4735
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4736 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
4737 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
4738
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4739 for(i=0; i<width*height; i++)
9197
ce32a456ce9a Align test program output columns.
diego
parents: 8627
diff changeset
4740 if(FFABS(buffer[0][i] - buffer[1][i])>20) printf("fsck: %6d %12d %7d\n",i, buffer[0][i], buffer[1][i]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4741
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4742 #if 0
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4743 printf("testing AC coder\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4744 memset(s.header_state, 0, sizeof(s.header_state));
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4745 ff_init_range_encoder(&s.c, buffer[0], 256*256);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4746 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
4747
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4748 for(i=-256; i<256; i++){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
4749 put_symbol(&s.c, s.header_state, i*i*i/3*FFABS(i), 1);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4750 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4751 ff_rac_terminate(&s.c);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4752
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4753 memset(s.header_state, 0, sizeof(s.header_state));
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4754 ff_init_range_decoder(&s.c, buffer[0], 256*256);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4755 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
4756
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4757 for(i=-256; i<256; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4758 int j;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4759 j= get_symbol(&s.c, s.header_state, 1);
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
4760 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
4761 }
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4762 #endif
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4763 {
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4764 int level, orientation, x, y;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4765 int64_t errors[8][4];
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4766 int64_t g=0;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4767
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4768 memset(errors, 0, sizeof(errors));
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4769 s.spatial_decomposition_count=3;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4770 s.spatial_decomposition_type=0;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4771 for(level=0; level<s.spatial_decomposition_count; level++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4772 for(orientation=level ? 1 : 0; orientation<4; orientation++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4773 int w= width >> (s.spatial_decomposition_count-level);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4774 int h= height >> (s.spatial_decomposition_count-level);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4775 int stride= width << (s.spatial_decomposition_count-level);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4776 DWTELEM *buf= buffer[0];
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4777 int64_t error=0;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4778
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4779 if(orientation&1) buf+=w;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4780 if(orientation>1) buf+=stride>>1;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4781
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4782 memset(buffer[0], 0, sizeof(int)*width*height);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4783 buf[w/2 + h/2*stride]= 256*256;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4784 ff_spatial_idwt(buffer[0], width, height, width, s.spatial_decomposition_type, s.spatial_decomposition_count);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4785 for(y=0; y<height; y++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4786 for(x=0; x<width; x++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4787 int64_t d= buffer[0][x + y*width];
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4788 error += d*d;
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4789 if(FFABS(width/2-x)<9 && FFABS(height/2-y)<9 && level==2) printf("%8"PRId64" ", d);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4790 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4791 if(FFABS(height/2-y)<9 && level==2) printf("\n");
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4792 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4793 error= (int)(sqrt(error)+0.5);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4794 errors[level][orientation]= error;
8611
a637db9f59b1 export gcd function as av_gcd()
aurel
parents: 8590
diff changeset
4795 if(g) g=av_gcd(g, error);
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4796 else g= error;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4797 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4798 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4799 printf("static int const visual_weight[][4]={\n");
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4800 for(level=0; level<s.spatial_decomposition_count; level++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4801 printf(" {");
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4802 for(orientation=0; orientation<4; orientation++){
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4803 printf("%8"PRId64",", errors[level][orientation]/g);
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4804 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4805 printf("},\n");
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4806 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4807 printf("};\n");
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4808 {
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4809 int level=2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4810 int w= width >> (s.spatial_decomposition_count-level);
6168
27f4e3175dac Remove unused variables in test code.
diego
parents: 6164
diff changeset
4811 //int h= height >> (s.spatial_decomposition_count-level);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4812 int stride= width << (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4813 DWTELEM *buf= buffer[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4814 int64_t error=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4815
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4816 buf+=w;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4817 buf+=stride>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4818
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4819 memset(buffer[0], 0, sizeof(int)*width*height);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4820 #if 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4821 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4822 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4823 int tab[4]={0,2,3,1};
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4824 buffer[0][x+width*y]= 256*256*tab[(x&1) + 2*(y&1)];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4825 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4826 }
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4827 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
4828 #else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4829 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4830 for(x=0; x<w; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4831 buf[x + y*stride ]=169;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4832 buf[x + y*stride-w]=64;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4833 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4834 }
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4835 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
4836 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4837 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4838 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4839 int64_t d= buffer[0][x + y*width];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4840 error += d*d;
4122
daae66c03857 Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 4011
diff changeset
4841 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
4842 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
4843 if(FFABS(height/2-y)<9) printf("\n");
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4844 }
6414
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4845 }
f2d49842ea63 cosmetics: Demplayerify indentation.
diego
parents: 6413
diff changeset
4846
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4847 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4848 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4849 }
6164
ecaf5226e9b0 Consistently use TEST as the preprocessor condition to enable test code.
diego
parents: 6144
diff changeset
4850 #endif /* TEST */