ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-10-28 14:14:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

sndfile tweak

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@213 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale committed 2005-12-27 19:52:30 +00:00
1 parent 378ce8e115
commit dad4780765
4 files changed
+34 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/mod/mod_sndfile/mod_sndfile.c
+15 -9
View File
@@ -85,22 +85,29 @@ switch_status sndfile_file_open(switch_file_handle *handle, char *path)
}
if (!strcmp(ext, "r24")) {
context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_PCM_16;
context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_PCM_24;
context->sfinfo.channels = 1;
context->sfinfo.samplerate = 24000;
}
if (!strcmp(ext, "r32")) {
context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_PCM_16;
context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_PCM_32;
context->sfinfo.channels = 1;
context->sfinfo.samplerate = 32000;
}
if (!strcmp(ext, "gsm")) {
context->sfinfo.format = SF_FORMAT_RAW |SF_FORMAT_GSM610;
context->sfinfo.channels = 1;
context->sfinfo.samplerate = 8000;
}
if (!(context->handle = sf_open(path, mode, &context->sfinfo))) {
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Error Opening File [%s] [%s]\n", path, sf_strerror(context->handle));
return SWITCH_STATUS_GENERR;
}
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Opening File [%s] %dhz\n", path, context->sfinfo.samplerate);
handle->samples = context->sfinfo.frames;
handle->samplerate = context->sfinfo.samplerate;
handle->channels = context->sfinfo.channels;
@@ -213,7 +220,8 @@ static switch_status setup_formats(void)
char buffer [128] ;
int format, major_count, subtype_count, m, s ;
int len,x,skip;
char *extras[] = {"r8", "r16", "r24", "r32", "gsm"};
int exlen = (sizeof(extras) / sizeof(extras[0]));
buffer [0] = 0 ;
sf_command (NULL, SFC_GET_LIB_VERSION, buffer, sizeof (buffer)) ;
if (strlen (buffer) < 1) {
@@ -228,7 +236,7 @@ static switch_status setup_formats(void)
sf_command (NULL, SFC_GET_FORMAT_SUBTYPE_COUNT, &subtype_count, sizeof (int)) ;
sfinfo.channels = 1 ;
len = (major_count + 5) * sizeof(char *);
len = ((major_count + (exlen + 2)) * sizeof(char *));
*supported_formats = switch_core_permenant_alloc(len);
memset(supported_formats, 0, len);
@@ -260,11 +268,9 @@ static switch_status setup_formats(void)
}
}
supported_formats[len++] = "r8";
supported_formats[len++] = "r16";
supported_formats[len++] = "r24";
supported_formats[len++] = "r32";
for(m=0; m< exlen; m++) {
supported_formats[len++] = extras[m];
}