kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-03 20:01:57 +00:00
Code Issues Projects Releases Wiki Activity

look for more sound files at various rates

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11601 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Brian West 2009-02-02 18:11:41 +00:00
parent c14dacd56e
commit 0064924ba5
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/mod/formats/mod_sndfile/mod_sndfile.c
View File

@ -62,8 +62,12 @@ static switch_status_t sndfile_file_open(switch_file_handle_t *handle, const cha
char *ext; char *ext;
struct format_map *map = NULL; struct format_map *map = NULL;
switch_status_t status = SWITCH_STATUS_SUCCESS; switch_status_t status = SWITCH_STATUS_SUCCESS;
char *alt_path = NULL, *next, *last, *ldup = NULL; char *alt_path = NULL, *last, *ldup = NULL;
size_t alt_len = 0; size_t alt_len = 0;
int rates[4] = {8000, 16000, 32000, 48000};
int i;
char ps[2] = {'/', '\\'};
int x;
if ((ext = strrchr(path, '.')) == 0) { if ((ext = strrchr(path, '.')) == 0) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Format\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Format\n");
@ -146,26 +150,32 @@ static switch_status_t sndfile_file_open(switch_file_handle_t *handle, const cha
switch_zmalloc(alt_path, alt_len); switch_zmalloc(alt_path, alt_len);
switch_copy_string(alt_path, path, alt_len); switch_copy_string(alt_path, path, alt_len);
if ((last = strrchr(alt_path, '/'))) {
next = ++last; for (x = 0; x < 2; x++) {
if ((last = strrchr(alt_path, ps[x]))) {
last++;
ldup = strdup(last); ldup = strdup(last);
switch_assert(ldup); switch_assert(ldup);
switch_snprintf(next, alt_len - (last - alt_path), "%d%s%s", handle->samplerate, SWITCH_PATH_SEPARATOR, ldup); switch_snprintf(last, alt_len - (last - alt_path), "%d%s%s", handle->samplerate, SWITCH_PATH_SEPARATOR, ldup);
if ((context->handle = sf_open(alt_path, mode, &context->sfinfo))) { if ((context->handle = sf_open(alt_path, mode, &context->sfinfo))) {
path = alt_path; path = alt_path;
} } else {
} /* Try to find the file at the highest rate possible if we can't find one that matches the exact rate.
#ifdef WIN32 If we don't find any, we will default back to the original file name.
else if ((last = strrchr(alt_path, '\\'))) { */
next = ++last; for (i = 3; i > 0; i--) {
ldup = strdup(last); switch_snprintf(last, alt_len - (last - alt_path), "%d%s%s", rates[i], SWITCH_PATH_SEPARATOR, ldup);
switch_assert(ldup);
switch_snprintf(next, alt_len - (last - alt_path), "%d%s%s", handle->samplerate, SWITCH_PATH_SEPARATOR, ldup);
if ((context->handle = sf_open(alt_path, mode, &context->sfinfo))) { if ((context->handle = sf_open(alt_path, mode, &context->sfinfo))) {
path = alt_path; path = alt_path;
break;
} }
} }
}
}
#ifndef WIN32
break;
#endif #endif
}
if (!context->handle) { if (!context->handle) {
if ((context->handle = sf_open(path, mode, &context->sfinfo)) == 0) { if ((context->handle = sf_open(path, mode, &context->sfinfo)) == 0) {