Skip to content

Commit 1e7872d

Browse files
HartmntHartmnt
committed
REFAC: Use clang-format autoformat
1 parent a030f2b commit 1e7872d

20 files changed

+5981
-13309
lines changed

‎.clang-format‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
---
2+
Language: Cpp
3+
AlignAfterOpenBracket: Align
4+
AlignConsecutiveAssignments: true
5+
AlignConsecutiveAssignments: false
6+
AlignEscapedNewlines: Left
7+
AlignOperands: AlignAfterOperator
8+
AlignTrailingComments:
9+
Kind: Always
10+
OverEmptyLines: 2
11+
AllowShortBlocksOnASingleLine: Never
12+
AllowShortCaseLabelsOnASingleLine: true
13+
AllowShortFunctionsOnASingleLine: None
14+
AllowShortIfStatementsOnASingleLine: Never
15+
AllowShortLoopsOnASingleLine: false
16+
AlwaysBreakBeforeMultilineStrings: false
17+
BinPackArguments: true
18+
BinPackParameters: true
19+
BreakBeforeBinaryOperators: NonAssignment
20+
BreakBeforeBraces: Attach
21+
BreakBeforeTernaryOperators: true
22+
BreakConstructorInitializers: AfterColon
23+
BreakStringLiterals: true
24+
ColumnLimit: 150
25+
ConstructorInitializerIndentWidth: 4
26+
ContinuationIndentWidth: 4
27+
Cpp11BracedListStyle: true
28+
DerivePointerAlignment: false
29+
IncludeBlocks: Regroup
30+
IndentCaseLabels: true
31+
IndentPPDirectives: AfterHash
32+
IndentWidth: 4
33+
InsertBraces: true
34+
KeepEmptyLinesAtTheStartOfBlocks: false
35+
MaxEmptyLinesToKeep: 1
36+
PointerAlignment: Right
37+
ReflowComments: true
38+
SortIncludes: CaseInsensitive
39+
SpaceAfterCStyleCast: true
40+
SpaceBeforeAssignmentOperators: true
41+
SpaceBeforeParens: ControlStatements
42+
SpaceInEmptyParentheses: false
43+
SpacesInAngles: false
44+
SpacesInContainerLiterals: false
45+
SpacesInParentheses: false
46+
SpacesInSquareBrackets: false
47+
TabWidth: 4
48+
UseTab: ForContinuationAndIndentation
49+

‎examples/renamenoise_demo.c‎

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -29,36 +29,45 @@
2929
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3030
*/
3131

32-
#include <stdio.h>
3332
#include "renamenoise.h"
3433

34+
#include <stdio.h>
35+
3536
#define FRAME_SIZE 480
3637

3738
int main(int argc, char **argv) {
38-
int i;
39-
int first = 1;
40-
float x[FRAME_SIZE];
41-
FILE *f1, *fout;
42-
ReNameNoiseDenoiseState *st;
43-
st = renamenoise_create(NULL);
44-
if (argc!=3) {
45-
fprintf(stderr, "usage: %s <noisy speech> <output denoised>\n", argv[0]);
46-
return 1;
47-
}
48-
f1 = fopen(argv[1], "rb");
49-
fout = fopen(argv[2], "wb");
50-
while (1) {
51-
short tmp[FRAME_SIZE];
52-
fread(tmp, sizeof(short), FRAME_SIZE, f1);
53-
if (feof(f1)) break;
54-
for (i=0;i<FRAME_SIZE;i++) x[i] = tmp[i];
55-
renamenoise_process_frame(st, x, x);
56-
for (i=0;i<FRAME_SIZE;i++) tmp[i] = x[i];
57-
if (!first) fwrite(tmp, sizeof(short), FRAME_SIZE, fout);
58-
first = 0;
59-
}
60-
renamenoise_destroy(st);
61-
fclose(f1);
62-
fclose(fout);
63-
return 0;
39+
int i;
40+
int first = 1;
41+
float x[FRAME_SIZE];
42+
FILE *f1, *fout;
43+
ReNameNoiseDenoiseState *st;
44+
st = renamenoise_create(NULL);
45+
if (argc != 3) {
46+
fprintf(stderr, "usage: %s <noisy speech> <output denoised>\n", argv[0]);
47+
return 1;
48+
}
49+
f1 = fopen(argv[1], "rb");
50+
fout = fopen(argv[2], "wb");
51+
while (1) {
52+
short tmp[FRAME_SIZE];
53+
fread(tmp, sizeof(short), FRAME_SIZE, f1);
54+
if (feof(f1)) {
55+
break;
56+
}
57+
for (i = 0; i < FRAME_SIZE; i++) {
58+
x[i] = tmp[i];
59+
}
60+
renamenoise_process_frame(st, x, x);
61+
for (i = 0; i < FRAME_SIZE; i++) {
62+
tmp[i] = x[i];
63+
}
64+
if (!first) {
65+
fwrite(tmp, sizeof(short), FRAME_SIZE, fout);
66+
}
67+
first = 0;
68+
}
69+
renamenoise_destroy(st);
70+
fclose(f1);
71+
fclose(fout);
72+
return 0;
6473
}

