Changeset 2483


Ignore:
Timestamp:
Mar 3, 2009 6:25:55 PM (11 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:
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/projects/aps-direct/build.symbian/symbian_ua.mmp

    r2475 r2483  
    1 #define SND_USE_APS     1 
    2 #define SND_USE_VAS     0 
     1#define SND_HAS_APS     1 
     2#define SND_HAS_VAS     0 
     3#define SND_HAS_MDA     0 
    34 
    45TARGET                  symbian_ua.exe 
     
    3536STATICLIBRARY           pjnath.lib pjlib_util.lib pjlib.lib 
    3637STATICLIBRARY           libsrtp.lib 
    37 STATICLIBRARY           libgsmcodec.lib libspeexcodec.lib libpassthroughcodec.lib 
    38 STATICLIBRARY           pjmedia_audiodev.lib 
     38STATICLIBRARY           libgsmcodec.lib libspeexcodec.lib 
     39STATICLIBRARY           libpassthroughcodec.lib 
     40STATICLIBRARY           pjmedia_audiodev.lib  
    3941 
    40 #if SND_USE_APS 
    41         LIBRARY         APSSession2.lib 
    42         CAPABILITY      NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment MultimediaDD 
    43 #elif SND_USE_VAS 
     42#if SND_HAS_APS 
     43LIBRARY         APSSession2.lib 
     44#endif 
     45 
     46#if SND_HAS_VAS 
    4447//      LIBRARY          
    45         CAPABILITY      NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment MultimediaDD 
    46 #else 
     48#endif 
     49 
     50#if SND_HAS_MDA 
    4751        LIBRARY         mediaclientaudiostream.lib 
    4852        LIBRARY         mediaclientaudioinputstream.lib 
     53#endif 
     54 
     55#if SND_HAS_APS || SND_HAS_VAS 
     56CAPABILITY      NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment MultimediaDD 
     57#else 
    4958        CAPABILITY      NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment 
    5059#endif 
    51  
     60         
    5261#ifdef WINSCW 
    5362        STATICLIBRARY   eexe.lib ecrt0.lib 
  • pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp

    r2475 r2483  
    731731             
    732732            strm->play_cb(strm->user_data, &f); 
     733            if (f.type != PJMEDIA_FRAME_TYPE_AUDIO) { 
     734                pjmedia_zero_samples(strm->play_buf,  
     735                                     strm->param.samples_per_frame); 
     736            } 
     737             
    733738            strm->play_buf_len = strm->param.samples_per_frame; 
    734739            strm->play_buf_start = 0; 
  • pjproject/branches/projects/aps-direct/pjsip-apps/src/symbian_ua/ua.cpp

    r2480 r2483  
    343343    med_cfg.enable_ice = USE_ICE; 
    344344    med_cfg.snd_auto_close_time = 0; // wait for 0 seconds idle before sound dev get auto-closed 
     345    //med_cfg.no_vad = PJ_TRUE; 
    345346     
    346347    status = pjsua_init(&cfg, &log_cfg, &med_cfg); 
     
    507508            "Codec Menu:\n" 
    508509            "  a    Enable all codecs\n" 
    509 #if PJMEDIA_SOUND_IMPLEMENTATION == PJMEDIA_SOUND_SYMB_APS_SOUND 
     510#if PJMEDIA_HAS_PASSTHROUGH_CODEC_AMR 
    510511            "  d    Enable only AMR\n" 
     512#endif 
     513#if PJMEDIA_HAS_PASSTHROUGH_CODEC_G729 
    511514            "  g    Enable only G.729\n" 
     515#endif 
     516#if PJMEDIA_HAS_PASSTHROUGH_CODEC_ILBC 
    512517            "  j    Enable only iLBC\n" 
    513518#endif 
Note: See TracChangeset for help on using the changeset viewer.