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

7 files changed, 80 insertions, 37 deletions

diff --git a/pjsip-apps/src/symbian_ua/main_symbian.cpp b/pjsip-apps/src/symbian_ua/main_symbian.cpp
index 62de1581..1786148f 100644
--- a/pjsip-apps/src/symbian_ua/main_symbian.cpp
+++ b/pjsip-apps/src/symbian_ua/main_symbian.cpp
@@ -27,6 +27,9 @@
 //  Global Variables
 CConsoleBase* console;
 
+// Needed by APS
+TPtrC APP_UID = _L("A000000E");
+
 
 ////////////////////////////////////////////////////////////////////////////
 class MyTask : public CActive
diff --git a/pjsip-apps/src/symbian_ua/ua.cpp b/pjsip-apps/src/symbian_ua/ua.cpp
index 5396bc72..7e4c9c3a 100644
--- a/pjsip-apps/src/symbian_ua/ua.cpp
+++ b/pjsip-apps/src/symbian_ua/ua.cpp
@@ -326,12 +326,17 @@ static pj_status_t app_startup()
     pjsua_logging_config_default(&log_cfg);
     log_cfg.console_level = 4;
     log_cfg.cb = &log_writer;
+    //log_cfg.log_filename = pj_str("C:\\data\\symbian_ua.log");
 
     pjsua_media_config_default(&med_cfg);
     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/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)

diff --git a/pjsip-apps/src/symsndtest/app_main.cpp b/pjsip-apps/src/symsndtest/app_main.cpp
index 981e5308..3ee50731 100644
--- a/pjsip-apps/src/symsndtest/app_main.cpp
+++ b/pjsip-apps/src/symsndtest/app_main.cpp
@@ -16,6 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
+#include <pjmedia/delaybuf.h>
 #include <pjmedia/sound.h>
 #include <pj/errno.h>
 #include <pj/os.h>
@@ -27,10 +28,9 @@
 #define THIS_FILE		"app_main.cpp"
 #define CLOCK_RATE		8000
 #define CHANNEL_COUNT		1
-#define PTIME			100
-#define SAMPLES_PER_FRAME	(80)
+#define PTIME			20
+#define SAMPLES_PER_FRAME	(CLOCK_RATE*PTIME/1000)
 #define BITS_PER_SAMPLE		16
-#define LOOPBACK_BUFF_COUNT 100
 
 extern CConsoleBase* console;
 
@@ -39,9 +39,8 @@ static pjmedia_snd_stream *strm;
 static unsigned rec_cnt, play_cnt;
 static pj_time_val t_start;
 
-
-static pj_int16_t buff_loopback[SAMPLES_PER_FRAME*LOOPBACK_BUFF_COUNT];
-static pj_uint32_t pointer_w, pointer_r;
+pj_pool_t *pool;
+pjmedia_delay_buf *delaybuf;
 
 /* Logging callback */
 static void log_writer(int level, const char *buf, unsigned len)
@@ -73,7 +72,7 @@ static pj_status_t app_init()
     /* Redirect log */
     pj_log_set_log_func((void (*)(int,const char*,int)) &log_writer);
     pj_log_set_decor(PJ_LOG_HAS_NEWLINE);
-    pj_log_set_level(5);
+    pj_log_set_level(3);
     
     /* Init pjlib */
     status = pj_init();
@@ -103,6 +102,26 @@ static pj_status_t app_init()
     		   i, info->name, info->input_count, info->output_count,
     		   info->default_samples_per_sec));	
     }
+
+    /* Create pool */
+    pool = pj_pool_create(&cp.factory, THIS_FILE, 512, 512, NULL);
+    if (pool == NULL) {
+    	app_perror("pj_pool_create()", status);
+        pj_caching_pool_destroy(&cp);
+    	pj_shutdown();
+    	return status;
+    }
+
+    /* Init delay buffer */
+    status = pjmedia_delay_buf_create(pool, THIS_FILE, CLOCK_RATE, 
+				      SAMPLES_PER_FRAME, CHANNEL_COUNT, 
+				      0, 0, &delaybuf);
+    if (status != PJ_SUCCESS) {
+    	app_perror("pjmedia_delay_buf_create()", status);
+        //pj_caching_pool_destroy(&cp);
+    	//pj_shutdown();
+    	//return status;
+    }
     
     return PJ_SUCCESS;
 }
