annotate src/xs_filter.c @ 331:5e82b21d1914

Minor fix to filter (mean value does not get reset on every filtered audio block)
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 22 Sep 2005 01:53:05 +0000
parents 7888e5d973b9
children b1a858b8cb1a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
278
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
1 /*
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
2 XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS)
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
3
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
4 Audio rate-conversion filter
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
5
324
dd201740a720 Changed copyright text.
Matti Hamalainen <ccr@tnsp.org>
parents: 312
diff changeset
6 Programmed and designed by Matti 'ccr' Hamalainen <ccr@tnsp.org>
dd201740a720 Changed copyright text.
Matti Hamalainen <ccr@tnsp.org>
parents: 312
diff changeset
7 (C) Copyright 1999-2005 Tecnic Software productions (TNSP)
278
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
8
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
9 This program is free software; you can redistribute it and/or modify
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
10 it under the terms of the GNU General Public License as published by
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
11 the Free Software Foundation; either version 2 of the License, or
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
12 (at your option) any later version.
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
13
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
14 This program is distributed in the hope that it will be useful,
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
15 but WITHOUT ANY WARRANTY; without even the implied warranty of
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
17 GNU General Public License for more details.
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
18
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
19 You should have received a copy of the GNU General Public License
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
20 along with this program; if not, write to the Free Software
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
21 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
22 */
324
dd201740a720 Changed copyright text.
Matti Hamalainen <ccr@tnsp.org>
parents: 312
diff changeset
23 #include "xs_filter.h"
278
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
24
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
25 /* Let's do some preprocessor magic :) */
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
26 #define XS_FVAR(T, P, K) g ## K ## int ## P *sp_ ## T ## P , *dp_ ## T ## P
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
27
312
7a5dc6898659 Fixed filter signedness bugs.
Matti Hamalainen <ccr@tnsp.org>
parents: 295
diff changeset
28 #define XS_FILTER1(T, P, K, Q) \
331
5e82b21d1914 Minor fix to filter (mean value does not get reset on every filtered audio block)
Matti Hamalainen <ccr@tnsp.org>
parents: 328
diff changeset
29 dataSize /= sizeof(g ## K ## int ## P); \
278
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
30 sp_ ## T ## P = (g ## K ## int ## P *) srcBuf; \
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
31 dp_ ## T ## P = (g ## K ## int ## P *) destBuf; \
280
b7e2938f2837 Changed method.
Matti Hamalainen <ccr@tnsp.org>
parents: 278
diff changeset
32 while (dataSize-- > 0) { \
312
7a5dc6898659 Fixed filter signedness bugs.
Matti Hamalainen <ccr@tnsp.org>
parents: 295
diff changeset
33 for (tmp = 0, i = 0; i < oversampleFactor; i++) \
7a5dc6898659 Fixed filter signedness bugs.
Matti Hamalainen <ccr@tnsp.org>
parents: 295
diff changeset
34 tmp += (gint32) ((gint ## P) (*(sp_ ## T ## P ++) Q)); \
331
5e82b21d1914 Minor fix to filter (mean value does not get reset on every filtered audio block)
Matti Hamalainen <ccr@tnsp.org>
parents: 328
diff changeset
35 xs_filter_mbn = (tmp + xs_filter_mbn) / (oversampleFactor + 1); \
5e82b21d1914 Minor fix to filter (mean value does not get reset on every filtered audio block)
Matti Hamalainen <ccr@tnsp.org>
parents: 328
diff changeset
36 *(dp_ ## T ## P ++) = ((g ## K ## int ## P) xs_filter_mbn) Q ; \
278
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
37 }
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
38
331
5e82b21d1914 Minor fix to filter (mean value does not get reset on every filtered audio block)
Matti Hamalainen <ccr@tnsp.org>
parents: 328
diff changeset
39
5e82b21d1914 Minor fix to filter (mean value does not get reset on every filtered audio block)
Matti Hamalainen <ccr@tnsp.org>
parents: 328
diff changeset
40 static gint32 xs_filter_mbn = 0;
5e82b21d1914 Minor fix to filter (mean value does not get reset on every filtered audio block)
Matti Hamalainen <ccr@tnsp.org>
parents: 328
diff changeset
41
5e82b21d1914 Minor fix to filter (mean value does not get reset on every filtered audio block)
Matti Hamalainen <ccr@tnsp.org>
parents: 328
diff changeset
42
328
7888e5d973b9 Minor cleanups
Matti Hamalainen <ccr@tnsp.org>
parents: 324
diff changeset
43 gint xs_filter_rateconv(void *destBuf, void *srcBuf, const AFormat audioFormat, const gint oversampleFactor, const gint bufSize)
278
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
44 {
331
5e82b21d1914 Minor fix to filter (mean value does not get reset on every filtered audio block)
Matti Hamalainen <ccr@tnsp.org>
parents: 328
diff changeset
45 static gint32 tmp;
312
7a5dc6898659 Fixed filter signedness bugs.
Matti Hamalainen <ccr@tnsp.org>
parents: 295
diff changeset
46 XS_FVAR(s,8,);
7a5dc6898659 Fixed filter signedness bugs.
Matti Hamalainen <ccr@tnsp.org>
parents: 295
diff changeset
47 XS_FVAR(u,8,u);
7a5dc6898659 Fixed filter signedness bugs.
Matti Hamalainen <ccr@tnsp.org>
parents: 295
diff changeset
48 XS_FVAR(s,16,);
7a5dc6898659 Fixed filter signedness bugs.
Matti Hamalainen <ccr@tnsp.org>
parents: 295
diff changeset
49 XS_FVAR(u,16,u);
278
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
50 gint i;
328
7888e5d973b9 Minor cleanups
Matti Hamalainen <ccr@tnsp.org>
parents: 324
diff changeset
51 gint dataSize = bufSize;
278
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
52
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
53 if (dataSize <= 0)
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
54 return dataSize;
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
55
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
56 switch (audioFormat) {
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
57 case FMT_U8:
312
7a5dc6898659 Fixed filter signedness bugs.
Matti Hamalainen <ccr@tnsp.org>
parents: 295
diff changeset
58 XS_FILTER1(u,8,u, ^ 0x80)
7a5dc6898659 Fixed filter signedness bugs.
Matti Hamalainen <ccr@tnsp.org>
parents: 295
diff changeset
59 break;
7a5dc6898659 Fixed filter signedness bugs.
Matti Hamalainen <ccr@tnsp.org>
parents: 295
diff changeset
60
278
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
61 case FMT_S8:
312
7a5dc6898659 Fixed filter signedness bugs.
Matti Hamalainen <ccr@tnsp.org>
parents: 295
diff changeset
62 XS_FILTER1(s,8,,)
278
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
63 break;
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
64
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
65
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
66 case FMT_U16_BE:
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
67 case FMT_U16_LE:
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
68 case FMT_U16_NE:
312
7a5dc6898659 Fixed filter signedness bugs.
Matti Hamalainen <ccr@tnsp.org>
parents: 295
diff changeset
69 XS_FILTER1(u,16,u, ^ 0x8000)
7a5dc6898659 Fixed filter signedness bugs.
Matti Hamalainen <ccr@tnsp.org>
parents: 295
diff changeset
70 break;
278
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
71
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
72 case FMT_S16_BE:
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
73 case FMT_S16_LE:
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
74 case FMT_S16_NE:
312
7a5dc6898659 Fixed filter signedness bugs.
Matti Hamalainen <ccr@tnsp.org>
parents: 295
diff changeset
75 XS_FILTER1(s,16,,)
278
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
76 break;
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
77
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
78 default:
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
79 return -1;
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
80 }
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
81
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
82 return 0;
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
83 }
69ec4290030c Added filtering code into CVS.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
84