[Freeswitch-svn] [commit] r10888 - freeswitch/trunk/src/mod/formats/mod_sndfile

[FreeSWITCH SVN]

Author: brian
Date: Fri Dec 19 16:58:57 2008
New Revision: 10888

Log:
this part was correct to begin with and r48 serves no purpose in this extra formats

Modified:
   freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c

Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c
==============================================================================
--- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c	(original)
+++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c	Fri Dec 19 16:58:57 2008
@@ -116,17 +116,13 @@
 		context->sfinfo.channels = 1;
 		context->sfinfo.samplerate = 16000;
 	} else 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;
 	} else 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;
-	} else if (!strcmp(ext, "r48")) {
-		context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_PCM_16;
-		context->sfinfo.channels = 1;
-		context->sfinfo.samplerate = 48000;
 	} else if (!strcmp(ext, "gsm")) {
 		context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_GSM610;
 		context->sfinfo.channels = 1;
@@ -299,7 +295,7 @@
 	char buffer[128];
 	int format, major_count, subtype_count, m, s;
 	int len, x, skip;
-	char *extras[] = { "r8", "r16", "r24", "r32", "r48", "gsm", "ul", "al", NULL };
+	char *extras[] = { "r8", "r16", "r24", "r32", "gsm", "ul", "al", NULL };
 	int exlen = (sizeof(extras) / sizeof(extras[0]));
 	buffer[0] = 0;