@@ -116,21 +135,15 @@ static pj_status_t rec_cb(void *user_data,
 {
     PJ_UNUSED_ARG(user_data);
     PJ_UNUSED_ARG(timestamp);
-    PJ_UNUSED_ARG(input);
     PJ_UNUSED_ARG(size);
 
-    pj_memcpy(&buff_loopback[pointer_w*SAMPLES_PER_FRAME], input, size);
+    pjmedia_delay_buf_put(delaybuf, (pj_int16_t*)input);
 
     if (size != SAMPLES_PER_FRAME*2) {
 		PJ_LOG(3, (THIS_FILE, "Size captured = %u",
 	 		   size));
-		pj_bzero(&buff_loopback[pointer_w*SAMPLES_PER_FRAME]+size/2, SAMPLES_PER_FRAME*2 - size);
     }
 
-    if (++pointer_w >= LOOPBACK_BUFF_COUNT) {
-    	pointer_w = 0;
-    }
-    
     ++rec_cnt;
     return PJ_SUCCESS;
 }
@@ -143,13 +156,9 @@ static pj_status_t play_cb(void *user_data,
 {
     PJ_UNUSED_ARG(user_data);
     PJ_UNUSED_ARG(timestamp);
+    PJ_UNUSED_ARG(size);
     
-    //pj_bzero(output, size);
-    pj_memcpy(output, &buff_loopback[pointer_r*SAMPLES_PER_FRAME], SAMPLES_PER_FRAME*2);
-
-    if (++pointer_r >= LOOPBACK_BUFF_COUNT) {
-    	pointer_r = 0;
-    }
+    pjmedia_delay_buf_get(delaybuf, (pj_int16_t*)output);
     
     ++play_cnt;
     return PJ_SUCCESS;	
@@ -186,6 +195,8 @@ static pj_status_t snd_start(unsigned flag)
     rec_cnt = play_cnt = 0;
     pj_gettimeofday(&t_start);
 
+    pjmedia_delay_buf_reset(delaybuf);
+
     status = pjmedia_snd_stream_start(strm);
     if (status != PJ_SUCCESS) {
     	app_perror("snd start", status);
@@ -194,9 +205,6 @@ static pj_status_t snd_start(unsigned flag)
     	return status;
     }
 
-    pointer_w = LOOPBACK_BUFF_COUNT/2;
-    pointer_r = 0;
-    
     return PJ_SUCCESS;
 }
 
@@ -231,6 +239,8 @@ static void app_fini()
     	snd_stop();
     
     pjmedia_snd_deinit();
+    pjmedia_delay_buf_destroy(delaybuf);
+    pj_pool_release(pool);
     pj_caching_pool_destroy(&cp);
     pj_shutdown();
 }
@@ -295,11 +305,11 @@ static void PrintMenu()
 {
     PJ_LOG(3, (THIS_FILE, "\n\n"
 	    "Menu:\n"
-	    "  b    Start bidir sound\n"
-	    "  r    Start recorder\n"
+	    "  a    Start bidir sound\n"
+	    "  t    Start recorder\n"
 	    "  p    Start player\n"
-	    "  c    Stop & close sound\n"
-	    "  q    Quit\n"));
+	    "  d    Stop & close sound\n"
+	    "  w    Quit\n"));
 }
 
 // Implementation: called when read has completed.
@@ -309,20 +319,20 @@ void ConsoleUI::RunL()
     pj_bool_t reschedule = PJ_TRUE;
     
     switch (kc) {
-    case 'q':
+    case 'w':
 	    asw_->AsyncStop();
 	    reschedule = PJ_FALSE;
 	    break;
-    case 'b':
+    case 'a':
     	snd_start(PJMEDIA_DIR_CAPTURE_PLAYBACK);
 	break;
-    case 'r':
+    case 't':
     	snd_start(PJMEDIA_DIR_CAPTURE);
 	break;
     case 'p':
     	snd_start(PJMEDIA_DIR_PLAYBACK);
     break;
-    case 'c':
+    case 'd':
     	snd_stop();
 	break;
     default:
diff --git a/pjsip-apps/src/symsndtest/main_symbian.cpp b/pjsip-apps/src/symsndtest/main_symbian.cpp
index 8c4d8026..3db9a19c 100644
--- a/pjsip-apps/src/symsndtest/main_symbian.cpp
+++ b/pjsip-apps/src/symsndtest/main_symbian.cpp
@@ -27,6 +27,9 @@
 //  Global Variables
 CConsoleBase* console;
 
+// Needed by APS
+TPtrC APP_UID = _L("A000000D");
+
 int app_main();