Changeset 5170 for pjproject/trunk/pjmedia/src/test/codec_vectors.c

Timestamp:

Aug 25, 2015 8:45:46 AM (9 years ago)

Author:

nanang

Message:

Re #1881: Fixed compile warnings on VS2015 about declaration hides previous declaration.

File:

• pjproject/trunk/pjmedia/src/test/codec_vectors.c (modified) (5 diffs)

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

@@ -160 +160 @@
     pos = 0;
     for (;;) {
-        pj_size_t count;
+        pj_size_t count2;
         
-        count = fread(in_frame.buf, encoded_frame_len, 1, fref);
-        if (count != 1)
+        count2 = fread(in_frame.buf, encoded_frame_len, 1, fref);
+        if (count2 != 1)
             break;
 
-        count = fread(out_frame.buf, encoded_frame_len, 1, output);
-        if (count != 1)
+        count2 = fread(out_frame.buf, encoded_frame_len, 1, output);
+        if (count2 != 1)
             break;
 
@@ -381 +381 @@
         pjmedia_frame in_frame[2];
         pj_timestamp ts;
-        unsigned count;
+        unsigned count2;
         pj_bool_t has_frame;
 
@@ -402 +402 @@
 
         if (has_frame) {
-            count = 2;
+            count2 = 2;
             if (pjmedia_codec_parse(codec, pkt, encoded_len, &ts, 
-                                    &count, in_frame) != PJ_SUCCESS) 
+                                    &count2, in_frame) != PJ_SUCCESS) 
             {
                 rc = -100;
@@ -410 +410 @@
             }
 
-            if (count != 1) {
+            if (count2 != 1) {
                 rc = -110;
                 goto on_return;
@@ -460 +460 @@
     pos = 0;
     for (;;) {
-        pj_size_t count;
+        pj_size_t count2;
         
-        count = fread(pkt, samples_per_frame*2, 1, fref);
-        if (count != 1)
+        count2 = fread(pkt, samples_per_frame*2, 1, fref);
+        if (count2 != 1)
             break;
 
-        count = fread(out_frame.buf, samples_per_frame*2, 1, output);
-        if (count != 1)
+        count2 = fread(out_frame.buf, samples_per_frame*2, 1, output);
+        if (count2 != 1)
             break;