annotate snow.c @ 4362:0271b214458b libavcodec

harden h264 decoding to prevent some crashes when input data is corrupted. Patch by Frank %eucloid A gmail P com% date: Jan 18, 2007 6:48 PM subject: Re: [Ffmpeg-devel] h264, protection against corrupted data (second try patch) AND date: Jan 17, 2007 8:22 PM subject: [Ffmpeg-devel] h264, protection against corrupted data this also fixes a possible security issue (the sps and pps ids where not checked, then used as index into an array of sps/pps structs which was then filled with data from the bitstream)
author gpoirier
date Fri, 19 Jan 2007 09:37:04 +0000
parents 5f887a3c7281
children 15688bdfe1b5
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 "common.h"
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
23 #include "dsputil.h"
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
24 #include "snow.h"
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
25
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
26 #include "rangecoder.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]={
1ac13c350369 my experimental wavelet codec
michael
parents:
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,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
181 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
182 0, 0, 0, 1, 1, 1, 1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
183 0, 0, 1, 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 7, 8, 8, 8, 8, 7, 7, 6, 6, 5, 4, 4, 3, 2, 2, 1, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
184 0, 0, 1, 2, 2, 3, 4, 6, 7, 8, 9,10,11,12,12,12,12,12,12,11,10, 9, 8, 7, 6, 4, 3, 2, 2, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
185 0, 1, 1, 2, 3, 5, 6, 8,10,11,13,14,15,16,17,18,18,17,16,15,14,13,11,10, 8, 6, 5, 3, 2, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
186 0, 1, 1, 3, 4, 6, 8,10,13,15,17,19,20,22,22,23,23,22,22,20,19,17,15,13,10, 8, 6, 4, 3, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
187 0, 1, 2, 4, 6, 8,10,13,16,19,21,23,25,27,28,29,29,28,27,25,23,21,19,16,13,10, 8, 6, 4, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
188 0, 1, 2, 4, 7,10,13,16,19,22,25,28,31,33,34,35,35,34,33,31,28,25,22,19,16,13,10, 7, 4, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
189 0, 1, 3, 5, 8,11,15,19,22,26,30,33,36,38,40,41,41,40,38,36,33,30,26,22,19,15,11, 8, 5, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
190 0, 1, 3, 6, 9,12,17,21,25,30,34,38,41,44,45,46,46,45,44,41,38,34,30,25,21,17,12, 9, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
191 0, 1, 3, 6,10,14,19,23,28,33,38,42,45,48,51,52,52,51,48,45,42,38,33,28,23,19,14,10, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
192 0, 1, 4, 7,11,15,20,25,31,36,41,45,49,52,55,56,56,55,52,49,45,41,36,31,25,20,15,11, 7, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
193 0, 2, 4, 7,12,16,22,27,33,38,44,48,52,56,58,60,60,58,56,52,48,44,38,33,27,22,16,12, 7, 4, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
194 0, 1, 4, 8,12,17,22,28,34,40,45,51,55,58,61,62,62,61,58,55,51,45,40,34,28,22,17,12, 8, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
195 0, 2, 4, 8,12,18,23,29,35,41,46,52,56,60,62,64,64,62,60,56,52,46,41,35,29,23,18,12, 8, 4, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
196 0, 2, 4, 8,12,18,23,29,35,41,46,52,56,60,62,64,64,62,60,56,52,46,41,35,29,23,18,12, 8, 4, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
197 0, 1, 4, 8,12,17,22,28,34,40,45,51,55,58,61,62,62,61,58,55,51,45,40,34,28,22,17,12, 8, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
198 0, 2, 4, 7,12,16,22,27,33,38,44,48,52,56,58,60,60,58,56,52,48,44,38,33,27,22,16,12, 7, 4, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
199 0, 1, 4, 7,11,15,20,25,31,36,41,45,49,52,55,56,56,55,52,49,45,41,36,31,25,20,15,11, 7, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
200 0, 1, 3, 6,10,14,19,23,28,33,38,42,45,48,51,52,52,51,48,45,42,38,33,28,23,19,14,10, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
201 0, 1, 3, 6, 9,12,17,21,25,30,34,38,41,44,45,46,46,45,44,41,38,34,30,25,21,17,12, 9, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
202 0, 1, 3, 5, 8,11,15,19,22,26,30,33,36,38,40,41,41,40,38,36,33,30,26,22,19,15,11, 8, 5, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
203 0, 1, 2, 4, 7,10,13,16,19,22,25,28,31,33,34,35,35,34,33,31,28,25,22,19,16,13,10, 7, 4, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
204 0, 1, 2, 4, 6, 8,10,13,16,19,21,23,25,27,28,29,29,28,27,25,23,21,19,16,13,10, 8, 6, 4, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
205 0, 1, 1, 3, 4, 6, 8,10,13,15,17,19,20,22,22,23,23,22,22,20,19,17,15,13,10, 8, 6, 4, 3, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
206 0, 1, 1, 2, 3, 5, 6, 8,10,11,13,14,15,16,17,18,18,17,16,15,14,13,11,10, 8, 6, 5, 3, 2, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
207 0, 0, 1, 2, 2, 3, 4, 6, 7, 8, 9,10,11,12,12,12,12,12,12,11,10, 9, 8, 7, 6, 4, 3, 2, 2, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
208 0, 0, 1, 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 7, 8, 8, 8, 8, 7, 7, 6, 6, 5, 4, 4, 3, 2, 2, 1, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
209 0, 0, 0, 1, 1, 1, 1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
210 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
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,
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]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
215 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
216 0, 1, 1, 2, 4, 5, 5, 6, 6, 5, 5, 4, 2, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
217 0, 1, 4, 6, 9,11,13,15,15,13,11, 9, 6, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
218 0, 2, 6,11,15,20,24,26,26,24,20,15,11, 6, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
219 0, 4, 9,15,23,29,34,38,38,34,29,23,15, 9, 4, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
220 0, 5,11,20,29,38,45,49,49,45,38,29,20,11, 5, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
221 1, 5,13,24,34,45,53,57,57,53,45,34,24,13, 5, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
222 1, 6,15,26,38,49,57,62,62,57,49,38,26,15, 6, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
223 1, 6,15,26,38,49,57,62,62,57,49,38,26,15, 6, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
224 1, 5,13,24,34,45,53,57,57,53,45,34,24,13, 5, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
225 0, 5,11,20,29,38,45,49,49,45,38,29,20,11, 5, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
226 0, 4, 9,15,23,29,34,38,38,34,29,23,15, 9, 4, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
227 0, 2, 6,11,15,20,24,26,26,24,20,15,11, 6, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
228 0, 1, 4, 6, 9,11,13,15,15,13,11, 9, 6, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
229 0, 1, 1, 2, 4, 5, 5, 6, 6, 5, 5, 4, 2, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
230 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
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]={
1ac13c350369 my experimental wavelet codec
michael
parents:
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,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
291 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
292 0, 0, 0, 1, 1, 1, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
293 0, 0, 1, 1, 1, 2, 2, 3, 4, 5, 5, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 5, 5, 4, 3, 2, 2, 1, 1, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
294 0, 0, 1, 1, 2, 3, 4, 5, 6, 7, 9,10,11,11,12,12,12,12,11,11,10, 9, 7, 6, 5, 4, 3, 2, 1, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
295 0, 0, 1, 2, 3, 5, 6, 8, 9,11,12,14,15,16,17,17,17,17,16,15,14,12,11, 9, 8, 6, 5, 3, 2, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
296 0, 1, 1, 2, 4, 6, 8,10,12,15,17,19,20,21,22,23,23,22,21,20,19,17,15,12,10, 8, 6, 4, 2, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
297 0, 1, 2, 3, 5, 8,10,13,16,19,21,24,26,27,28,29,29,28,27,26,24,21,19,16,13,10, 8, 5, 3, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
298 0, 1, 2, 4, 6, 9,12,16,19,23,26,29,31,33,34,35,35,34,33,31,29,26,23,19,16,12, 9, 6, 4, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
299 0, 1, 3, 5, 7,11,15,19,23,26,30,34,37,39,40,41,41,40,39,37,34,30,26,23,19,15,11, 7, 5, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
300 0, 1, 3, 5, 9,12,17,21,26,30,35,38,42,44,46,47,47,46,44,42,38,35,30,26,21,17,12, 9, 5, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
301 0, 1, 3, 6, 9,14,19,24,29,34,38,43,46,49,51,52,52,51,49,46,43,38,34,29,24,19,14, 9, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
302 0, 1, 3, 6,11,15,20,26,31,37,42,46,50,53,56,57,57,56,53,50,46,42,37,31,26,20,15,11, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
303 0, 1, 3, 7,11,16,21,27,33,39,44,49,53,57,59,60,60,59,57,53,49,44,39,33,27,21,16,11, 7, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
304 0, 1, 4, 7,12,17,22,28,34,40,46,51,56,59,61,63,63,61,59,56,51,46,40,34,28,22,17,12, 7, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
305 0, 1, 4, 7,12,17,23,29,35,41,47,52,57,60,63,64,64,63,60,57,52,47,41,35,29,23,17,12, 7, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
306 0, 1, 4, 7,12,17,23,29,35,41,47,52,57,60,63,64,64,63,60,57,52,47,41,35,29,23,17,12, 7, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
307 0, 1, 4, 7,12,17,22,28,34,40,46,51,56,59,61,63,63,61,59,56,51,46,40,34,28,22,17,12, 7, 4, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
308 0, 1, 3, 7,11,16,21,27,33,39,44,49,53,57,59,60,60,59,57,53,49,44,39,33,27,21,16,11, 7, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
309 0, 1, 3, 6,11,15,20,26,31,37,42,46,50,53,56,57,57,56,53,50,46,42,37,31,26,20,15,11, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
310 0, 1, 3, 6, 9,14,19,24,29,34,38,43,46,49,51,52,52,51,49,46,43,38,34,29,24,19,14, 9, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
311 0, 1, 3, 5, 9,12,17,21,26,30,35,38,42,44,46,47,47,46,44,42,38,35,30,26,21,17,12, 9, 5, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
312 0, 1, 3, 5, 7,11,15,19,23,26,30,34,37,39,40,41,41,40,39,37,34,30,26,23,19,15,11, 7, 5, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
313 0, 1, 2, 4, 6, 9,12,16,19,23,26,29,31,33,34,35,35,34,33,31,29,26,23,19,16,12, 9, 6, 4, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
314 0, 1, 2, 3, 5, 8,10,13,16,19,21,24,26,27,28,29,29,28,27,26,24,21,19,16,13,10, 8, 5, 3, 2, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
315 0, 1, 1, 2, 4, 6, 8,10,12,15,17,19,20,21,22,23,23,22,21,20,19,17,15,12,10, 8, 6, 4, 2, 1, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
316 0, 0, 1, 2, 3, 5, 6, 8, 9,11,12,14,15,16,17,17,17,17,16,15,14,12,11, 9, 8, 6, 5, 3, 2, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
317 0, 0, 1, 1, 2, 3, 4, 5, 6, 7, 9,10,11,11,12,12,12,12,11,11,10, 9, 7, 6, 5, 4, 3, 2, 1, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
318 0, 0, 1, 1, 1, 2, 2, 3, 4, 5, 5, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 5, 5, 4, 3, 2, 2, 1, 1, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
319 0, 0, 0, 1, 1, 1, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
320 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
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,
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]={
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
325 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
326 0, 0, 1, 2, 3, 4, 5, 5, 5, 5, 4, 3, 2, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
327 0, 1, 3, 6, 8,11,13,14,14,13,11, 8, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
328 0, 2, 6,10,15,20,24,26,26,24,20,15,10, 6, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
329 0, 3, 8,16,23,30,35,38,38,35,30,23,16, 8, 3, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
330 1, 4,11,20,30,39,46,49,49,46,39,30,20,11, 4, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
331 1, 5,13,24,35,46,54,58,58,54,46,35,24,13, 5, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
332 0, 5,14,26,38,49,58,63,63,58,49,38,26,14, 5, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
333 0, 5,14,26,38,49,58,63,63,58,49,38,26,14, 5, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
334 1, 5,13,24,35,46,54,58,58,54,46,35,24,13, 5, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
335 1, 4,11,20,30,39,46,49,49,46,39,30,20,11, 4, 1,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
336 0, 3, 8,16,23,30,35,38,38,35,30,23,16, 8, 3, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
337 0, 2, 6,10,15,20,24,26,26,24,20,15,10, 6, 2, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
338 0, 1, 3, 6, 8,11,13,14,14,13,11, 8, 6, 3, 1, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
339 0, 0, 1, 2, 3, 4, 5, 5, 5, 5, 4, 3, 2, 1, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
340 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
341 //error:0.000022
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
342 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
343 #endif
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
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
367 static const uint8_t *obmc_tab[4]={
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
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)
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
397
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
398 typedef struct x_and_coeff{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
399 int16_t x;
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
400 uint16_t coeff;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
401 } x_and_coeff;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
402
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
403 typedef struct SubBand{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
404 int level;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
405 int stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
406 int width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
407 int height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
408 int qlog; ///< log(qscale)/log[2^(1/6)]
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
409 DWTELEM *buf;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
410 int buf_x_offset;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
411 int buf_y_offset;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
412 int stride_line; ///< Stride measured in lines, not pixels.
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
413 x_and_coeff * x_coeff;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
414 struct SubBand *parent;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
415 uint8_t state[/*7*2*/ 7 + 512][32];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
416 }SubBand;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
417
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
418 typedef struct Plane{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
419 int width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
420 int height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
421 SubBand band[MAX_DECOMPOSITIONS][4];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
422 }Plane;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
423
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
424 typedef struct SnowContext{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
425 // MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to make the motion estimation eventually independant of MpegEncContext, so this will be removed then (FIXME/XXX)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
426
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
427 AVCodecContext *avctx;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
428 RangeCoder c;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
429 DSPContext dsp;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
430 AVFrame new_picture;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
431 AVFrame input_picture; ///< new_picture with the internal linesizes
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
432 AVFrame current_picture;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
433 AVFrame last_picture[MAX_REF_FRAMES];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
434 AVFrame mconly_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
435 // uint8_t q_context[16];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
436 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
437 uint8_t block_state[128 + 32*128];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
438 int keyframe;
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
439 int always_reset;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
440 int version;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
441 int spatial_decomposition_type;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
442 int last_spatial_decomposition_type;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
443 int temporal_decomposition_type;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
444 int spatial_decomposition_count;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
445 int temporal_decomposition_count;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
446 int max_ref_frames;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
447 int ref_frames;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
448 int16_t (*ref_mvs[MAX_REF_FRAMES])[2];
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
449 uint32_t *ref_scores[MAX_REF_FRAMES];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
450 DWTELEM *spatial_dwt_buffer;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
451 int colorspace_type;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
452 int chroma_h_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
453 int chroma_v_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
454 int spatial_scalability;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
455 int qlog;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
456 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
457 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
458 int lambda2;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
459 int pass1_rc;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
460 int mv_scale;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
461 int last_mv_scale;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
462 int qbias;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
463 int last_qbias;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
464 #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
465 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
466 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
467 int block_max_depth;
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
468 int last_block_max_depth;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
469 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
470 BlockNode *block;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
471 #define ME_CACHE_SIZE 1024
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
472 int me_cache[ME_CACHE_SIZE];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
473 int me_cache_generation;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
474 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
475
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
476 MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to make the motion estimation eventually independant of MpegEncContext, so this will be removed then (FIXME/XXX)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
477 }SnowContext;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
478
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
479 typedef struct {
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
480 DWTELEM *b0;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
481 DWTELEM *b1;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
482 DWTELEM *b2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
483 DWTELEM *b3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
484 int y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
485 } dwt_compose_t;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
486
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
487 #define slice_buffer_get_line(slice_buf, line_num) ((slice_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
488 //#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
489
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
490 static void iterative_me(SnowContext *s);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
491
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
492 static void slice_buffer_init(slice_buffer * buf, int line_count, int max_allocated_lines, int line_width, DWTELEM * base_buffer)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
493 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
494 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
495
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
496 buf->base_buffer = base_buffer;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
497 buf->line_count = line_count;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
498 buf->line_width = line_width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
499 buf->data_count = max_allocated_lines;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
500 buf->line = (DWTELEM * *) av_mallocz (sizeof(DWTELEM *) * line_count);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
501 buf->data_stack = (DWTELEM * *) av_malloc (sizeof(DWTELEM *) * max_allocated_lines);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
502
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
503 for (i = 0; i < max_allocated_lines; i++)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
504 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
505 buf->data_stack[i] = (DWTELEM *) av_malloc (sizeof(DWTELEM) * line_width);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
506 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
507
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
508 buf->data_stack_top = max_allocated_lines - 1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
509 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
510
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
511 static DWTELEM * slice_buffer_load_line(slice_buffer * buf, int line)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
512 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
513 int offset;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
514 DWTELEM * buffer;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
515
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
516 // av_log(NULL, AV_LOG_DEBUG, "Cache hit: %d\n", line);
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
517
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
518 assert(buf->data_stack_top >= 0);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
519 // assert(!buf->line[line]);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
520 if (buf->line[line])
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
521 return buf->line[line];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
522
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
523 offset = buf->line_width * line;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
524 buffer = buf->data_stack[buf->data_stack_top];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
525 buf->data_stack_top--;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
526 buf->line[line] = buffer;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
527
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
528 // av_log(NULL, AV_LOG_DEBUG, "slice_buffer_load_line: line: %d remaining: %d\n", line, buf->data_stack_top + 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
529
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
530 return buffer;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
531 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
532
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
533 static void slice_buffer_release(slice_buffer * buf, int line)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
534 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
535 int offset;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
536 DWTELEM * buffer;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
537
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
538 assert(line >= 0 && line < buf->line_count);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
539 assert(buf->line[line]);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
540
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
541 offset = buf->line_width * line;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
542 buffer = buf->line[line];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
543 buf->data_stack_top++;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
544 buf->data_stack[buf->data_stack_top] = buffer;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
545 buf->line[line] = NULL;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
546
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
547 // av_log(NULL, AV_LOG_DEBUG, "slice_buffer_release: line: %d remaining: %d\n", line, buf->data_stack_top + 1);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
548 }
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 static void slice_buffer_flush(slice_buffer * buf)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
551 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
552 int i;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
553 for (i = 0; i < buf->line_count; i++)
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 if (buf->line[i])
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
556 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
557 // av_log(NULL, AV_LOG_DEBUG, "slice_buffer_flush: line: %d \n", i);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
558 slice_buffer_release(buf, i);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
559 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
560 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
561 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
562
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
563 static void slice_buffer_destroy(slice_buffer * buf)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
564 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
565 int i;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
566 slice_buffer_flush(buf);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
567
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
568 for (i = buf->data_count - 1; i >= 0; i--)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
569 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
570 assert(buf->data_stack[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 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
573 assert(buf->data_stack);
3190
e9fa3ac61966 av_free -> av_freep
michael
parents: 3189
diff changeset
574 av_freep(&buf->data_stack);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
575 assert(buf->line);
3190
e9fa3ac61966 av_free -> av_freep
michael
parents: 3189
diff changeset
576 av_freep(&buf->line);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
577 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
578
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2975
diff changeset
579 #ifdef __sgi
2368
a7ac68734a91 fix for build on IRIX by (Michel Bardiaux {mbardiaux peaktime be})
michael
parents: 2335
diff changeset
580 // Avoid a name clash on SGI IRIX
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2975
diff changeset
581 #undef qexp
2368
a7ac68734a91 fix for build on IRIX by (Michel Bardiaux {mbardiaux peaktime be})
michael
parents: 2335
diff changeset
582 #endif
2246
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
583 #define QEXPSHIFT (7-FRAC_BITS+8) //FIXME try to change this to 0
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
584 static uint8_t qexp[QROOT];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
585
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
586 static inline int mirror(int v, int m){
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
587 while((unsigned)v > (unsigned)m){
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
588 v=-v;
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
589 if(v<0) v+= 2*m;
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
590 }
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
591 return v;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
592 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
593
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
594 static inline void put_symbol(RangeCoder *c, uint8_t *state, int v, int is_signed){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
595 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
596
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
597 if(v){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
598 const int a= FFABS(v);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
599 const int e= av_log2(a);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
600 #if 1
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
601 const int el= FFMIN(e, 10);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
602 put_rac(c, state+0, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
603
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
604 for(i=0; i<el; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
605 put_rac(c, state+1+i, 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
606 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
607 for(; i<e; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
608 put_rac(c, state+1+9, 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
609 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
610 put_rac(c, state+1+FFMIN(i,9), 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
611
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
612 for(i=e-1; i>=el; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
613 put_rac(c, state+22+9, (a>>i)&1); //22..31
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
614 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
615 for(; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
616 put_rac(c, state+22+i, (a>>i)&1); //22..31
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
617 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
618
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
619 if(is_signed)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
620 put_rac(c, state+11 + el, v < 0); //11..21
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
621 #else
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
622
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
623 put_rac(c, state+0, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
624 if(e<=9){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
625 for(i=0; i<e; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
626 put_rac(c, state+1+i, 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
627 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
628 put_rac(c, state+1+i, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
629
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
630 for(i=e-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
631 put_rac(c, state+22+i, (a>>i)&1); //22..31
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
632 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
633
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
634 if(is_signed)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
635 put_rac(c, state+11 + e, v < 0); //11..21
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
636 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
637 for(i=0; i<e; i++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
638 put_rac(c, state+1+FFMIN(i,9), 1); //1..10
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
639 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
640 put_rac(c, state+1+FFMIN(i,9), 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
641
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
642 for(i=e-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
643 put_rac(c, state+22+FFMIN(i,9), (a>>i)&1); //22..31
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
644 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
645
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
646 if(is_signed)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
647 put_rac(c, state+11 + FFMIN(e,10), v < 0); //11..21
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
648 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
649 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
650 }else{
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
651 put_rac(c, state+0, 1);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
652 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
653 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
654
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
655 static inline int get_symbol(RangeCoder *c, uint8_t *state, int is_signed){
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
656 if(get_rac(c, state+0))
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
657 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
658 else{
2240
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
659 int i, e, a;
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
660 e= 0;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
661 while(get_rac(c, state+1 + FFMIN(e,9))){ //1..10
2240
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
662 e++;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
663 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
664
2240
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
665 a= 1;
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
666 for(i=e-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
667 a += a + get_rac(c, state+22 + FFMIN(i,9)); //22..31
2240
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
668 }
c46fed9b7575 simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2232
diff changeset
669
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
670 if(is_signed && get_rac(c, state+11 + FFMIN(e,10))) //11..21
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
671 return -a;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
672 else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
673 return a;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
674 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
675 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
676
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
677 static inline void put_symbol2(RangeCoder *c, uint8_t *state, int v, int log2){
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
678 int i;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
679 int r= log2>=0 ? 1<<log2 : 1;
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
680
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
681 assert(v>=0);
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
682 assert(log2>=-4);
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
683
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
684 while(v >= r){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
685 put_rac(c, state+4+log2, 1);
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
686 v -= r;
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
687 log2++;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
688 if(log2>0) r+=r;
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
689 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
690 put_rac(c, state+4+log2, 0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
691
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
692 for(i=log2-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
693 put_rac(c, state+31-i, (v>>i)&1);
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
694 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
695 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
696
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
697 static inline int get_symbol2(RangeCoder *c, uint8_t *state, int log2){
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
698 int i;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
699 int r= log2>=0 ? 1<<log2 : 1;
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
700 int v=0;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
701
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
702 assert(log2>=-4);
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
703
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
704 while(get_rac(c, state+4+log2)){
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
705 v+= r;
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
706 log2++;
2159
7f42295c1517 improved magnitude coding, 0.2% lower bitrate (foreman@352x288 qscale 1 and 8)
michael
parents: 2156
diff changeset
707 if(log2>0) r+=r;
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
708 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
709
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
710 for(i=log2-1; i>=0; i--){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
711 v+= get_rac(c, state+31-i)<<i;
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
712 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
713
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
714 return v;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
715 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
716
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
717 static av_always_inline void lift(DWTELEM *dst, DWTELEM *src, DWTELEM *ref, int dst_step, int src_step, int ref_step, int width, int mul, int add, int shift, int highpass, int inverse){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
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++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
731 dst[i*dst_step] = LIFT(src[i*src_step], ((mul*(ref[i*ref_step] + ref[(i+1)*ref_step])+add)>>shift), inverse);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
732 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
733
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
734 if(mirror_right){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
735 dst[w*dst_step] = LIFT(src[w*src_step], ((mul*2*ref[w*ref_step]+add)>>shift), inverse);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
736 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
737 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
738
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
739 #ifndef lift5
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
740 static av_always_inline void lift5(DWTELEM *dst, DWTELEM *src, DWTELEM *ref, int dst_step, int src_step, int ref_step, int width, int mul, int add, int shift, int highpass, int inverse){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
741 const int mirror_left= !highpass;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
742 const int mirror_right= (width&1) ^ highpass;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
743 const int w= (width>>1) - 1 + (highpass & width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
744 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
745
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
746 if(mirror_left){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
747 int r= 3*2*ref[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
748 r += r>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
749 r += r>>8;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
750 dst[0] = LIFT(src[0], ((r+add)>>shift), inverse);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
751 dst += dst_step;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
752 src += src_step;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
753 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
754
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
755 for(i=0; i<w; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
756 int r= 3*(ref[i*ref_step] + ref[(i+1)*ref_step]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
757 r += r>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
758 r += r>>8;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
759 dst[i*dst_step] = LIFT(src[i*src_step], ((r+add)>>shift), inverse);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
760 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
761
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
762 if(mirror_right){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
763 int r= 3*2*ref[w*ref_step];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
764 r += r>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
765 r += r>>8;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
766 dst[w*dst_step] = LIFT(src[w*src_step], ((r+add)>>shift), inverse);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
767 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
768 }
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
769 #endif
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
770
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
771 #ifndef liftS
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
772 static av_always_inline void liftS(DWTELEM *dst, DWTELEM *src, DWTELEM *ref, int dst_step, int src_step, int ref_step, int width, int mul, int add, int shift, int highpass, int inverse){
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
773 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
774 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
775 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
776 int i;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
777
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
778 assert(shift == 4);
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
779 #define LIFTS(src, ref, inv) ((inv) ? (src) - (((ref) - 4*(src))>>shift): (16*4*(src) + 4*(ref) + 8 + (5<<27))/(5*16) - (1<<23))
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
780 if(mirror_left){
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
781 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
782 dst += dst_step;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
783 src += src_step;
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
784 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
785
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
786 for(i=0; i<w; i++){
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
787 dst[i*dst_step] = LIFTS(src[i*src_step], mul*(ref[i*ref_step] + ref[(i+1)*ref_step])+add, inverse);
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
788 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
789
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
790 if(mirror_right){
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
791 dst[w*dst_step] = LIFTS(src[w*src_step], mul*2*ref[w*ref_step]+add, inverse);
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
792 }
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
793 }
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
794 #endif
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
795
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
796
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
797 static void inplace_lift(DWTELEM *dst, int width, int *coeffs, int n, int shift, int start, int inverse){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
798 int x, i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
799
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
800 for(x=start; x<width; x+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
801 int64_t sum=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
802
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
803 for(i=0; i<n; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
804 int x2= x + 2*i - n + 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
805 if (x2< 0) x2= -x2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
806 else if(x2>=width) x2= 2*width-x2-2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
807 sum += coeffs[i]*(int64_t)dst[x2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
808 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
809 if(inverse) dst[x] -= (sum + (1<<shift)/2)>>shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
810 else dst[x] += (sum + (1<<shift)/2)>>shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
811 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
812 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
813
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
814 static void inplace_liftV(DWTELEM *dst, int width, int height, int stride, int *coeffs, int n, int shift, int start, int inverse){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
815 int x, y, i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
816 for(y=start; y<height; y+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
817 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
818 int64_t sum=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
819
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
820 for(i=0; i<n; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
821 int y2= y + 2*i - n + 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
822 if (y2< 0) y2= -y2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
823 else if(y2>=height) y2= 2*height-y2-2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
824 sum += coeffs[i]*(int64_t)dst[x + y2*stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
825 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
826 if(inverse) dst[x + y*stride] -= (sum + (1<<shift)/2)>>shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
827 else dst[x + y*stride] += (sum + (1<<shift)/2)>>shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
828 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
829 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
830 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
831
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
832 #define SCALEX 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
833 #define LX0 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
834 #define LX1 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
835
2139
michael
parents: 2138
diff changeset
836 #if 0 // more accurate 9/7
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
837 #define N1 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
838 #define SHIFT1 14
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
839 #define COEFFS1 (int[]){-25987,-25987}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
840 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
841 #define SHIFT2 19
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
842 #define COEFFS2 (int[]){-27777,-27777}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
843 #define N3 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
844 #define SHIFT3 15
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
845 #define COEFFS3 (int[]){28931,28931}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
846 #define N4 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
847 #define SHIFT4 15
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
848 #define COEFFS4 (int[]){14533,14533}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
849 #elif 1 // 13/7 CRF
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
850 #define N1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
851 #define SHIFT1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
852 #define COEFFS1 (int[]){1,-9,-9,1}
2139
michael
parents: 2138
diff changeset
853 #define N2 4
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
854 #define SHIFT2 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
855 #define COEFFS2 (int[]){-1,5,5,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
856 #define N3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
857 #define SHIFT3 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
858 #define COEFFS3 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
859 #define N4 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
860 #define SHIFT4 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
861 #define COEFFS4 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
862 #elif 1 // 3/5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
863 #define LX0 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
864 #define LX1 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
865 #define SCALEX 0.5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
866 #define N1 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
867 #define SHIFT1 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
868 #define COEFFS1 (int[]){1,1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
869 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
870 #define SHIFT2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
871 #define COEFFS2 (int[]){-1,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
872 #define N3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
873 #define SHIFT3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
874 #define COEFFS3 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
875 #define N4 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
876 #define SHIFT4 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
877 #define COEFFS4 NULL
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
878 #elif 1 // 11/5
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
879 #define N1 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
880 #define SHIFT1 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
881 #define COEFFS1 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
882 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
883 #define SHIFT2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
884 #define COEFFS2 (int[]){-1,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
885 #define N3 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
886 #define SHIFT3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
887 #define COEFFS3 (int[]){-1,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
888 #define N4 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
889 #define SHIFT4 7
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
890 #define COEFFS4 (int[]){-5,29,29,-5}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
891 #define SCALEX 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
892 #elif 1 // 9/7 CDF
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
893 #define N1 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
894 #define SHIFT1 7
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
895 #define COEFFS1 (int[]){-203,-203}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
896 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
897 #define SHIFT2 12
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
898 #define COEFFS2 (int[]){-217,-217}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
899 #define N3 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
900 #define SHIFT3 7
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
901 #define COEFFS3 (int[]){113,113}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
902 #define N4 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
903 #define SHIFT4 9
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
904 #define COEFFS4 (int[]){227,227}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
905 #define SCALEX 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
906 #elif 1 // 7/5 CDF
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
907 #define N1 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
908 #define SHIFT1 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
909 #define COEFFS1 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
910 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
911 #define SHIFT2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
912 #define COEFFS2 (int[]){-1,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
913 #define N3 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
914 #define SHIFT3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
915 #define COEFFS3 (int[]){-1,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
916 #define N4 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
917 #define SHIFT4 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
918 #define COEFFS4 (int[]){3,3}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
919 #elif 1 // 9/7 MN
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
920 #define N1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
921 #define SHIFT1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
922 #define COEFFS1 (int[]){1,-9,-9,1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
923 #define N2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
924 #define SHIFT2 2
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
925 #define COEFFS2 (int[]){1,1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
926 #define N3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
927 #define SHIFT3 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
928 #define COEFFS3 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
929 #define N4 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
930 #define SHIFT4 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
931 #define COEFFS4 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
932 #else // 13/7 CRF
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
933 #define N1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
934 #define SHIFT1 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
935 #define COEFFS1 (int[]){1,-9,-9,1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
936 #define N2 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
937 #define SHIFT2 4
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
938 #define COEFFS2 (int[]){-1,5,5,-1}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
939 #define N3 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
940 #define SHIFT3 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
941 #define COEFFS3 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
942 #define N4 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
943 #define SHIFT4 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
944 #define COEFFS4 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
945 #endif
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
946 static void horizontal_decomposeX(DWTELEM *b, int width){
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
947 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
948 const int width2= width>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
949 const int w2= (width+1)>>1;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
950 int x;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
951
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
952 inplace_lift(b, width, COEFFS1, N1, SHIFT1, LX1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
953 inplace_lift(b, width, COEFFS2, N2, SHIFT2, LX0, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
954 inplace_lift(b, width, COEFFS3, N3, SHIFT3, LX1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
955 inplace_lift(b, width, COEFFS4, N4, SHIFT4, LX0, 0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
956
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
957 for(x=0; x<width2; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
958 temp[x ]= b[2*x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
959 temp[x+w2]= b[2*x + 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
960 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
961 if(width&1)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
962 temp[x ]= b[2*x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
963 memcpy(b, temp, width*sizeof(int));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
964 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
965
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
966 static void horizontal_composeX(DWTELEM *b, int width){
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
967 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
968 const int width2= width>>1;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
969 int x;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
970 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
971
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
972 memcpy(temp, b, width*sizeof(int));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
973 for(x=0; x<width2; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
974 b[2*x ]= temp[x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
975 b[2*x + 1]= temp[x+w2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
976 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
977 if(width&1)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
978 b[2*x ]= temp[x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
979
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
980 inplace_lift(b, width, COEFFS4, N4, SHIFT4, LX0, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
981 inplace_lift(b, width, COEFFS3, N3, SHIFT3, LX1, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
982 inplace_lift(b, width, COEFFS2, N2, SHIFT2, LX0, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
983 inplace_lift(b, width, COEFFS1, N1, SHIFT1, LX1, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
984 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
985
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
986 static void spatial_decomposeX(DWTELEM *buffer, int width, int height, int stride){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
987 int x, y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
988
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
989 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
990 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
991 buffer[y*stride + x] *= SCALEX;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
992 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
993 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
994
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
995 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
996 horizontal_decomposeX(buffer + y*stride, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
997 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
998
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
999 inplace_liftV(buffer, width, height, stride, COEFFS1, N1, SHIFT1, LX1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1000 inplace_liftV(buffer, width, height, stride, COEFFS2, N2, SHIFT2, LX0, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1001 inplace_liftV(buffer, width, height, stride, COEFFS3, N3, SHIFT3, LX1, 0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1002 inplace_liftV(buffer, width, height, stride, COEFFS4, N4, SHIFT4, LX0, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1003 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1004
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1005 static void spatial_composeX(DWTELEM *buffer, int width, int height, int stride){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1006 int x, y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1007
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1008 inplace_liftV(buffer, width, height, stride, COEFFS4, N4, SHIFT4, LX0, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1009 inplace_liftV(buffer, width, height, stride, COEFFS3, N3, SHIFT3, LX1, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1010 inplace_liftV(buffer, width, height, stride, COEFFS2, N2, SHIFT2, LX0, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1011 inplace_liftV(buffer, width, height, stride, COEFFS1, N1, SHIFT1, LX1, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1012
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1013 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1014 horizontal_composeX(buffer + y*stride, width);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1015 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1016
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1017 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1018 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1019 buffer[y*stride + x] /= SCALEX;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1020 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1021 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1022 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1023
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1024 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
1025 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1026 const int width2= width>>1;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1027 int x;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1028 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1029
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1030 for(x=0; x<width2; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1031 temp[x ]= b[2*x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1032 temp[x+w2]= b[2*x + 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1033 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1034 if(width&1)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1035 temp[x ]= b[2*x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1036 #if 0
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1037 {
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1038 int A1,A2,A3,A4;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1039 A2= temp[1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1040 A4= temp[0 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1041 A1= temp[0+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1042 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1043 A4 += (A1 + 1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1044 b[0+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1045 b[0 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1046 for(x=1; x+1<width2; x+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1047 A3= temp[x+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1048 A4= temp[x+1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1049 A3 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1050 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1051 b[x+width2] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1052 b[x ] = A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1053
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1054 A1= temp[x+1+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1055 A2= temp[x+2 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1056 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1057 A4 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1058 b[x+1+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1059 b[x+1 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1060 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1061 A3= temp[width-1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1062 A3 -= A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1063 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1064 b[width -1] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1065 b[width2-1] = A2;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1066 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1067 #else
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1068 lift(b+w2, temp+w2, temp, 1, 1, 1, width, -1, 0, 1, 1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1069 lift(b , temp , b+w2, 1, 1, 1, width, 1, 2, 2, 0, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1070 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1071 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1072
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1073 static void vertical_decompose53iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1074 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1075
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1076 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1077 b1[i] -= (b0[i] + b2[i])>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1078 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1079 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1080
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1081 static void vertical_decompose53iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1082 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1083
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1084 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1085 b1[i] += (b0[i] + b2[i] + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1086 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1087 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1088
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1089 static void spatial_decompose53i(DWTELEM *buffer, int width, int height, int stride){
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
1090 int y;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1091 DWTELEM *b0= buffer + mirror(-2-1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1092 DWTELEM *b1= buffer + mirror(-2 , height-1)*stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1093
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1094 for(y=-2; y<height; y+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1095 DWTELEM *b2= buffer + mirror(y+1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1096 DWTELEM *b3= buffer + mirror(y+2, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1097
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1098 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1099 if(y+1<(unsigned)height) horizontal_decompose53i(b2, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1100 if(y+2<(unsigned)height) horizontal_decompose53i(b3, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1101 STOP_TIMER("horizontal_decompose53i")}
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1102
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1103 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1104 if(y+1<(unsigned)height) vertical_decompose53iH0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1105 if(y+0<(unsigned)height) vertical_decompose53iL0(b0, b1, b2, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1106 STOP_TIMER("vertical_decompose53i*")}
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1107
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1108 b0=b2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1109 b1=b3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1110 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1111 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1112
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1113 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
1114 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1115 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1116
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1117 lift (temp+w2, b +1, b , 1, 2, 2, width, -W_AM, W_AO, W_AS, 1, 0);
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1118 liftS(temp , b , temp+w2, 1, 2, 1, width, -W_BM, W_BO, W_BS, 0, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1119 lift5(b +w2, temp+w2, temp , 1, 1, 1, width, W_CM, W_CO, W_CS, 1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1120 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
1121 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1122
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1123
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1124 static void vertical_decompose97iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1125 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1126
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1127 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1128 b1[i] -= (W_AM*(b0[i] + b2[i])+W_AO)>>W_AS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1129 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1130 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1131
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1132 static void vertical_decompose97iH1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1133 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1134
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1135 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1136 #ifdef lift5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1137 b1[i] += (W_CM*(b0[i] + b2[i])+W_CO)>>W_CS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1138 #else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1139 int r= 3*(b0[i] + b2[i]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1140 r+= r>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1141 r+= r>>8;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1142 b1[i] += (r+W_CO)>>W_CS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1143 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1144 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1145 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1146
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1147 static void vertical_decompose97iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1148 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1149
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1150 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
1151 #ifdef liftS
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1152 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
1153 #else
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1154 b1[i] = (16*4*b1[i] - 4*(b0[i] + b2[i]) + 8*5 + (5<<27)) / (5*16) - (1<<23);
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1155 #endif
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1156 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1157 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1158
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1159 static void vertical_decompose97iL1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1160 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1161
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1162 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1163 b1[i] += (W_DM*(b0[i] + b2[i])+W_DO)>>W_DS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1164 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1165 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1166
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1167 static void spatial_decompose97i(DWTELEM *buffer, int width, int height, int stride){
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
1168 int y;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1169 DWTELEM *b0= buffer + mirror(-4-1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1170 DWTELEM *b1= buffer + mirror(-4 , height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1171 DWTELEM *b2= buffer + mirror(-4+1, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1172 DWTELEM *b3= buffer + mirror(-4+2, height-1)*stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1173
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1174 for(y=-4; y<height; y+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1175 DWTELEM *b4= buffer + mirror(y+3, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1176 DWTELEM *b5= buffer + mirror(y+4, height-1)*stride;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1177
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1178 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1179 if(y+3<(unsigned)height) horizontal_decompose97i(b4, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1180 if(y+4<(unsigned)height) horizontal_decompose97i(b5, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1181 if(width>400){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1182 STOP_TIMER("horizontal_decompose97i")
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1183 }}
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1184
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1185 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1186 if(y+3<(unsigned)height) vertical_decompose97iH0(b3, b4, b5, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1187 if(y+2<(unsigned)height) vertical_decompose97iL0(b2, b3, b4, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1188 if(y+1<(unsigned)height) vertical_decompose97iH1(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1189 if(y+0<(unsigned)height) vertical_decompose97iL1(b0, b1, b2, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1190
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1191 if(width>400){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1192 STOP_TIMER("vertical_decompose97i")
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1193 }}
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1194
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1195 b0=b2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1196 b1=b3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1197 b2=b4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1198 b3=b5;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1199 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1200 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1201
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1202 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
1203 int level;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1204
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
1205 for(level=0; level<decomposition_count; level++){
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
1206 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1207 case DWT_97: spatial_decompose97i(buffer, width>>level, height>>level, stride<<level); break;
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1208 case DWT_53: spatial_decompose53i(buffer, width>>level, height>>level, stride<<level); break;
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1209 case DWT_X: spatial_decomposeX (buffer, width>>level, height>>level, stride<<level); break;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1210 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1211 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1212 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1213
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1214 static void horizontal_compose53i(DWTELEM *b, int width){
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1215 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1216 const int width2= width>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1217 const int w2= (width+1)>>1;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1218 int x;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1219
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1220 #if 0
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1221 int A1,A2,A3,A4;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1222 A2= temp[1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1223 A4= temp[0 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1224 A1= temp[0+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1225 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1226 A4 += (A1 + 1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1227 b[0+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1228 b[0 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1229 for(x=1; x+1<width2; x+=2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1230 A3= temp[x+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1231 A4= temp[x+1 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1232 A3 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1233 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1234 b[x+width2] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1235 b[x ] = A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1236
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1237 A1= temp[x+1+width2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1238 A2= temp[x+2 ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1239 A1 -= (A2 + A4)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1240 A4 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1241 b[x+1+width2] = A1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1242 b[x+1 ] = A4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1243 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1244 A3= temp[width-1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1245 A3 -= A2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1246 A2 += (A1 + A3 + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1247 b[width -1] = A3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1248 b[width2-1] = A2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1249 #else
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1250 lift(temp , b , b+w2, 1, 1, 1, width, 1, 2, 2, 0, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1251 lift(temp+w2, b+w2, temp, 1, 1, 1, width, -1, 0, 1, 1, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1252 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1253 for(x=0; x<width2; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1254 b[2*x ]= temp[x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1255 b[2*x + 1]= temp[x+w2];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1256 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1257 if(width&1)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1258 b[2*x ]= temp[x ];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1259 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1260
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1261 static void vertical_compose53iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1262 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1263
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1264 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1265 b1[i] += (b0[i] + b2[i])>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1266 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1267 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1268
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1269 static void vertical_compose53iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1270 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1271
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1272 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1273 b1[i] -= (b0[i] + b2[i] + 2)>>2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1274 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1275 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1276
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1277 static void spatial_compose53i_buffered_init(dwt_compose_t *cs, slice_buffer * sb, int height, int stride_line){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1278 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
1279 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
1280 cs->y = -1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1281 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1282
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1283 static void spatial_compose53i_init(dwt_compose_t *cs, DWTELEM *buffer, int height, int stride){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1284 cs->b0 = buffer + mirror(-1-1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1285 cs->b1 = buffer + mirror(-1 , height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1286 cs->y = -1;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1287 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1288
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1289 static void spatial_compose53i_dy_buffered(dwt_compose_t *cs, slice_buffer * sb, int width, int height, int stride_line){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1290 int y= cs->y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1291
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1292 DWTELEM *b0= cs->b0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1293 DWTELEM *b1= cs->b1;
3012
088920c095fc cleanup
michael
parents: 3000
diff changeset
1294 DWTELEM *b2= slice_buffer_get_line(sb, mirror(y+1, height-1) * stride_line);
088920c095fc cleanup
michael
parents: 3000
diff changeset
1295 DWTELEM *b3= slice_buffer_get_line(sb, mirror(y+2, height-1) * stride_line);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1296
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1297 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1298 if(y+1<(unsigned)height) vertical_compose53iL0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1299 if(y+0<(unsigned)height) vertical_compose53iH0(b0, b1, b2, width);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1300 STOP_TIMER("vertical_compose53i*")}
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1301
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1302 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1303 if(y-1<(unsigned)height) horizontal_compose53i(b0, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1304 if(y+0<(unsigned)height) horizontal_compose53i(b1, width);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1305 STOP_TIMER("horizontal_compose53i")}
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1306
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1307 cs->b0 = b2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1308 cs->b1 = b3;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1309 cs->y += 2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1310 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1311
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1312 static void spatial_compose53i_dy(dwt_compose_t *cs, DWTELEM *buffer, int width, int height, int stride){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1313 int y= cs->y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1314 DWTELEM *b0= cs->b0;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1315 DWTELEM *b1= cs->b1;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1316 DWTELEM *b2= buffer + mirror(y+1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1317 DWTELEM *b3= buffer + mirror(y+2, height-1)*stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1318
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1319 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1320 if(y+1<(unsigned)height) vertical_compose53iL0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1321 if(y+0<(unsigned)height) vertical_compose53iH0(b0, b1, b2, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1322 STOP_TIMER("vertical_compose53i*")}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1323
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1324 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1325 if(y-1<(unsigned)height) horizontal_compose53i(b0, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1326 if(y+0<(unsigned)height) horizontal_compose53i(b1, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1327 STOP_TIMER("horizontal_compose53i")}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1328
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1329 cs->b0 = b2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1330 cs->b1 = b3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1331 cs->y += 2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1332 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1333
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1334 static void spatial_compose53i(DWTELEM *buffer, int width, int height, int stride){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1335 dwt_compose_t cs;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1336 spatial_compose53i_init(&cs, buffer, height, stride);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1337 while(cs.y <= height)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1338 spatial_compose53i_dy(&cs, buffer, width, height, stride);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1339 }
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1340
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1341
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1342 void ff_snow_horizontal_compose97i(DWTELEM *b, int width){
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1343 DWTELEM temp[width];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1344 const int w2= (width+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1345
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1346 lift (temp , b , b +w2, 1, 1, 1, width, W_DM, W_DO, W_DS, 0, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1347 lift5(temp+w2, b +w2, temp , 1, 1, 1, width, W_CM, W_CO, W_CS, 1, 1);
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1348 liftS(b , temp , temp+w2, 2, 1, 1, width, -W_BM, W_BO, W_BS, 0, 1);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1349 lift (b+1 , temp+w2, b , 2, 1, 2, width, -W_AM, W_AO, W_AS, 1, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1350 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1351
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1352 static void vertical_compose97iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1353 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1354
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1355 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1356 b1[i] += (W_AM*(b0[i] + b2[i])+W_AO)>>W_AS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1357 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1358 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1359
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1360 static void vertical_compose97iH1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1361 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1362
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1363 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1364 #ifdef lift5
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1365 b1[i] -= (W_CM*(b0[i] + b2[i])+W_CO)>>W_CS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1366 #else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1367 int r= 3*(b0[i] + b2[i]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1368 r+= r>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1369 r+= r>>8;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1370 b1[i] -= (r+W_CO)>>W_CS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1371 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1372 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1373 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1374
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1375 static void vertical_compose97iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1376 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1377
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1378 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
1379 #ifdef liftS
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1380 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
1381 #else
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1382 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
1383 #endif
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1384 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1385 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1386
2241
c26038875ebc consistent use of types patch by (D Richard Felker III <dalias at aerifal dot cx>)
michael
parents: 2240
diff changeset
1387 static void vertical_compose97iL1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1388 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1389
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1390 for(i=0; i<width; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1391 b1[i] -= (W_DM*(b0[i] + b2[i])+W_DO)>>W_DS;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1392 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1393 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1394
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1395 void ff_snow_vertical_compose97i(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, DWTELEM *b3, DWTELEM *b4, DWTELEM *b5, int width){
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1396 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1397
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1398 for(i=0; i<width; i++){
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1399 #ifndef lift5
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1400 int r;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1401 #endif
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1402 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
1403 #ifdef lift5
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1404 b3[i] -= (W_CM*(b2[i] + b4[i])+W_CO)>>W_CS;
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1405 #else
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1406 r= 3*(b2[i] + b4[i]);
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1407 r+= r>>4;
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1408 r+= r>>8;
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1409 b3[i] -= (r+W_CO)>>W_CS;
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1410 #endif
2602
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1411 #ifdef liftS
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1412 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
1413 #else
5ec55feb6fdd rescale coefficients during IDWT, that way the lifting steps are much simpler and faster
michael
parents: 2601
diff changeset
1414 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
1415 #endif
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1416 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
1417 }
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1418 }
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1419
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1420 static void spatial_compose97i_buffered_init(dwt_compose_t *cs, slice_buffer * sb, int height, int stride_line){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1421 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
1422 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
1423 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
1424 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
1425 cs->y = -3;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1426 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1427
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1428 static void spatial_compose97i_init(dwt_compose_t *cs, DWTELEM *buffer, int height, int stride){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1429 cs->b0 = buffer + mirror(-3-1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1430 cs->b1 = buffer + mirror(-3 , height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1431 cs->b2 = buffer + mirror(-3+1, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1432 cs->b3 = buffer + mirror(-3+2, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1433 cs->y = -3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1434 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1435
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1436 static void spatial_compose97i_dy_buffered(DSPContext *dsp, dwt_compose_t *cs, slice_buffer * sb, int width, int height, int stride_line){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1437 int y = cs->y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1438
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1439 DWTELEM *b0= cs->b0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1440 DWTELEM *b1= cs->b1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1441 DWTELEM *b2= cs->b2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1442 DWTELEM *b3= cs->b3;
3012
088920c095fc cleanup
michael
parents: 3000
diff changeset
1443 DWTELEM *b4= slice_buffer_get_line(sb, mirror(y + 3, height - 1) * stride_line);
088920c095fc cleanup
michael
parents: 3000
diff changeset
1444 DWTELEM *b5= slice_buffer_get_line(sb, mirror(y + 4, height - 1) * stride_line);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1445
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1446 {START_TIMER
2592
b70b4b69960b merge vertical lifting steps and a little cleanup
michael
parents: 2589
diff changeset
1447 if(y>0 && y+4<height){
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1448 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
1449 }else{
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1450 if(y+3<(unsigned)height) vertical_compose97iL1(b3, b4, b5, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1451 if(y+2<(unsigned)height) vertical_compose97iH1(b2, b3, b4, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1452 if(y+1<(unsigned)height) vertical_compose97iL0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1453 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
1454 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1455 if(width>400){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1456 STOP_TIMER("vertical_compose97i")}}
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1457
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1458 {START_TIMER
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1459 if(y-1<(unsigned)height) dsp->horizontal_compose97i(b0, width);
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1460 if(y+0<(unsigned)height) dsp->horizontal_compose97i(b1, width);
3012
088920c095fc cleanup
michael
parents: 3000
diff changeset
1461 if(width>400 && y+0<(unsigned)height){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1462 STOP_TIMER("horizontal_compose97i")}}
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1463
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1464 cs->b0=b2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1465 cs->b1=b3;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1466 cs->b2=b4;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1467 cs->b3=b5;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1468 cs->y += 2;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1469 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1470
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1471 static void spatial_compose97i_dy(dwt_compose_t *cs, DWTELEM *buffer, int width, int height, int stride){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1472 int y = cs->y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1473 DWTELEM *b0= cs->b0;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1474 DWTELEM *b1= cs->b1;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1475 DWTELEM *b2= cs->b2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1476 DWTELEM *b3= cs->b3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1477 DWTELEM *b4= buffer + mirror(y+3, height-1)*stride;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1478 DWTELEM *b5= buffer + mirror(y+4, height-1)*stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1479
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1480 {START_TIMER
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1481 if(y+3<(unsigned)height) vertical_compose97iL1(b3, b4, b5, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1482 if(y+2<(unsigned)height) vertical_compose97iH1(b2, b3, b4, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1483 if(y+1<(unsigned)height) vertical_compose97iL0(b1, b2, b3, width);
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
1484 if(y+0<(unsigned)height) vertical_compose97iH0(b0, b1, b2, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1485 if(width>400){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1486 STOP_TIMER("vertical_compose97i")}}
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1487
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1488 {START_TIMER
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1489 if(y-1<(unsigned)height) ff_snow_horizontal_compose97i(b0, width);
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1490 if(y+0<(unsigned)height) ff_snow_horizontal_compose97i(b1, width);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1491 if(width>400 && b0 <= b2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1492 STOP_TIMER("horizontal_compose97i")}}
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1493
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1494 cs->b0=b2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1495 cs->b1=b3;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1496 cs->b2=b4;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1497 cs->b3=b5;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1498 cs->y += 2;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1499 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1500
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1501 static void spatial_compose97i(DWTELEM *buffer, int width, int height, int stride){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1502 dwt_compose_t cs;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1503 spatial_compose97i_init(&cs, buffer, height, stride);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1504 while(cs.y <= height)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1505 spatial_compose97i_dy(&cs, buffer, width, height, stride);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1506 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1507
3075
961af1358c7f add static keyword to some functions
mru
parents: 3063
diff changeset
1508 static void ff_spatial_idwt_buffered_init(dwt_compose_t *cs, slice_buffer * sb, int width, int height, int stride_line, int type, int decomposition_count){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1509 int level;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1510 for(level=decomposition_count-1; level>=0; level--){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1511 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1512 case DWT_97: spatial_compose97i_buffered_init(cs+level, sb, height>>level, stride_line<<level); break;
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1513 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
1514 /* not slicified yet */
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1515 case DWT_X: /*spatial_composeX(buffer, width>>level, height>>level, stride<<level); break;*/
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1516 av_log(NULL, AV_LOG_ERROR, "spatial_composeX neither buffered nor slicified yet.\n"); break;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1517 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1518 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1519 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1520
3075
961af1358c7f add static keyword to some functions
mru
parents: 3063
diff changeset
1521 static void ff_spatial_idwt_init(dwt_compose_t *cs, DWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1522 int level;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1523 for(level=decomposition_count-1; level>=0; level--){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1524 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1525 case DWT_97: spatial_compose97i_init(cs+level, buffer, height>>level, stride<<level); break;
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1526 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
1527 /* not slicified yet */
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1528 case DWT_X: spatial_composeX(buffer, width>>level, height>>level, stride<<level); break;
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1529 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1530 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1531 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1532
3075
961af1358c7f add static keyword to some functions
mru
parents: 3063
diff changeset
1533 static void ff_spatial_idwt_slice(dwt_compose_t *cs, DWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count, int y){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1534 const int support = type==1 ? 3 : 5;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1535 int level;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1536 if(type==2) return;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1537
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1538 for(level=decomposition_count-1; level>=0; level--){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1539 while(cs[level].y <= FFMIN((y>>level)+support, height>>level)){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1540 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1541 case DWT_97: spatial_compose97i_dy(cs+level, buffer, width>>level, height>>level, stride<<level);
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1542 break;
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1543 case DWT_53: spatial_compose53i_dy(cs+level, buffer, width>>level, height>>level, stride<<level);
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1544 break;
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1545 case DWT_X: break;
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1546 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1547 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1548 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1549 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1550
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
1551 static void ff_spatial_idwt_buffered_slice(DSPContext *dsp, dwt_compose_t *cs, slice_buffer * slice_buf, int width, int height, int stride_line, int type, int decomposition_count, int y){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1552 const int support = type==1 ? 3 : 5;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1553 int level;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1554 if(type==2) return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1555
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1556 for(level=decomposition_count-1; level>=0; level--){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1557 while(cs[level].y <= FFMIN((y>>level)+support, height>>level)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1558 switch(type){
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1559 case DWT_97: spatial_compose97i_dy_buffered(dsp, cs+level, slice_buf, width>>level, height>>level, stride_line<<level);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1560 break;
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1561 case DWT_53: spatial_compose53i_dy_buffered(cs+level, slice_buf, width>>level, height>>level, stride_line<<level);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1562 break;
3326
fb245e797c5d Snow: cosmetics
lorenm
parents: 3325
diff changeset
1563 case DWT_X: break;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1564 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1565 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1566 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1567 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1568
3075
961af1358c7f add static keyword to some functions
mru
parents: 3063
diff changeset
1569 static void ff_spatial_idwt(DWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1570 if(type==2){
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1571 int level;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1572 for(level=decomposition_count-1; level>=0; level--)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1573 spatial_composeX (buffer, width>>level, height>>level, stride<<level);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1574 }else{
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1575 dwt_compose_t cs[MAX_DECOMPOSITIONS];
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1576 int y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1577 ff_spatial_idwt_init(cs, buffer, width, height, stride, type, decomposition_count);
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1578 for(y=0; y<height; y+=4)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
1579 ff_spatial_idwt_slice(cs, buffer, width, height, stride, type, decomposition_count, y);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1580 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1581 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1582
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1583 static int encode_subband_c0run(SnowContext *s, SubBand *b, DWTELEM *src, DWTELEM *parent, int stride, int orientation){
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1584 const int w= b->width;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1585 const int h= b->height;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1586 int x, y;
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1587
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1588 if(1){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1589 int run=0;
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1590 int runs[w*h];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1591 int run_index=0;
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1592 int max_index;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1593
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1594 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1595 for(x=0; x<w; x++){
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1596 int v, p=0;
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1597 int /*ll=0, */l=0, lt=0, t=0, rt=0;
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1598 v= src[x + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1599
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1600 if(y){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1601 t= src[x + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1602 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1603 lt= src[x - 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1604 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1605 if(x + 1 < w){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1606 rt= src[x + 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1607 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1608 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1609 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1610 l= src[x - 1 + y*stride];
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1611 /*if(x > 1){
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1612 if(orientation==1) ll= src[y + (x-2)*stride];
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1613 else ll= src[x - 2 + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1614 }*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1615 }
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1616 if(parent){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1617 int px= x>>1;
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1618 int py= y>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1619 if(px<b->parent->width && py<b->parent->height)
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1620 p= parent[px + py*2*stride];
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1621 }
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1622 if(!(/*ll|*/l|lt|t|rt|p)){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1623 if(v){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1624 runs[run_index++]= run;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1625 run=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1626 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1627 run++;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1628 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1629 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1630 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1631 }
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1632 max_index= run_index;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1633 runs[run_index++]= run;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1634 run_index=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1635 run= runs[run_index++];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1636
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1637 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
1638 if(run_index <= max_index)
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1639 put_symbol2(&s->c, b->state[1], run, 3);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1640
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1641 for(y=0; y<h; y++){
2435
c89ac0e70c66 10l patch by (matthieu castet <castet.matthieu free fr>)
michael
parents: 2422
diff changeset
1642 if(s->c.bytestream_end - s->c.bytestream < w*40){
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1643 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1644 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1645 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1646 for(x=0; x<w; x++){
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1647 int v, p=0;
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1648 int /*ll=0, */l=0, lt=0, t=0, rt=0;
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1649 v= src[x + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1650
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1651 if(y){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1652 t= src[x + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1653 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1654 lt= src[x - 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1655 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1656 if(x + 1 < w){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1657 rt= src[x + 1 + (y-1)*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1658 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1659 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1660 if(x){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1661 l= src[x - 1 + y*stride];
2144
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1662 /*if(x > 1){
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1663 if(orientation==1) ll= src[y + (x-2)*stride];
e33371c1e2b4 better context model (0.2-1% lower bitrate)
michael
parents: 2139
diff changeset
1664 else ll= src[x - 2 + y*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1665 }*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1666 }
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1667 if(parent){
2149
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1668 int px= x>>1;
48dc4ec06e88 cleanup
michael
parents: 2148
diff changeset
1669 int py= y>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1670 if(px<b->parent->width && py<b->parent->height)
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1671 p= parent[px + py*2*stride];
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1672 }
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1673 if(/*ll|*/l|lt|t|rt|p){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1674 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
1675
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1676 put_rac(&s->c, &b->state[0][context], !!v);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1677 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1678 if(!run){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1679 run= runs[run_index++];
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1680
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1681 if(run_index <= max_index)
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1682 put_symbol2(&s->c, b->state[1], run, 3);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1683 assert(v);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1684 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1685 run--;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1686 assert(!v);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1687 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1688 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1689 if(v){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1690 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
1691 int l2= 2*FFABS(l) + (l<0);
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1692 int t2= 2*FFABS(t) + (t<0);
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1693
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1694 put_symbol2(&s->c, b->state[context + 2], FFABS(v)-1, context-4);
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1695 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
1696 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1697 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1698 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1699 }
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1700 return 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1701 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1702
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1703 static int encode_subband(SnowContext *s, SubBand *b, DWTELEM *src, DWTELEM *parent, int stride, int orientation){
2155
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1704 // 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
1705 // encode_subband_z0run(s, b, src, parent, stride, orientation);
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
1706 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
1707 // 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
1708 }
274a01d80f4a various subband encoders (all either worse or complicated so they are commented out)
michael
parents: 2152
diff changeset
1709
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1710 static inline void unpack_coeffs(SnowContext *s, SubBand *b, SubBand * parent, int orientation){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1711 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1712 const int h= b->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1713 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1714
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1715 if(1){
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1716 int run, runs;
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1717 x_and_coeff *xc= b->x_coeff;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1718 x_and_coeff *prev_xc= NULL;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1719 x_and_coeff *prev2_xc= xc;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1720 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
1721 x_and_coeff *prev_parent_xc= parent_xc;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1722
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1723 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
1724 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
1725 else run= INT_MAX;
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1726
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1727 for(y=0; y<h; y++){
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1728 int v=0;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1729 int lt=0, t=0, rt=0;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1730
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1731 if(y && prev_xc->x == 0){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1732 rt= prev_xc->coeff;
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1733 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1734 for(x=0; x<w; x++){
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1735 int p=0;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1736 const int l= v;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1737
2193
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1738 lt= t; t= rt;
ea7715935e55 5% faster decode_subband()
michael
parents: 2192
diff changeset
1739
2194
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1740 if(y){
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1741 if(prev_xc->x <= x)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1742 prev_xc++;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1743 if(prev_xc->x == x + 1)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1744 rt= prev_xc->coeff;
2194
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1745 else
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1746 rt=0;
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1747 }
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1748 if(parent_xc){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1749 if(x>>1 > parent_xc->x){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1750 parent_xc++;
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1751 }
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1752 if(x>>1 == parent_xc->x){
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1753 p= parent_xc->coeff;
2194
d29037435955 11% faster decode_subband()
michael
parents: 2193
diff changeset
1754 }
2148
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1755 }
678be5a8f282 use parent sample to predict significance & magnitude
michael
parents: 2146
diff changeset
1756 if(/*ll|*/l|lt|t|rt|p){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1757 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
1758
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1759 v=get_rac(&s->c, &b->state[0][context]);
2605
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1760 if(v){
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1761 v= 2*(get_symbol2(&s->c, b->state[context + 2], context-4) + 1);
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1762 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
1763
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1764 xc->x=x;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1765 (xc++)->coeff= v;
2605
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1766 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1767 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1768 if(!run){
2609
0f74a379a890 store the number of runs to avoid storing the last run value
michael
parents: 2608
diff changeset
1769 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
1770 else run= INT_MAX;
2605
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1771 v= 2*(get_symbol2(&s->c, b->state[0 + 2], 0-4) + 1);
39ef4c5454f0 optimizing unpack_coeffs()
michael
parents: 2604
diff changeset
1772 v+=get_rac(&s->c, &b->state[0][16 + 1 + 3]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1773
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1774 xc->x=x;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1775 (xc++)->coeff= v;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1776 }else{
2606
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1777 int max_run;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1778 run--;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1779 v=0;
2191
44afbcec70b8 50% faster decode_subband()
michael
parents: 2189
diff changeset
1780
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1781 if(y) max_run= FFMIN(run, prev_xc->x - x - 2);
2606
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1782 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
1783 if(parent_xc)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1784 max_run= FFMIN(max_run, 2*parent_xc->x - x - 1);
2606
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1785 x+= max_run;
2649aeaadc44 minor optimization
michael
parents: 2605
diff changeset
1786 run-= max_run;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1787 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1788 }
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1789 }
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1790 (xc++)->x= w+1; //end marker
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1791 prev_xc= prev2_xc;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1792 prev2_xc= xc;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1793
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1794 if(parent_xc){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1795 if(y&1){
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1796 while(parent_xc->x != parent->width+1)
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1797 parent_xc++;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1798 parent_xc++;
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1799 prev_parent_xc= parent_xc;
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
1800 }else{
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1801 parent_xc= prev_parent_xc;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1802 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1803 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1804 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1805
2607
fde7b6fe2aaf replace complicated pointer dereference + index stuff by pointers in unpack_coeffs()
michael
parents: 2606
diff changeset
1806 (xc++)->x= w+1; //end marker
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1807 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1808 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1809
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1810 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
1811 const int w= b->width;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
1812 int y;
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
1813 const int qlog= clip(s->qlog + b->qlog, 0, QROOT*16);
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
1814 int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1815 int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1816 int new_index = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1817
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1818 START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1819
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1820 if(b->buf == s->spatial_dwt_buffer || s->qlog == LOSSLESS_QLOG){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1821 qadd= 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1822 qmul= 1<<QEXPSHIFT;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1823 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1824
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1825 /* 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
1826 if (start_y != 0)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1827 new_index = save_state[0];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1828
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1829
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1830 for(y=start_y; y<h; y++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1831 int x = 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1832 int v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1833 DWTELEM * line = slice_buffer_get_line(sb, y * b->stride_line + b->buf_y_offset) + b->buf_x_offset;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1834 memset(line, 0, b->width*sizeof(DWTELEM));
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1835 v = b->x_coeff[new_index].coeff;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1836 x = b->x_coeff[new_index++].x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1837 while(x < w)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1838 {
2596
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1839 register int t= ( (v>>1)*qmul + qadd)>>QEXPSHIFT;
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1840 register int u= -(v&1);
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1841 line[x] = (t^u) - u;
3e90a8cfddc6 10% faster unpack_coeffs
michael
parents: 2595
diff changeset
1842
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1843 v = b->x_coeff[new_index].coeff;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1844 x = b->x_coeff[new_index++].x;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1845 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1846 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1847 if(w > 200 && start_y != 0/*level+1 == s->spatial_decomposition_count*/){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1848 STOP_TIMER("decode_subband")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1849 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1850
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1851 /* Save our variables for the next slice. */
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1852 save_state[0] = new_index;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1853
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
1854 return;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1855 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1856
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
1857 static void reset_contexts(SnowContext *s){ //FIXME better initial contexts
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1858 int plane_index, level, orientation;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1859
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
1860 for(plane_index=0; plane_index<3; plane_index++){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1861 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1862 for(orientation=level ? 1:0; orientation<4; orientation++){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1863 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
1864 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1865 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
1866 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1867 memset(s->header_state, MID_STATE, sizeof(s->header_state));
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1868 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
1869 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1870
70b27300a496 quad 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 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
1872 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
1873 int h= -((-s->avctx->height)>>LOG2_MB_SIZE);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1874
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1875 s->b_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
1876 s->b_height= h;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
1877
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1878 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
1879 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
1880 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1881
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1882 static inline void copy_rac_state(RangeCoder *d, RangeCoder *s){
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1883 uint8_t *bytestream= d->bytestream;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1884 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
1885 *d= *s;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1886 d->bytestream= bytestream;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1887 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
1888 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1889
70b27300a496 quad 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 //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
1891 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
1892 {
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1893 int 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
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 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
1896 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
1897 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
1898 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
1899 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
1900 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1901 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
1902 }
70b27300a496 quad 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 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
1904 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1905
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1906 //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
1907 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
1908 {
70b27300a496 quad 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 int s, i, j;
4179
46d38e3d7038 rename squareTbl -> ff_squareTbl
mru
parents: 4123
diff changeset
1910 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
1911
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1912 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
1913 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
1914 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
1915 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
1916 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
1917 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1918 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
1919 }
70b27300a496 quad 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 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
1921 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1922
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1923 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
1924 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
1925 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
1926 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
1927 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
1928 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
1929 int i,j;
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 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
1932 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
1933 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
1934 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
1935 block.my= my;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
1936 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
1937 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
1938 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
1939
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1940 for(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
1941 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
1942 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
1943 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1944 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1945 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1946
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1947 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
1948 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
1949 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
1950 ((y*c->uvstride + x)>>1),
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1951 ((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
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 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
1954 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
1955 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
1956 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
1957 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1958 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
1959 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1960
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1961 static inline void pred_mv(SnowContext *s, int *mx, int *my, int ref,
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1962 BlockNode *left, BlockNode *top, BlockNode *tr){
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1963 if(s->ref_frames == 1){
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1964 *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
1965 *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
1966 }else{
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1967 const int *scale = scale_mv_ref[ref];
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1968 *mx = mid_pred(left->mx * scale[left->ref] + 128 >>8,
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1969 top ->mx * scale[top ->ref] + 128 >>8,
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1970 tr ->mx * scale[tr ->ref] + 128 >>8);
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1971 *my = mid_pred(left->my * scale[left->ref] + 128 >>8,
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1972 top ->my * scale[top ->ref] + 128 >>8,
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1973 tr ->my * scale[tr ->ref] + 128 >>8);
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1974 }
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1975 }
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
1976
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1977 //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
1978 #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
1979 #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
1980 #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
1981 #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
1982 #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
1983 #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
1984
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1985 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
1986 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
1987 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
1988 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
1989 uint8_t i_state[sizeof(s->block_state)];
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1990 RangeCoder pc, ic;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1991 uint8_t *pbbak= s->c.bytestream;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
1992 uint8_t *pbbak_start= s->c.bytestream_start;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1993 int score, score2, iscore, i_len, p_len, block_s, sum;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
1994 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
1995 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
1996 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
1997 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
1998 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
1999 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
2000 int try= (y+1)<<rem_depth;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2001 BlockNode *left = x ? &s->block[index-1] : &null_block;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2002 BlockNode *top = y ? &s->block[index-w] : &null_block;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2003 BlockNode *right = trx<w ? &s->block[index+1] : &null_block;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2004 BlockNode *bottom= try<h ? &s->block[index+w] : &null_block;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2005 BlockNode *tl = y && x ? &s->block[index-w-1] : left;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2006 BlockNode *tr = y && trx<w && ((x&1)==0 || level==0) ? &s->block[index-w+(1<<rem_depth)] : tl; //FIXME use lt
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2007 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
2008 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
2009 int pcr= left->color[2];
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2010 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
2011 int mx=0, my=0;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2012 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
2013 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
2014 const int uvstride= s->current_picture.linesize[1];
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2015 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
2016 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
2017 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
2018 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
2019 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
2020 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
2021 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
2022 MotionEstContext *c= &s->m.me;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2023 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
2024 int mx_context= av_log2(2*FFABS(left->mx - top->mx));
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2025 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
2026 int s_context= 2*left->level + 2*top->level + tl->level + tr->level;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2027 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
2028
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2029 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
2030 if(s->keyframe){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2031 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
2032 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
2033 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2034
70b27300a496 quad 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 // 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
2036
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2037 P_LEFT[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
2038 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
2039 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
2040 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
2041 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
2042 P_TOPRIGHT[1]= tr->my;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2043
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2044 last_mv[0][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
2045 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
2046 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
2047 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
2048 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
2049 last_mv[2][1]= bottom->my;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2050
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2051 s->m.mb_stride=2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2052 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
2053 s->m.mb_y= 0;
4360
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
2054 c->skip= 0;
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
2055
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
2056 assert(c-> stride == stride);
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
2057 assert(c->uvstride == uvstride);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2058
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2059 c->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
2060 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
2061 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
2062 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
2063
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2064 c->xmin = - x*block_w - 16+2;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2065 c->ymin = - y*block_w - 16+2;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2066 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
2067 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
2068
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2069 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
2070 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
2071 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
2072 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
2073 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
2074 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
2075 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
2076
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2077 P_MEDIAN[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
2078 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
2079
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2080 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
2081 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
2082 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
2083 } 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
2084 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
2085 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
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
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2088 score= INT_MAX;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2089 best_ref= 0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2090 for(ref=0; ref<s->ref_frames; ref++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2091 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
2092
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2093 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
2094 (1<<16)>>shift, level-LOG2_MB_SIZE+4, block_w);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2095
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2096 assert(ref_mx >= c->xmin);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2097 assert(ref_mx <= c->xmax);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2098 assert(ref_my >= c->ymin);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2099 assert(ref_my <= c->ymax);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2100
4360
5f887a3c7281 Change the Snow encoder to always use the available MotionEstContext pointer.
takis
parents: 4332
diff changeset
2101 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
2102 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
2103 ref_score+= 2*av_log2(2*ref)*c->penalty_factor;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2104 if(s->ref_mvs[ref]){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2105 s->ref_mvs[ref][index][0]= ref_mx;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2106 s->ref_mvs[ref][index][1]= ref_my;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2107 s->ref_scores[ref][index]= ref_score;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2108 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2109 if(score > ref_score){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2110 score= ref_score;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2111 best_ref= ref;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2112 mx= ref_mx;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2113 my= ref_my;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2114 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2115 }
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2116 //FIXME if mb_cmp != SSE then intra cant be compared currently and mb_penalty vs. lambda2
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2117
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2118 // subpel search
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2119 pc= s->c;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2120 pc.bytestream_start=
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2121 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
2122 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
2123
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2124 if(level!=s->block_max_depth)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2125 put_rac(&pc, &p_state[4 + s_context], 1);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2126 put_rac(&pc, &p_state[1 + left->type + top->type], 0);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2127 if(s->ref_frames > 1)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2128 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
2129 pred_mv(s, &pmx, &pmy, best_ref, left, top, tr);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2130 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
2131 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
2132 p_len= pc.bytestream - pc.bytestream_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2133 score += (s->lambda2*(p_len*8
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2134 + (pc.outstanding_count - s->c.outstanding_count)*8
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2135 + (-av_log2(pc.range) + av_log2(s->c.range))
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2136 ))>>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
2137
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2138 block_s= block_w*block_w;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2139 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
2140 l= (sum + block_s/2)/block_s;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2141 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
2142
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2143 block_s= block_w*block_w>>2;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2144 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
2145 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
2146 // 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
2147 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
2148 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
2149 // 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
2150
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2151 ic= s->c;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2152 ic.bytestream_start=
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2153 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
2154 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
2155 if(level!=s->block_max_depth)
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2156 put_rac(&ic, &i_state[4 + s_context], 1);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2157 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
2158 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
2159 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
2160 put_symbol(&ic, &i_state[96], cr-pcr, 1);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2161 i_len= ic.bytestream - ic.bytestream_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2162 iscore += (s->lambda2*(i_len*8
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2163 + (ic.outstanding_count - s->c.outstanding_count)*8
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2164 + (-av_log2(ic.range) + av_log2(s->c.range))
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2165 ))>>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
2166
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2167 // assert(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
2168 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
2169 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
2170 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
2171 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
2172
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2173 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
2174 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
2175 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
2176 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
2177 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
2178 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
2179 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
2180 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2181
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2182 if(level!=s->block_max_depth){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2183 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
2184 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
2185 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
2186 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
2187 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
2188 score2+= s->lambda2>>FF_LAMBDA_SHIFT; //FIXME exact split overhead
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2189
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2190 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
2191 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
2192 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2193
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2194 if(iscore < score){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2195 pred_mv(s, &pmx, &pmy, 0, left, top, tr);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2196 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
2197 s->c= ic;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2198 s->c.bytestream_start= pbbak_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2199 s->c.bytestream= pbbak + i_len;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2200 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
2201 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
2202 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
2203 }else{
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2204 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
2205 s->c= pc;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2206 s->c.bytestream_start= pbbak_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2207 s->c.bytestream= pbbak + p_len;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2208 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
2209 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
2210 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
2211 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2212 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2213
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
2214 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
2215 if((a->type&BLOCK_INTRA) && (b->type&BLOCK_INTRA)){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2216 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
2217 }else{
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2218 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
2219 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2220 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2221
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2222 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
2223 const int w= s->b_width << s->block_max_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2224 const int rem_depth= s->block_max_depth - level;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2225 const int index= (x + y*w) << rem_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2226 int trx= (x+1)<<rem_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2227 BlockNode *b= &s->block[index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2228 BlockNode *left = x ? &s->block[index-1] : &null_block;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2229 BlockNode *top = y ? &s->block[index-w] : &null_block;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2230 BlockNode *tl = y && x ? &s->block[index-w-1] : left;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2231 BlockNode *tr = y && trx<w && ((x&1)==0 || level==0) ? &s->block[index-w+(1<<rem_depth)] : tl; //FIXME use lt
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2232 int pl = left->color[0];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2233 int pcb= left->color[1];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2234 int pcr= left->color[2];
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2235 int pmx, pmy;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2236 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
2237 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
2238 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
2239 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
2240
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2241 if(s->keyframe){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2242 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
2243 return;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2244 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2245
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2246 if(level!=s->block_max_depth){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2247 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
2248 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
2249 }else{
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2250 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
2251 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
2252 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
2253 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
2254 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
2255 return;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2256 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2257 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2258 if(b->type & BLOCK_INTRA){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2259 pred_mv(s, &pmx, &pmy, 0, left, top, tr);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2260 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
2261 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
2262 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
2263 put_symbol(&s->c, &s->block_state[96], b->color[2]-pcr, 1);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2264 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
2265 }else{
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2266 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
2267 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
2268 if(s->ref_frames > 1)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2269 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
2270 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
2271 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
2272 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
2273 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2274 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2275
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2276 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
2277 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
2278 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
2279 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
2280 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
2281 BlockNode *left = x ? &s->block[index-1] : &null_block;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2282 BlockNode *top = y ? &s->block[index-w] : &null_block;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2283 BlockNode *tl = y && x ? &s->block[index-w-1] : left;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2284 BlockNode *tr = y && trx<w && ((x&1)==0 || level==0) ? &s->block[index-w+(1<<rem_depth)] : tl; //FIXME use lt
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2285 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
2286
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2287 if(s->keyframe){
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2288 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
2289 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
2290 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2291
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2292 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
2293 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
2294 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
2295 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
2296 int cr= left->color[2];
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2297 int ref = 0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2298 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
2299 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
2300 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
2301
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
2302 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
2303
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2304 if(type){
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2305 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
2306 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
2307 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
2308 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
2309 }else{
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2310 if(s->ref_frames > 1)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2311 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
2312 pred_mv(s, &mx, &my, ref, left, top, tr);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2313 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
2314 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
2315 }
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2316 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
2317 }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
2318 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
2319 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
2320 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
2321 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
2322 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2323 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2324
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
2325 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
2326 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
2327 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
2328 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
2329
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
2330 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
2331 iterative_me(s);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2332
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2333 for(y=0; y<h; y++){
2435
c89ac0e70c66 10l patch by (matthieu castet <castet.matthieu free fr>)
michael
parents: 2422
diff changeset
2334 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
2335 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
2336 return;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2408
diff changeset
2337 }
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2338 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
2339 if(s->avctx->me_method == ME_ITER || !search)
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2340 encode_q_branch2(s, 0, x, y);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2341 else
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2342 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
2343 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2344 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2345 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2346
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2347 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
2348 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
2349 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
2350 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
2351
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2352 for(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
2353 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
2354 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
2355 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
2356 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2357 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2358
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2359 static void mc_block(uint8_t *dst, uint8_t *src, uint8_t *tmp, int stride, int b_w, int b_h, int dx, int dy){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2360 int x, y;
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2361 START_TIMER
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2362 for(y=0; y < b_h+5; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2363 for(x=0; x < b_w; x++){
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2364 int a0= src[x ];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2365 int a1= src[x + 1];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2366 int a2= src[x + 2];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2367 int a3= src[x + 3];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2368 int a4= src[x + 4];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2369 int a5= src[x + 5];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2370 // int am= 9*(a1+a2) - (a0+a3);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2371 int am= 20*(a2+a3) - 5*(a1+a4) + (a0+a5);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2372 // int am= 18*(a2+a3) - 2*(a1+a4);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2373 // int aL= (-7*a0 + 105*a1 + 35*a2 - 5*a3)>>3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2374 // int aR= (-7*a3 + 105*a2 + 35*a1 - 5*a0)>>3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2375
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2376 // if(b_w==16) am= 8*(a1+a2);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2377
2610
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2378 if(dx<8) am = (32*a2*( 8-dx) + am* dx + 128)>>8;
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2379 else am = ( am*(16-dx) + 32*a3*(dx-8) + 128)>>8;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2380
2610
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2381 /* FIXME Try increasing tmp buffer to 16 bits and not clipping here. Should give marginally better results. - Robert*/
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2382 if(am&(~255)) am= ~(am>>31);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2383
2610
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2384 tmp[x] = am;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2385
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2386 /* if (dx< 4) tmp[x + y*stride]= (16*a1*( 4-dx) + aL* dx + 32)>>6;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2387 else if(dx< 8) tmp[x + y*stride]= ( aL*( 8-dx) + am*(dx- 4) + 32)>>6;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2388 else if(dx<12) tmp[x + y*stride]= ( am*(12-dx) + aR*(dx- 8) + 32)>>6;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2389 else tmp[x + y*stride]= ( aR*(16-dx) + 16*a2*(dx-12) + 32)>>6;*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2390 }
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2391 tmp += stride;
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2392 src += stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2393 }
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2394 tmp -= (b_h+5)*stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2395
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2396 for(y=0; y < b_h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2397 for(x=0; x < b_w; x++){
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2398 int a0= tmp[x + 0*stride];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2399 int a1= tmp[x + 1*stride];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2400 int a2= tmp[x + 2*stride];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2401 int a3= tmp[x + 3*stride];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2402 int a4= tmp[x + 4*stride];
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2403 int a5= tmp[x + 5*stride];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2404 int am= 20*(a2+a3) - 5*(a1+a4) + (a0+a5);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2405 // int am= 18*(a2+a3) - 2*(a1+a4);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2406 /* int aL= (-7*a0 + 105*a1 + 35*a2 - 5*a3)>>3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2407 int aR= (-7*a3 + 105*a2 + 35*a1 - 5*a0)>>3;*/
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2408
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2409 // if(b_w==16) am= 8*(a1+a2);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2410
2610
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2411 if(dy<8) am = (32*a2*( 8-dy) + am* dy + 128)>>8;
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2412 else am = ( am*(16-dy) + 32*a3*(dy-8) + 128)>>8;
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2413
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2414 if(am&(~255)) am= ~(am>>31);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2415
2610
f794026f4551 fix overflow in mc_block() patch by (Yartrebo )yartrebo earthlink net
michael
parents: 2609
diff changeset
2416 dst[x] = am;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2417 /* if (dy< 4) tmp[x + y*stride]= (16*a1*( 4-dy) + aL* dy + 32)>>6;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2418 else if(dy< 8) tmp[x + y*stride]= ( aL*( 8-dy) + am*(dy- 4) + 32)>>6;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2419 else if(dy<12) tmp[x + y*stride]= ( am*(12-dy) + aR*(dy- 8) + 32)>>6;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2420 else tmp[x + y*stride]= ( aR*(16-dy) + 16*a2*(dy-12) + 32)>>6;*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2421 }
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2422 dst += stride;
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2423 tmp += stride;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2424 }
2221
3543987dccad use pointer arithmetic in mc_block(), 25% faster
michael
parents: 2206
diff changeset
2425 STOP_TIMER("mc_block")
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2426 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2427
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2428 #define mca(dx,dy,b_w)\
2224
11d54cb7ac4e 100l (forgot to set the 8x8 mc functions, so ME did use the mpeg ones ...)
michael
parents: 2223
diff changeset
2429 static void mc_block_hpel ## dx ## dy ## b_w(uint8_t *dst, uint8_t *src, int stride, int h){\
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2430 uint8_t tmp[stride*(b_w+5)];\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2431 assert(h==b_w);\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2432 mc_block(dst, src-2-2*stride, tmp, stride, b_w, b_w, dx, dy);\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2433 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2434
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2435 mca( 0, 0,16)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2436 mca( 8, 0,16)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2437 mca( 0, 8,16)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2438 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
2439 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
2440 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
2441 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
2442 mca( 8, 8,8)
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2443
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2444 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
2445 if(block->type & BLOCK_INTRA){
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2446 int x, y;
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2447 const int color = block->color[plane_index];
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2448 const int color4= color*0x01010101;
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2449 if(b_w==32){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2450 for(y=0; y < b_h; y++){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2451 *(uint32_t*)&dst[0 + y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2452 *(uint32_t*)&dst[4 + y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2453 *(uint32_t*)&dst[8 + y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2454 *(uint32_t*)&dst[12+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2455 *(uint32_t*)&dst[16+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2456 *(uint32_t*)&dst[20+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2457 *(uint32_t*)&dst[24+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2458 *(uint32_t*)&dst[28+ y*stride]= color4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2459 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2460 }else if(b_w==16){
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2461 for(y=0; y < b_h; y++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2462 *(uint32_t*)&dst[0 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2463 *(uint32_t*)&dst[4 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2464 *(uint32_t*)&dst[8 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2465 *(uint32_t*)&dst[12+ y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2466 }
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2467 }else if(b_w==8){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2468 for(y=0; y < b_h; y++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2469 *(uint32_t*)&dst[0 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2470 *(uint32_t*)&dst[4 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2471 }
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2472 }else if(b_w==4){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2473 for(y=0; y < b_h; y++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2474 *(uint32_t*)&dst[0 + y*stride]= color4;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2475 }
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2476 }else{
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2477 for(y=0; y < b_h; y++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2478 for(x=0; x < b_w; x++){
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2479 dst[x + y*stride]= color;
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2480 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2481 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2482 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2483 }else{
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2484 uint8_t *src= s->last_picture[block->ref].data[plane_index];
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2485 const int scale= plane_index ? s->mv_scale : 2*s->mv_scale;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2486 int mx= block->mx*scale;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2487 int my= block->my*scale;
2223
b26474e72d6d use h264 MC code if possible
michael
parents: 2221
diff changeset
2488 const int dx= mx&15;
b26474e72d6d use h264 MC code if possible
michael
parents: 2221
diff changeset
2489 const int dy= my&15;
3020
c75fb0747e74 use h264 MC functions for 2xX Xx2 blocks in snow too
michael
parents: 3018
diff changeset
2490 const int tab_index= 3 - (b_w>>2) + (b_w>>4);
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2491 sx += (mx>>4) - 2;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2492 sy += (my>>4) - 2;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2493 src += sx + sy*stride;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2494 if( (unsigned)sx >= w - b_w - 4
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2495 || (unsigned)sy >= h - b_h - 4){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2496 ff_emulated_edge_mc(tmp + MB_SIZE, src, stride, b_w+5, b_h+5, sx, sy, w, h);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2497 src= tmp + MB_SIZE;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2498 }
3189
e1cbe2635325 fix %8 != 0 w/h
michael
parents: 3075
diff changeset
2499 // 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
2500 // assert(!(b_w&(b_w-1)));
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2501 assert(b_w>1 && b_h>1);
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2502 assert(tab_index>=0 && tab_index<4 || b_w==32);
3189
e1cbe2635325 fix %8 != 0 w/h
michael
parents: 3075
diff changeset
2503 if((dx&3) || (dy&3) || !(b_w == b_h || 2*b_w == b_h || b_w == 2*b_h) || (b_w&(b_w-1)))
2223
b26474e72d6d use h264 MC code if possible
michael
parents: 2221
diff changeset
2504 mc_block(dst, src, tmp, stride, b_w, b_h, dx, dy);
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2505 else if(b_w==32){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2506 int y;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2507 for(y=0; y<b_h; y+=16){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2508 s->dsp.put_h264_qpel_pixels_tab[0][dy+(dx>>2)](dst + y*stride, src + 2 + (y+2)*stride,stride);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2509 s->dsp.put_h264_qpel_pixels_tab[0][dy+(dx>>2)](dst + 16 + y*stride, src + 18 + (y+2)*stride,stride);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2510 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2511 }else if(b_w==b_h)
3020
c75fb0747e74 use h264 MC functions for 2xX Xx2 blocks in snow too
michael
parents: 3018
diff changeset
2512 s->dsp.put_h264_qpel_pixels_tab[tab_index ][dy+(dx>>2)](dst,src + 2 + 2*stride,stride);
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2513 else if(b_w==2*b_h){
3020
c75fb0747e74 use h264 MC functions for 2xX Xx2 blocks in snow too
michael
parents: 3018
diff changeset
2514 s->dsp.put_h264_qpel_pixels_tab[tab_index+1][dy+(dx>>2)](dst ,src + 2 + 2*stride,stride);
c75fb0747e74 use h264 MC functions for 2xX Xx2 blocks in snow too
michael
parents: 3018
diff changeset
2515 s->dsp.put_h264_qpel_pixels_tab[tab_index+1][dy+(dx>>2)](dst+b_h,src + 2 + b_h + 2*stride,stride);
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2516 }else{
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2517 assert(2*b_w==b_h);
3020
c75fb0747e74 use h264 MC functions for 2xX Xx2 blocks in snow too
michael
parents: 3018
diff changeset
2518 s->dsp.put_h264_qpel_pixels_tab[tab_index ][dy+(dx>>2)](dst ,src + 2 + 2*stride ,stride);
c75fb0747e74 use h264 MC functions for 2xX Xx2 blocks in snow too
michael
parents: 3018
diff changeset
2519 s->dsp.put_h264_qpel_pixels_tab[tab_index ][dy+(dx>>2)](dst+b_w*stride,src + 2 + 2*stride+b_w*stride,stride);
3018
1d22fe43aa78 use h264 MC functions for rectangular blocks too
michael
parents: 3017
diff changeset
2520 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2521 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2522 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2523
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2524 void ff_snow_inner_add_yblock(uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h,
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2525 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
2526 int y, x;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2527 DWTELEM * dst;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2528 for(y=0; y<b_h; y++){
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2529 //FIXME ugly missue of obmc_stride
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2530 uint8_t *obmc1= obmc + y*obmc_stride;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2531 uint8_t *obmc2= obmc1+ (obmc_stride>>1);
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2532 uint8_t *obmc3= obmc1+ obmc_stride*(obmc_stride>>1);
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2533 uint8_t *obmc4= obmc3+ (obmc_stride>>1);
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2534 dst = slice_buffer_get_line(sb, src_y + y);
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2535 for(x=0; x<b_w; x++){
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2536 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
2537 +obmc2[x] * block[2][x + y*src_stride]
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2538 +obmc3[x] * block[1][x + y*src_stride]
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2539 +obmc4[x] * block[0][x + y*src_stride];
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2540
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2541 v <<= 8 - LOG2_OBMC_MAX;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2542 if(FRAC_BITS != 8){
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2543 v += 1<<(7 - FRAC_BITS);
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2544 v >>= 8 - FRAC_BITS;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2545 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2546 if(add){
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2547 v += dst[x + src_x];
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2548 v = (v + (1<<(FRAC_BITS-1))) >> FRAC_BITS;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2549 if(v&(~255)) v= ~(v>>31);
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2550 dst8[x + y*src_stride] = v;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2551 }else{
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2552 dst[x + src_x] -= v;
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2553 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2554 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2555 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2556 }
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
2557
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2558 //FIXME name clenup (b_w, block_w, b_width stuff)
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
2559 static av_always_inline void add_yblock(SnowContext *s, int sliced, slice_buffer *sb, DWTELEM *dst, uint8_t *dst8, const uint8_t *obmc, int src_x, int src_y, int b_w, int b_h, int w, int h, int dst_stride, int src_stride, int obmc_stride, int b_x, int b_y, int add, int offset_dst, int plane_index){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2560 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
2561 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
2562 const int b_stride= b_width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2563 BlockNode *lt= &s->block[b_x + b_y*b_stride];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2564 BlockNode *rt= lt+1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2565 BlockNode *lb= lt+b_stride;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2566 BlockNode *rb= lb+1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2567 uint8_t *block[4];
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2568 int tmp_step= src_stride >= 7*MB_SIZE ? MB_SIZE : MB_SIZE*src_stride;
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2569 uint8_t tmp[src_stride*7*MB_SIZE]; //FIXME align
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2570 uint8_t *ptmp;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2571 int x,y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2572
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2573 if(b_x<0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2574 lt= rt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2575 lb= rb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2576 }else if(b_x + 1 >= b_width){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2577 rt= lt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2578 rb= lb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2579 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2580 if(b_y<0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2581 lt= lb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2582 rt= rb;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2583 }else if(b_y + 1 >= b_height){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2584 lb= lt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2585 rb= rt;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2586 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2587
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2588 if(src_x<0){ //FIXME merge with prev & always round internal width upto *16
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2589 obmc -= src_x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2590 b_w += src_x;
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2591 if(!sliced && !offset_dst)
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2592 dst -= src_x;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2593 src_x=0;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2594 }else if(src_x + b_w > w){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2595 b_w = w - src_x;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2596 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2597 if(src_y<0){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2598 obmc -= src_y*obmc_stride;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2599 b_h += src_y;
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2600 if(!sliced && !offset_dst)
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2601 dst -= src_y*dst_stride;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2602 src_y=0;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2603 }else if(src_y + b_h> h){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2604 b_h = h - src_y;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2605 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2606
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2607 if(b_w<=0 || b_h<=0) return;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2608
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2609 assert(src_stride > 2*MB_SIZE + 5);
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2610 if(!sliced && offset_dst)
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2611 dst += src_x + src_y*dst_stride;
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2612 dst8+= src_x + src_y*src_stride;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2613 // src += src_x + src_y*src_stride;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2614
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2615 ptmp= tmp + 3*tmp_step;
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2616 block[0]= ptmp;
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2617 ptmp+=tmp_step;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2618 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
2619
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2620 if(same_block(lt, rt)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2621 block[1]= block[0];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2622 }else{
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2623 block[1]= ptmp;
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2624 ptmp+=tmp_step;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2625 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
2626 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2627
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2628 if(same_block(lt, lb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2629 block[2]= block[0];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2630 }else if(same_block(rt, lb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2631 block[2]= block[1];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2632 }else{
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2633 block[2]= ptmp;
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2634 ptmp+=tmp_step;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2635 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
2636 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2637
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2638 if(same_block(lt, rb) ){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2639 block[3]= block[0];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2640 }else if(same_block(rt, rb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2641 block[3]= block[1];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2642 }else if(same_block(lb, rb)){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2643 block[3]= block[2];
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2644 }else{
2842
55b83c229b88 reducing minimum supported picture size
michael
parents: 2658
diff changeset
2645 block[3]= ptmp;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2646 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
2647 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2648 #if 0
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2649 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2650 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2651 int v= obmc [x + y*obmc_stride] * block[3][x + y*src_stride] * (256/OBMC_MAX);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2652 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2653 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2654 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2655 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2656 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2657 uint8_t *obmc2= obmc + (obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2658 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2659 int v= obmc2[x + y*obmc_stride] * block[2][x + y*src_stride] * (256/OBMC_MAX);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2660 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2661 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2662 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2663 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2664 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2665 uint8_t *obmc3= obmc + obmc_stride*(obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2666 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2667 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
2668 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2669 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2670 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2671 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2672 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2673 uint8_t *obmc3= obmc + obmc_stride*(obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2674 uint8_t *obmc4= obmc3+ (obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2675 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2676 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
2677 if(add) dst[x + y*dst_stride] += v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2678 else dst[x + y*dst_stride] -= v;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2679 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2680 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2681 #else
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2682 if(sliced){
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2683 START_TIMER
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2684
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2685 s->dsp.inner_add_yblock(obmc, obmc_stride, block, b_w, b_h, src_x,src_y, src_stride, sb, add, dst8);
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2686 STOP_TIMER("inner_add_yblock")
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2687 }else
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2688 for(y=0; y<b_h; y++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2689 //FIXME ugly missue of obmc_stride
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2690 uint8_t *obmc1= obmc + y*obmc_stride;
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2691 uint8_t *obmc2= obmc1+ (obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2692 uint8_t *obmc3= obmc1+ obmc_stride*(obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2693 uint8_t *obmc4= obmc3+ (obmc_stride>>1);
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2694 for(x=0; x<b_w; x++){
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2695 int v= obmc1[x] * block[3][x + y*src_stride]
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2696 +obmc2[x] * block[2][x + y*src_stride]
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2697 +obmc3[x] * block[1][x + y*src_stride]
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2698 +obmc4[x] * block[0][x + y*src_stride];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2699
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2700 v <<= 8 - LOG2_OBMC_MAX;
2246
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
2701 if(FRAC_BITS != 8){
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
2702 v += 1<<(7 - FRAC_BITS);
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
2703 v >>= 8 - FRAC_BITS;
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
2704 }
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2705 if(add){
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2706 v += dst[x + y*dst_stride];
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2707 v = (v + (1<<(FRAC_BITS-1))) >> FRAC_BITS;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2708 if(v&(~255)) v= ~(v>>31);
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2709 dst8[x + y*src_stride] = v;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2710 }else{
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2711 dst[x + y*dst_stride] -= v;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2712 }
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2713 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2714 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2715 #endif
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2716 }
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2717
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
2718 static av_always_inline void predict_slice_buffered(SnowContext *s, slice_buffer * sb, DWTELEM * old_buffer, int plane_index, int add, int mb_y){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2719 Plane *p= &s->plane[plane_index];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2720 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
2721 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
2722 int x, y, mb_x;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2723 int block_size = MB_SIZE >> s->block_max_depth;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2724 int block_w = plane_index ? block_size/2 : block_size;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2725 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
2726 int obmc_stride= plane_index ? block_size : 2*block_size;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2727 int ref_stride= s->current_picture.linesize[plane_index];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2728 uint8_t *dst8= s->current_picture.data[plane_index];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2729 int w= p->width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2730 int h= p->height;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2731 START_TIMER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2732
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2733 if(s->keyframe || (s->avctx->debug&512)){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2734 if(mb_y==mb_h)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2735 return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2736
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2737 if(add){
2604
b7e6c3d31c65 Snow segfault bug in revision 1.43 patch by (Yartrebo /yartrebo earthlink net/)
michael
parents: 2602
diff changeset
2738 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
2739 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2740 // DWTELEM * line = slice_buffer_get_line(sb, y);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2741 DWTELEM * line = sb->line[y];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2742 for(x=0; x<w; x++)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2743 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2744 // 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
2745 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
2746 v >>= FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2747 if(v&(~255)) v= ~(v>>31);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2748 dst8[x + y*ref_stride]= v;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2749 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2750 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2751 }else{
2604
b7e6c3d31c65 Snow segfault bug in revision 1.43 patch by (Yartrebo /yartrebo earthlink net/)
michael
parents: 2602
diff changeset
2752 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
2753 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2754 // DWTELEM * line = slice_buffer_get_line(sb, y);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2755 DWTELEM * line = sb->line[y];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2756 for(x=0; x<w; x++)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2757 {
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2758 line[x] -= 128 << FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2759 // buf[x + y*w]-= 128<<FRAC_BITS;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2760 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2761 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2762 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2763
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2764 return;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2765 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2766
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2767 for(mb_x=0; mb_x<=mb_w; mb_x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2768 START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2769
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2770 add_yblock(s, 1, sb, old_buffer, dst8, obmc,
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2771 block_w*mb_x - block_w/2,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2772 block_w*mb_y - block_w/2,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2773 block_w, block_w,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2774 w, h,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2775 w, ref_stride, obmc_stride,
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2776 mb_x - 1, mb_y - 1,
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2777 add, 0, plane_index);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2778
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2779 STOP_TIMER("add_yblock")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2780 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2781
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2782 STOP_TIMER("predict_slice")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2783 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
2784
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
2785 static av_always_inline void predict_slice(SnowContext *s, DWTELEM *buf, int plane_index, int add, int mb_y){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2786 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
2787 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
2788 const int mb_h= s->b_height << s->block_max_depth;
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2789 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
2790 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
2791 int block_w = plane_index ? block_size/2 : block_size;
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2792 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
2793 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
2794 int ref_stride= s->current_picture.linesize[plane_index];
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2795 uint8_t *dst8= s->current_picture.data[plane_index];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2796 int w= p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2797 int h= p->height;
2197
michael
parents: 2195
diff changeset
2798 START_TIMER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2799
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2800 if(s->keyframe || (s->avctx->debug&512)){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2801 if(mb_y==mb_h)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2802 return;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2803
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2804 if(add){
2604
b7e6c3d31c65 Snow segfault bug in revision 1.43 patch by (Yartrebo /yartrebo earthlink net/)
michael
parents: 2602
diff changeset
2805 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
2806 for(x=0; x<w; x++){
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2807 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
2808 v >>= FRAC_BITS;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2809 if(v&(~255)) v= ~(v>>31);
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2810 dst8[x + y*ref_stride]= v;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2811 }
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2812 }
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2813 }else{
2604
b7e6c3d31c65 Snow segfault bug in revision 1.43 patch by (Yartrebo /yartrebo earthlink net/)
michael
parents: 2602
diff changeset
2814 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
2815 for(x=0; x<w; x++){
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2816 buf[x + y*w]-= 128<<FRAC_BITS;
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
2817 }
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2818 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2819 }
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2820
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2821 return;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2822 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2823
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2824 for(mb_x=0; mb_x<=mb_w; mb_x++){
2197
michael
parents: 2195
diff changeset
2825 START_TIMER
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2826
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2827 add_yblock(s, 0, NULL, buf, dst8, obmc,
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2828 block_w*mb_x - block_w/2,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2829 block_w*mb_y - block_w/2,
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2830 block_w, block_w,
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2831 w, h,
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2832 w, ref_stride, obmc_stride,
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2833 mb_x - 1, mb_y - 1,
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2834 add, 1, plane_index);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2835
2206
713ad427a3c7 20% faster predict_plane()
michael
parents: 2199
diff changeset
2836 STOP_TIMER("add_yblock")
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2837 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
2838
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2839 STOP_TIMER("predict_slice")
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2840 }
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2841
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
2842 static av_always_inline void predict_plane(SnowContext *s, DWTELEM *buf, int plane_index, int add){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2843 const int mb_h= s->b_height << s->block_max_depth;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2844 int mb_y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2845 for(mb_y=0; mb_y<=mb_h; mb_y++)
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
2846 predict_slice(s, buf, plane_index, add, mb_y);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2847 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
2848
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2849 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
2850 int i, x2, y2;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2851 Plane *p= &s->plane[plane_index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2852 const int block_size = MB_SIZE >> s->block_max_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2853 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
2854 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
2855 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
2856 const int ref_stride= s->current_picture.linesize[plane_index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2857 uint8_t *src= s-> input_picture.data[plane_index];
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2858 DWTELEM *dst= (DWTELEM*)s->m.obmc_scratchpad + plane_index*block_size*block_size*4;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2859 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
2860 const int w= p->width;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2861 const int h= p->height;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2862 int index= mb_x + mb_y*b_stride;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2863 BlockNode *b= &s->block[index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2864 BlockNode backup= *b;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2865 int ab=0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2866 int aa=0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2867
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2868 b->type|= BLOCK_INTRA;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2869 b->color[plane_index]= 0;
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2870 memset(dst, 0, obmc_stride*obmc_stride*sizeof(DWTELEM));
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2871
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2872 for(i=0; i<4; i++){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2873 int mb_x2= mb_x + (i &1) - 1;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2874 int mb_y2= mb_y + (i>>1) - 1;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2875 int x= block_w*mb_x2 + block_w/2;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2876 int y= block_w*mb_y2 + block_w/2;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2877
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
2878 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
2879 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
2880
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2881 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
2882 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
2883 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
2884 int obmc_v= obmc[index];
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2885 int d;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2886 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
2887 if(x<0) obmc_v += obmc[index + block_w];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2888 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
2889 if(x+block_w>w) obmc_v += obmc[index - block_w];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2890 //FIXME precalc this or simplify it somehow else
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2891
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2892 d = -dst[index] + (1<<(FRAC_BITS-1));
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2893 dst[index] = d;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2894 ab += (src[x2 + y2*ref_stride] - (d>>FRAC_BITS)) * obmc_v;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2895 aa += obmc_v * obmc_v; //FIXME precalclate this
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2896 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2897 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2898 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2899 *b= backup;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2900
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2901 return clip(((ab<<LOG2_OBMC_MAX) + aa/2)/aa, 0, 255); //FIXME we shouldnt need cliping
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2902 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2903
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2904 static inline int get_block_bits(SnowContext *s, int x, int y, int w){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2905 const int b_stride = s->b_width << s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2906 const int b_height = s->b_height<< s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2907 int index= x + y*b_stride;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2908 BlockNode *b = &s->block[index];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2909 BlockNode *left = x ? &s->block[index-1] : &null_block;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2910 BlockNode *top = y ? &s->block[index-b_stride] : &null_block;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2911 BlockNode *tl = y && x ? &s->block[index-b_stride-1] : left;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2912 BlockNode *tr = y && x+w<b_stride ? &s->block[index-b_stride+w] : tl;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2913 int dmx, dmy;
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2914 // int mx_context= av_log2(2*FFABS(left->mx - top->mx));
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2915 // int my_context= av_log2(2*FFABS(left->my - top->my));
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2916
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2917 if(x<0 || x>=b_stride || y>=b_height)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2918 return 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2919 /*
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2920 1 0 0
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2921 01X 1-2 1
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2922 001XX 3-6 2-3
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2923 0001XXX 7-14 4-7
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2924 00001XXXX 15-30 8-15
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2925 */
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2926 //FIXME try accurate rate
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2927 //FIXME intra and inter predictors if surrounding blocks arent the same type
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2928 if(b->type & BLOCK_INTRA){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2929 return 3+2*( av_log2(2*FFABS(left->color[0] - b->color[0]))
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2930 + av_log2(2*FFABS(left->color[1] - b->color[1]))
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2931 + 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
2932 }else{
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2933 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
2934 dmx-= b->mx;
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2935 dmy-= b->my;
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2936 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
2937 + av_log2(2*FFABS(dmy))
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2938 + av_log2(2*b->ref));
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
2939 }
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2940 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
2941
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2942 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
2943 Plane *p= &s->plane[plane_index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2944 const int block_size = MB_SIZE >> s->block_max_depth;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2945 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
2946 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
2947 const int ref_stride= s->current_picture.linesize[plane_index];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2948 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
2949 uint8_t *src= s-> input_picture.data[plane_index];
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2950 DWTELEM *pred= (DWTELEM*)s->m.obmc_scratchpad + plane_index*block_size*block_size*4;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2951 uint8_t cur[ref_stride*2*MB_SIZE]; //FIXME alignment
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2952 uint8_t tmp[ref_stride*(2*MB_SIZE+5)];
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2953 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
2954 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
2955 const int w= p->width;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2956 const int h= p->height;
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2957 int distortion;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2958 int rate= 0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2959 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
2960 int sx= block_w*mb_x - block_w/2;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2961 int sy= block_w*mb_y - block_w/2;
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2962 int x0= FFMAX(0,-sx);
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2963 int y0= FFMAX(0,-sy);
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2964 int x1= FFMIN(block_w*2, w-sx);
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2965 int y1= FFMIN(block_w*2, h-sy);
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2966 int i,x,y;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2967
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
2968 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
2969
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2970 for(y=y0; y<y1; y++){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2971 const uint8_t *obmc1= obmc_edged + y*obmc_stride;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2972 const DWTELEM *pred1 = pred + y*obmc_stride;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2973 uint8_t *cur1 = cur + y*ref_stride;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2974 uint8_t *dst1 = dst + sx + (sy+y)*ref_stride;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2975 for(x=x0; x<x1; x++){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2976 int v = (cur1[x] * obmc1[x]) << (FRAC_BITS - LOG2_OBMC_MAX);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2977 v = (v + pred1[x]) >> FRAC_BITS;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2978 if(v&(~255)) v= ~(v>>31);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2979 dst1[x] = v;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
2980 }
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2981 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2982
3206
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2983 /* copy the regions where obmc[] = (uint8_t)256 */
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2984 if(LOG2_OBMC_MAX == 8
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2985 && (mb_x == 0 || mb_x == b_stride-1)
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2986 && (mb_y == 0 || mb_y == b_height-1)){
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2987 if(mb_x == 0)
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2988 x1 = block_w;
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2989 else
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2990 x0 = block_w;
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2991 if(mb_y == 0)
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2992 y1 = block_w;
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2993 else
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2994 y0 = block_w;
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2995 for(y=y0; y<y1; y++)
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2996 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
2997 }
c1add9fe5c65 Snow mmx + sse2 part 2
corey
parents: 3198
diff changeset
2998
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
2999 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
3000 /* 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
3001 /* FIXME check alignment of the cmp wavelet vs the encoding wavelet */
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3002 /* FIXME cmps overlap but don't cover the wavelet's whole support,
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3003 * so improving the score of one block is not strictly guaranteed to
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3004 * improve the score of the whole frame, so iterative motion est
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3005 * doesn't always converge. */
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3006 if(s->avctx->me_cmp == FF_CMP_W97)
4197
bbe0bc387a19 revert bad checkin
mru
parents: 4196
diff changeset
3007 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
3008 else if(s->avctx->me_cmp == FF_CMP_W53)
4197
bbe0bc387a19 revert bad checkin
mru
parents: 4196
diff changeset
3009 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
3010 else{
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3011 distortion = 0;
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3012 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
3013 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
3014 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
3015 }
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3016 }
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3017 }else{
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3018 assert(block_w==8);
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3019 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
3020 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3021
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3022 if(plane_index==0){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3023 for(i=0; i<4; i++){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3024 /* ..RRr
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3025 * .RXx.
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3026 * rxx..
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3027 */
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3028 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
3029 }
3057
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
3030 if(mb_x == b_stride-2)
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
3031 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
3032 }
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3033 return distortion + rate*penalty_factor;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3034 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3035
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3036 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
3037 int i, y2;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3038 Plane *p= &s->plane[plane_index];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3039 const int block_size = MB_SIZE >> s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3040 const int block_w = plane_index ? block_size/2 : block_size;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3041 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
3042 const int obmc_stride= plane_index ? block_size : 2*block_size;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3043 const int ref_stride= s->current_picture.linesize[plane_index];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3044 uint8_t *dst= s->current_picture.data[plane_index];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3045 uint8_t *src= s-> input_picture.data[plane_index];
3556
6805c1e5507e Fix some "'static' is not at beginning of declaration" warnings.
diego
parents: 3338
diff changeset
3046 static const DWTELEM zero_dst[4096]; //FIXME
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3047 const int b_stride = s->b_width << s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3048 const int w= p->width;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3049 const int h= p->height;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3050 int distortion= 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3051 int rate= 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3052 const int penalty_factor= get_penalty_factor(s->lambda, s->lambda2, s->avctx->me_cmp);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3053
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3054 for(i=0; i<9; i++){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3055 int mb_x2= mb_x + (i%3) - 1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3056 int mb_y2= mb_y + (i/3) - 1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3057 int x= block_w*mb_x2 + block_w/2;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3058 int y= block_w*mb_y2 + block_w/2;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3059
3662
fc714e9a5419 snow cosmetics: merge the sliced and non-sliced versions of add_yblock
lorenm
parents: 3661
diff changeset
3060 add_yblock(s, 0, NULL, zero_dst, dst, obmc,
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3061 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
3062
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3063 //FIXME find a cleaner/simpler way to skip the outside stuff
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3064 for(y2= y; y2<0; y2++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3065 memcpy(dst + x + y2*ref_stride, src + x + y2*ref_stride, block_w);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3066 for(y2= h; y2<y+block_w; y2++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3067 memcpy(dst + x + y2*ref_stride, src + x + y2*ref_stride, block_w);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3068 if(x<0){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3069 for(y2= y; y2<y+block_w; y2++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3070 memcpy(dst + x + y2*ref_stride, src + x + y2*ref_stride, -x);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3071 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3072 if(x+block_w > w){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3073 for(y2= y; y2<y+block_w; y2++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3074 memcpy(dst + w + y2*ref_stride, src + w + y2*ref_stride, x+block_w - w);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3075 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3076
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3077 assert(block_w== 8 || block_w==16);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3078 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
3079 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3080
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3081 if(plane_index==0){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3082 BlockNode *b= &s->block[mb_x+mb_y*b_stride];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3083 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
3084
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3085 /* ..RRRr
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3086 * .RXXx.
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3087 * .RXXx.
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3088 * rxxx.
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3089 */
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3090 if(merged)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3091 rate = get_block_bits(s, mb_x, mb_y, 2);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3092 for(i=merged?4:0; i<9; i++){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3093 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
3094 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
3095 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3096 }
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3097 return distortion + rate*penalty_factor;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3098 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3099
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
3100 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
3101 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
3102 BlockNode *block= &s->block[mb_x + mb_y * b_stride];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3103 BlockNode backup= *block;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3104 int rd, index, value;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3105
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3106 assert(mb_x>=0 && mb_y>=0);
2994
michael
parents: 2993
diff changeset
3107 assert(mb_x<b_stride);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3108
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3109 if(intra){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3110 block->color[0] = p[0];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3111 block->color[1] = p[1];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3112 block->color[2] = p[2];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3113 block->type |= BLOCK_INTRA;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3114 }else{
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3115 index= (p[0] + 31*p[1]) & (ME_CACHE_SIZE-1);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3116 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
3117 if(s->me_cache[index] == value)
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3118 return 0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3119 s->me_cache[index]= value;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3120
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3121 block->mx= p[0];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3122 block->my= p[1];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3123 block->type &= ~BLOCK_INTRA;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3124 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3125
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3126 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
3127
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3128 //FIXME chroma
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3129 if(rd < *best_rd){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3130 *best_rd= rd;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3131 return 1;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3132 }else{
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3133 *block= backup;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3134 return 0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3135 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3136 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3137
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
3138 /* special case for int[2] args we discard afterward, fixes compilation prob with gcc 2.95 */
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
3139 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
3140 int p[2] = {p0, p1};
3197
8f53630cd24e dont pass intra flag if its always 0
michael
parents: 3194
diff changeset
3141 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
3142 }
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
3143
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4197
diff changeset
3144 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
3145 const int b_stride= s->b_width << s->block_max_depth;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3146 BlockNode *block= &s->block[mb_x + mb_y * b_stride];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3147 BlockNode backup[4]= {block[0], block[1], block[b_stride], block[b_stride+1]};
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3148 int rd, index, value;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3149
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3150 assert(mb_x>=0 && mb_y>=0);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3151 assert(mb_x<b_stride);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3152 assert(((mb_x|mb_y)&1) == 0);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3153
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3154 index= (p0 + 31*p1) & (ME_CACHE_SIZE-1);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3155 value= s->me_cache_generation + (p0>>10) + (p1<<6) + (block->ref<<12);
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3156 if(s->me_cache[index] == value)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3157 return 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3158 s->me_cache[index]= value;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3159
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3160 block->mx= p0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3161 block->my= p1;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3162 block->ref= ref;
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3163 block->type &= ~BLOCK_INTRA;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3164 block[1]= block[b_stride]= block[b_stride+1]= *block;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3165
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3166 rd= get_4block_rd(s, mb_x, mb_y, 0);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3167
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3168 //FIXME chroma
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3169 if(rd < *best_rd){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3170 *best_rd= rd;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3171 return 1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3172 }else{
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3173 block[0]= backup[0];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3174 block[1]= backup[1];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3175 block[b_stride]= backup[2];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3176 block[b_stride+1]= backup[3];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3177 return 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3178 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3179 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3180
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3181 static void iterative_me(SnowContext *s){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3182 int pass, mb_x, mb_y;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3183 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
3184 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
3185 const int b_stride= b_width;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3186 int color[3];
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3187
3194
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3188 {
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3189 RangeCoder r = s->c;
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3190 uint8_t state[sizeof(s->block_state)];
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3191 memcpy(state, s->block_state, sizeof(s->block_state));
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3192 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
3193 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
3194 encode_q_branch(s, 0, mb_x, mb_y);
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3195 s->c = r;
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3196 memcpy(s->block_state, state, sizeof(s->block_state));
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3197 }
c30e9bcbb716 seed iterative_me with mvs from conventional search.
lorenm
parents: 3193
diff changeset
3198
3323
87c54a3f8d19 Snow: fix subband weighting in wavelet cmp functions. use 32x32 cmp in iterative motion estimation.
lorenm
parents: 3322
diff changeset
3199 for(pass=0; pass<25; pass++){
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3200 int change= 0;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3201
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3202 for(mb_y= 0; mb_y<b_height; mb_y++){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3203 for(mb_x= 0; mb_x<b_width; mb_x++){
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3204 int dia_change, i, j, ref;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3205 int best_rd= INT_MAX, ref_rd;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3206 BlockNode backup, ref_b;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3207 const int index= mb_x + mb_y * b_stride;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3208 BlockNode *block= &s->block[index];
3324
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3209 BlockNode *tb = mb_y ? &s->block[index-b_stride ] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3210 BlockNode *lb = mb_x ? &s->block[index -1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3211 BlockNode *rb = mb_x+1<b_width ? &s->block[index +1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3212 BlockNode *bb = mb_y+1<b_height ? &s->block[index+b_stride ] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3213 BlockNode *tlb= mb_x && mb_y ? &s->block[index-b_stride-1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3214 BlockNode *trb= mb_x+1<b_width && mb_y ? &s->block[index-b_stride+1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3215 BlockNode *blb= mb_x && mb_y+1<b_height ? &s->block[index+b_stride-1] : NULL;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3216 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
3217 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
3218 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
3219
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3220 if(pass && (block->type & BLOCK_OPT))
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3221 continue;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3222 block->type |= BLOCK_OPT;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3223
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3224 backup= *block;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3225
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3226 if(!s->me_cache_generation)
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3227 memset(s->me_cache, 0, sizeof(s->me_cache));
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3228 s->me_cache_generation += 1<<22;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3229
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3230 //FIXME precalc
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3231 {
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3232 int x, y;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3233 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
3234 if(mb_x==0)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3235 for(y=0; y<b_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3236 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
3237 if(mb_x==b_stride-1)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3238 for(y=0; y<b_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3239 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
3240 if(mb_y==0){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3241 for(x=0; x<b_w*2; x++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3242 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
3243 for(y=1; y<b_w; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3244 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
3245 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3246 if(mb_y==b_height-1){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3247 for(x=0; x<b_w*2; x++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3248 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
3249 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
3250 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
3251 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3252 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3253
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3254 //skip stuff outside the picture
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3255 if(mb_x==0 || mb_y==0 || mb_x==b_width-1 || mb_y==b_height-1)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3256 {
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3257 uint8_t *src= s-> input_picture.data[0];
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3258 uint8_t *dst= s->current_picture.data[0];
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3259 const int stride= s->current_picture.linesize[0];
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3260 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
3261 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
3262 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
3263 const int w= s->plane[0].width;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3264 const int h= s->plane[0].height;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3265 int y;
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3266
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3267 for(y=sy; y<0; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3268 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
3269 for(y=h; y<sy+block_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3270 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
3271 if(sx<0){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3272 for(y=sy; y<sy+block_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3273 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
3274 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3275 if(sx+block_w*2 > w){
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3276 for(y=sy; y<sy+block_w*2; y++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3277 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
3278 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3279 }
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3280
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3281 // intra(black) = neighbors' contribution to the current block
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3282 for(i=0; i<3; i++)
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3283 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
3284
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3285 // get previous score (cant be cached due to OBMC)
3057
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
3286 if(pass > 0 && (block->type&BLOCK_INTRA)){
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
3287 int color0[3]= {block->color[0], block->color[1], block->color[2]};
8f78b00d1252 fix convergence of snow iterative_me
lorenm
parents: 3056
diff changeset
3288 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
3289 }else
3197
8f53630cd24e dont pass intra flag if its always 0
michael
parents: 3194
diff changeset
3290 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
3291
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3292 ref_b= *block;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3293 ref_rd= best_rd;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3294 for(ref=0; ref < s->ref_frames; ref++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3295 int16_t (*mvr)[2]= &s->ref_mvs[ref][index];
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3296 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
3297 continue;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3298 block->ref= ref;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3299 best_rd= INT_MAX;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3300
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3301 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
3302 check_block_inter(s, mb_x, mb_y, 0, 0, *obmc_edged, &best_rd);
3324
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3303 if(tb)
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3304 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
3305 if(lb)
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3306 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
3307 if(rb)
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3308 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
3309 if(bb)
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3310 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
3311
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3312 /* fullpel ME */
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3313 //FIXME avoid subpel interpol / round to nearest integer
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3314 do{
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3315 dia_change=0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3316 for(i=0; i<FFMAX(s->avctx->dia_size, 1); i++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3317 for(j=0; j<i; j++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3318 dia_change |= check_block_inter(s, mb_x, mb_y, block->mx+4*(i-j), block->my+(4*j), *obmc_edged, &best_rd);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3319 dia_change |= check_block_inter(s, mb_x, mb_y, block->mx-4*(i-j), block->my-(4*j), *obmc_edged, &best_rd);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3320 dia_change |= check_block_inter(s, mb_x, mb_y, block->mx+4*(i-j), block->my-(4*j), *obmc_edged, &best_rd);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3321 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
3322 }
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3323 }
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3324 }while(dia_change);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3325 /* subpel ME */
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3326 do{
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3327 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
3328 dia_change=0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3329 for(i=0; i<8; i++)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3330 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
3331 }while(dia_change);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3332 //FIXME or try the standard 2 pass qpel or similar
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3333
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3334 mvr[0][0]= block->mx;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3335 mvr[0][1]= block->my;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3336 if(ref_rd > best_rd){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3337 ref_rd= best_rd;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3338 ref_b= *block;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3339 }
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3340 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3341 best_rd= ref_rd;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3342 *block= ref_b;
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
3343 #if 1
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
3344 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
3345 //FIXME RD style color selection
2998
733ceb1e079e mem corruption fix
michael
parents: 2995
diff changeset
3346 #endif
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3347 if(!same_block(block, &backup)){
3324
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3348 if(tb ) tb ->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3349 if(lb ) lb ->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3350 if(rb ) rb ->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3351 if(bb ) bb ->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3352 if(tlb) tlb->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3353 if(trb) trb->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3354 if(blb) blb->type &= ~BLOCK_OPT;
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3355 if(brb) brb->type &= ~BLOCK_OPT;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3356 change ++;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3357 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3358 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3359 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3360 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
3361 if(!change)
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3362 break;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3363 }
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3364
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3365 if(s->block_max_depth == 1){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3366 int change= 0;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3367 for(mb_y= 0; mb_y<b_height; mb_y+=2){
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3368 for(mb_x= 0; mb_x<b_width; mb_x+=2){
3324
dbb617c134ff Snow: cosmetics
lorenm
parents: 3323
diff changeset
3369 int i;
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3370 int best_rd, init_rd;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3371 const int index= mb_x + mb_y * b_stride;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3372 BlockNode *b[4];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3373
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3374 b[0]= &s->block[index];
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3375 b[1]= b[0]+1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3376 b[2]= b[0]+b_stride;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3377 b[3]= b[2]+1;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3378 if(same_block(b[0], b[1]) &&
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3379 same_block(b[0], b[2]) &&
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3380 same_block(b[0], b[3]))
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3381 continue;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3382
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3383 if(!s->me_cache_generation)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3384 memset(s->me_cache, 0, sizeof(s->me_cache));
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3385 s->me_cache_generation += 1<<22;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3386
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3387 init_rd= best_rd= get_4block_rd(s, mb_x, mb_y, 0);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3388
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3389 //FIXME more multiref search?
3051
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3390 check_4block_inter(s, mb_x, mb_y,
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3391 (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
3392 (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
3393
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3394 for(i=0; i<4; i++)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3395 if(!(b[i]->type&BLOCK_INTRA))
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3396 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
3397
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3398 if(init_rd != best_rd)
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3399 change++;
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3400 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3401 }
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3402 av_log(NULL, AV_LOG_ERROR, "pass:4mv changed:%d\n", change*4);
c0fde3eb7784 obmc-aware 4mv
lorenm
parents: 3036
diff changeset
3403 }
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3404 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
3405
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3406 static void quantize(SnowContext *s, SubBand *b, DWTELEM *src, int stride, int bias){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3407 const int level= b->level;
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;
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3410 const int qlog= clip(s->qlog + b->qlog, 0, QROOT*16);
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3411 const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3412 int x,y, thres1, thres2;
2893
6f8bcb169256 fix unused variable warnings
aurel
parents: 2842
diff changeset
3413 // START_TIMER
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3414
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3415 if(s->qlog == LOSSLESS_QLOG) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3416
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3417 bias= bias ? 0 : (3*qmul)>>3;
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3418 thres1= ((qmul - bias)>>QEXPSHIFT) - 1;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3419 thres2= 2*thres1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3420
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3421 if(!bias){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3422 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3423 for(x=0; x<w; x++){
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3424 int i= src[x + y*stride];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3425
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3426 if((unsigned)(i+thres1) > thres2){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3427 if(i>=0){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3428 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3429 i/= qmul; //FIXME optimize
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3430 src[x + y*stride]= i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3431 }else{
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3432 i= -i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3433 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3434 i/= qmul; //FIXME optimize
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3435 src[x + y*stride]= -i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3436 }
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3437 }else
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3438 src[x + y*stride]= 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3439 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3440 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3441 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3442 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3443 for(x=0; x<w; x++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3444 int i= src[x + y*stride];
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3445
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3446 if((unsigned)(i+thres1) > thres2){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3447 if(i>=0){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3448 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3449 i= (i + bias) / qmul; //FIXME optimize
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3450 src[x + y*stride]= i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3451 }else{
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3452 i= -i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3453 i<<= QEXPSHIFT;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3454 i= (i + bias) / qmul; //FIXME optimize
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3455 src[x + y*stride]= -i;
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3456 }
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3457 }else
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3458 src[x + y*stride]= 0;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3459 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3460 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3461 }
2150
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3462 if(level+1 == s->spatial_decomposition_count){
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3463 // STOP_TIMER("quantize")
8aff375a986b optimize quantizaton (about 3x faster)
michael
parents: 2149
diff changeset
3464 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3465 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3466
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3467 static void dequantize_slice_buffered(SnowContext *s, slice_buffer * sb, SubBand *b, DWTELEM *src, int stride, int start_y, int end_y){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3468 const int w= b->width;
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3469 const int qlog= clip(s->qlog + b->qlog, 0, QROOT*16);
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3470 const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3471 const int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3472 int x,y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3473 START_TIMER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3474
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3475 if(s->qlog == LOSSLESS_QLOG) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3476
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3477 for(y=start_y; y<end_y; y++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3478 // DWTELEM * line = slice_buffer_get_line_from_address(sb, src + (y * stride));
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3479 DWTELEM * line = slice_buffer_get_line(sb, (y * b->stride_line) + b->buf_y_offset) + b->buf_x_offset;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3480 for(x=0; x<w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3481 int i= line[x];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3482 if(i<0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3483 line[x]= -((-i*qmul + qadd)>>(QEXPSHIFT)); //FIXME try different bias
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3484 }else if(i>0){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3485 line[x]= (( i*qmul + qadd)>>(QEXPSHIFT));
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3486 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3487 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3488 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3489 if(w > 200 /*level+1 == s->spatial_decomposition_count*/){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3490 STOP_TIMER("dquant")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3491 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3492 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3493
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3494 static void dequantize(SnowContext *s, SubBand *b, DWTELEM *src, int stride){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3495 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3496 const int h= b->height;
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3497 const int qlog= clip(s->qlog + b->qlog, 0, QROOT*16);
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3498 const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3499 const int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3500 int x,y;
2195
df3079d7806f merge decode_subband() and dequantize()
michael
parents: 2194
diff changeset
3501 START_TIMER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3502
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
3503 if(s->qlog == LOSSLESS_QLOG) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3504
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3505 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3506 for(x=0; x<w; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3507 int i= src[x + y*stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3508 if(i<0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3509 src[x + y*stride]= -((-i*qmul + qadd)>>(QEXPSHIFT)); //FIXME try different bias
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3510 }else if(i>0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3511 src[x + y*stride]= (( i*qmul + qadd)>>(QEXPSHIFT));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3512 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3513 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3514 }
2195
df3079d7806f merge decode_subband() and dequantize()
michael
parents: 2194
diff changeset
3515 if(w > 200 /*level+1 == s->spatial_decomposition_count*/){
df3079d7806f merge decode_subband() and dequantize()
michael
parents: 2194
diff changeset
3516 STOP_TIMER("dquant")
df3079d7806f merge decode_subband() and dequantize()
michael
parents: 2194
diff changeset
3517 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3518 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3519
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3520 static void decorrelate(SnowContext *s, SubBand *b, DWTELEM *src, int stride, int inverse, int use_median){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3521 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3522 const int h= b->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3523 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3524
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3525 for(y=h-1; y>=0; y--){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3526 for(x=w-1; x>=0; x--){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3527 int i= x + y*stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3528
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3529 if(x){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3530 if(use_median){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3531 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
3532 else src[i] -= src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3533 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3534 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
3535 else src[i] -= src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3536 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3537 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3538 if(y) src[i] -= src[i - stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3539 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3540 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3541 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3542 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3543
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3544 static void correlate_slice_buffered(SnowContext *s, slice_buffer * sb, SubBand *b, DWTELEM *src, int stride, int inverse, int use_median, int start_y, int end_y){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3545 const int w= b->width;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3546 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3547
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3548 // START_TIMER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3549
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3550 DWTELEM * line;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3551 DWTELEM * prev;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3552
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3553 if (start_y != 0)
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3554 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
3555
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
3556 for(y=start_y; y<end_y; y++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3557 prev = line;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3558 // 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
3559 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
3560 for(x=0; x<w; x++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3561 if(x){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3562 if(use_median){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3563 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
3564 else line[x] += line[x - 1];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3565 }else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3566 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
3567 else line[x] += line[x - 1];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3568 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3569 }else{
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3570 if(y) line[x] += prev[x];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3571 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3572 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3573 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3574
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3575 // STOP_TIMER("correlate")
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3576 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3577
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3578 static void correlate(SnowContext *s, SubBand *b, DWTELEM *src, int stride, int inverse, int use_median){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3579 const int w= b->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3580 const int h= b->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3581 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3582
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3583 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3584 for(x=0; x<w; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3585 int i= x + y*stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3586
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3587 if(x){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3588 if(use_median){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3589 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
3590 else src[i] += src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3591 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3592 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
3593 else src[i] += src[i - 1];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3594 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3595 }else{
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3596 if(y) src[i] += src[i - stride];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3597 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3598 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3599 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3600 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3601
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3602 static void encode_header(SnowContext *s){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3603 int plane_index, level, orientation;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3604 uint8_t kstate[32];
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3605
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3606 memset(kstate, MID_STATE, sizeof(kstate));
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3607
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3608 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
3609 if(s->keyframe || s->always_reset){
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
3610 reset_contexts(s);
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3611 s->last_spatial_decomposition_type=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3612 s->last_qlog=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3613 s->last_qbias=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3614 s->last_mv_scale=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3615 s->last_block_max_depth= 0;
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3616 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3617 if(s->keyframe){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3618 put_symbol(&s->c, s->header_state, s->version, 0);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3619 put_rac(&s->c, s->header_state, s->always_reset);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3620 put_symbol(&s->c, s->header_state, s->temporal_decomposition_type, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3621 put_symbol(&s->c, s->header_state, s->temporal_decomposition_count, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3622 put_symbol(&s->c, s->header_state, s->spatial_decomposition_count, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3623 put_symbol(&s->c, s->header_state, s->colorspace_type, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3624 put_symbol(&s->c, s->header_state, s->chroma_h_shift, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3625 put_symbol(&s->c, s->header_state, s->chroma_v_shift, 0);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3626 put_rac(&s->c, s->header_state, s->spatial_scalability);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3627 // put_rac(&s->c, s->header_state, s->rate_scalability);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3628 put_symbol(&s->c, s->header_state, s->max_ref_frames-1, 0);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3629
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3630 for(plane_index=0; plane_index<2; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3631 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3632 for(orientation=level ? 1:0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3633 if(orientation==2) continue;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3634 put_symbol(&s->c, s->header_state, s->plane[plane_index].band[level][orientation].qlog, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3635 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3636 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3637 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3638 }
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3639 put_symbol(&s->c, s->header_state, s->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
3640 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
3641 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
3642 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
3643 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
3644
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3645 s->last_spatial_decomposition_type= s->spatial_decomposition_type;
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3646 s->last_qlog = s->qlog;
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3647 s->last_qbias = s->qbias;
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3648 s->last_mv_scale = s->mv_scale;
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3649 s->last_block_max_depth = s->block_max_depth;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3650 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3651
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3652 static int decode_header(SnowContext *s){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3653 int plane_index, level, orientation;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3654 uint8_t kstate[32];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3655
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3656 memset(kstate, MID_STATE, sizeof(kstate));
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3657
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3658 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
3659 if(s->keyframe || s->always_reset){
2199
e0b08bdf565d 10l (keyframes and context resets)
michael
parents: 2198
diff changeset
3660 reset_contexts(s);
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3661 s->spatial_decomposition_type=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3662 s->qlog=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3663 s->qbias=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3664 s->mv_scale=
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3665 s->block_max_depth= 0;
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3666 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3667 if(s->keyframe){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3668 s->version= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3669 if(s->version>0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3670 av_log(s->avctx, AV_LOG_ERROR, "version %d not supported", s->version);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3671 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3672 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3673 s->always_reset= get_rac(&s->c, s->header_state);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3674 s->temporal_decomposition_type= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3675 s->temporal_decomposition_count= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3676 s->spatial_decomposition_count= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3677 s->colorspace_type= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3678 s->chroma_h_shift= get_symbol(&s->c, s->header_state, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3679 s->chroma_v_shift= get_symbol(&s->c, s->header_state, 0);
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3680 s->spatial_scalability= get_rac(&s->c, s->header_state);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
3681 // s->rate_scalability= get_rac(&s->c, s->header_state);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3682 s->max_ref_frames= get_symbol(&s->c, s->header_state, 0)+1;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3683
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3684 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3685 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3686 for(orientation=level ? 1:0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3687 int q;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3688 if (plane_index==2) q= s->plane[1].band[level][orientation].qlog;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3689 else if(orientation==2) q= s->plane[plane_index].band[level][1].qlog;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3690 else q= get_symbol(&s->c, s->header_state, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3691 s->plane[plane_index].band[level][orientation].qlog= q;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3692 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3693 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3694 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3695 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3696
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3697 s->spatial_decomposition_type+= get_symbol(&s->c, s->header_state, 1);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3698 if(s->spatial_decomposition_type > 2){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3699 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
3700 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3701 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3702
4331
e571dfe677be store a few values in the header as difference to the last
michael
parents: 4283
diff changeset
3703 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
3704 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
3705 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
3706 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
3707 if(s->block_max_depth > 1 || s->block_max_depth < 0){
2952
d7be13d3ef00 check block_max_depth (fixes crash)
michael
parents: 2951
diff changeset
3708 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
3709 s->block_max_depth= 0;
d7be13d3ef00 check block_max_depth (fixes crash)
michael
parents: 2951
diff changeset
3710 return -1;
d7be13d3ef00 check block_max_depth (fixes crash)
michael
parents: 2951
diff changeset
3711 }
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3712
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3713 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
3714 }
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3715
3075
961af1358c7f add static keyword to some functions
mru
parents: 3063
diff changeset
3716 static void init_qexp(void){
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3717 int i;
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3718 double v=128;
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3719
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3720 for(i=0; i<QROOT; i++){
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3721 qexp[i]= lrintf(v);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3722 v *= pow(2, 1.0 / QROOT);
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3723 }
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3724 }
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3725
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3726 static int common_init(AVCodecContext *avctx){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3727 SnowContext *s = avctx->priv_data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3728 int width, height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3729 int level, orientation, plane_index, dec;
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
3730 int i, j;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3731
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3732 s->avctx= avctx;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3733
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3734 dsputil_init(&s->dsp, avctx);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3735
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3736 #define mcf(dx,dy)\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3737 s->dsp.put_qpel_pixels_tab [0][dy+dx/4]=\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3738 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
3739 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
3740 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
3741 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
3742 s->dsp.put_h264_qpel_pixels_tab[1][dy+dx/4];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3743
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3744 mcf( 0, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3745 mcf( 4, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3746 mcf( 8, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3747 mcf(12, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3748 mcf( 0, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3749 mcf( 4, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3750 mcf( 8, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3751 mcf(12, 4)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3752 mcf( 0, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3753 mcf( 4, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3754 mcf( 8, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3755 mcf(12, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3756 mcf( 0,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3757 mcf( 4,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3758 mcf( 8,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3759 mcf(12,12)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3760
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3761 #define mcfh(dx,dy)\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3762 s->dsp.put_pixels_tab [0][dy/4+dx/8]=\
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3763 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
3764 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
3765 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
3766 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
3767 mc_block_hpel ## dx ## dy ## 8;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3768
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3769 mcfh(0, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3770 mcfh(8, 0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3771 mcfh(0, 8)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3772 mcfh(8, 8)
2600
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3773
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3774 if(!qexp[0])
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3775 init_qexp();
2bcea6618a87 fix QROOT != 8
michael
parents: 2596
diff changeset
3776
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3777 dec= s->spatial_decomposition_count= 5;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3778 s->spatial_decomposition_type= avctx->prediction_method; //FIXME add decorrelator type r transform_type
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3779
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3780 s->chroma_h_shift= 1; //FIXME XXX
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3781 s->chroma_v_shift= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3782
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3783 // dec += FFMAX(s->chroma_h_shift, s->chroma_v_shift);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3784
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3785 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
3786 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
3787
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3788 s->spatial_dwt_buffer= av_mallocz(width*height*sizeof(DWTELEM));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3789
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3790 s->mv_scale= (s->avctx->flags & CODEC_FLAG_QPEL) ? 2 : 4;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
3791 s->block_max_depth= (s->avctx->flags & CODEC_FLAG_4MV) ? 1 : 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3792
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3793 for(plane_index=0; plane_index<3; plane_index++){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3794 int w= s->avctx->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3795 int h= s->avctx->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3796
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3797 if(plane_index){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3798 w>>= s->chroma_h_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3799 h>>= s->chroma_v_shift;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3800 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3801 s->plane[plane_index].width = w;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3802 s->plane[plane_index].height= h;
2160
11e1425b3a66 cleanup
michael
parents: 2159
diff changeset
3803 //av_log(NULL, AV_LOG_DEBUG, "%d %d\n", w, h);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3804 for(level=s->spatial_decomposition_count-1; level>=0; level--){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3805 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3806 SubBand *b= &s->plane[plane_index].band[level][orientation];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3807
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3808 b->buf= s->spatial_dwt_buffer;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3809 b->level= level;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3810 b->stride= s->plane[plane_index].width << (s->spatial_decomposition_count - level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3811 b->width = (w + !(orientation&1))>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3812 b->height= (h + !(orientation>1))>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3813
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3814 b->stride_line = 1 << (s->spatial_decomposition_count - level);
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3815 b->buf_x_offset = 0;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3816 b->buf_y_offset = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3817
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3818 if(orientation&1){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3819 b->buf += (w+1)>>1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3820 b->buf_x_offset = (w+1)>>1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3821 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3822 if(orientation>1){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3823 b->buf += b->stride>>1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3824 b->buf_y_offset = b->stride_line >> 1;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3825 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3826
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3827 if(level)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3828 b->parent= &s->plane[plane_index].band[level-1][orientation];
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
3829 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
3830 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3831 w= (w+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3832 h= (h+1)>>1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3833 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3834 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3835
3325
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
3836 for(i=0; i<MAX_REF_FRAMES; i++)
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
3837 for(j=0; j<MAX_REF_FRAMES; j++)
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
3838 scale_mv_ref[i][j] = 256*(i+1)/(j+1);
c2a017de6bea Snow: scale predicted mv based on which reference frame the neighbors used.
lorenm
parents: 3324
diff changeset
3839
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3840 reset_contexts(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3841 /*
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3842 width= s->width= avctx->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3843 height= s->height= avctx->height;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3844
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3845 assert(width && height);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3846 */
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3847 s->avctx->get_buffer(s->avctx, &s->mconly_picture);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3848
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3849 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3850 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3851
3322
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3852 static int qscale2qlog(int qscale){
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3853 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
3854 + 61*QROOT/8; //<64 >60
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3855 }
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3856
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
3857 static int ratecontrol_1pass(SnowContext *s, AVFrame *pict)
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3858 {
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3859 /* estimate the frame's complexity as a sum of weighted dwt coefs.
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3860 * FIXME we know exact mv bits at this point,
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3861 * but ratecontrol isn't set up to include them. */
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3862 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
3863 int level, orientation, delta_qlog;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3864
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3865 for(level=0; level<s->spatial_decomposition_count; level++){
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3866 for(orientation=level ? 1 : 0; orientation<4; orientation++){
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3867 SubBand *b= &s->plane[0].band[level][orientation];
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3868 DWTELEM *buf= b->buf;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3869 const int w= b->width;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3870 const int h= b->height;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3871 const int stride= b->stride;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3872 const int qlog= clip(2*QROOT + b->qlog, 0, QROOT*16);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3873 const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3874 const int qdiv= (1<<16)/qmul;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3875 int x, y;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3876 if(orientation==0)
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3877 decorrelate(s, b, buf, stride, 1, 0);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3878 for(y=0; y<h; y++)
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3879 for(x=0; x<w; x++)
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3880 coef_sum+= abs(buf[x+y*stride]) * qdiv >> 16;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3881 if(orientation==0)
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3882 correlate(s, b, buf, stride, 1, 0);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3883 }
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3884 }
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3885
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3886 /* ugly, ratecontrol just takes a sqrt again */
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3887 coef_sum = (uint64_t)coef_sum * coef_sum >> 16;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3888 assert(coef_sum < INT_MAX);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3889
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3890 if(pict->pict_type == I_TYPE){
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3891 s->m.current_picture.mb_var_sum= coef_sum;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3892 s->m.current_picture.mc_mb_var_sum= 0;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3893 }else{
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3894 s->m.current_picture.mc_mb_var_sum= coef_sum;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3895 s->m.current_picture.mb_var_sum= 0;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3896 }
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3897
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3898 pict->quality= ff_rate_estimate_qscale(&s->m, 1);
3766
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
3899 if (pict->quality < 0)
4011
5bce97c30a69 -1 is a valid return value in ratecontrol_1pass() -> 100l for takis
michael
parents: 4001
diff changeset
3900 return INT_MIN;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3901 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
3902 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
3903 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
3904 return delta_qlog;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3905 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3906
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3907 static void calculate_vissual_weight(SnowContext *s, Plane *p){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3908 int width = p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3909 int height= p->height;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
3910 int level, orientation, x, y;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3911
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3912 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3913 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3914 SubBand *b= &p->band[level][orientation];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3915 DWTELEM *buf= b->buf;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3916 int64_t error=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3917
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3918 memset(s->spatial_dwt_buffer, 0, sizeof(int)*width*height);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3919 buf[b->width/2 + b->height/2*b->stride]= 256*256;
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3920 ff_spatial_idwt(s->spatial_dwt_buffer, width, height, width, s->spatial_decomposition_type, s->spatial_decomposition_count);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3921 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3922 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3923 int64_t d= s->spatial_dwt_buffer[x + y*width];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3924 error += d*d;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3925 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3926 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3927
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3928 b->qlog= (int)(log(352256.0/sqrt(error)) / log(pow(2.0, 1.0/QROOT))+0.5);
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
3929 // av_log(NULL, AV_LOG_DEBUG, "%d %d %d\n", level, orientation, b->qlog/*, sqrt(error)*/);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3930 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3931 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3932 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3933
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3934 static int encode_init(AVCodecContext *avctx)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3935 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3936 SnowContext *s = avctx->priv_data;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
3937 int plane_index;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3938
2658
d1609cfeb1d0 #defines for strict_std_compliance and split between inofficial extensions and non standarized things
michael
parents: 2635
diff changeset
3939 if(avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL){
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2610
diff changeset
3940 av_log(avctx, AV_LOG_ERROR, "this codec is under development, files encoded with it may not be decodable with future versions!!!\n"
2658
d1609cfeb1d0 #defines for strict_std_compliance and split between inofficial extensions and non standarized things
michael
parents: 2635
diff changeset
3941 "use vstrict=-2 / -strict -2 to use it anyway\n");
2151
44c973bfec0f dont segfault without -strict -1
michael
parents: 2150
diff changeset
3942 return -1;
44c973bfec0f dont segfault without -strict -1
michael
parents: 2150
diff changeset
3943 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3944
3327
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3945 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
3946 && (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
3947 && avctx->global_quality == 0){
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3948 av_log(avctx, AV_LOG_ERROR, "the 9/7 wavelet is incompatible with lossless mode\n");
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3949 return -1;
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3950 }
955096780e7c Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless.
lorenm
parents: 3326
diff changeset
3951
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3952 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
3953 alloc_blocks(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3954
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3955 s->version=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3956
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3957 s->m.avctx = avctx;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3958 s->m.flags = avctx->flags;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3959 s->m.bit_rate= avctx->bit_rate;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3960
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3961 s->m.me.scratchpad= av_mallocz((avctx->width+64)*2*16*2*sizeof(uint8_t));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3962 s->m.me.map = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3963 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
3964 s->m.obmc_scratchpad= av_mallocz(MB_SIZE*MB_SIZE*12*sizeof(uint32_t));
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3965 h263_encode_init(&s->m); //mv_penalty
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3966
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3967 s->max_ref_frames = FFMAX(FFMIN(avctx->refs, MAX_REF_FRAMES), 1);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
3968
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3969 if(avctx->flags&CODEC_FLAG_PASS1){
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3970 if(!avctx->stats_out)
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3971 avctx->stats_out = av_mallocz(256);
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3972 }
3322
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
3973 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
3974 if(ff_rate_control_init(&s->m) < 0)
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3975 return -1;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
3976 }
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
3977 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
3978
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3979 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3980 calculate_vissual_weight(s, &s->plane[plane_index]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3981 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3982
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
3983
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3984 avctx->coded_frame= &s->current_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3985 switch(avctx->pix_fmt){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3986 // case PIX_FMT_YUV444P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3987 // case PIX_FMT_YUV422P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3988 case PIX_FMT_YUV420P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3989 case PIX_FMT_GRAY8:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3990 // case PIX_FMT_YUV411P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3991 // case PIX_FMT_YUV410P:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3992 s->colorspace_type= 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3993 break;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3994 /* case PIX_FMT_RGBA32:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3995 s->colorspace= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3996 break;*/
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3997 default:
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3998 av_log(avctx, AV_LOG_ERROR, "format not supported\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
3999 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4000 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4001 // 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
4002 s->chroma_h_shift= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4003 s->chroma_v_shift= 1;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4004
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4005 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
4006 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
4007
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4008 s->avctx->get_buffer(s->avctx, &s->input_picture);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4009
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4010 if(s->avctx->me_method == ME_ITER){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4011 int i;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4012 int size= s->b_width * s->b_height << 2*s->block_max_depth;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4013 for(i=0; i<s->max_ref_frames; i++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4014 s->ref_mvs[i]= av_mallocz(size*sizeof(int16_t[2]));
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4015 s->ref_scores[i]= av_mallocz(size*sizeof(uint32_t));
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4016 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4017 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4018
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4019 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4020 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4021
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4022 static int frame_start(SnowContext *s){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4023 AVFrame tmp;
2187
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4024 int w= s->avctx->width; //FIXME round up to x16 ?
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4025 int h= s->avctx->height;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4026
2187
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4027 if(s->current_picture.data[0]){
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4028 draw_edges(s->current_picture.data[0], s->current_picture.linesize[0], w , h , EDGE_WIDTH );
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4029 draw_edges(s->current_picture.data[1], s->current_picture.linesize[1], w>>1, h>>1, EDGE_WIDTH/2);
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4030 draw_edges(s->current_picture.data[2], s->current_picture.linesize[2], w>>1, h>>1, EDGE_WIDTH/2);
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4031 }
eedd352930b2 edge bugfix
michael
parents: 2164
diff changeset
4032
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4033 tmp= s->last_picture[s->max_ref_frames-1];
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4034 memmove(s->last_picture+1, s->last_picture, (s->max_ref_frames-1)*sizeof(AVFrame));
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4035 s->last_picture[0]= s->current_picture;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4036 s->current_picture= tmp;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4037
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4038 if(s->keyframe){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4039 s->ref_frames= 0;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4040 }else{
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4041 int i;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4042 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
4043 if(i && s->last_picture[i-1].key_frame)
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4044 break;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4045 s->ref_frames= i;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4046 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4047
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4048 s->current_picture.reference= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4049 if(s->avctx->get_buffer(s->avctx, &s->current_picture) < 0){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4050 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4051 return -1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4052 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4053
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4054 s->current_picture.key_frame= s->keyframe;
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4055
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4056 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4057 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4058
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4059 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4060 SnowContext *s = avctx->priv_data;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4061 RangeCoder * const c= &s->c;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4062 AVFrame *pict = data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4063 const int width= s->avctx->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4064 const int height= s->avctx->height;
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4065 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
4066 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
4067 uint8_t rc_block_bak[sizeof(s->block_state)];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4068
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4069 ff_init_range_encoder(c, buf, buf_size);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4070 ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4071
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4072 for(i=0; i<3; i++){
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4073 int shift= !!i;
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4074 for(y=0; y<(height>>shift); y++)
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4075 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
4076 &pict->data[i][y * pict->linesize[i]],
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4077 width>>shift);
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4078 }
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4079 s->new_picture = *pict;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4080
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4081 s->m.picture_number= avctx->frame_number;
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4082 if(avctx->flags&CODEC_FLAG_PASS2){
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4083 s->m.pict_type =
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4084 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
4085 s->keyframe= pict->pict_type==FF_I_TYPE;
3766
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4086 if(!(avctx->flags&CODEC_FLAG_QSCALE)) {
3193
66116775b315 obey vqscale in 2nd pass
lorenm
parents: 3190
diff changeset
4087 pict->quality= ff_rate_estimate_qscale(&s->m, 0);
3766
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4088 if (pict->quality < 0)
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4089 return -1;
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4090 }
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4091 }else{
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4092 s->keyframe= avctx->gop_size==0 || avctx->frame_number % avctx->gop_size == 0;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4093 s->m.pict_type=
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4094 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
4095 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4096
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4097 if(s->pass1_rc && avctx->frame_number == 0)
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4098 pict->quality= 2*FF_QP2LAMBDA;
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4099 if(pict->quality){
3322
0b4f548dfb44 Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
lorenm
parents: 3314
diff changeset
4100 s->qlog= qscale2qlog(pict->quality);
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4101 s->lambda = pict->quality * 3/2;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4102 }
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4103 if(s->qlog < 0 || (!pict->quality && (avctx->flags & CODEC_FLAG_QSCALE))){
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4104 s->qlog= LOSSLESS_QLOG;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4105 s->lambda = 0;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4106 }//else keep previous frame's qlog until after motion est
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4107
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4108 frame_start(s);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4109
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4110 s->m.current_picture_ptr= &s->m.current_picture;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4111 if(pict->pict_type == P_TYPE){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4112 int block_width = (width +15)>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4113 int block_height= (height+15)>>4;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4114 int stride= s->current_picture.linesize[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4115
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4116 assert(s->current_picture.data[0]);
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4117 assert(s->last_picture[0].data[0]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4118
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4119 s->m.avctx= s->avctx;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4120 s->m.current_picture.data[0]= s->current_picture.data[0];
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4121 s->m. last_picture.data[0]= s->last_picture[0].data[0];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4122 s->m. new_picture.data[0]= s-> input_picture.data[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4123 s->m. last_picture_ptr= &s->m. last_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4124 s->m.linesize=
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4125 s->m. last_picture.linesize[0]=
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4126 s->m. new_picture.linesize[0]=
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4127 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
4128 s->m.uvlinesize= s->current_picture.linesize[1];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4129 s->m.width = width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4130 s->m.height= height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4131 s->m.mb_width = block_width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4132 s->m.mb_height= block_height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4133 s->m.mb_stride= s->m.mb_width+1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4134 s->m.b8_stride= 2*s->m.mb_width+1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4135 s->m.f_code=1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4136 s->m.pict_type= pict->pict_type;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4137 s->m.me_method= s->avctx->me_method;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4138 s->m.me.scene_change_score=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4139 s->m.flags= s->avctx->flags;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4140 s->m.quarter_sample= (s->avctx->flags & CODEC_FLAG_QPEL)!=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4141 s->m.out_format= FMT_H263;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4142 s->m.unrestricted_mv= 1;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4143
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4144 s->m.lambda = s->lambda;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4145 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
4146 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
4147
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4148 s->m.dsp= s->dsp; //move
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4149 ff_init_me(&s->m);
2993
cb0e26759cca iterative overlapped block based motion estimation for snow
michael
parents: 2979
diff changeset
4150 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
4151 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4152
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
4153 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
4154 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
4155 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
4156 }
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
4157
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
4158 redo_frame:
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4159
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4160 s->m.pict_type = pict->pict_type;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4161 s->qbias= pict->pict_type == P_TYPE ? 2 : 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4162
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4163 encode_header(s);
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4164 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
4165 encode_blocks(s, 1);
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4166 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
4167
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4168 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4169 Plane *p= &s->plane[plane_index];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4170 int w= p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4171 int h= p->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4172 int x, y;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
4173 // int bits= put_bits_count(&s->c.pb);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4174
3338
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4175 if(!(avctx->flags2 & CODEC_FLAG2_MEMC_ONLY)){
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4176 //FIXME optimize
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4177 if(pict->data[plane_index]) //FIXME gray hack
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4178 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4179 for(x=0; x<w; x++){
2246
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
4180 s->spatial_dwt_buffer[y*w + x]= pict->data[plane_index][y*pict->linesize[plane_index] + x]<<FRAC_BITS;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4181 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4182 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4183 predict_plane(s, s->spatial_dwt_buffer, plane_index, 0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4184
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4185 if( plane_index==0
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4186 && pict->pict_type == P_TYPE
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4187 && !(avctx->flags&CODEC_FLAG_PASS2)
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
4188 && s->m.me.scene_change_score > s->avctx->scenechange_threshold){
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4189 ff_init_range_encoder(c, buf, buf_size);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4190 ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
4191 pict->pict_type= FF_I_TYPE;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
4192 s->keyframe=1;
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4193 s->current_picture.key_frame=1;
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
4194 goto redo_frame;
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
4195 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4196
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4197 if(s->qlog == LOSSLESS_QLOG){
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4198 for(y=0; y<h; y++){
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4199 for(x=0; x<w; x++){
2595
6b385f3e07a3 fixing lossless snow
michael
parents: 2592
diff changeset
4200 s->spatial_dwt_buffer[y*w + x]= (s->spatial_dwt_buffer[y*w + x] + (1<<(FRAC_BITS-1))-1)>>FRAC_BITS;
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4201 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4202 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4203 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4204
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
4205 ff_spatial_dwt(s->spatial_dwt_buffer, w, h, w, s->spatial_decomposition_type, s->spatial_decomposition_count);
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4206
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
4207 if(s->pass1_rc && plane_index==0){
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4208 int delta_qlog = ratecontrol_1pass(s, pict);
4011
5bce97c30a69 -1 is a valid return value in ratecontrol_1pass() -> 100l for takis
michael
parents: 4001
diff changeset
4209 if (delta_qlog <= INT_MIN)
3766
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4210 return -1;
3661
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4211 if(delta_qlog){
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4212 //reordering qlog in the bitstream would eliminate this reset
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4213 ff_init_range_encoder(c, buf, buf_size);
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4214 memcpy(s->header_state, rc_header_bak, sizeof(s->header_state));
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4215 memcpy(s->block_state, rc_block_bak, sizeof(s->block_state));
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4216 encode_header(s);
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4217 encode_blocks(s, 0);
b4425339894b fix snow 1pass rc: the qlog used and the one written to the bitstream weren't always the same.
lorenm
parents: 3556
diff changeset
4218 }
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
4219 }
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4220
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4221 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4222 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4223 SubBand *b= &p->band[level][orientation];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4224
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4225 quantize(s, b, b->buf, b->stride, s->qbias);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4226 if(orientation==0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4227 decorrelate(s, b, b->buf, b->stride, pict->pict_type == P_TYPE, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4228 encode_subband(s, b, b->buf, b->parent ? b->parent->buf : NULL, b->stride, orientation);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4229 assert(b->parent==NULL || b->parent->stride == b->stride*2);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4230 if(orientation==0)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4231 correlate(s, b, b->buf, b->stride, 1, 0);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4232 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4233 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4234 // av_log(NULL, AV_LOG_DEBUG, "plane:%d bits:%d\n", plane_index, put_bits_count(&s->c.pb) - bits);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4235
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4236 for(level=0; level<s->spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4237 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4238 SubBand *b= &p->band[level][orientation];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4239
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4240 dequantize(s, b, b->buf, b->stride);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4241 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4242 }
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4243
2164
cbac56a6244f cleanup
michael
parents: 2161
diff changeset
4244 ff_spatial_idwt(s->spatial_dwt_buffer, w, h, w, s->spatial_decomposition_type, s->spatial_decomposition_count);
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4245 if(s->qlog == LOSSLESS_QLOG){
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4246 for(y=0; y<h; y++){
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4247 for(x=0; x<w; x++){
2246
3414ac0b8c55 8 -> FRAC_BITS
michael
parents: 2241
diff changeset
4248 s->spatial_dwt_buffer[y*w + x]<<=FRAC_BITS;
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4249 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4250 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4251 }
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
4252 {START_TIMER
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4253 predict_plane(s, s->spatial_dwt_buffer, plane_index, 1);
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
4254 STOP_TIMER("pred-conv")}
3338
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4255 }else{
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4256 //ME/MC only
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4257 if(pict->pict_type == I_TYPE){
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4258 for(y=0; y<h; y++){
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4259 for(x=0; x<w; x++){
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4260 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
4261 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
4262 }
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4263 }
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4264 }else{
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4265 memset(s->spatial_dwt_buffer, 0, sizeof(DWTELEM)*w*h);
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4266 predict_plane(s, s->spatial_dwt_buffer, plane_index, 1);
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4267 }
937f14bb0f23 support doing motion estimation and compensation without any residual transform or coding
michael
parents: 3327
diff changeset
4268 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4269 if(s->avctx->flags&CODEC_FLAG_PSNR){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4270 int64_t error= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4271
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4272 if(pict->data[plane_index]) //FIXME gray hack
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4273 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4274 for(x=0; x<w; x++){
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4275 int d= s->current_picture.data[plane_index][y*s->current_picture.linesize[plane_index] + x] - pict->data[plane_index][y*pict->linesize[plane_index] + x];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4276 error += d*d;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4277 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4278 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4279 s->avctx->error[plane_index] += error;
2232
960e3552e418 per picture psnr
michael
parents: 2224
diff changeset
4280 s->current_picture.error[plane_index] = error;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4281 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4282 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4283
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4284 if(s->last_picture[s->max_ref_frames-1].data[0])
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4285 avctx->release_buffer(avctx, &s->last_picture[s->max_ref_frames-1]);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4286
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4287 s->current_picture.coded_picture_number = avctx->frame_number;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4288 s->current_picture.pict_type = pict->pict_type;
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4289 s->current_picture.quality = pict->quality;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4290 s->m.frame_bits = 8*(s->c.bytestream - s->c.bytestream_start);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4291 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
4292 s->m.current_picture.display_picture_number =
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4293 s->m.current_picture.coded_picture_number = avctx->frame_number;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4294 s->m.current_picture.quality = pict->quality;
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4295 s->m.total_bits += 8*(s->c.bytestream - s->c.bytestream_start);
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4296 if(s->pass1_rc)
3766
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4297 if (ff_rate_estimate_qscale(&s->m, 0) < 0)
acf9ca729bd2 Handle possible failure of ff_eval.
takis
parents: 3662
diff changeset
4298 return -1;
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4299 if(avctx->flags&CODEC_FLAG_PASS1)
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4300 ff_write_pass1_stats(&s->m);
3313
be941215e8e6 Snow 1pass ratecontrol
lorenm
parents: 3303
diff changeset
4301 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
4302 avctx->frame_bits = s->m.frame_bits;
5c86acb39889 outputs bit spent on various encoding functions (motion vectors, overhead, etc)
gpoirier
parents: 4122
diff changeset
4303 avctx->mv_bits = s->m.mv_bits;
5c86acb39889 outputs bit spent on various encoding functions (motion vectors, overhead, etc)
gpoirier
parents: 4122
diff changeset
4304 avctx->misc_bits = s->m.misc_bits;
5c86acb39889 outputs bit spent on various encoding functions (motion vectors, overhead, etc)
gpoirier
parents: 4122
diff changeset
4305 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
4306
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4307 emms_c();
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4308
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4309 return ff_rac_terminate(c);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4310 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4311
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4312 static void common_end(SnowContext *s){
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4313 int plane_index, level, orientation, i;
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4314
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4315 av_freep(&s->spatial_dwt_buffer);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4316
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4317 av_freep(&s->m.me.scratchpad);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4318 av_freep(&s->m.me.map);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4319 av_freep(&s->m.me.score_map);
3033
e8599ab02b38 faster iterative_me: avoid duplicate mc of neighboring blocks.
lorenm
parents: 3020
diff changeset
4320 av_freep(&s->m.obmc_scratchpad);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4321
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
4322 av_freep(&s->block);
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4323
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4324 for(i=0; i<MAX_REF_FRAMES; i++){
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4325 av_freep(&s->ref_mvs[i]);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4326 av_freep(&s->ref_scores[i]);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4327 if(s->last_picture[i].data[0])
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4328 s->avctx->release_buffer(s->avctx, &s->last_picture[i]);
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4329 }
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4330
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4331 for(plane_index=0; plane_index<3; plane_index++){
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4332 for(level=s->spatial_decomposition_count-1; level>=0; level--){
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4333 for(orientation=level ? 1 : 0; orientation<4; orientation++){
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4334 SubBand *b= &s->plane[plane_index].band[level][orientation];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4335
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4336 av_freep(&b->x_coeff);
2192
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4337 }
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4338 }
77167ed8453f 46% faster decode_subband()
michael
parents: 2191
diff changeset
4339 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4340 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4341
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4342 static int encode_end(AVCodecContext *avctx)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4343 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4344 SnowContext *s = avctx->priv_data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4345
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4346 common_end(s);
2608
4fb7fa34050b allow 2pass ratecontrol. also fixes psnr displayed by mencoder.
lorenm
parents: 2607
diff changeset
4347 av_free(avctx->stats_out);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4348
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4349 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4350 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4351
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4352 static int decode_init(AVCodecContext *avctx)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4353 {
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4354 SnowContext *s = avctx->priv_data;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4355 int block_size;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4356
2635
eaa57c3336fc PIX_FMT_NONE and related fixes
michael
parents: 2634
diff changeset
4357 avctx->pix_fmt= PIX_FMT_YUV420P;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4358
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4359 common_init(avctx);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4360
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4361 block_size = MB_SIZE >> s->block_max_depth;
3017
1fb6215d621b 10l (assertion failure)
michael
parents: 3012
diff changeset
4362 slice_buffer_init(&s->sb, s->plane[0].height, (block_size) + (s->spatial_decomposition_count * (s->spatial_decomposition_count + 3)) + 1, s->plane[0].width, s->spatial_dwt_buffer);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4363
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4364 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4365 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4366
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4367 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4368 SnowContext *s = avctx->priv_data;
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4369 RangeCoder * const c= &s->c;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4370 int bytes_read;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4371 AVFrame *picture = data;
2198
970c2de19b2e cleanup
michael
parents: 2197
diff changeset
4372 int level, orientation, plane_index;
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4373
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4374 ff_init_range_decoder(c, buf, buf_size);
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4375 ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4376
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4377 s->current_picture.pict_type= FF_I_TYPE; //FIXME I vs. P
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4378 decode_header(s);
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
4379 if(!s->block) alloc_blocks(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4380
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4381 frame_start(s);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4382 //keyframe flag dupliaction mess FIXME
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4383 if(avctx->debug&FF_DEBUG_PICT_INFO)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4384 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
4385
2189
70b27300a496 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
michael
parents: 2187
diff changeset
4386 decode_blocks(s);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4387
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4388 for(plane_index=0; plane_index<3; plane_index++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4389 Plane *p= &s->plane[plane_index];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4390 int w= p->width;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4391 int h= p->height;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4392 int x, y;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4393 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
4394
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4395 if(s->avctx->debug&2048){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4396 memset(s->spatial_dwt_buffer, 0, sizeof(DWTELEM)*w*h);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4397 predict_plane(s, s->spatial_dwt_buffer, plane_index, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4398
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4399 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4400 for(x=0; x<w; x++){
2249
2b1a5e1fd449 merge predict_plane() with DWTELEM->8bit conversation (21% faster)
michael
parents: 2246
diff changeset
4401 int v= s->current_picture.data[plane_index][y*s->current_picture.linesize[plane_index] + x];
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4402 s->mconly_picture.data[plane_index][y*s->mconly_picture.linesize[plane_index] + x]= v;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4403 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4404 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4405 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4406
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4407 { START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4408 for(level=0; level<s->spatial_decomposition_count; level++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4409 for(orientation=level ? 1 : 0; orientation<4; orientation++){
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4410 SubBand *b= &p->band[level][orientation];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4411 unpack_coeffs(s, b, b->parent, orientation);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4412 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4413 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4414 STOP_TIMER("unpack coeffs");
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4415 }
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4416
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4417 {START_TIMER
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4418 const int mb_h= s->b_height << s->block_max_depth;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4419 const int block_size = MB_SIZE >> s->block_max_depth;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4420 const int block_w = plane_index ? block_size/2 : block_size;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4421 int mb_y;
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4422 dwt_compose_t cs[MAX_DECOMPOSITIONS];
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4423 int yd=0, yq=0;
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4424 int y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4425 int end_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4426
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4427 ff_spatial_idwt_buffered_init(cs, &s->sb, w, h, 1, s->spatial_decomposition_type, s->spatial_decomposition_count);
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4428 for(mb_y=0; mb_y<=mb_h; mb_y++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4429
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4430 int slice_starty = block_w*mb_y;
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4431 int slice_h = block_w*(mb_y+1);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4432 if (!(s->keyframe || s->avctx->debug&512)){
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4433 slice_starty = FFMAX(0, slice_starty - (block_w >> 1));
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4434 slice_h -= (block_w >> 1);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4435 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4436
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4437 {
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4438 START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4439 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
4440 for(orientation=level ? 1 : 0; orientation<4; orientation++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4441 SubBand *b= &p->band[level][orientation];
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4442 int start_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4443 int end_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4444 int our_mb_start = mb_y;
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4445 int our_mb_end = (mb_y + 1);
3012
088920c095fc cleanup
michael
parents: 3000
diff changeset
4446 const int extra= 3;
088920c095fc cleanup
michael
parents: 3000
diff changeset
4447 start_y = (mb_y ? ((block_w * our_mb_start) >> (s->spatial_decomposition_count - level)) + s->spatial_decomposition_count - level + extra: 0);
088920c095fc cleanup
michael
parents: 3000
diff changeset
4448 end_y = (((block_w * our_mb_end) >> (s->spatial_decomposition_count - level)) + s->spatial_decomposition_count - level + extra);
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4449 if (!(s->keyframe || s->avctx->debug&512)){
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4450 start_y = FFMAX(0, start_y - (block_w >> (1+s->spatial_decomposition_count - level)));
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4451 end_y = FFMAX(0, end_y - (block_w >> (1+s->spatial_decomposition_count - level)));
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4452 }
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4453 start_y = FFMIN(b->height, start_y);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4454 end_y = FFMIN(b->height, end_y);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4455
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4456 if (start_y != end_y){
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4457 if (orientation == 0){
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4458 SubBand * correlate_band = &p->band[0][0];
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4459 int correlate_end_y = FFMIN(b->height, end_y + 1);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4460 int correlate_start_y = FFMIN(b->height, (start_y ? start_y + 1 : 0));
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4461 decode_subband_slice_buffered(s, correlate_band, &s->sb, correlate_start_y, correlate_end_y, decode_state[0][0]);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4462 correlate_slice_buffered(s, &s->sb, correlate_band, correlate_band->buf, correlate_band->stride, 1, 0, correlate_start_y, correlate_end_y);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4463 dequantize_slice_buffered(s, &s->sb, correlate_band, correlate_band->buf, correlate_band->stride, start_y, end_y);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4464 }
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4465 else
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4466 decode_subband_slice_buffered(s, b, &s->sb, start_y, end_y, decode_state[level][orientation]);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4467 }
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4468 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4469 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4470 STOP_TIMER("decode_subband_slice");
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4471 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4472
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4473 { START_TIMER
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4474 for(; yd<slice_h; yd+=4){
3198
6b9f0c4fbdbe First part of a series of speed-enchancing patches.
gpoirier
parents: 3197
diff changeset
4475 ff_spatial_idwt_buffered_slice(&s->dsp, cs, &s->sb, w, h, 1, s->spatial_decomposition_type, s->spatial_decomposition_count, yd);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4476 }
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4477 STOP_TIMER("idwt slice");}
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4478
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4479
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4480 if(s->qlog == LOSSLESS_QLOG){
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4481 for(; yq<slice_h && yq<h; yq++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4482 DWTELEM * line = slice_buffer_get_line(&s->sb, yq);
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4483 for(x=0; x<w; x++){
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4484 line[x] <<= FRAC_BITS;
2161
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4485 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4486 }
ec7789e19e43 lossless support
michael
parents: 2160
diff changeset
4487 }
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4488
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4489 predict_slice_buffered(s, &s->sb, s->spatial_dwt_buffer, plane_index, 1, mb_y);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4490
2634
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4491 y = FFMIN(p->height, slice_starty);
337217ecbb3e tighter snow slicing patch by (Yartrebo || yartrebo earthlink net)
michael
parents: 2628
diff changeset
4492 end_y = FFMIN(p->height, slice_h);
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4493 while(y < end_y)
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4494 slice_buffer_release(&s->sb, y++);
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4495 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4496
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4497 slice_buffer_flush(&s->sb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4498
2562
d0a58dca5ad2 slice-based idwt (10% faster decoding)
lorenm
parents: 2521
diff changeset
4499 STOP_TIMER("idwt + predict_slices")}
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4500 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4501
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4502 emms_c();
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4503
3314
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4504 if(s->last_picture[s->max_ref_frames-1].data[0])
aea2230e6033 Snow multiple reference frames
lorenm
parents: 3313
diff changeset
4505 avctx->release_buffer(avctx, &s->last_picture[s->max_ref_frames-1]);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4506
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4507 if(!(s->avctx->debug&2048))
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4508 *picture= s->current_picture;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4509 else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4510 *picture= s->mconly_picture;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4511
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4512 *data_size = sizeof(AVFrame);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4513
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4514 bytes_read= c->bytestream - c->bytestream_start;
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4515 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
4516
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4517 return bytes_read;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4518 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4519
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4520 static int decode_end(AVCodecContext *avctx)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4521 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4522 SnowContext *s = avctx->priv_data;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4523
2589
a5a62827f195 Snow Slicing patch by (Yartrebo) yartrebo earthlink net
michael
parents: 2562
diff changeset
4524 slice_buffer_destroy(&s->sb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4525
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4526 common_end(s);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4527
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4528 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4529 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4530
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4531 AVCodec snow_decoder = {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4532 "snow",
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4533 CODEC_TYPE_VIDEO,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4534 CODEC_ID_SNOW,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4535 sizeof(SnowContext),
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4536 decode_init,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4537 NULL,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4538 decode_end,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4539 decode_frame,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4540 0 /*CODEC_CAP_DR1*/ /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4541 NULL
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4542 };
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4543
2408
a6e4da1c28ee Disable encoders patch by (Gianluigi Tiesi <mplayer netfarm it>)
michael
parents: 2368
diff changeset
4544 #ifdef CONFIG_ENCODERS
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4545 AVCodec snow_encoder = {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4546 "snow",
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4547 CODEC_TYPE_VIDEO,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4548 CODEC_ID_SNOW,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4549 sizeof(SnowContext),
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4550 encode_init,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4551 encode_frame,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4552 encode_end,
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4553 };
2408
a6e4da1c28ee Disable encoders patch by (Gianluigi Tiesi <mplayer netfarm it>)
michael
parents: 2368
diff changeset
4554 #endif
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4555
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4556
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4557 #if 0
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4558 #undef malloc
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4559 #undef free
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4560 #undef printf
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4561
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4562 int main(){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4563 int width=256;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4564 int height=256;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4565 int buffer[2][width*height];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4566 SnowContext s;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4567 int i;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4568 s.spatial_decomposition_count=6;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4569 s.spatial_decomposition_type=1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4570
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4571 printf("testing 5/3 DWT\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4572 for(i=0; i<width*height; i++)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4573 buffer[0][i]= buffer[1][i]= random()%54321 - 12345;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4574
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4575 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
4576 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
4577
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4578 for(i=0; i<width*height; i++)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4579 if(buffer[0][i]!= buffer[1][i]) printf("fsck: %d %d %d\n",i, buffer[0][i], buffer[1][i]);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4580
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4581 printf("testing 9/7 DWT\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4582 s.spatial_decomposition_type=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4583 for(i=0; i<width*height; i++)
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4584 buffer[0][i]= buffer[1][i]= random()%54321 - 12345;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4585
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4586 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
4587 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
4588
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4589 for(i=0; i<width*height; i++)
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
4590 if(FFABS(buffer[0][i] - buffer[1][i])>20) printf("fsck: %d %d %d\n",i, buffer[0][i], buffer[1][i]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4591
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4592 #if 0
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4593 printf("testing AC coder\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4594 memset(s.header_state, 0, sizeof(s.header_state));
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4595 ff_init_range_encoder(&s.c, buffer[0], 256*256);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4596 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
4597
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4598 for(i=-256; i<256; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4599 START_TIMER
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
4600 put_symbol(&s.c, s.header_state, i*i*i/3*FFABS(i), 1);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4601 STOP_TIMER("put_symbol")
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4602 }
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4603 ff_rac_terminate(&s.c);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4604
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4605 memset(s.header_state, 0, sizeof(s.header_state));
2335
28eb7b1dcefc CABAC -> range coder
michael
parents: 2252
diff changeset
4606 ff_init_range_decoder(&s.c, buffer[0], 256*256);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4607 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
4608
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4609 for(i=-256; i<256; i++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4610 int j;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4611 START_TIMER
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4612 j= get_symbol(&s.c, s.header_state, 1);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4613 STOP_TIMER("get_symbol")
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
4614 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
4615 }
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4616 #endif
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4617 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4618 int level, orientation, x, y;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4619 int64_t errors[8][4];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4620 int64_t g=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4621
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4622 memset(errors, 0, sizeof(errors));
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4623 s.spatial_decomposition_count=3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4624 s.spatial_decomposition_type=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4625 for(level=0; level<s.spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4626 for(orientation=level ? 1 : 0; orientation<4; orientation++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4627 int w= width >> (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4628 int h= height >> (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4629 int stride= width << (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4630 DWTELEM *buf= buffer[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4631 int64_t error=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4632
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4633 if(orientation&1) buf+=w;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4634 if(orientation>1) buf+=stride>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4635
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4636 memset(buffer[0], 0, sizeof(int)*width*height);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4637 buf[w/2 + h/2*stride]= 256*256;
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4638 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
4639 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4640 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4641 int64_t d= buffer[0][x + y*width];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4642 error += d*d;
4122
daae66c03857 Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 4011
diff changeset
4643 if(FFABS(width/2-x)<9 && FFABS(height/2-y)<9 && level==2) printf("%8"PRId64" ", d);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4644 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
4645 if(FFABS(height/2-y)<9 && level==2) printf("\n");
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4646 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4647 error= (int)(sqrt(error)+0.5);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4648 errors[level][orientation]= error;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4649 if(g) g=ff_gcd(g, error);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4650 else g= error;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4651 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4652 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4653 printf("static int const visual_weight[][4]={\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4654 for(level=0; level<s.spatial_decomposition_count; level++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4655 printf(" {");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4656 for(orientation=0; orientation<4; orientation++){
4122
daae66c03857 Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 4011
diff changeset
4657 printf("%8"PRId64",", errors[level][orientation]/g);
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4658 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4659 printf("},\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4660 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4661 printf("};\n");
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4662 {
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4663 int level=2;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4664 int orientation=3;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4665 int w= width >> (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4666 int h= height >> (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4667 int stride= width << (s.spatial_decomposition_count-level);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4668 DWTELEM *buf= buffer[0];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4669 int64_t error=0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4670
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4671 buf+=w;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4672 buf+=stride>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2952
diff changeset
4673
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4674 memset(buffer[0], 0, sizeof(int)*width*height);
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4675 #if 1
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4676 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4677 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4678 int tab[4]={0,2,3,1};
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4679 buffer[0][x+width*y]= 256*256*tab[(x&1) + 2*(y&1)];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4680 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4681 }
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4682 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
4683 #else
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4684 for(y=0; y<h; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4685 for(x=0; x<w; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4686 buf[x + y*stride ]=169;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4687 buf[x + y*stride-w]=64;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4688 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4689 }
2951
98a2bd9c8674 make selftest code compile again
michael
parents: 2893
diff changeset
4690 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
4691 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4692 for(y=0; y<height; y++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4693 for(x=0; x<width; x++){
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4694 int64_t d= buffer[0][x + y*width];
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4695 error += d*d;
4122
daae66c03857 Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 4011
diff changeset
4696 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
4697 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
4698 if(FFABS(height/2-y)<9) printf("\n");
2138
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4699 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4700 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4701
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4702 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4703 return 0;
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4704 }
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4705 #endif
1ac13c350369 my experimental wavelet codec
michael
parents:
diff changeset
4706