Changeset 2675 for pjproject

Timestamp:

May 6, 2009 2:34:13 PM (16 years ago)

Author:

bennylp

Message:

More ticket #774: fixed G.722.1 compilation warnings on linux/gcc-4.3.2

Location:

pjproject/trunk

Files:

• pjmedia/src/test/codec_vectors.c (modified) (3 diffs)
• pjmedia/src/test/mips_test.c (modified) (4 diffs)
• pjmedia/src/test/sdp_neg_test.c (modified) (2 diffs)
• third_party/g7221/common/common.c (modified) (1 diff)
• third_party/g7221/decode/decoder.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/test/codec_vectors.c

@@ -126 +126 @@
 
         if (out_frame.size) {
-            fwrite(out_frame.buf, out_frame.size, 1, output);
+            int cnt;
+
+            cnt = fwrite(out_frame.buf, out_frame.size, 1, output);
 
             if (encoded_frame_len == 0)
                 encoded_frame_len = out_frame.size;
-        }    }
+        }    
+    }
 
     fclose(output);
@@ -491 +494 @@
 }
 
-
+#if PJMEDIA_HAS_G7221_CODEC
 /* For ITU testing, off the 2 lsbs. */
 static void g7221_pcm_manip(short *pcm, unsigned count)
@@ -500 +503 @@
 
 }
+#endif  /* PJMEDIA_HAS_G7221_CODEC */
 
 int codec_test_vectors(void)

pjproject/trunk/pjmedia/src/test/mips_test.c

@@ -883 +883 @@
 }
 
+#if PJMEDIA_HAS_G7221_CODEC
 /* G.722.1 benchmark benchmark */
 static pjmedia_port* g7221_encode_decode(pj_pool_t *pool,
@@ -912 +913 @@
                                samples_per_frame, flags, te);
 }
+#endif  /* PJMEDIA_HAS_G7221_CODEC */
 
 #if defined(PJMEDIA_HAS_L16_CODEC) && PJMEDIA_HAS_L16_CODEC!=0
@@ -1940 +1942 @@
 
 /* G722.1 stream */
+#if PJMEDIA_HAS_G7221_CODEC
 static pjmedia_port* create_stream_g7221( pj_pool_t *pool,
                                           unsigned clock_rate,
@@ -1968 +1971 @@
                          samples_per_frame, flags, te);
 }
+#endif  /* PJMEDIA_HAS_G7221_CODEC */ 
 
 /***************************************************************************/

pjproject/trunk/pjmedia/src/test/sdp_neg_test.c

@@ -1461 +1461 @@
             }
         } else if (neg) {
-            status = pjmedia_sdp_neg_get_active_local(neg, &sdp2);
+            const pjmedia_sdp_session *lsdp;
+            status = pjmedia_sdp_neg_get_active_local(neg, &lsdp);
             if (status != PJ_SUCCESS) {
                 app_perror(status, 
@@ -1467 +1468 @@
                 return -215;
             }
+            sdp2 = (pjmedia_sdp_session*)lsdp;
         }
 

pjproject/trunk/third_party/g7221/common/common.c

@@ -170 +170 @@
     Word16 temp_category_balances[2*MAX_NUM_CATEGORIZATION_CONTROL_POSSIBILITIES];
     Word16 raw_max, raw_min;
-    Word16 raw_max_index, raw_min_index;
+    Word16 raw_max_index=0, raw_min_index=0;
     Word16 max_rate_pointer, min_rate_pointer;
     Word16 max, min;

pjproject/trunk/third_party/g7221/decode/decoder.c

@@ -473 +473 @@
     Word16 num_vecs;
     Word16 index;
-    Word16 bit;
-    Word16 signs_index;
+    Word16 bit=0;
+    Word16 signs_index=0;
     Word16 num_sign_bits;
     Word16 ran_out_of_bits_flag;