Changeset 2676


Ignore:
Timestamp:
May 6, 2009 3:37:47 PM (11 years ago)
Author:
nanang
Message:

Ticket #818:

  • Added libresample.mmp
  • Modified config_site_sample.h to enable resampling with small filter on Symbian platforms.
Location:
pjproject/trunk
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/build.symbian/bld.inf

    r2666 r2676  
    2424libpassthroughcodec.mmp 
    2525 
     26/* Resample */ 
     27libresample.mmp 
     28 
    2629/* Audio device. */ 
    2730pjmedia_audiodev.mmp 
  • pjproject/trunk/build.symbian/pjmedia.mmp

    r2506 r2676  
    9999SYSTEMINCLUDE   ..\third_party\srtp\crypto\include 
    100100SYSTEMINCLUDE   ..\third_party\build\srtp 
     101SYSTEMINCLUDE   .. 
    101102 
    102103SYSTEMINCLUDE   \epoc32\include 
  • pjproject/trunk/build.symbian/symbian_ua.mmp

    r2673 r2676  
    4545STATICLIBRARY           pjlib_util.lib pjlib.lib 
    4646STATICLIBRARY           libsrtp.lib 
     47STATICLIBRARY           libresample.lib 
    4748 
    4849#if SND_HAS_APS 
  • pjproject/trunk/pjlib/include/pj/config_site_sample.h

    r2506 r2676  
    134134    #define PJMEDIA_HAS_SPEEX_AEC               0 
    135135 
    136     /* Shouldn't use resampling for performance reason too. */ 
    137     #define PJMEDIA_RESAMPLE_IMP                PJMEDIA_RESAMPLE_NONE 
     136    /* Previously, resampling is disabled due to performance reason and 
     137     * this condition prevented some 'light' wideband codecs (e.g: G722.1) 
     138     * to work along with narrowband codecs. Lately, some tests showed 
     139     * that 16kHz <-> 8kHz resampling using libresample small filter was  
     140     * affordable on ARM9 222 MHz, so here we decided to enable resampling. 
     141     * Note that it is important to make sure that libresample is created 
     142     * using small filter. For example PJSUA_DEFAULT_CODEC_QUALITY must 
     143     * be set to 3 or 4 so pjsua-lib will apply small filter resampling. 
     144     */ 
     145    //#define PJMEDIA_RESAMPLE_IMP              PJMEDIA_RESAMPLE_NONE 
     146    #define PJMEDIA_RESAMPLE_IMP                PJMEDIA_RESAMPLE_LIBRESAMPLE 
    138147 
    139148    /* Use the lighter WSOLA implementation */ 
     
    173182     */ 
    174183 
    175     /* Default codec quality */ 
    176     #define PJSUA_DEFAULT_CODEC_QUALITY         5 
     184    /* Default codec quality, previously was set to 5, however it is now 
     185     * set to 4 to make sure pjsua instantiates resampler with small filter. 
     186     */ 
     187    #define PJSUA_DEFAULT_CODEC_QUALITY         4 
    177188 
    178189    /* Set maximum number of dialog/transaction/calls to minimum */ 
  • pjproject/trunk/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp

    r2666 r2676  
    4646STATICLIBRARY   libspeexcodec.lib 
    4747STATICLIBRARY   libg7221codec.lib 
     48STATICLIBRARY   libresample.lib 
    4849 
    4950 
  • pjproject/trunk/third_party/build/resample/config.h

    r1177 r2676  
    1 #define RESAMPLE_HAS_SMALL_FILTER       1 
    2 #define RESAMPLE_HAS_LARGE_FILTER       1 
     1#ifndef RESAMPLE_HAS_SMALL_FILTER 
     2#   define RESAMPLE_HAS_SMALL_FILTER    1 
     3#endif 
    34 
     5#ifndef RESAMPLE_HAS_LARGE_FILTER 
     6#   define RESAMPLE_HAS_LARGE_FILTER    1 
     7#endif 
Note: See TracChangeset for help on using the changeset viewer.