Made modifications to have G722 decoder compile in Windows.

git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@592 09dcff7a-b715-0410-9601-b79a96267cd0

7 files changed, 69 insertions, 14 deletions

diff --git a/orkaudio/OrkAudio.cpp b/orkaudio/OrkAudio.cpp
index edda45a..12531ff 100644
--- a/orkaudio/OrkAudio.cpp
+++ b/orkaudio/OrkAudio.cpp
@@ -45,6 +45,9 @@
 #include "TapeProcessor.h"
 #include <list>
 #include "EventStreaming.h"
+#ifdef WIN32
+#include "G722Codec.h"
+#endif
 
 static volatile bool serviceStop = false;
 
@@ -150,9 +153,13 @@ void Transcode(CStdString &file)
 	filter.reset(new GsmToPcmFilter());
 	FilterRegistry::instance()->RegisterFilter(filter);
 	filter.reset(new IlbcToPcmFilter());
-        FilterRegistry::instance()->RegisterFilter(filter);
+	FilterRegistry::instance()->RegisterFilter(filter);
 	filter.reset(new AudioGainFilter());
 	FilterRegistry::instance()->RegisterFilter(filter);
+#ifdef WIN32
+	filter.reset(new G722Decoder());
+	FilterRegistry::instance()->RegisterFilter(filter);
+#endif
 
 	// Register in-built tape processors and build the processing chain
 	BatchProcessing::Initialize();
@@ -238,6 +245,10 @@ void MainThread()
 	FilterRegistry::instance()->RegisterFilter(filter);
 	filter.reset(new AudioGainFilter());
 	FilterRegistry::instance()->RegisterFilter(filter);
+#ifdef WIN32
+	filter.reset(new G722Decoder());
+	FilterRegistry::instance()->RegisterFilter(filter);
+#endif
 
 	// Register in-built tape processors and build the processing chain
 	BatchProcessing::Initialize();
diff --git a/orkaudio/OrkAudio.dsp b/orkaudio/OrkAudio.dsp
index dcaf1c6..aae2d84 100644
--- a/orkaudio/OrkAudio.dsp
+++ b/orkaudio/OrkAudio.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Op /Ob0 /I "." /I "..\OrkBaseCxx" /I "..\OrkBaseCxx\filters\gsm" /I "..\OrkBaseCxx\filters\ilbc" /I "..\OrkBaseCxx\filters\ilbc\ilbc" /I "C:\devExt\libsndfile\src\GSM610" /I "C:\devExt\boost\boost_1_32_0\\" /I "C:\devExt\ACE_wrappers" /I "C:\devExt\log4cxx\log4cxx-0.9.7\include" /I "C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\include" /I "C:\devExt\libsndfile\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Op /Ob0 /I "." /I "..\OrkBaseCxx" /I "..\OrkBaseCxx\filters\gsm" /I "..\OrkBaseCxx\filters\ilbc" /I "..\OrkBaseCxx\filters\ilbc\ilbc" /I "C:\devExt\libsndfile\src\GSM610" /I "C:\devExt\boost\boost_1_32_0\\" /I "C:\devExt\ACE_wrappers" /I "C:\devExt\log4cxx\log4cxx-0.9.7\include" /I "C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\include" /I "C:\devExt\libsndfile\src" /I "..\OrkBaseCxx\filters\g722codec" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /I "..\OrkBaseCxx" /I "..\OrkBaseCxx\filters\gsm" /I "..\OrkBaseCxx\filters\ilbc" /I "..\OrkBaseCxx\filters\ilbc\ilbc" /I "C:\devExt\libsndfile\src\GSM610" /I "C:\devExt\boost\boost_1_32_0\\" /I "C:\devExt\ACE_wrappers" /I "C:\devExt\log4cxx\log4cxx-0.9.7\include" /I "C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\include" /I "C:\devExt\libsndfile\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /I "..\OrkBaseCxx" /I "..\OrkBaseCxx\filters\gsm" /I "..\OrkBaseCxx\filters\ilbc" /I "..\OrkBaseCxx\filters\ilbc\ilbc" /I "C:\devExt\libsndfile\src\GSM610" /I "C:\devExt\boost\boost_1_32_0\\" /I "C:\devExt\ACE_wrappers" /I "C:\devExt\log4cxx\log4cxx-0.9.7\include" /I "C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\include" /I "C:\devExt\libsndfile\src" /I "..\OrkBaseCxx\filters\g722codec" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/orkbasecxx/EventStreaming.h b/orkbasecxx/EventStreaming.h
index da0daa3..44307a3 100644
--- a/orkbasecxx/EventStreaming.h
+++ b/orkbasecxx/EventStreaming.h
@@ -24,10 +24,11 @@
 #include "ConfigManager.h"

 #include "CapturePluginProxy.h"

 #include "AudioTape.h"

