Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-22 09:33:01 +01:00
Code Issues Projects Releases Wiki Activity

Fix issue with audio VAD threshold

Browse Source 
The default VAD was always being set to 0. We now use the
value provided by the config file if defined
This commit is contained in:
jfreegman 2021-12-05 16:36:13 -05:00
parent 7b734f3996
commit 8aa57b0539
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
5 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/audio_call.c
View File

@ -204,7 +204,7 @@ static int start_transmission(ToxWindow *self, Call *call)
return -1; return -1;
} }
DeviceError error = open_input_device(&call->in_idx, read_device_callback, &self->num, false, DeviceError error = open_input_device(&call->in_idx, read_device_callback, &self->num,
CallControl.audio_sample_rate, CallControl.audio_frame_duration, CallControl.audio_channels); CallControl.audio_sample_rate, CallControl.audio_frame_duration, CallControl.audio_channels);
if (error != de_None) { if (error != de_None) {

25
src/audio_device.c
View File

@ -484,8 +484,7 @@ DeviceError set_al_device(DeviceType type, int32_t selection)
return de_None; return de_None;
} }
static DeviceError open_device(DeviceType type, uint32_t *device_idx, static DeviceError open_device(DeviceType type, uint32_t *device_idx, DataHandleCallback cb, void *cb_data,
DataHandleCallback cb, void *cb_data, bool enable_VAD,
uint32_t sample_rate, uint32_t frame_duration, uint8_t channels) uint32_t sample_rate, uint32_t frame_duration, uint8_t channels)
{ {
if (channels != 1 && channels != 2) { if (channels != 1 && channels != 2) {
@ -530,7 +529,11 @@ static DeviceError open_device(DeviceType type, uint32_t *device_idx,
device->cb = cb; device->cb = cb;
device->cb_data = cb_data; device->cb_data = cb_data;
#ifdef AUDIO #ifdef AUDIO
device->VAD_threshold = enable_VAD ? user_settings->VAD_threshold : 0.0f;
if (user_settings->VAD_threshold >= 0.0f) {
device->VAD_threshold = user_settings->VAD_threshold;
}
#else #else
device->VAD_threshold = 0.0f; device->VAD_threshold = 0.0f;
#endif #endif
@ -547,21 +550,15 @@ static DeviceError open_device(DeviceType type, uint32_t *device_idx,
return de_None; return de_None;
} }
DeviceError open_input_device(uint32_t *device_idx, DeviceError open_input_device(uint32_t *device_idx, DataHandleCallback cb, void *cb_data, uint32_t sample_rate,
DataHandleCallback cb, void *cb_data, bool enable_VAD, uint32_t frame_duration, uint8_t channels)
uint32_t sample_rate, uint32_t frame_duration, uint8_t channels)
{ {
return open_device(input, device_idx, return open_device(input, device_idx, cb, cb_data, sample_rate, frame_duration, channels);
cb, cb_data, enable_VAD,
sample_rate, frame_duration, channels);
} }
DeviceError open_output_device(uint32_t *device_idx, DeviceError open_output_device(uint32_t *device_idx, uint32_t sample_rate, uint32_t frame_duration, uint8_t channels)
uint32_t sample_rate, uint32_t frame_duration, uint8_t channels)
{ {
return open_device(output, device_idx, return open_device(output, device_idx, 0, 0, sample_rate, frame_duration, channels);
0, 0, 0,
sample_rate, frame_duration, channels);
} }
DeviceError close_device(DeviceType type, uint32_t device_idx) DeviceError close_device(DeviceType type, uint32_t device_idx)

6
src/audio_device.h
View File

@ -75,11 +75,9 @@ DeviceError set_source_position(uint32_t device_idx, float x, float y, float z);
DeviceError set_al_device(DeviceType type, int32_t selection); DeviceError set_al_device(DeviceType type, int32_t selection);
/* Start device */ /* Start device */
DeviceError open_input_device(uint32_t *device_idx, DeviceError open_input_device(uint32_t *device_idx, DataHandleCallback cb, void *cb_data,
DataHandleCallback cb, void *cb_data, bool enable_VAD,
uint32_t sample_rate, uint32_t frame_duration, uint8_t channels); uint32_t sample_rate, uint32_t frame_duration, uint8_t channels);
DeviceError open_output_device(uint32_t *device_idx, DeviceError open_output_device(uint32_t *device_idx, uint32_t sample_rate, uint32_t frame_duration, uint8_t channels);
uint32_t sample_rate, uint32_t frame_duration, uint8_t channels);
/* Stop device */ /* Stop device */
DeviceError close_device(DeviceType type, uint32_t device_idx); DeviceError close_device(DeviceType type, uint32_t device_idx);

2
src/chat.c
View File

@ -1034,7 +1034,7 @@ static void init_infobox(ToxWindow *self)
ctx->infobox.win = newwin(INFOBOX_HEIGHT, INFOBOX_WIDTH + 1, 1, x2 - INFOBOX_WIDTH); ctx->infobox.win = newwin(INFOBOX_HEIGHT, INFOBOX_WIDTH + 1, 1, x2 - INFOBOX_WIDTH);
ctx->infobox.starttime = get_unix_time(); ctx->infobox.starttime = get_unix_time();
ctx->infobox.vad_lvl = 0.0f; ctx->infobox.vad_lvl = user_settings->VAD_threshold;
ctx->infobox.active = true; ctx->infobox.active = true;
strcpy(ctx->infobox.timestr, "00"); strcpy(ctx->infobox.timestr, "00");
} }

2
src/conference.c
View File

@ -1312,7 +1312,7 @@ bool init_conference_audio_input(Tox *tox, uint32_t conferencenum)
int channels = user_settings->conference_audio_channels; int channels = user_settings->conference_audio_channels;
bool success = (open_input_device(&chat->audio_in_idx, bool success = (open_input_device(&chat->audio_in_idx,
conference_read_device_callback, &chat->audio_input_callback_data, true, conference_read_device_callback, &chat->audio_input_callback_data,
CONFAV_SAMPLE_RATE, CONFAV_FRAME_DURATION, channels) CONFAV_SAMPLE_RATE, CONFAV_FRAME_DURATION, channels)
== de_None); == de_None);