(Major) Task #737 and #738: integration of APS-Direct and Audiodev from aps-direct branch to trunk.

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2506 74dad513-b988-da41-8d7b-12977e46ad98

19 files changed, 192 insertions, 172 deletions

diff --git a/build.symbian/bld.inf b/build.symbian/bld.inf
index b624905e..1f0ddbc6 100644
--- a/build.symbian/bld.inf
+++ b/build.symbian/bld.inf
@@ -1,6 +1,3 @@
-#define SND_USE_NULL	0
-#define SND_USE_APS	0
-
 prj_platforms
 winscw
 //armv5
@@ -23,15 +20,10 @@ libsrtp.mmp
 /* Codecs */
 libgsmcodec.mmp
 libspeexcodec.mmp
+libpassthroughcodec.mmp
 
-/* Sound device impl */
-#if SND_USE_NULL
-	null_audio.mmp
-#elif SND_USE_APS
-	symbian_audio_aps.mmp
-#else
-	symbian_audio.mmp
-#endif
+/* Audio device. */
+pjmedia_audiodev.mmp
 
 /* Applications */
 //pjlib_test.mmp
diff --git a/build.symbian/libpassthroughcodec.mmp b/build.symbian/libpassthroughcodec.mmp
new file mode 100644
index 00000000..c4fb2775
--- /dev/null
+++ b/build.symbian/libpassthroughcodec.mmp
@@ -0,0 +1,26 @@
+TARGET		libpassthroughcodec.lib
+TARGETTYPE	lib
+
+MACRO		HAVE_CONFIG_H
+MACRO		PJ_M_I386=1
+MACRO		PJ_SYMBIAN=1
+
+//
+// GCCE optimization setting
+//
+OPTION		GCCE -O2 -fno-unit-at-a-time
+
+//
+// Passthrough codecs wrapper for pjmedia-codec
+//
+SOURCEPATH 	..\pjmedia\src\pjmedia-codec
+SOURCE		passthrough.c
+
+//
+// Header files
+//
+SYSTEMINCLUDE	..\pjmedia\include
+SYSTEMINCLUDE	..\pjlib\include 
+
+SYSTEMINCLUDE	\epoc32\include 
+SYSTEMINCLUDE	\epoc32\include\libc
diff --git a/build.symbian/pjlib.mmp b/build.symbian/pjlib.mmp
index db396672..3b2e9cf8 100644
--- a/build.symbian/pjlib.mmp
+++ b/build.symbian/pjlib.mmp
@@ -19,10 +19,6 @@ TARGETTYPE 	lib
 
 SOURCEPATH	..\pjlib\src\pj
 
-OPTION		CW -lang c++
-OPTION		ARMCC --cpp
-OPTION		GCC	-x c++
-
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1
 
diff --git a/build.symbian/pjlib_test.mmp b/build.symbian/pjlib_test.mmp
index 37c5c53c..13783c2f 100644
--- a/build.symbian/pjlib_test.mmp
+++ b/build.symbian/pjlib_test.mmp
@@ -15,10 +15,6 @@ LIBRARY		pjlib.lib
 STATICLIBRARY	pjlib.lib 
 #endif
 
-OPTION		CW -lang c++
-OPTION		ARMCC --cpp
-OPTION		GCC	-x c++
-
 // Test files
 
 SOURCE	activesock.c
diff --git a/build.symbian/pjlib_util.mmp b/build.symbian/pjlib_util.mmp
index efbb41cf..c2d6ebec 100644
--- a/build.symbian/pjlib_util.mmp
+++ b/build.symbian/pjlib_util.mmp
@@ -22,10 +22,6 @@ SOURCEPATH	..\pjlib-util\src\pjlib-util
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1
 
-OPTION		CW -lang c++
-OPTION		ARMCC --cpp
-OPTION		GCC	-x c++
-
 //
 // PJLIB-UTIL files
 //
