Changeset 2676 for pjproject

Timestamp:

May 6, 2009 3:37:47 PM (16 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:

• build.symbian/bld.inf (modified) (1 diff)
• build.symbian/libresample.mmp (added)
• build.symbian/pjmedia.mmp (modified) (1 diff)
• build.symbian/symbian_ua.mmp (modified) (1 diff)
• pjlib/include/pj/config_site_sample.h (modified) (2 diffs)
• pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp (modified) (1 diff)
• third_party/build/resample/config.h (modified) (1 diff)

pjproject/trunk/build.symbian/bld.inf

@@ -24 +24 @@
 libpassthroughcodec.mmp
 
+/* Resample */
+libresample.mmp
+
 /* Audio device. */
 pjmedia_audiodev.mmp

pjproject/trunk/build.symbian/pjmedia.mmp

@@ -99 +99 @@
 SYSTEMINCLUDE   ..\third_party\srtp\crypto\include
 SYSTEMINCLUDE   ..\third_party\build\srtp
+SYSTEMINCLUDE   ..
 
 SYSTEMINCLUDE   \epoc32\include

pjproject/trunk/build.symbian/symbian_ua.mmp

@@ -45 +45 @@
 STATICLIBRARY           pjlib_util.lib pjlib.lib
 STATICLIBRARY           libsrtp.lib
+STATICLIBRARY           libresample.lib
 
 #if SND_HAS_APS

pjproject/trunk/pjlib/include/pj/config_site_sample.h

@@ -134 +134 @@
     #define PJMEDIA_HAS_SPEEX_AEC               0
 
-    /* Shouldn't use resampling for performance reason too. */
-    #define PJMEDIA_RESAMPLE_IMP                PJMEDIA_RESAMPLE_NONE
+    /* Previously, resampling is disabled due to performance reason and
+     * this condition prevented some 'light' wideband codecs (e.g: G722.1)
+     * to work along with narrowband codecs. Lately, some tests showed
+     * that 16kHz <-> 8kHz resampling using libresample small filter was 
+     * affordable on ARM9 222 MHz, so here we decided to enable resampling.
+     * Note that it is important to make sure that libresample is created
+     * using small filter. For example PJSUA_DEFAULT_CODEC_QUALITY must
+     * be set to 3 or 4 so pjsua-lib will apply small filter resampling.
+     */
+    //#define PJMEDIA_RESAMPLE_IMP              PJMEDIA_RESAMPLE_NONE
+    #define PJMEDIA_RESAMPLE_IMP                PJMEDIA_RESAMPLE_LIBRESAMPLE
 
     /* Use the lighter WSOLA implementation */
@@ -173 +182 @@
      */
 
-    /* Default codec quality */
-    #define PJSUA_DEFAULT_CODEC_QUALITY         5
+    /* Default codec quality, previously was set to 5, however it is now
+     * set to 4 to make sure pjsua instantiates resampler with small filter.
+     */
+    #define PJSUA_DEFAULT_CODEC_QUALITY         4
 
     /* Set maximum number of dialog/transaction/calls to minimum */

pjproject/trunk/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp

@@ -46 +46 @@
 STATICLIBRARY   libspeexcodec.lib
 STATICLIBRARY   libg7221codec.lib
+STATICLIBRARY   libresample.lib
 
 

pjproject/trunk/third_party/build/resample/config.h

@@ -1 @@
-#define RESAMPLE_HAS_SMALL_FILTER       1
-#define RESAMPLE_HAS_LARGE_FILTER       1
+#ifndef RESAMPLE_HAS_SMALL_FILTER
+#   define RESAMPLE_HAS_SMALL_FILTER    1
+#endif
 
+#ifndef RESAMPLE_HAS_LARGE_FILTER
+#   define RESAMPLE_HAS_LARGE_FILTER    1
+#endif