Ticket #577: Initial source of sound device wrapper with APS

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

3 files changed, 28 insertions, 6 deletions

diff --git a/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp b/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp
index c00e1e28..7077b6ca 100644
--- a/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp
+++ b/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp
@@ -1,3 +1,6 @@
+#define SND_USE_NULL	0

+#define SND_USE_APS	0

+

 TARGET			symbian_ua_gui.exe

 UID			   0x100039CE 0xEBD12EE4

 VENDORID	  	  0

@@ -32,17 +35,30 @@ LIBRARY			commonengine.lib efsrv.lib estor.lib eikcoctl.lib eikdlg.lib
 LIBRARY			eikctl.lib bafl.lib fbscli.lib aknnotify.lib aknicon.lib

 LIBRARY			etext.lib gdi.lib egul.lib insock.lib

 LIBRARY			ecom.lib inetprotutil.lib http.lib esock.lib

+LIBRARY			charconv.lib estlib.lib 

 

 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	symbian_audio.lib libsrtp.lib

+STATICLIBRARY	libsrtp.lib

 STATICLIBRARY	libgsmcodec.lib

 STATICLIBRARY	libspeexcodec.lib

 

-LIBRARY		charconv.lib estlib.lib 

-LIBRARY 	mediaclientaudiostream.lib

-LIBRARY 	mediaclientaudioinputstream.lib

+

+#if SND_USE_NULL || defined(WINSCW)

+    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

 

 LANG 				01

 

@@ -56,5 +72,3 @@ END
 SOURCEPATH		..\src

 SOURCE symbian_ua_guiContainerView.cpp symbian_ua_guiContainer.cpp symbian_ua_guiAppUi.cpp symbian_ua_guiDocument.cpp symbian_ua_guiApplication.cpp symbian_ua_guiSettingItemList.cpp Symbian_ua_guiSettingItemListSets.cpp symbian_ua_guiSettingItemListView.cpp

 SOURCE symbian_ua.cpp

-

-CAPABILITY	NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment 

diff --git a/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp b/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp
index 7d693b41..7bb75177 100644
--- a/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp
+++ b/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp
@@ -323,7 +323,11 @@ int symbian_ua_init()
     med_cfg.thread_cnt = 0; // Disable threading on Symbian

     med_cfg.has_ioqueue = PJ_FALSE;

     med_cfg.clock_rate = 8000;

+#if defined(PJMEDIA_SYM_SND_USE_APS) && (PJMEDIA_SYM_SND_USE_APS==1)

+    med_cfg.audio_frame_ptime = 20;

+#else

     med_cfg.audio_frame_ptime = 40;

+#endif

     med_cfg.ec_tail_len = 0;

     med_cfg.enable_ice = USE_ICE;

     med_cfg.snd_auto_close_time = 5; // wait for 5 seconds idle before sound dev get auto-closed

diff --git a/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp b/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp
index e1b5e2bf..a234b036 100644
--- a/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp
+++ b/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp
@@ -17,6 +17,10 @@
 #endif

 // ]]] end generated region [Generated Includes]

 

+

+// Needed by APS

+TPtrC APP_UID = _L("EBD12EE4");

+

 /**

  * @brief Returns the application's UID (override from CApaApplication::AppDllUid())

  * @return UID for this application (KUidsymbian_ua_guiApplication)