Preston_PLB/freeswitch
1
0
Fork 0
forked from Mirrors/freeswitch
Code Pull Requests Activity

[mod_fsv] fix channels regression from 94eb8ac0a

Browse Source
This commit is contained in:
Seven Du 2020-03-30 16:46:01 +08:00 committed by Andrey Volk
parent 7b46c01e9e
commit 3a1a2b3831
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mod/applications/mod_fsv/mod_fsv.c
View File

@ -847,8 +847,6 @@ static switch_status_t fsv_file_open(switch_file_handle_t *handle, const char *p
} }
handle->samples = 0; handle->samples = 0;
// handle->samplerate = 8000;
// handle->channels = 1;
handle->format = 0; handle->format = 0;
handle->sections = 0; handle->sections = 0;
handle->seekable = 0; handle->seekable = 0;
@ -892,6 +890,7 @@ static switch_status_t fsv_file_open(switch_file_handle_t *handle, const char *p
} }
handle->samplerate = h.audio_rate; handle->samplerate = h.audio_rate;
handle->channels = h.channels;
video_codec = switch_core_strdup(handle->memory_pool, h.video_codec_name); video_codec = switch_core_strdup(handle->memory_pool, h.video_codec_name);
} }
@ -910,6 +909,8 @@ static switch_status_t fsv_file_open(switch_file_handle_t *handle, const char *p
} }
} }
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "File opened [%s] %dhz [%d] channels\n", path, handle->samplerate, handle->channels);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
@ -963,7 +964,7 @@ static switch_status_t fsv_file_seek(switch_file_handle_t *handle, unsigned int
static switch_status_t fsv_file_read(switch_file_handle_t *handle, void *data, size_t *len) static switch_status_t fsv_file_read(switch_file_handle_t *handle, void *data, size_t *len)
{ {
switch_status_t status; switch_status_t status;
size_t need = *len; size_t need = *len * 2;
uint32_t size; uint32_t size;
size_t bytes = sizeof(size); size_t bytes = sizeof(size);
fsv_file_context *context = handle->private_info; fsv_file_context *context = handle->private_info;