diff --git a/build.symbian/pjmedia.mmp b/build.symbian/pjmedia.mmp
index ce2d279f..6c48b6c4 100644
--- a/build.symbian/pjmedia.mmp
+++ b/build.symbian/pjmedia.mmp
@@ -40,6 +40,7 @@ SOURCE		bidirectional.c
 SOURCE		clock_thread.c
 SOURCE		codec.c
 SOURCE		conference.c
+SOURCE		conf_switch.c
 SOURCE		echo_common.c
 SOURCE		echo_port.c
 SOURCE		echo_suppress.c
diff --git a/build.symbian/pjmedia_audiodev.mmp b/build.symbian/pjmedia_audiodev.mmp
new file mode 100644
index 00000000..ccabc2fc
--- /dev/null
+++ b/build.symbian/pjmedia_audiodev.mmp
@@ -0,0 +1,30 @@
+TARGET 		pjmedia_audiodev.lib
+TARGETTYPE 	lib
+
+SOURCEPATH	..\pjmedia\src\pjmedia-audiodev
+
+//
+// GCCE optimization setting
+//
+//OPTION		GCCE -O2 -fno-unit-at-a-time
+
+MACRO		PJ_M_I386=1
+MACRO		PJ_SYMBIAN=1
+
+SOURCE		audiodev.c
+SOURCE		errno.c
+SOURCE		symb_aps_dev.cpp
+SOURCE		symb_mda_dev.cpp
+
+SYSTEMINCLUDE	..\pjmedia\include
+SYSTEMINCLUDE	..\pjlib\include 
+SYSTEMINCLUDE	..\pjlib-util\include 
+
+SYSTEMINCLUDE	\epoc32\include
+SYSTEMINCLUDE	\epoc32\include\libc
+SYSTEMINCLUDE   \epoc32\include\mmf\server 
+SYSTEMINCLUDE   \epoc32\include\mmf\common 
+SYSTEMINCLUDE   \epoc32\include\mda\common 
+SYSTEMINCLUDE	\epoc32\include\mmf\plugin 
+
+
diff --git a/build.symbian/pjnath.mmp b/build.symbian/pjnath.mmp
index 3060c4c7..7168313d 100644
--- a/build.symbian/pjnath.mmp
+++ b/build.symbian/pjnath.mmp
@@ -22,10 +22,6 @@ SOURCEPATH	..\pjnath\src\pjnath
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1
 
-OPTION		CW -lang c++
-OPTION		ARMCC --cpp
-OPTION		GCC	-x c++
-
 //
 // PJNATH files
 //
diff --git a/build.symbian/pjsdp.mmp b/build.symbian/pjsdp.mmp
index 23c8bd3d..e8b41b84 100644
--- a/build.symbian/pjsdp.mmp
+++ b/build.symbian/pjsdp.mmp
@@ -19,10 +19,6 @@ TARGETTYPE 	lib
 
 SOURCEPATH	..\pjmedia\src\pjmedia
 
-OPTION		CW -lang c++
-OPTION		ARMCC --cpp
-OPTION		GCC	-x c++
-
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1
 
diff --git a/build.symbian/pjsip.mmp b/build.symbian/pjsip.mmp
index 8fb7d085..e3e2bc29 100644
--- a/build.symbian/pjsip.mmp
+++ b/build.symbian/pjsip.mmp
@@ -25,10 +25,6 @@ SOURCEPATH	..\pjsip\src\pjsip
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1
 
-OPTION		CW -lang c++
-OPTION		ARMCC --cpp
-OPTION		GCC	-x c++
-
 // PJSIP-CORE files
 
 //SOURCE	sip_auth_aka.c
diff --git a/build.symbian/pjsip_simple.mmp b/build.symbian/pjsip_simple.mmp
index d44b0cad..b02d1423 100644
--- a/build.symbian/pjsip_simple.mmp
+++ b/build.symbian/pjsip_simple.mmp
@@ -25,11 +25,6 @@ SOURCEPATH	..\pjsip\src\pjsip-simple
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1
 
