annotate mpegaudiodec_float.c @ 12288:6bdbab1d9ed4 libavcodec

save some copies by moving some fields out of proba[2]
author skal
date Tue, 27 Jul 2010 22:21:49 +0000
parents fb3fcaf3c1b6
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11707
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
1 /*
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
2 * Float MPEG Audio decoder
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
3 * Copyright (c) 2010 Michael Niedermayer
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
4 *
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
5 * This file is part of FFmpeg.
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
6 *
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
11 *
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
15 * Lesser General Public License for more details.
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
16 *
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
20 */
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
21
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
22 #define CONFIG_FLOAT 1
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
23 #include "mpegaudiodec.c"
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
24
11935
5e8770f9d8f1 Move float-specific function to mpegaudiodec_float.c
vitor
parents: 11707
diff changeset
25 void ff_mpa_synth_filter_float(MPADecodeContext *s, float *synth_buf_ptr,
5e8770f9d8f1 Move float-specific function to mpegaudiodec_float.c
vitor
parents: 11707
diff changeset
26 int *synth_buf_offset,
5e8770f9d8f1 Move float-specific function to mpegaudiodec_float.c
vitor
parents: 11707
diff changeset
27 float *window, int *dither_state,
5e8770f9d8f1 Move float-specific function to mpegaudiodec_float.c
vitor
parents: 11707
diff changeset
28 float *samples, int incr,
5e8770f9d8f1 Move float-specific function to mpegaudiodec_float.c
vitor
parents: 11707
diff changeset
29 float sb_samples[SBLIMIT])
5e8770f9d8f1 Move float-specific function to mpegaudiodec_float.c
vitor
parents: 11707
diff changeset
30 {
5e8770f9d8f1 Move float-specific function to mpegaudiodec_float.c
vitor
parents: 11707
diff changeset
31 float *synth_buf;
5e8770f9d8f1 Move float-specific function to mpegaudiodec_float.c
vitor
parents: 11707
diff changeset
32 int offset;
5e8770f9d8f1 Move float-specific function to mpegaudiodec_float.c
vitor
parents: 11707
diff changeset
33
5e8770f9d8f1 Move float-specific function to mpegaudiodec_float.c
vitor
parents: 11707
diff changeset
34 offset = *synth_buf_offset;
5e8770f9d8f1 Move float-specific function to mpegaudiodec_float.c
vitor
parents: 11707
diff changeset
35 synth_buf = synth_buf_ptr + offset;
5e8770f9d8f1 Move float-specific function to mpegaudiodec_float.c
vitor
parents: 11707
diff changeset
36
12026
3f3d08bb5cf8 More mp{1,2,3} 32-point DCT transform to our common DCT framework.
vitor
parents: 11935
diff changeset
37 s->dct.dct32(synth_buf, sb_samples);
11935
5e8770f9d8f1 Move float-specific function to mpegaudiodec_float.c
vitor
parents: 11707
diff changeset
38 s->apply_window_mp3(synth_buf, window, dither_state, samples, incr);
5e8770f9d8f1 Move float-specific function to mpegaudiodec_float.c
vitor
parents: 11707
diff changeset
39
5e8770f9d8f1 Move float-specific function to mpegaudiodec_float.c
vitor
parents: 11707
diff changeset
40 offset = (offset - 32) & 511;
5e8770f9d8f1 Move float-specific function to mpegaudiodec_float.c
vitor
parents: 11707
diff changeset
41 *synth_buf_offset = offset;
5e8770f9d8f1 Move float-specific function to mpegaudiodec_float.c
vitor
parents: 11707
diff changeset
42 }
5e8770f9d8f1 Move float-specific function to mpegaudiodec_float.c
vitor
parents: 11707
diff changeset
43
12044
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
44 static void compute_antialias_float(MPADecodeContext *s,
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
45 GranuleDef *g)
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
46 {
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
47 float *ptr;
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
48 int n, i;
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
49
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
50 /* we antialias only "long" bands */
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
51 if (g->block_type == 2) {
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
52 if (!g->switch_point)
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
53 return;
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
54 /* XXX: check this for 8000Hz case */
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
55 n = 1;
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
56 } else {
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
57 n = SBLIMIT - 1;
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
58 }
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
59
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
60 ptr = g->sb_hybrid + 18;
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
61 for(i = n;i > 0;i--) {
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
62 float tmp0, tmp1;
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
63 float *csa = &csa_table_float[0][0];
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
64 #define FLOAT_AA(j)\
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
65 tmp0= ptr[-1-j];\
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
66 tmp1= ptr[ j];\
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
67 ptr[-1-j] = tmp0 * csa[0+4*j] - tmp1 * csa[1+4*j];\
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
68 ptr[ j] = tmp0 * csa[1+4*j] + tmp1 * csa[0+4*j];
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
69
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
70 FLOAT_AA(0)
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
71 FLOAT_AA(1)
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
72 FLOAT_AA(2)
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
73 FLOAT_AA(3)
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
74 FLOAT_AA(4)
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
75 FLOAT_AA(5)
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
76 FLOAT_AA(6)
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
77 FLOAT_AA(7)
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
78
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
79 ptr += 18;
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
80 }
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
81 }
49c528a39187 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c
mru
parents: 12026
diff changeset
82
12187
fb3fcaf3c1b6 Fix memleak when using mp*float decoder.
cehoyos
parents: 12044
diff changeset
83 static av_cold int decode_end(AVCodecContext * avctx)
fb3fcaf3c1b6 Fix memleak when using mp*float decoder.
cehoyos
parents: 12044
diff changeset
84 {
fb3fcaf3c1b6 Fix memleak when using mp*float decoder.
cehoyos
parents: 12044
diff changeset
85 MPADecodeContext *s = avctx->priv_data;
fb3fcaf3c1b6 Fix memleak when using mp*float decoder.
cehoyos
parents: 12044
diff changeset
86 ff_dct_end(&s->dct);
fb3fcaf3c1b6 Fix memleak when using mp*float decoder.
cehoyos
parents: 12044
diff changeset
87 return 0;
fb3fcaf3c1b6 Fix memleak when using mp*float decoder.
cehoyos
parents: 12044
diff changeset
88 }
fb3fcaf3c1b6 Fix memleak when using mp*float decoder.
cehoyos
parents: 12044
diff changeset
89
11707
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
90 #if CONFIG_MP1FLOAT_DECODER
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
91 AVCodec mp1float_decoder =
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
92 {
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
93 "mp1float",
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
94 AVMEDIA_TYPE_AUDIO,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
95 CODEC_ID_MP1,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
96 sizeof(MPADecodeContext),
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
97 decode_init,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
98 NULL,
12187
fb3fcaf3c1b6 Fix memleak when using mp*float decoder.
cehoyos
parents: 12044
diff changeset
99 decode_end,
11707
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
100 decode_frame,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
101 CODEC_CAP_PARSE_ONLY,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
102 .flush= flush,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
103 .long_name= NULL_IF_CONFIG_SMALL("MP1 (MPEG audio layer 1)"),
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
104 };
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
105 #endif
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
106 #if CONFIG_MP2FLOAT_DECODER
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
107 AVCodec mp2float_decoder =
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
108 {
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
109 "mp2float",
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
110 AVMEDIA_TYPE_AUDIO,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
111 CODEC_ID_MP2,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
112 sizeof(MPADecodeContext),
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
113 decode_init,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
114 NULL,
12187
fb3fcaf3c1b6 Fix memleak when using mp*float decoder.
cehoyos
parents: 12044
diff changeset
115 decode_end,
11707
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
116 decode_frame,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
117 CODEC_CAP_PARSE_ONLY,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
118 .flush= flush,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
119 .long_name= NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"),
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
120 };
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
121 #endif
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
122 #if CONFIG_MP3FLOAT_DECODER
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
123 AVCodec mp3float_decoder =
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
124 {
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
125 "mp3float",
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
126 AVMEDIA_TYPE_AUDIO,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
127 CODEC_ID_MP3,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
128 sizeof(MPADecodeContext),
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
129 decode_init,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
130 NULL,
12187
fb3fcaf3c1b6 Fix memleak when using mp*float decoder.
cehoyos
parents: 12044
diff changeset
131 decode_end,
11707
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
132 decode_frame,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
133 CODEC_CAP_PARSE_ONLY,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
134 .flush= flush,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
135 .long_name= NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"),
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
136 };
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
137 #endif
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
138 #if CONFIG_MP3ADUFLOAT_DECODER
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
139 AVCodec mp3adufloat_decoder =
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
140 {
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
141 "mp3adufloat",
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
142 AVMEDIA_TYPE_AUDIO,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
143 CODEC_ID_MP3ADU,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
144 sizeof(MPADecodeContext),
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
145 decode_init,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
146 NULL,
12187
fb3fcaf3c1b6 Fix memleak when using mp*float decoder.
cehoyos
parents: 12044
diff changeset
147 decode_end,
11707
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
148 decode_frame_adu,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
149 CODEC_CAP_PARSE_ONLY,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
150 .flush= flush,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
151 .long_name= NULL_IF_CONFIG_SMALL("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"),
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
152 };
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
153 #endif
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
154 #if CONFIG_MP3ON4FLOAT_DECODER
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
155 AVCodec mp3on4float_decoder =
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
156 {
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
157 "mp3on4float",
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
158 AVMEDIA_TYPE_AUDIO,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
159 CODEC_ID_MP3ON4,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
160 sizeof(MP3On4DecodeContext),
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
161 decode_init_mp3on4,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
162 NULL,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
163 decode_close_mp3on4,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
164 decode_frame_mp3on4,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
165 .flush= flush,
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
166 .long_name= NULL_IF_CONFIG_SMALL("MP3onMP4"),
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
167 };
eb9e142ea51f float based mp1/mp2/mp3 decoders.
michael
parents:
diff changeset
168 #endif