Changeset 347 for pjproject/trunk/pjmedia/src/pjmedia/resample.c

Timestamp:

Mar 21, 2006 11:59:15 AM (18 years ago)

Author:

bennylp

Message:

Added macro to exclude filters in resample and added options to select resample algorithm in conference

File:

• pjproject/trunk/pjmedia/src/pjmedia/resample.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/resample.c

@@ -66 +66 @@
 #include <pjmedia/errno.h>
 #include <pj/assert.h>
+#include <pj/log.h>
 #include <pj/pool.h>
 
+
+#define THIS_FILE   "resample.c"
 
 
@@ -192 +195 @@
 #endif
 
-#include "smallfilter.h"
-#include "largefilter.h"
+#if defined(PJMEDIA_HAS_SMALL_FILTER) && PJMEDIA_HAS_SMALL_FILTER!=0
+#   include "smallfilter.h"
+#else
+#   define SMALL_FILTER_NMULT   0
+#   define SMALL_FILTER_SCALE   0
+#   define SMALL_FILTER_NWING   0
+#   define SMALL_FILTER_IMP     NULL
+#   define SMALL_FILTER_IMPD    NULL
+#endif
+
+#if defined(PJMEDIA_HAS_LARGE_FILTER) && PJMEDIA_HAS_LARGE_FILTER!=0
+#   include "largefilter.h"
+#else
+#   define LARGE_FILTER_NMULT   0
+#   define LARGE_FILTER_SCALE   0
+#   define LARGE_FILTER_NWING   0
+#   define LARGE_FILTER_IMP     NULL
+#   define LARGE_FILTER_IMPD    NULL
+#endif
+
 
 #undef INLINE
@@ -481 +502 @@
     }
 
+#if !defined(PJMEDIA_HAS_LARGE_FILTER) || PJMEDIA_HAS_LARGE_FILTER==0
+    /*
+     * If large filter is excluded in the build, then prevent application
+     * from using it.
+     */
+    if (high_quality && large_filter) {
+        large_filter = PJ_FALSE;
+        PJ_LOG(5,(THIS_FILE, 
+                  "Resample uses small filter because large filter is "
+                  "disabled"));
+    }
+#endif
+
+#if !defined(PJMEDIA_HAS_SMALL_FILTER) || PJMEDIA_HAS_SMALL_FILTER==0
+    /*
+     * If small filter is excluded in the build and application wants to
+     * use it, then drop to linear conversion.
+     */
+    if (high_quality && large_filter == 0) {
+        high_quality = PJ_FALSE;
+        PJ_LOG(4,(THIS_FILE, 
+                  "Resample uses linear because small filter is disabled"));
+    }
+#endif
+
     resample->factor = rate_out * 1.0 / rate_in;
     resample->large_filter = large_filter;