-OPTION		CW -lang c++
-OPTION		ARMCC --cpp
-OPTION		GCC	-x c++
-
-
 // PJSIP-SIMPLE files
 
 SOURCE	errno.c
diff --git a/build.symbian/pjstun_client.mmp b/build.symbian/pjstun_client.mmp
index 37b855da..fedb7a25 100644
--- a/build.symbian/pjstun_client.mmp
+++ b/build.symbian/pjstun_client.mmp
@@ -7,10 +7,6 @@ SOURCEPATH	..\pjnath\src\pjstun-client
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1
 
-OPTION		CW -lang c++
-OPTION		ARMCC --cpp
-OPTION		GCC	-x c++
-
 // PJSTUN-CLIENT files
 
 SOURCE	client_main.c
diff --git a/build.symbian/symbian_audio.mmp b/build.symbian/symbian_audio.mmp
index 571b4b0c..e53f4e89 100644
--- a/build.symbian/symbian_audio.mmp
+++ b/build.symbian/symbian_audio.mmp
@@ -24,22 +24,23 @@ TARGETTYPE 	lib
 SOURCEPATH	..\pjmedia\src\pjmedia
 
 OPTION		CW -lang c++
-
-//
-// GCCE optimization setting
-//
 OPTION		GCCE -O2 -fno-unit-at-a-time
 
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1
 
+SOURCE		nullsound.c
 SOURCE		symbian_sound.cpp
+SOURCE		symbian_sound_aps.cpp
 
 SYSTEMINCLUDE	..\pjlib\include
 SYSTEMINCLUDE	..\pjmedia\include
 
 SYSTEMINCLUDE	\epoc32\include
 SYSTEMINCLUDE	\epoc32\include\libc
+SYSTEMINCLUDE   \epoc32\include\mmf\server 
+SYSTEMINCLUDE   \epoc32\include\mmf\common 
+SYSTEMINCLUDE   \epoc32\include\mda\common 
 
 SYSTEMINCLUDE	\epoc32\include\mmf\plugin 
 
diff --git a/build.symbian/symbian_audio_aps.mmp b/build.symbian/symbian_audio_aps.mmp
deleted file mode 100644
index 85cb1e84..00000000
--- a/build.symbian/symbian_audio_aps.mmp
+++ /dev/null
@@ -1,20 +0,0 @@
-TARGET 					symbian_audio_aps.lib
-TARGETTYPE 				lib
-
-OPTION                                  CW -lang c++ 
-OPTION                                  GCCE -O2 -fno-unit-at-a-time 
-
-MACRO                                   PJ_M_I386=1
-MACRO					PJ_SYMBIAN=1 
-
-SYSTEMINCLUDE                           ..\pjmedia\include 
-SYSTEMINCLUDE                           ..\pjlib\include 
-
-SOURCEPATH                              ..\pjmedia\src\pjmedia 
-SOURCE                                  symbian_sound_aps.cpp 
-
-SYSTEMINCLUDE                           \epoc32\include\mmf\server 
-SYSTEMINCLUDE                           \epoc32\include\mmf\common 
-SYSTEMINCLUDE                           \epoc32\include\mda\common 
-SYSTEMINCLUDE                           \epoc32\include\libc 
-SYSTEMINCLUDE                           \epoc32\include 
diff --git a/build.symbian/symbian_ua.mmp b/build.symbian/symbian_ua.mmp
index 938b84d4..a96da6ac 100644
--- a/build.symbian/symbian_ua.mmp
+++ b/build.symbian/symbian_ua.mmp
@@ -1,63 +1,70 @@
-#define SND_USE_NULL	0

-#define SND_USE_APS	0

-

-TARGET 		symbian_ua.exe

-TARGETTYPE 	exe

-UID		0x0 0xA000000D

-

-SOURCEPATH	..\pjsip-apps\src\symbian_ua

-

-MACRO		PJ_M_I386=1

-MACRO		PJ_SYMBIAN=1

-

-// Source files

-

