From 0fa01ab377354d3b4adb2f31b50a6c0d6cf1dc56 Mon Sep 17 00:00:00 2001
From: Henri Herscher <henri@oreka.org>
Date: Thu, 8 Dec 2005 17:41:04 +0000
Subject: Orkaudio can now encode in "pcmwav" format, ie, pcm stored in a wav
 file without compression.

git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@100 09dcff7a-b715-0410-9601-b79a96267cd0
---
 orkaudio/AudioTape.cpp             | 8 ++++++++
 orkaudio/AudioTape.h               | 4 +++-
 orkaudio/BatchProcessing.cpp       | 4 +++-
 orkaudio/config-linux-template.xml | 2 +-
 orkaudio/config-template.xml       | 2 +-
 5 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'orkaudio')

diff --git a/orkaudio/AudioTape.cpp b/orkaudio/AudioTape.cpp
index 6c24641..fd01b2c 100644
--- a/orkaudio/AudioTape.cpp
+++ b/orkaudio/AudioTape.cpp
@@ -339,6 +339,10 @@ int AudioTape::FileFormatToEnum(CStdString& format)
 	{
 		formatEnum = FfAlaw;
 	}
+	else if (format.CompareNoCase(FF_PCMWAV) == 0)
+	{
+		formatEnum = FfPcmWav;
+	}
 	return formatEnum;
 }
 
@@ -359,6 +363,9 @@ CStdString AudioTape::FileFormatToString(int formatEnum)
 	case FfAlaw:
 		formatString = FF_ALAW;
 		break;
+	case FfPcmWav:
+		formatString = FF_PCMWAV;
+		break;
 	default:
 		formatString = FF_UNKNOWN;
 	}
@@ -373,6 +380,7 @@ CStdString AudioTape::GetFileFormatExtension(FileFormatEnum formatEnum)
 	case FfGsm:
 	case FfUlaw:
 	case FfAlaw:
+	case FfPcmWav:
 		extension = ".wav";
 		break;
 	default:
diff --git a/orkaudio/AudioTape.h b/orkaudio/AudioTape.h
index 113ff23..7d40564 100644
--- a/orkaudio/AudioTape.h
+++ b/orkaudio/AudioTape.h
@@ -61,6 +61,7 @@ public:
 #define FF_GSM "GSM"
 #define FF_ULAW "ulaw"
 #define FF_ALAW "alaw"
+#define FF_PCMWAV "pcmwav"
 #define FF_UNKNOWN "unknown"
 	typedef enum
 	{
@@ -69,7 +70,8 @@ public:
 		FfGsm = 2,
 		FfUlaw = 3,
 		FfAlaw = 4,
-		FfInvalid = 5
+		FfPcmWav = 5,
+		FfInvalid = 6
 	} FileFormatEnum;
 	static int FileFormatToEnum(CStdString& format);
 	static CStdString FileFormatToString(int formatEnum);
diff --git a/orkaudio/BatchProcessing.cpp b/orkaudio/BatchProcessing.cpp
index fe73a3d..a5ffc5c 100644
--- a/orkaudio/BatchProcessing.cpp
+++ b/orkaudio/BatchProcessing.cpp
@@ -86,8 +86,10 @@ void BatchProcessing::ThreadHandler(void *args)
 					outFileRef.reset(new LibSndFileFile(SF_FORMAT_ALAW | SF_FORMAT_WAV));
 					break;
 				case AudioTape::FfGsm:
-				default:
 					outFileRef.reset(new LibSndFileFile(SF_FORMAT_GSM610 | SF_FORMAT_WAV));
+				case AudioTape::FfPcmWav:
+				default:
+					outFileRef.reset(new LibSndFileFile(SF_FORMAT_PCM_16 | SF_FORMAT_WAV));
 				}
 				CStdString file = CONFIG.m_audioOutputPath + "/" + audioTapeRef->GetPath() + audioTapeRef->GetIdentifier();
 				outFileRef->Open(file, AudioFile::WRITE, false, fileRef->GetSampleRate());
diff --git a/orkaudio/config-linux-template.xml b/orkaudio/config-linux-template.xml
index 10434e7..0dda663 100644
--- a/orkaudio/config-linux-template.xml
+++ b/orkaudio/config-linux-template.xml
@@ -11,7 +11,7 @@
 	<!--<CapturePluginPath>audiocaptureplugins/voip/.libs</CapturePluginPath>-->
 	<!--<CapturePlugin>libvoip.so</CapturePlugin>-->
 
-	<!-- Audio file storage format: choose from: native, gsm, ulaw, alaw -->
+	<!-- Audio file storage format: choose from: native, gsm, ulaw, alaw, pcmwav -->
 	<StorageAudioFormat>gsm</StorageAudioFormat>
 
 	<!-- If you want to keep native audio files as well as compressed, change this to "no" -->
diff --git a/orkaudio/config-template.xml b/orkaudio/config-template.xml
index 5599f04..db2248e 100644
--- a/orkaudio/config-template.xml
+++ b/orkaudio/config-template.xml
@@ -10,7 +10,7 @@
 	<!--<CapturePlugin>SoundDevice.dll</CapturePlugin>-->
 	<CapturePluginPath>audiocaptureplugins/</CapturePluginPath>	
 	
-	<!-- Audio file storage format: choose from: native, gsm, ulaw, alaw -->
+	<!-- Audio file storage format: choose from: native, gsm, ulaw, alaw, pcmwav -->
 	<StorageAudioFormat>gsm</StorageAudioFormat>
 	
 	<!-- If you want to keep native audio files as well as compressed, change this to "no" -->
-- 
cgit v1.2.3