NetEqRTPplay modification

Make the program look for the ptypes.txt file in the default trunk
path, if the path to the executable indicates that it sits in the
trunk/out/Debug folder.

Changing PT for CNG-WB to 98

Remove warnings when building NetEQ with NETEQ_DELAY_LOGGING

Review URL: https://webrtc-codereview.appspot.com/339003

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1497 4adac7df-926f-26a2-2b94-8c16560cd09d

src/modules/audio_coding/neteq/recout.c

@@ -128,7 +128,7 @@ int WebRtcNetEQ_RecOutInternal(DSPInst_t *inst, WebRtc_Word16 *pw16_outData,
     void *mainInstBackup = inst->main_inst;
 
 #ifdef NETEQ_DELAY_LOGGING
-    int i, j, temp_var;
+    int temp_var;
 #endif
     WebRtc_Word16 dtmfValue = -1;
     WebRtc_Word16 dtmfVolume = -1;

src/modules/audio_coding/neteq/test/NetEqRTPplay.cc

@@ -263,7 +263,7 @@ int main(int argc, char* argv[])
 		fprintf(stderr,"Could not open file %s for writing\n", outfilename);
 		return(-1);
 	}
-	printf("Output file: %s\n\n",outfilename);
+	printf("Output file: %s\n",outfilename);
 
     // Parse for more arguments, all beginning with '-'
     
@@ -345,8 +345,19 @@ int main(int argc, char* argv[])
   strcpy(ptypesfile, "ptypes.txt");
 #endif
     FILE *ptypeFile = fopen(ptypesfile,"rt");
+    if (!ptypeFile) {
+        // Check if we can find the file at the usual place in the trunk.
+        if (strstr(argv[0], "out/Debug/")) {
+            int path_len = strstr(argv[0], "out/Debug/") - argv[0];
+            strncpy(ptypesfile, argv[0], path_len);
+            ptypesfile[path_len] = '\0';
+            strcat(ptypesfile,
+                   "src/modules/audio_coding/NetEQ/main/test/ptypes.txt");
+            ptypeFile = fopen(ptypesfile,"rt");
+        }
+    }
     CHECK_NOT_NULL(ptypeFile);
-
+    printf("Ptypes file: %s\n\n", ptypesfile);
 
     parsePtypeFile(ptypeFile, &decoders);
     fclose(ptypeFile);

src/modules/audio_coding/neteq/test/ptypes.txt

@@ -9,8 +9,8 @@ isac 103
 isacswb 104
 avt 106
 red 117
-cn_wb 105
+cn_wb 98
-cn_swb32 126
+cn_swb32 99
 pcm16b 93
 pcm16b_wb 94
 pcm16b_swb32khz 95