-SOURCE	ua.cpp

-SOURCE	main_symbian.cpp

-

-DOCUMENT ua.h

-

-START RESOURCE  symbian_ua_reg.rss

-	TARGETPATH      \private\10003a3f\apps

-END

-

-SYSTEMINCLUDE	..\pjlib\include

-SYSTEMINCLUDE	..\pjlib-util\include

-SYSTEMINCLUDE	..\pjnath\include

-SYSTEMINCLUDE	..\pjmedia\include

-SYSTEMINCLUDE	..\pjsip\include

-

-SYSTEMINCLUDE	\epoc32\include

-SYSTEMINCLUDE	\epoc32\include\libc

-

-STATICLIBRARY	pjsua_lib.lib pjsip_ua.lib

-STATICLIBRARY	pjsip_simple.lib pjsip.lib pjsdp.lib pjmedia.lib

-STATICLIBRARY	pjnath.lib pjlib_util.lib pjlib.lib

-STATICLIBRARY	libsrtp.lib

-STATICLIBRARY	libgsmcodec.lib libspeexcodec.lib

-

-#if SND_USE_NULL

-    STATICLIBRARY	null_audio.lib

-    CAPABILITY		NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment 

-#elif SND_USE_APS

-    STATICLIBRARY	symbian_audio_aps.lib

-    LIBRARY		APSSession2.lib

-    CAPABILITY		NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment MultimediaDD

-    MACRO		PJMEDIA_SYM_SND_USE_APS=1

-#else

-    STATICLIBRARY	symbian_audio.lib

-    LIBRARY 		mediaclientaudiostream.lib

-    LIBRARY 		mediaclientaudioinputstream.lib

-    CAPABILITY		NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment 

-#endif

-

-#ifdef WINSCW

-	STATICLIBRARY   eexe.lib ecrt0.lib

-#endif

-

-LIBRARY		esock.lib insock.lib charconv.lib euser.lib estlib.lib commdb.lib apengine.lib 

-

-// The default 8KB seems to be insufficient with all bells and

-// whistles turned on

-EPOCSTACKSIZE	12288

-

