kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor: fix comments 

Applying code guidelines. No side effects.
This commit is contained in:
Piotr Gregor 2016-02-05 00:37:33 +00:00
parent 2e30c94c35
commit 6d8fd0def6
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod/applications/mod_avmd/buffer.c
View File

@ -9,11 +9,11 @@ extern size_t next_power_of_2(size_t v)
v++; v++;
do{ do {
prev = v; prev = v;
v &= ~tmp; v &= ~tmp;
tmp <<= 1; tmp <<= 1;
}while(v != 0); } while (v != 0);
prev <<= 1; prev <<= 1;

20
src/mod/applications/mod_avmd/buffer.h
View File

@ -29,7 +29,7 @@ extern size_t next_power_of_2(size_t v);
(b)->pos++; \ (b)->pos++; \
(b)->pos &= (b)->mask; \ (b)->pos &= (b)->mask; \
(b)->lpos++; \ (b)->lpos++; \
if((b)->backlog < (b)->buf_len) (b)->backlog++; \ if ((b)->backlog < (b)->buf_len) (b)->backlog++; \
} }
#define DEC_POS(b) \ #define DEC_POS(b) \
@ -37,27 +37,27 @@ extern size_t next_power_of_2(size_t v);
(b)->pos--; \ (b)->pos--; \
(b)->pos &= (b)->mask; \ (b)->pos &= (b)->mask; \
(b)->lpos--; \ (b)->lpos--; \
if(((b)->backlog - 1) < (b)->backlog) (b)->backlog--; \ if (((b)->backlog - 1) < (b)->backlog) (b)->backlog--; \
} }
#define GET_SAMPLE(b, i) ((b)->buf[(i) & (b)->mask]) #define GET_SAMPLE(b, i) ((b)->buf[(i) & (b)->mask])
#define SET_SAMPLE(b, i, v) ((b)->buf[(i) & (b)->mask] = (v)) #define SET_SAMPLE(b, i, v) ((b)->buf[(i) & (b)->mask] = (v))
#define INSERT_FRAME(b, f, l) \ #define INSERT_FRAME(b, f, l) \
do{ \ do { \
for((b)->i = 0; (b)->i < (l); (b)->i++){ \ for ((b)->i = 0; (b)->i < (l); (b)->i++) { \
SET_SAMPLE((b), ((b)->i + (b)->pos), (f)[(b)->i]); \ SET_SAMPLE((b), ((b)->i + (b)->pos), (f)[(b)->i]); \
} \ } \
(b)->pos += (l); \ (b)->pos += (l); \
(b)->lpos += (l); \ (b)->lpos += (l); \
(b)->pos %= (b)->buf_len; \ (b)->pos %= (b)->buf_len; \
(b)->backlog += (l); \ (b)->backlog += (l); \
if((b)->backlog > (b)->buf_len) (b)->backlog = (b)->buf_len; \ if ((b)->backlog > (b)->buf_len) (b)->backlog = (b)->buf_len; \
}while(0) } while (0)
#define INSERT_INT16_FRAME(b, f, l) \ #define INSERT_INT16_FRAME(b, f, l) \
{ \ { \
for((b)->i = 0; (b)->i < (l); (b)->i++){ \ for ((b)->i = 0; (b)->i < (l); (b)->i++) { \
SET_SAMPLE( \ SET_SAMPLE( \
(b), \ (b), \
((b)->i + (b)->pos), \ ((b)->i + (b)->pos), \
@ -72,7 +72,7 @@ extern size_t next_power_of_2(size_t v);
(b)->lpos += (l); \ (b)->lpos += (l); \
(b)->pos &= (b)->mask; \ (b)->pos &= (b)->mask; \
(b)->backlog += (l); \ (b)->backlog += (l); \
if((b)->backlog > (b)->buf_len) (b)->backlog = (b)->buf_len; \ if ((b)->backlog > (b)->buf_len) (b)->backlog = (b)->buf_len; \
} }
@ -95,10 +95,10 @@ extern size_t next_power_of_2(size_t v);
#define GET_CURRENT_SAMPLE(b) GET_SAMPLE((b), GET_CURRENT_POS((b))) #define GET_CURRENT_SAMPLE(b) GET_SAMPLE((b), GET_CURRENT_POS((b)))
#define ADD_SAMPLE(b, s) \ #define ADD_SAMPLE(b, s) \
do{ \ do { \
INC_POS((b)); \ INC_POS((b)); \
SET_SAMPLE((b), GET_CURRENT_POS((b)), (s)); \ SET_SAMPLE((b), GET_CURRENT_POS((b)), (s)); \
}while(0) } while (0)
#endif #endif

10
src/mod/applications/mod_avmd/goertzel.c
View File

@ -21,11 +21,11 @@ extern double goertzel(circ_buffer_t *b, size_t pos, double f, size_t num)
coeff = 2.0 * cos(2.0 * M_PI * f); coeff = 2.0 * cos(2.0 * M_PI * f);
for(i = 0; i < num; i++){ for (i = 0; i < num; i++) {
/* TODO: optimize to avoid GET_SAMPLE when possible */ /* TODO: optimize to avoid GET_SAMPLE when possible */
s = GET_SAMPLE(b, i + pos) + (coeff * p) - p2; s = GET_SAMPLE(b, i + pos) + (coeff * p) - p2;
p2 = p; p2 = p;
p = s; p = s;
} }
return (p2 * p2) + (p * p) - (coeff * p2 * p); return (p2 * p2) + (p * p) - (coeff * p2 * p);