williamp/osmocom-analog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixup debug class definition: rename DFSK and DAUDIO to DDSP

Browse Source
This commit is contained in:
Andreas Eversberg
2016-03-15 19:26:13 +01:00
parent 57caa536cf
commit a5db02775e
7 changed files with 55 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/debug.c
View File

@@ -35,8 +35,7 @@ struct debug_cat {
} debug_cat[] = {
{ "sender", "\033[1;33m" },
{ "sound", "\033[0;35m" },
{ "fsk", "\033[0;31m" },
{ "audio", "\033[0;31m" },
{ "dsp", "\033[0;31m" },
{ "anetz", "\033[1;34m" },
{ "bnetz", "\033[1;34m" },
{ "nmt", "\033[1;34m" },

15
src/common/debug.h
View File

@@ -6,14 +6,13 @@
#define DSENDER 0
#define DSOUND 1
#define DFSK 2
#define DAUDIO 3
#define DANETZ 4
#define DBNETZ 5
#define DNMT 6
#define DFRAME 7
#define DCALL 8
#define DMNCC 9
#define DDSP 2
#define DANETZ 3
#define DBNETZ 4
#define DNMT 5
#define DFRAME 6
#define DCALL 7
#define DMNCC 8
#define PDEBUG(cat, level, fmt, arg...) _printdebug(__FILE__, __FUNCTION__, __LINE__, cat, level, fmt, ## arg)
void _printdebug(const char *file, const char *function, int line, int cat, int level, const char *fmt, ...);

2
src/common/jitter.c
View File

@@ -31,7 +31,7 @@ int jitter_create(jitter_t *jitter, int length)
memset(jitter, 0, sizeof(jitter));
jitter->spl = calloc(length * sizeof(int16_t), 1);
if (!jitter->spl) {
PDEBUG(DAUDIO, DEBUG_ERROR, "No memory for jitter buffer.\n");
PDEBUG(DDSP, DEBUG_ERROR, "No memory for jitter buffer.\n");
return -ENOMEM;
}
jitter->len = length;

6
src/common/loss.c
View File

@@ -44,7 +44,7 @@ void audio_init_loss(loss_t *loss, int interval, double threshold, int seconds)
void audio_reset_loss(loss_t *loss)
{
if (loss->interval_count > 0) {
PDEBUG(DAUDIO, DEBUG_DEBUG, "Signal is recovered (loss is gone).\n");
PDEBUG(DDSP, DEBUG_DEBUG, "Signal is recovered (loss is gone).\n");
loss->interval_count = 0;
}
loss->level = 0;
@@ -71,7 +71,7 @@ int audio_detect_loss(loss_t *loss, double level)
/* normalize level */
loss->level = loss->level / loss->level_count;
PDEBUG(DAUDIO, DEBUG_DEBUG, "Noise level = %.0f%%\n", loss->level * 100);
PDEBUG(DDSP, DEBUG_DEBUG, "Noise level = %.0f%%\n", loss->level * 100);
diff = loss->level / loss->level_last;
if (diff < 1.0)
@@ -81,7 +81,7 @@ int audio_detect_loss(loss_t *loss, double level)
loss->level_count = 0;
if (diff < LOSS_MAX_DIFF && loss->level_last > loss->threshold) {
loss->interval_count++;
PDEBUG(DAUDIO, DEBUG_DEBUG, "Detected signal loss %d for intervals level change %.0f%% (below %.0f%%).\n", loss->interval_count, diff * 100 - 100, LOSS_MAX_DIFF * 100 - 100);
PDEBUG(DDSP, DEBUG_DEBUG, "Detected signal loss %d for intervals level change %.0f%% (below %.0f%%).\n", loss->interval_count, diff * 100 - 100, LOSS_MAX_DIFF * 100 - 100);
} else if (loss->interval_count > 0) {
audio_reset_loss(loss);
}