Ignore:
Timestamp:
May 11, 2007 3:14:34 PM (14 years ago)
Author:
bennylp
Message:

HUGE changeset to make the rest of the libraries compile with C++ mode

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/src/pjmedia/echo_speex.c

    r974 r1266  
    7878    unsigned i; 
    7979 
    80     fq = pj_pool_zalloc(pool, sizeof(pjmedia_frame_queue)); 
     80    fq = PJ_POOL_ZALLOC_T(pool, pjmedia_frame_queue); 
    8181 
    8282    pj_ansi_snprintf(fq->obj_name, sizeof(fq->obj_name), name, fq); 
     
    9494        struct fq_frame *f; 
    9595 
    96         f = pj_pool_zalloc(pool, sizeof(struct fq_frame)); 
     96        f = PJ_POOL_ZALLOC_T(pool, struct fq_frame); 
    9797        f->buf = pj_pool_alloc(pool, frame_size); 
    9898 
     
    295295    *p_echo = NULL; 
    296296 
    297     echo = pj_pool_zalloc(pool, sizeof(speex_ec)); 
     297    echo = PJ_POOL_ZALLOC_T(pool, speex_ec); 
    298298    PJ_ASSERT_RETURN(echo != NULL, PJ_ENOMEM); 
    299299 
     
    356356 
    357357    /* Create temporary frame for echo cancellation */ 
    358     echo->tmp_frame = pj_pool_zalloc(pool, 2 * samples_per_frame); 
     358    echo->tmp_frame = (pj_int16_t*) pj_pool_zalloc(pool, 2 * samples_per_frame); 
    359359    PJ_ASSERT_RETURN(echo->tmp_frame != NULL, PJ_ENOMEM); 
    360360 
    361361    /* Create temporary frame to receive residue */ 
    362     echo->residue = pj_pool_zalloc(pool, sizeof(spx_int32_t) *  
     362    echo->residue = (spx_int32_t*) 
     363                    pj_pool_zalloc(pool, sizeof(spx_int32_t) *  
    363364                                            (samples_per_frame+1)); 
    364365    PJ_ASSERT_RETURN(echo->residue != NULL, PJ_ENOMEM); 
     
    392393PJ_DEF(pj_status_t) speex_aec_destroy(void *state ) 
    393394{ 
    394     speex_ec *echo = state; 
     395    speex_ec *echo = (speex_ec*) state; 
    395396 
    396397    PJ_ASSERT_RETURN(echo && echo->state, PJ_EINVAL); 
     
    424425                                       pj_int16_t *play_frm ) 
    425426{ 
    426     speex_ec *echo = state; 
     427    speex_ec *echo = (speex_ec*) state; 
    427428 
    428429    /* Sanity checks */ 
     
    482483                                       unsigned options ) 
    483484{ 
    484     speex_ec *echo = state; 
     485    speex_ec *echo = (speex_ec*) state; 
    485486    pj_status_t status = PJ_SUCCESS; 
    486487 
     
    552553                                           void *reserved ) 
    553554{ 
    554     speex_ec *echo = state; 
     555    speex_ec *echo = (speex_ec*) state; 
    555556 
    556557    /* Sanity checks */ 
Note: See TracChangeset for help on using the changeset viewer.