‎include/renamenoise.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@ extern "C" {
3939
#endif
4040

4141
#ifndef RENAMENOISE_EXPORT
42-
# if defined(WIN32)
43-
# if defined(RENAMENOISE_BUILD) && defined(DLL_EXPORT)
44-
# define RENAMENOISE_EXPORT __declspec(dllexport)
45-
# else
46-
# define RENAMENOISE_EXPORT
47-
# endif
48-
# elif defined(__GNUC__) && defined(RENAMENOISE_BUILD)
49-
# define RENAMENOISE_EXPORT __attribute__ ((visibility ("default")))
50-
# else
51-
# define RENAMENOISE_EXPORT
52-
# endif
42+
# if defined(WIN32)
43+
# if defined(RENAMENOISE_BUILD) && defined(DLL_EXPORT)
44+
# define RENAMENOISE_EXPORT __declspec(dllexport)
45+
# else
46+
# define RENAMENOISE_EXPORT
47+
# endif
48+
# elif defined(__GNUC__) && defined(RENAMENOISE_BUILD)
49+
# define RENAMENOISE_EXPORT __attribute__((visibility("default")))
50+
# else
51+
# define RENAMENOISE_EXPORT
52+
# endif
5353
#endif
5454

5555
typedef struct ReNameNoiseDenoiseState ReNameNoiseDenoiseState;

‎src/_renamenoise_fft_guts.h‎

Lines changed: 78 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,18 @@
3131
#ifndef RENAMENOISE_FFT_GUTS_H
3232
#define RENAMENOISE_FFT_GUTS_H
3333

34-
#define RENAMENOISE_MIN(a,b) ((a)<(b) ? (a):(b))
35-
#define RENAMENOISE_MAX(a,b) ((a)>(b) ? (a):(b))
36-
37-
/* renamenoise_fft.h
38-
defines renamenoise_fft_scalar as either short or a float type
39-
and defines
40-
typedef struct { renamenoise_fft_scalar r; renamenoise_fft_scalar i; }renamenoise_fft_cpx; */
34+
#define RENAMENOISE_MIN(a, b) ((a) < (b) ? (a) : (b))
35+
#define RENAMENOISE_MAX(a, b) ((a) > (b) ? (a) : (b))
36+
37+
/**
38+
renamenoise_fft.h
39+
Defines renamenoise_fft_scalar as either short or a float type
40+
and defines
41+
typedef struct {
42+
renamenoise_fft_scalar r;
43+
renamenoise_fft_scalar i;
44+
} renamenoise_fft_cpx;
45+
**/
4146
#include "renamenoise_fft.h"
4247

4348
/*
@@ -48,69 +53,84 @@
4853
C_SUB( res, a,b) : res = a - b
4954
C_SUBFROM( res , a) : res -= a
5055
C_ADDTO( res , a) : res += a
51-
* */
56+
*/
57+
58+
#define RENAMENOISE_S_MUL(a, b) ((a) * (b))
59+
60+
#define RENAMENOISE_C_MUL(m, a, b) \
61+
do { \
62+
(m).r = (a).r * (b).r - (a).i * (b).i; \
63+
(m).i = (a).r * (b).i + (a).i * (b).r; \
64+
} while (0)
65+
66+
#define RENAMENOISE_C_MULC(m, a, b) \
67+
do { \
68+
(m).r = (a).r * (b).r + (a).i * (b).i; \
69+
(m).i = (a).i * (b).r - (a).r * (b).i; \
70+
} while (0)
5271

53-
# define RENAMENOISE_S_MUL(a,b) ( (a)*(b) )
54-
#define RENAMENOISE_C_MUL(m,a,b) \
55-
do{ (m).r = (a).r*(b).r - (a).i*(b).i;\
56-
(m).i = (a).r*(b).i + (a).i*(b).r; }while(0)
57-
#define RENAMENOISE_C_MULC(m,a,b) \
58-
do{ (m).r = (a).r*(b).r + (a).i*(b).i;\
59-
(m).i = (a).i*(b).r - (a).r*(b).i; }while(0)
72+
#define RENAMENOISE_C_MUL4(m, a, b) RENAMENOISE_C_MUL(m, a, b)
6073

61-
#define RENAMENOISE_C_MUL4(m,a,b) RENAMENOISE_C_MUL(m,a,b)
74+
#define RENAMENOISE_C_FIXDIV(c, div) /* NOOP */
6275

63-
# define RENAMENOISE_C_FIXDIV(c,div) /* NOOP */
64-
# define RENAMENOISE_C_MULBYSCALAR( c, s ) \
65-
do{ (c).r *= (s);\
66-
(c).i *= (s); }while(0)
76+
#define RENAMENOISE_C_MULBYSCALAR(c, s) \
77+
do { \
78+
(c).r *= (s); \
79+
(c).i *= (s); \
80+
} while (0)
6781

6882
#ifndef RENAMENOISE_CHECK_OVERFLOW_OP
69-
# define RENAMENOISE_CHECK_OVERFLOW_OP(a,op,b) /* noop */
83+
# define RENAMENOISE_CHECK_OVERFLOW_OP(a, op, b) /* NOOP */
7084
#endif
7185

7286
#ifndef RENAMENOISE_C_ADD
73-
#define RENAMENOISE_C_ADD( res, a,b)\
74-
do { \
75-
RENAMENOISE_CHECK_OVERFLOW_OP((a).r,+,(b).r)\
76-
RENAMENOISE_CHECK_OVERFLOW_OP((a).i,+,(b).i)\
77-
(res).r=(a).r+(b).r; (res).i=(a).i+(b).i; \
78-
}while(0)
79-
#define RENAMENOISE_C_SUB( res, a,b)\
80-
do { \
81-
RENAMENOISE_CHECK_OVERFLOW_OP((a).r,-,(b).r)\
82-
RENAMENOISE_CHECK_OVERFLOW_OP((a).i,-,(b).i)\
83-
(res).r=(a).r-(b).r; (res).i=(a).i-(b).i; \
84-
}while(0)
85-
#define RENAMENOISE_C_ADDTO( res , a)\
86-
do { \
87-
RENAMENOISE_CHECK_OVERFLOW_OP((res).r,+,(a).r)\
88-
RENAMENOISE_CHECK_OVERFLOW_OP((res).i,+,(a).i)\
89-
(res).r += (a).r; (res).i += (a).i;\
90-
}while(0)
91-
92-
#define RENAMENOISE_C_SUBFROM( res , a)\
93-
do {\
94-
RENAMENOISE_CHECK_OVERFLOW_OP((res).r,-,(a).r)\
95-
RENAMENOISE_CHECK_OVERFLOW_OP((res).i,-,(a).i)\
96-
(res).r -= (a).r; (res).i -= (a).i; \
97-
}while(0)
98-
#endif /* RENAMENOISE_C_ADD defined */
87+
# define RENAMENOISE_C_ADD(res, a, b) \
88+
do { \
89+
RENAMENOISE_CHECK_OVERFLOW_OP((a).r, +, (b).r) \
90+
RENAMENOISE_CHECK_OVERFLOW_OP((a).i, +, (b).i) \
91+
(res).r = (a).r + (b).r; \
92+
(res).i = (a).i + (b).i; \
93+
} while (0)
94+
95+
# define RENAMENOISE_C_SUB(res, a, b) \
96+
do { \
97+
RENAMENOISE_CHECK_OVERFLOW_OP((a).r, -, (b).r) \
98+
RENAMENOISE_CHECK_OVERFLOW_OP((a).i, -, (b).i) \
99+
(res).r = (a).r - (b).r; \
100+
(res).i = (a).i - (b).i; \
101+
} while (0)
102+
103+
# define RENAMENOISE_C_ADDTO(res, a) \
104+
do { \
105+
RENAMENOISE_CHECK_OVERFLOW_OP((res).r, +, (a).r) \
106+
RENAMENOISE_CHECK_OVERFLOW_OP((res).i, +, (a).i) \
107+
(res).r += (a).r; \
108+
(res).i += (a).i; \
109+
} while (0)
110+
111+
# define RENAMENOISE_C_SUBFROM(res, a) \
112+
do { \
113+
RENAMENOISE_CHECK_OVERFLOW_OP((res).r, -, (a).r) \
114+
RENAMENOISE_CHECK_OVERFLOW_OP((res).i, -, (a).i) \
115+
(res).r -= (a).r; \
116+
(res).i -= (a).i; \
117+
} while (0)
118+
#endif /* !RENAMENOISE_C_ADD defined */
99119

100120
#ifdef USE_SIMD
101-
# define RENAMENOISE_FFT_COS(phase) _mm_set1_ps( cos(phase) )
102-
# define RENAMENOISE_FFT_SIN(phase) _mm_set1_ps( sin(phase) )
103-
# define RENAMENOISE_HALF_OF(x) ((x)*_mm_set1_ps(.5f))
121+
# define RENAMENOISE_FFT_COS(phase) _mm_set1_ps(cos(phase))
122+
# define RENAMENOISE_FFT_SIN(phase) _mm_set1_ps(sin(phase))
123+
# define RENAMENOISE_HALF_OF(x) ((x) *_mm_set1_ps(.5f))
104124
#else
105-
# define RENAMENOISE_FFT_COS(phase) (renamenoise_fft_scalar) cos(phase)
106-
# define RENAMENOISE_FFT_SIN(phase) (renamenoise_fft_scalar) sin(phase)
107-
# define RENAMENOISE_HALF_OF(x) ((x)*.5f)
125+
# define RENAMENOISE_FFT_COS(phase) (renamenoise_fft_scalar) cos(phase)
126+
# define RENAMENOISE_FFT_SIN(phase) (renamenoise_fft_scalar) sin(phase)
127+
# define RENAMENOISE_HALF_OF(x) ((x) *.5f)
108128
#endif
109129

110-
#define renamenoise_kf_cexp(x,phase) \
111-
do{ \
112-
(x)->r = RENAMENOISE_FFT_COS(phase);\
113-
(x)->i = RENAMENOISE_FFT_SIN(phase);\
114-
}while(0)
130+
#define renamenoise_kf_cexp(x, phase) \
131+
do { \
132+
(x)->r = RENAMENOISE_FFT_COS(phase); \
133+
(x)->i = RENAMENOISE_FFT_SIN(phase); \
134+
} while (0)
115135

116136
#endif /* RENAMENOISE_FFT_GUTS_H */

0 commit comments

Comments
 (0)