+#define SND_HAS_APS	0
+#define SND_HAS_VAS	0
+#define SND_HAS_MDA	1
+
+TARGET 			symbian_ua.exe
+TARGETTYPE 		exe
+UID			0x0 0x200235D3
+
+SOURCEPATH		..\pjsip-apps\src\symbian_ua
+
+MACRO			PJ_M_I386=1
+MACRO			PJ_SYMBIAN=1
+
+// Source files
+
+SOURCE			ua.cpp
+SOURCE			main_symbian.cpp
+
+DOCUMENT 		ua.h
+
+START RESOURCE  	symbian_ua_reg.rss
+	TARGETPATH      \private\10003a3f\apps
+END
+
+SYSTEMINCLUDE		..\pjlib\include
+SYSTEMINCLUDE		..\pjlib-util\include
+SYSTEMINCLUDE		..\pjnath\include
+SYSTEMINCLUDE		..\pjmedia\include
+SYSTEMINCLUDE		..\pjsip\include
+
+SYSTEMINCLUDE		\epoc32\include
+SYSTEMINCLUDE		\epoc32\include\libc
+
+STATICLIBRARY		pjsua_lib.lib pjsip_ua.lib
+STATICLIBRARY		pjsip_simple.lib pjsip.lib pjsdp.lib pjmedia.lib
+STATICLIBRARY		pjnath.lib pjlib_util.lib pjlib.lib
+STATICLIBRARY		libsrtp.lib
+STATICLIBRARY		libgsmcodec.lib libspeexcodec.lib
+STATICLIBRARY		libpassthroughcodec.lib
+STATICLIBRARY		pjmedia_audiodev.lib 
+
+#if SND_HAS_APS
+	LIBRARY		APSSession2.lib
+#endif
+
+#if SND_HAS_VAS
+//	LIBRARY		
+#endif
+
+#if SND_HAS_MDA
+	LIBRARY 	mediaclientaudiostream.lib
+	LIBRARY 	mediaclientaudioinputstream.lib
+#endif
+
+#if SND_HAS_APS || SND_HAS_VAS
+	CAPABILITY	NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment MultimediaDD
+#else
+	CAPABILITY	NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment
+#endif
+	
+#ifdef WINSCW
+	STATICLIBRARY   eexe.lib ecrt0.lib
+#endif
+
+LIBRARY			esock.lib insock.lib charconv.lib euser.lib estlib.lib commdb.lib apengine.lib 
+
+// The default 8KB seems to be insufficient with all bells and
+// whistles turned on
+EPOCSTACKSIZE		12288
+
diff --git a/build.symbian/symbian_ua.pkg b/build.symbian/symbian_ua.pkg
new file mode 100644
index 00000000..c60a62bb
--- /dev/null
+++ b/build.symbian/symbian_ua.pkg
@@ -0,0 +1,18 @@
+; symbian_ua.pkg
+
+; Languages
+&EN
+
+; Header
+#{"symbian_ua"},(0x200235D3), 0, 1, 1
+
+; Platform compatibility
+[0x101F7961], *, *, *,{"Series60ProductID"}
+
+; vendor
+%{"PJSIP"}
+:"PJSIP"
+
+; Target
+"$(EPOCROOT)Epoc32\release\$(PLATFORM)\$(TARGET)\symbian_ua.exe"-"!:\sys\bin\symbian_ua.exe"
+"$(EPOCROOT)Epoc32\data\z\private\10003a3f\apps\symbian_ua_reg.rSC"-"!:\private\10003a3f\import\apps\symbian_ua_reg.rSC"
diff --git a/build.symbian/symbian_ua_udeb.pkg b/build.symbian/symbian_ua_udeb.pkg
index 4f6c6694..5c255bf0 100644
--- a/build.symbian/symbian_ua_udeb.pkg
+++ b/build.symbian/symbian_ua_udeb.pkg
@@ -1,10 +1,13 @@
-; symbian_ua.pkg

+; symbian_ua_udeb.pkg

+

+; for Carbide development, please use symbian_ua.pkg for comfortness

+; (epoc32 path, platform, and target are set automatically using env vars)

 

 ; Languages

 &EN

 

 ; Header

-#{"symbian_ua"},(0xA000000D), 0, 1, 1

+#{"symbian_ua"},(0x200235D3), 0, 1, 1

 

 ; Platform compatibility

 [0x101F7961], *, *, *,{"Series60ProductID"}

@@ -14,5 +17,5 @@
 :"PJSIP"

 

 ; Target

-"C:\Symbian\9.1\S60_3rd_MR\epoc32\release\gcce\UDEB\symbian_ua.exe"-"!:\sys\bin\symbian_ua.exe"

-"C:\Symbian\9.1\S60_3rd_MR\epoc32\data\z\private\10003a3f\apps\symbian_ua_reg.rSC"-"!:\private\10003a3f\import\apps\symbian_ua_reg.rSC"

+"C:\Symbian\9.2\S60_3rd_FP1\epoc32\release\gcce\UDEB\symbian_ua.exe"-"!:\sys\bin\symbian_ua.exe"

+"C:\Symbian\9.2\S60_3rd_FP1\epoc32\data\z\private\10003a3f\apps\symbian_ua_reg.rSC"-"!:\private\10003a3f\import\apps\symbian_ua_reg.rSC"

diff --git a/build.symbian/symbian_ua_urel.pkg b/build.symbian/symbian_ua_urel.pkg
index 731276d2..3bd60982 100644
--- a/build.symbian/symbian_ua_urel.pkg
+++ b/build.symbian/symbian_ua_urel.pkg
@@ -1,10 +1,13 @@
 ; symbian_ua.pkg

 

+; for Carbide development, please use symbian_ua.pkg for comfortness

+; (epoc32 path, platform, and target are set automatically using env vars)

