Changeset 523

Timestamp:

Jun 19, 2006 12:09:20 PM (18 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:

• gsm/proto.h (modified) (1 diff)
• gsm/rpe.c (modified) (1 diff)
• speex/jitter.c (modified) (4 diffs)
• speex/kiss_fft.c (modified) (1 diff)
• speex/mdf.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia-codec/gsm/proto.h

@@ -20 +20 @@
 #ifdef  _NO_PROTO
 #       undef   NeedFunctionPrototypes
+#endif
+
+/* PJMEDIA: always use NeedFunctionPrototypes */
+#ifndef NeedFunctionPrototypes
+#       define NeedFunctionPrototypes   1
 #endif
 

pjproject/trunk/pjmedia/src/pjmedia-codec/gsm/rpe.c

@@ -299 +299 @@
 
         assert(temp <= 11 && temp >= 0);
-        xmaxc = gsm_add( SASR(xmax, temp), exp << 3 );
+        xmaxc = gsm_add( (word)SASR(xmax, temp), (word)(exp << 3) );
 
         /*   Quantizing and coding of the xM[0..12] RPE sequence

pjproject/trunk/pjmedia/src/pjmedia-codec/speex/jitter.c

@@ -221 +221 @@
       jitter->longterm_margin[0] = 0;            
       /*fprintf (stderr, "interpolate frame\n");*/
-      speex_decode_int(jitter->dec, NULL, out);
+      speex_decode_int(jitter->dec, NULL, (spx_int16_t*)out);
       if (current_timestamp)
          *current_timestamp = jitter->pointer_timestamp;
@@ -269 +269 @@
       {
          /* Try decoding last received packet */
-         ret = speex_decode_int(jitter->dec, &jitter->current_packet, out);
+         ret = speex_decode_int(jitter->dec, &jitter->current_packet, (spx_int16_t*)out);
          if (ret == 0)
          {
@@ -281 +281 @@
       /*fprintf (stderr, "lost/late frame %d\n", jitter->pointer_timestamp);*/
       /*Packet is late or lost*/
-      speex_decode_int(jitter->dec, NULL, out);
+      speex_decode_int(jitter->dec, NULL, (spx_int16_t*)out);
       jitter->lost_count++;
       if (jitter->lost_count>=25)
@@ -296 +296 @@
       jitter->len[i]=-1;
       /* Decode packet */
-      ret = speex_decode_int(jitter->dec, &jitter->current_packet, out);
+      ret = speex_decode_int(jitter->dec, &jitter->current_packet, (spx_int16_t*)out);
       if (ret == 0)
       {

pjproject/trunk/pjmedia/src/pjmedia-codec/speex/kiss_fft.c

@@ -88 +88 @@
        int i;
        kiss_fft_cpx *x=Fout;
-       for (i=0;i<4*m;i++)
+       for (i=0;i<(int)(4*m);i++)
        {
           x[i].r = PSHR16(x[i].r,2);

pjproject/trunk/pjmedia/src/pjmedia-codec/speex/mdf.c

@@ -417 +417 @@
 #endif
 
-   filter_dc_notch16(ref, st->notch_radius, st->d, st->frame_size, st->notch_mem);
+   filter_dc_notch16((spx_int16_t*)ref, st->notch_radius, st->d, st->frame_size, st->notch_mem);
    /* Copy input data to buffer */
    for (i=0;i<st->frame_size;i++)