+#include "dll.h"

 

 //==========================================================

 

-class EventStreamingSession

+class DLL_IMPORT_EXPORT_ORKBASE EventStreamingSession

 {

 public:

 	EventStreamingSession();

@@ -45,7 +46,7 @@ typedef boost::shared_ptr<EventStreamingSession> EventStreamingSessionRef;
 

 //==========================================================

 

-class EventStreaming

+class DLL_IMPORT_EXPORT_ORKBASE EventStreaming

 {

 public:

 	EventStreaming();

diff --git a/orkbasecxx/MultiThreadedServer.h b/orkbasecxx/MultiThreadedServer.h
index 58c0622..df785d5 100644
--- a/orkbasecxx/MultiThreadedServer.h
+++ b/orkbasecxx/MultiThreadedServer.h
@@ -67,7 +67,7 @@ typedef ACE_Acceptor<HttpServer, ACE_SOCK_ACCEPTOR> HttpAcceptor;
     format of all events from a given port, one thread per connection e.g
 	http://localhost:23000/message=streamevents
 */
-class EventStreamingServer : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+class DLL_IMPORT_EXPORT_ORKBASE EventStreamingServer : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 {
 public:
 	virtual int open (void *);
diff --git a/orkbasecxx/OrkBase.dsp b/orkbasecxx/OrkBase.dsp
index e73361e..ef6522b 100644
--- a/orkbasecxx/OrkBase.dsp
+++ b/orkbasecxx/OrkBase.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Ob0 /I "." /I ".\filters\gsm" /I ".\filters\gsm\gsm610" /I ".\filters\ilbc" /I ".\filters\ilbc\ilbc" /I "C:\devExt\libsndfile\src" /I "C:\devExt\boost\boost_1_32_0" /I "C:\devExt\ACE_wrappers" /I "C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\include" /I "C:\devExt\log4cxx\log4cxx-0.9.7\include" /D "BUILD_ORKBASE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D inline=__inline /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Ob0 /I "." /I ".\filters\gsm" /I ".\filters\gsm\gsm610" /I ".\filters\ilbc" /I ".\filters\ilbc\ilbc" /I "C:\devExt\libsndfile\src" /I "C:\devExt\boost\boost_1_32_0" /I "C:\devExt\ACE_wrappers" /I "C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\include" /I "C:\devExt\log4cxx\log4cxx-0.9.7\include" /I ".\filters\g722codec" /D "BUILD_ORKBASE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D inline=__inline /FD /c
 # SUBTRACT CPP /YX /Yc /Yu
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -74,7 +74,7 @@ PostBuild_Cmds=copy Release\OrkBase.dll ..\OrkAudio\OrkBase.dll
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /I ".\filters\gsm" /I ".\filters\gsm\gsm610" /I ".\filters\ilbc" /I ".\filters\ilbc\ilbc" /I "C:\devExt\libsndfile\src" /I "C:\devExt\boost\boost_1_32_0" /I "C:\devExt\ACE_wrappers" /I "C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\include" /I "C:\devExt\log4cxx\log4cxx-0.9.7\include" /D "BUILD_ORKBASE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D inline=__inline /FR /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /I ".\filters\gsm" /I ".\filters\gsm\gsm610" /I ".\filters\ilbc" /I ".\filters\ilbc\ilbc" /I "C:\devExt\libsndfile\src" /I "C:\devExt\boost\boost_1_32_0" /I "C:\devExt\ACE_wrappers" /I "C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\include" /I "C:\devExt\log4cxx\log4cxx-0.9.7\include" /I ".\filters\g722codec" /D "BUILD_ORKBASE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D inline=__inline /FR /FD /GZ /c
 # SUBTRACT CPP /YX /Yc /Yu
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -526,6 +526,22 @@ SOURCE=.\filters\audiogain\AudioGain.cpp
 SOURCE=.\filters\audiogain\AudioGain.h
 # End Source File
 # End Group
+# Begin Group "g722codec"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\filters\g722codec\G722.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\filters\g722codec\G722Codec.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\filters\g722codec\G722Codec.h
+# End Source File
+# End Group
 # End Group
 # Begin Source File
 
@@ -601,6 +617,14 @@ SOURCE=.\dll.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\EventStreaming.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\EventStreaming.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\Filter.cpp
 # End Source File
 # Begin Source File
diff --git a/orkbasecxx/filters/g722codec/G722.h b/orkbasecxx/filters/g722codec/G722.h
index 156d3de..d7a4a80 100644
--- a/orkbasecxx/filters/g722codec/G722.h
+++ b/orkbasecxx/filters/g722codec/G722.h
@@ -143,10 +143,16 @@ typedef struct
     unsigned int out_buffer;
     int out_bits;
 } g722_decode_state_t;
+

+#ifdef WIN32

+#define int16_t short

+#define uint8_t unsigned char

+#define int32_t int

+#endif

 
 #ifdef __cplusplus
 extern "C" {
-#endif
+#endif

 
 g722_decode_state_t *g722_decode_init(g722_decode_state_t *s, int rate, int options);
 int g722_decode_release(g722_decode_state_t *s);
diff --git a/orkbasecxx/filters/g722codec/G722Codec.cpp b/orkbasecxx/filters/g722codec/G722Codec.cpp
index 00387f5..d2a72b7 100644
--- a/orkbasecxx/filters/g722codec/G722Codec.cpp
+++ b/orkbasecxx/filters/g722codec/G722Codec.cpp
@@ -16,10 +16,17 @@
 
 #include "G722Codec.h"
 
-static log4cxx::LoggerPtr s_log;
+static log4cxx::LoggerPtr s_log;

+static bool s_initialized = false;
 
 G722Decoder::G722Decoder()
-{
+{

+#ifdef WIN32

+	if(s_initialized == false)

+	{

+		s_log = log4cxx::Logger::getLogger("codec.g722");

+	}

+#endif
 	// Initialize decoder
 	memset(&m_ctx, 0, sizeof(m_ctx));
 	g722_decode_init(&m_ctx, 64000, G722_SAMPLE_RATE_8000);
@@ -150,8 +157,10 @@ extern "C"
 
 /*! \file */
 
-#include <stdio.h>
-#include <inttypes.h>
+#include <stdio.h>

+#ifndef WIN32
+#include <inttypes.h>

+#endif
 #include <memory.h>
 #include <stdlib.h>
 #if 0
@@ -165,7 +174,11 @@ extern "C"
 #define TRUE (!FALSE)
 #endif
 
-static __inline__ int16_t saturate(int32_t amp)
+#ifdef WIN32

+static inline int16_t saturate(int32_t amp)

+#else

+static __inline__ int16_t saturate(int32_t amp)

+#endif
 {
     int16_t amp16;