Changeset 2483

Timestamp:

Mar 3, 2009 6:25:55 PM (14 years ago)

Author:

nanang

Message:

• Fixed player callback (for PCM) of APS aud dev to zero-fill the buffer whenever it gets non-audio frame type.
• Updated symbian_ua.mmp to allow it links to multiple audio back-ends (feature of the new audio device framework).
• Minor fix in symbian_ua to use codec macros instead of sound device macro.

Location:

pjproject/branches/projects/aps-direct

Files:

• build.symbian/symbian_ua.mmp (modified) (2 diffs)
• pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp (modified) (1 diff)
• pjsip-apps/src/symbian_ua/ua.cpp (modified) (2 diffs)

pjproject/branches/projects/aps-direct/build.symbian/symbian_ua.mmp

@@ -1 @@
-#define SND_USE_APS     1
-#define SND_USE_VAS     0
+#define SND_HAS_APS     1
+#define SND_HAS_VAS     0
+#define SND_HAS_MDA     0
 
 TARGET                  symbian_ua.exe
@@ -35 +36 @@
 STATICLIBRARY           pjnath.lib pjlib_util.lib pjlib.lib
 STATICLIBRARY           libsrtp.lib
-STATICLIBRARY           libgsmcodec.lib libspeexcodec.lib libpassthroughcodec.lib
-STATICLIBRARY           pjmedia_audiodev.lib
+STATICLIBRARY           libgsmcodec.lib libspeexcodec.lib
+STATICLIBRARY           libpassthroughcodec.lib
+STATICLIBRARY           pjmedia_audiodev.lib 
 
-#if SND_USE_APS
-        LIBRARY         APSSession2.lib
-        CAPABILITY      NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment MultimediaDD
-#elif SND_USE_VAS
+#if SND_HAS_APS
+LIBRARY         APSSession2.lib
+#endif
+
+#if SND_HAS_VAS
 //      LIBRARY         
-        CAPABILITY      NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment MultimediaDD
-#else
+#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

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp

@@ -731 +731 @@
             
             strm->play_cb(strm->user_data, &f);
+            if (f.type != PJMEDIA_FRAME_TYPE_AUDIO) {
+                pjmedia_zero_samples(strm->play_buf, 
+                                     strm->param.samples_per_frame);
+            }
+            
             strm->play_buf_len = strm->param.samples_per_frame;
             strm->play_buf_start = 0;

pjproject/branches/projects/aps-direct/pjsip-apps/src/symbian_ua/ua.cpp

@@ -343 +343 @@
     med_cfg.enable_ice = USE_ICE;
     med_cfg.snd_auto_close_time = 0; // wait for 0 seconds idle before sound dev get auto-closed
+    //med_cfg.no_vad = PJ_TRUE;
     
     status = pjsua_init(&cfg, &log_cfg, &med_cfg);
@@ -507 +508 @@
             "Codec Menu:\n"
             "  a    Enable all codecs\n"
-#if PJMEDIA_SOUND_IMPLEMENTATION == PJMEDIA_SOUND_SYMB_APS_SOUND
+#if PJMEDIA_HAS_PASSTHROUGH_CODEC_AMR
             "  d    Enable only AMR\n"
+#endif
+#if PJMEDIA_HAS_PASSTHROUGH_CODEC_G729
             "  g    Enable only G.729\n"
+#endif
+#if PJMEDIA_HAS_PASSTHROUGH_CODEC_ILBC
             "  j    Enable only iLBC\n"
 #endif