Changeset 2277


Ignore:
Timestamp:
Sep 15, 2008 11:16:57 AM (16 years ago)
Author:
nanang
Message:

Fixed linking error undefined CHECK_ when PJMEDIA_WSOLA_IMP_NULL is used (Thanks Samuel Vinson).

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r2145 r2277  
    3232 
    3333 
    34 #if (PJMEDIA_WSOLA_IMP==PJMEDIA_WSOLA_IMP_WSOLA) || \ 
    35     (PJMEDIA_WSOLA_IMP==PJMEDIA_WSOLA_IMP_WSOLA_LITE) 
    36  
    37 /* 
    38  * WSOLA implementation using WSOLA 
    39  */ 
    40  
    41 /* Buffer size including history, in frames */ 
    42 #define FRAME_CNT       6 
    43  
    44 /* Number of history frames in buffer */ 
    45 #define HIST_CNT        1.5 
    46  
    47 /* Template size, in msec */ 
    48 #define TEMPLATE_PTIME  5 
    49  
    50 /* Hanning window size, in msec */ 
    51 #define HANNING_PTIME   5 
    52  
    53 /* Number of frames in erase buffer */ 
    54 #define ERASE_CNT       ((unsigned)3) 
    55  
    56 /* Minimum distance from template for find_pitch() of expansion, in frames */ 
    57 #define EXP_MIN_DIST    0.5 
    58  
    59 /* Maximum distance from template for find_pitch() of expansion, in frames */ 
    60 #define EXP_MAX_DIST    HIST_CNT 
    61  
    62  
    6334#if 0 
    6435#   define TRACE_(x)    PJ_LOG(4,x) 
    … …  
    7243#   define CHECK_(x) 
    7344#endif 
     45 
     46 
     47#if (PJMEDIA_WSOLA_IMP==PJMEDIA_WSOLA_IMP_WSOLA) || \ 
     48    (PJMEDIA_WSOLA_IMP==PJMEDIA_WSOLA_IMP_WSOLA_LITE) 
     49 
     50/* 
     51 * WSOLA implementation using WSOLA 
     52 */ 
     53 
     54/* Buffer size including history, in frames */ 
     55#define FRAME_CNT       6 
     56 
     57/* Number of history frames in buffer */ 
     58#define HIST_CNT        1.5 
     59 
     60/* Template size, in msec */ 
     61#define TEMPLATE_PTIME  5 
     62 
     63/* Hanning window size, in msec */ 
     64#define HANNING_PTIME   5 
     65 
     66/* Number of frames in erase buffer */ 
     67#define ERASE_CNT       ((unsigned)3) 
     68 
     69/* Minimum distance from template for find_pitch() of expansion, in frames */ 
     70#define EXP_MIN_DIST    0.5 
     71 
     72/* Maximum distance from template for find_pitch() of expansion, in frames */ 
     73#define EXP_MAX_DIST    HIST_CNT 
     74 
    7475 
    7576/* Buffer content: 
Note: See TracChangeset for help on using the changeset viewer.