Changeset 2378 for pjproject/trunk

Timestamp:

Dec 12, 2008 2:59:38 PM (16 years ago)

Author:

bennylp

Message:

Workaround for ticket #683: Crash/segfault on pjmedia_wsola_create() on ARM9 platform with GCC optimizations

File:

• pjproject/trunk/pjmedia/src/pjmedia/wsola.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia/wsola.c

@@ -31 +31 @@
 #define THIS_FILE   "wsola.c"
 
+/*
+ * http://trac.pjsip.org/repos/ticket/683:
+ *  Workaround for segfault problem in the fixed point version of create_win()
+ *  on ARM9 platform, possibly due to gcc optimization bug.
+ *
+ *  For now, we will use linear window when floating point is disabled.
+ */
+#ifndef PJMEDIA_WSOLA_LINEAR_WIN
+#   define PJMEDIA_WSOLA_LINEAR_WIN    (!PJ_HAS_FLOATING_POINT)
+#endif
+
 
 #if 0
@@ -369 +380 @@
 }
 
-#if PJ_HAS_INT64
+#if PJ_HAS_INT64 && !PJMEDIA_WSOLA_LINEAR_WIN
 /* approx_cos():
  *   see: http://www.audiomulch.com/~rossb/code/sinusoids/ 
@@ -389 +400 @@
     return j;
 }
-#endif  /* PJ_HAS_INT64 */
+#endif  /* PJ_HAS_INT64 && .. */
 
 static void create_win(pj_pool_t *pool, pj_uint16_t **pw, unsigned count)
@@ -401 +412 @@
 
     for (i=0; i<count; i++) {
-#if PJ_HAS_INT64
+#if PJ_HAS_INT64 && !PJMEDIA_WSOLA_LINEAR_WIN
         pj_uint32_t phase;
         pj_uint64_t cos_val;