From 7939bfd47e3cef5faf9d0e95434519b0a418bf84 Mon Sep 17 00:00:00 2001 From: Henri Herscher Date: Wed, 21 Jun 2006 20:17:33 +0000 Subject: Moved FileFormatEnum from AudioTape.cpp in OrkAudio to AudioCapture.cpp in OrkBase git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@271 09dcff7a-b715-0410-9601-b79a96267cd0 --- orkaudio/AudioTape.cpp | 77 +------------------------------------------- orkaudio/AudioTape.h | 21 ------------ orkaudio/BatchProcessing.cpp | 8 ++--- orkaudio/Config.cpp | 7 ++-- orkaudio/Config.h | 6 ++-- orkaudio/OrkAudio.cpp | 2 +- 6 files changed, 13 insertions(+), 108 deletions(-) (limited to 'orkaudio') diff --git a/orkaudio/AudioTape.cpp b/orkaudio/AudioTape.cpp index 7495dc3..7df41b8 100644 --- a/orkaudio/AudioTape.cpp +++ b/orkaudio/AudioTape.cpp @@ -139,7 +139,7 @@ void AudioTape::Write() } else { - m_fileExtension = GetFileFormatExtension(CONFIG.m_storageAudioFormat); + m_fileExtension = FileFormatGetExtension(CONFIG.m_storageAudioFormat); } } } @@ -328,78 +328,3 @@ bool AudioTape::IsReadyForBatchProcessing() } -//======================================== -// File format related methods - -int AudioTape::FileFormatToEnum(CStdString& format) -{ - int formatEnum = FfUnknown; - if(format.CompareNoCase(FF_NATIVE) == 0) - { - formatEnum = FfNative; - } - else if (format.CompareNoCase(FF_GSM) == 0) - { - formatEnum = FfGsm; - } - else if (format.CompareNoCase(FF_ULAW) == 0) - { - formatEnum = FfUlaw; - } - else if (format.CompareNoCase(FF_ALAW) == 0) - { - formatEnum = FfAlaw; - } - else if (format.CompareNoCase(FF_PCMWAV) == 0) - { - formatEnum = FfPcmWav; - } - return formatEnum; -} - -CStdString AudioTape::FileFormatToString(int formatEnum) -{ - CStdString formatString; - switch (formatEnum) - { - case FfNative: - formatString = FF_NATIVE; - break; - case FfGsm: - formatString = FF_GSM; - break; - case FfUlaw: - formatString = FF_ULAW; - break; - case FfAlaw: - formatString = FF_ALAW; - break; - case FfPcmWav: - formatString = FF_PCMWAV; - break; - default: - formatString = FF_UNKNOWN; - } - return formatString; -} - -CStdString AudioTape::GetFileFormatExtension(FileFormatEnum formatEnum) -{ - CStdString extension; - switch (formatEnum) - { - case FfGsm: - case FfUlaw: - case FfAlaw: - case FfPcmWav: - extension = ".wav"; - break; - default: - CStdString formatEnumString = IntToString(formatEnum); - throw (CStdString("AudioTape::GetFileFormatExtension: unknown file format:") + formatEnumString); - } - return extension; -} - - - diff --git a/orkaudio/AudioTape.h b/orkaudio/AudioTape.h index 8fd8e8f..9e288fa 100644 --- a/orkaudio/AudioTape.h +++ b/orkaudio/AudioTape.h @@ -59,27 +59,6 @@ public: StateInvalid = 5 } StateEnum; -#define FF_NATIVE "native" -#define FF_GSM "GSM" -#define FF_ULAW "ulaw" -#define FF_ALAW "alaw" -#define FF_PCMWAV "pcmwav" -#define FF_UNKNOWN "unknown" - typedef enum - { - FfUnknown = 0, - FfNative = 1, - FfGsm = 2, - FfUlaw = 3, - FfAlaw = 4, - FfPcmWav = 5, - FfInvalid = 6 - } FileFormatEnum; - static int FileFormatToEnum(CStdString& format); - static CStdString FileFormatToString(int formatEnum); - static CStdString GetFileFormatExtension(FileFormatEnum); - - AudioTape(CStdString &portId); void AddAudioChunk(AudioChunkRef chunkRef); diff --git a/orkaudio/BatchProcessing.cpp b/orkaudio/BatchProcessing.cpp index 6fb3fa5..31f464b 100644 --- a/orkaudio/BatchProcessing.cpp +++ b/orkaudio/BatchProcessing.cpp @@ -172,16 +172,16 @@ void BatchProcessing::ThreadHandler(void *args) switch(CONFIG.m_storageAudioFormat) { - case AudioTape::FfUlaw: + case FfUlaw: outFileRef.reset(new LibSndFileFile(SF_FORMAT_ULAW | SF_FORMAT_WAV)); break; - case AudioTape::FfAlaw: + case FfAlaw: outFileRef.reset(new LibSndFileFile(SF_FORMAT_ALAW | SF_FORMAT_WAV)); break; - case AudioTape::FfGsm: + case FfGsm: outFileRef.reset(new LibSndFileFile(SF_FORMAT_GSM610 | SF_FORMAT_WAV)); break; - case AudioTape::FfPcmWav: + case FfPcmWav: default: outFileRef.reset(new LibSndFileFile(SF_FORMAT_PCM_16 | SF_FORMAT_WAV)); } diff --git a/orkaudio/Config.cpp b/orkaudio/Config.cpp index ca7273c..9f5e64c 100644 --- a/orkaudio/Config.cpp +++ b/orkaudio/Config.cpp @@ -13,6 +13,7 @@ #define _WINSOCKAPI_ // prevents the inclusion of winsock.h +#include "ace/OS_NS_unistd.h" #include "Utils.h" #include "serializers/Serializer.h" #include "Config.h" @@ -45,7 +46,7 @@ Config::Config() char hostname[40]; ACE_OS::hostname(hostname, 40); - ACE_OS::hostname(hostname, HOSTNAME_BUF_LEN); + //ACE_OS::hostname(hostname, HOSTNAME_BUF_LEN); m_serviceName = CStdString("orkaudio-") + hostname; m_reportingRetryDelay = 5; @@ -59,7 +60,7 @@ void Config::Define(Serializer* s) s->BoolValue(ENABLE_REPORTING_PARAM, m_enableReporting); s->StringValue(CAPTURE_PLUGIN_PARAM, m_capturePlugin); s->StringValue(CAPTURE_PLUGIN_PATH_PARAM, m_capturePluginPath); - s->EnumValue(STORAGE_AUDIO_FORMAT_PARAM, (int&)m_storageAudioFormat, AudioTape::FileFormatToEnum, AudioTape::FileFormatToString); + s->EnumValue(STORAGE_AUDIO_FORMAT_PARAM, (int&)m_storageAudioFormat, FileFormatToEnum, FileFormatToString); s->IntValue(NUM_BATCH_THREADS_PARAM, m_numBatchThreads); s->BoolValue(DELETE_NATIVE_FILE_PARAM, m_deleteNativeFile); s->IntValue(AUDIO_CHUNK_DEFAULT_SIZE_PARAM, m_audioChunkDefaultSize); @@ -84,7 +85,7 @@ void Config::Define(Serializer* s) void Config::Validate() { - if (m_storageAudioFormat <= AudioTape::FfUnknown || m_storageAudioFormat >= AudioTape::FfInvalid) + if (m_storageAudioFormat <= FfUnknown || m_storageAudioFormat >= FfInvalid) { throw CStdString(CStdString("Config::Validate: value out of range:") + STORAGE_AUDIO_FORMAT_PARAM); } diff --git a/orkaudio/Config.h b/orkaudio/Config.h index 48be3f0..35b5ea6 100644 --- a/orkaudio/Config.h +++ b/orkaudio/Config.h @@ -16,7 +16,7 @@ #include "StdString.h" #include "Object.h" -#include "AudioTape.h" +#include "AudioCapture.h" #define LOG_MESSAGES_PARAM "LogMessages" #define LOG_MESSAGES_DEFAULT false @@ -25,7 +25,7 @@ #define CAPTURE_PLUGIN_PATH_PARAM "CapturePluginPath" #define CAPTURE_PLUGIN_PATH_DEFAULT "AudioCapturePlugins" #define STORAGE_AUDIO_FORMAT_PARAM "StorageAudioFormat" -#define STORAGE_AUDIO_FORMAT_DEFAULT (AudioTape::FfGsm) +#define STORAGE_AUDIO_FORMAT_DEFAULT FfGsm #define NUM_BATCH_THREADS_PARAM "NumBatchThreads" #define NUM_BATCH_THREADS_DEFAULT 1 #define DELETE_NATIVE_FILE_PARAM "DeleteNativeFile" @@ -89,7 +89,7 @@ public: int m_audioChunkDefaultSize; bool m_audioSegmentation; int m_audioSegmentDuration; - AudioTape::FileFormatEnum m_storageAudioFormat; + FileFormatEnum m_storageAudioFormat; bool m_vad; double m_vadHighThresholdDb; double m_vadLowThresholdDb; diff --git a/orkaudio/OrkAudio.cpp b/orkaudio/OrkAudio.cpp index cfc04d6..f93b168 100644 --- a/orkaudio/OrkAudio.cpp +++ b/orkaudio/OrkAudio.cpp @@ -150,7 +150,7 @@ void MainThread() { LOG4CXX_INFO(LOG.rootLog, CStdString("Failed to create immediate processing thread")); } - if(CONFIG.m_storageAudioFormat != AudioTape::FfNative) + if(CONFIG.m_storageAudioFormat != FfNative) { // storage format is not native, which means we need batch workers to compress to wanted format if (!ACE_Thread_Manager::instance()->spawn_n(CONFIG.m_numBatchThreads, ACE_THR_FUNC(BatchProcessing::ThreadHandler))) -- cgit v1.2.3