Changeset 523


Ignore:
Timestamp:
Jun 19, 2006 12:09:20 PM (16 years ago)
Author:
bennylp
Message:

Fix warning messages in GSM and speex because of previous update to GSM patchlevel 10 and speex 1.1.12

Location:
pjproject/trunk/pjmedia/src/pjmedia-codec
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/src/pjmedia-codec/gsm/proto.h

    r517 r523  
    2020#ifdef  _NO_PROTO 
    2121#       undef   NeedFunctionPrototypes 
     22#endif 
     23 
     24/* PJMEDIA: always use NeedFunctionPrototypes */ 
     25#ifndef NeedFunctionPrototypes 
     26#       define NeedFunctionPrototypes   1 
    2227#endif 
    2328 
  • pjproject/trunk/pjmedia/src/pjmedia-codec/gsm/rpe.c

    r176 r523  
    299299 
    300300        assert(temp <= 11 && temp >= 0); 
    301         xmaxc = gsm_add( SASR(xmax, temp), exp << 3 ); 
     301        xmaxc = gsm_add( (word)SASR(xmax, temp), (word)(exp << 3) ); 
    302302 
    303303        /*   Quantizing and coding of the xM[0..12] RPE sequence 
  • pjproject/trunk/pjmedia/src/pjmedia-codec/speex/jitter.c

    r516 r523  
    221221      jitter->longterm_margin[0] = 0;             
    222222      /*fprintf (stderr, "interpolate frame\n");*/ 
    223       speex_decode_int(jitter->dec, NULL, out); 
     223      speex_decode_int(jitter->dec, NULL, (spx_int16_t*)out); 
    224224      if (current_timestamp) 
    225225         *current_timestamp = jitter->pointer_timestamp; 
     
    269269      { 
    270270         /* Try decoding last received packet */ 
    271          ret = speex_decode_int(jitter->dec, &jitter->current_packet, out); 
     271         ret = speex_decode_int(jitter->dec, &jitter->current_packet, (spx_int16_t*)out); 
    272272         if (ret == 0) 
    273273         { 
     
    281281      /*fprintf (stderr, "lost/late frame %d\n", jitter->pointer_timestamp);*/ 
    282282      /*Packet is late or lost*/ 
    283       speex_decode_int(jitter->dec, NULL, out); 
     283      speex_decode_int(jitter->dec, NULL, (spx_int16_t*)out); 
    284284      jitter->lost_count++; 
    285285      if (jitter->lost_count>=25) 
     
    296296      jitter->len[i]=-1; 
    297297      /* Decode packet */ 
    298       ret = speex_decode_int(jitter->dec, &jitter->current_packet, out); 
     298      ret = speex_decode_int(jitter->dec, &jitter->current_packet, (spx_int16_t*)out); 
    299299      if (ret == 0) 
    300300      { 
  • pjproject/trunk/pjmedia/src/pjmedia-codec/speex/kiss_fft.c

    r516 r523  
    8888       int i; 
    8989       kiss_fft_cpx *x=Fout; 
    90        for (i=0;i<4*m;i++) 
     90       for (i=0;i<(int)(4*m);i++) 
    9191       { 
    9292          x[i].r = PSHR16(x[i].r,2); 
  • pjproject/trunk/pjmedia/src/pjmedia-codec/speex/mdf.c

    r516 r523  
    417417#endif 
    418418 
    419    filter_dc_notch16(ref, st->notch_radius, st->d, st->frame_size, st->notch_mem); 
     419   filter_dc_notch16((spx_int16_t*)ref, st->notch_radius, st->d, st->frame_size, st->notch_mem); 
    420420   /* Copy input data to buffer */ 
    421421   for (i=0;i<st->frame_size;i++) 
Note: See TracChangeset for help on using the changeset viewer.