+

 ; Languages

 &EN

 

 ; Header

-#{"symbian_ua"},(0xA000000D), 0, 1, 1

+#{"symbian_ua"},(0x200235D3), 0, 1, 1

 

 ; Platform compatibility

 [0x101F7961], *, *, *,{"Series60ProductID"}

diff --git a/build.symbian/symsndtest.mmp b/build.symbian/symsndtest.mmp
index a08f1d8d..470de9d0 100644
--- a/build.symbian/symsndtest.mmp
+++ b/build.symbian/symsndtest.mmp
@@ -1,53 +1,45 @@
-#define SND_USE_NULL	0
-#define SND_USE_APS	0
+#define SND_USE_APS	1
+#define SND_USE_VAS	0
 
-TARGET 		symsndtest.exe
-TARGETTYPE 	exe
-UID		0x0 0xA000000E
+TARGET 			symsndtest.exe
+TARGETTYPE 		exe
+UID			0x0 0xA000000E
 
-SOURCEPATH	..\pjsip-apps\src\symsndtest
+SOURCEPATH		..\pjsip-apps\src\symsndtest
 
-MACRO		PJ_M_I386=1
-MACRO		PJ_SYMBIAN=1
+MACRO			PJ_M_I386=1
+MACRO			PJ_SYMBIAN=1
 
 // Test files
 
-SOURCE	app_main.cpp
-SOURCE	main_symbian.cpp
+SOURCE			app_main.cpp
+SOURCE			main_symbian.cpp
 
-START RESOURCE  symsndtest_reg.rss
+START RESOURCE  	symsndtest_reg.rss
 	TARGETPATH	\private\10003a3f\apps
 END
 
-SYSTEMINCLUDE	..\pjlib\include
-SYSTEMINCLUDE	..\pjmedia\include
+SYSTEMINCLUDE		..\pjlib\include
+SYSTEMINCLUDE		..\pjmedia\include
 
-SYSTEMINCLUDE	\epoc32\include
-SYSTEMINCLUDE	\epoc32\include\libc
+SYSTEMINCLUDE		\epoc32\include
+SYSTEMINCLUDE		\epoc32\include\libc
 
-LIBRARY		charconv.lib euser.lib estlib.lib
-LIBRARY		esock.lib insock.lib
-STATICLIBRARY	pjlib.lib pjmedia.lib
+LIBRARY			charconv.lib euser.lib estlib.lib
+LIBRARY			esock.lib insock.lib
+STATICLIBRARY		pjlib.lib pjmedia.lib
+STATICLIBRARY		symbian_audio.lib
 
-#if SND_USE_NULL
-    STATICLIBRARY	null_audio.lib
-    CAPABILITY		NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment 
-#elif SND_USE_APS
-    SOURCEPATH                              ..\pjmedia\src\pjmedia 
-    SOURCE                                  symbian_sound_aps.cpp 
-
-    SYSTEMINCLUDE                           \epoc32\include\mmf\server 
-    SYSTEMINCLUDE                           \epoc32\include\mmf\common 
-    SYSTEMINCLUDE                           \epoc32\include\mda\common 
-
-    //STATICLIBRARY	symbian_audio_aps.lib
-    LIBRARY		APSSession2.lib
-    CAPABILITY		NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment MultimediaDD
+#if SND_USE_APS
+	LIBRARY		APSSession2.lib
+	CAPABILITY	NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment MultimediaDD
+#elif SND_USE_VAS
+//	LIBRARY		
+	CAPABILITY	NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment MultimediaDD
 #else
-    STATICLIBRARY	symbian_audio.lib
-    LIBRARY 		mediaclientaudiostream.lib
-    LIBRARY 		mediaclientaudioinputstream.lib
-    CAPABILITY		NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment 
+	LIBRARY 	mediaclientaudiostream.lib
+	LIBRARY 	mediaclientaudioinputstream.lib
+	CAPABILITY	NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment
 #endif
 
 #ifdef WINSCW