From 29fd9a5f30a2a56c5f8b69e33ba9521d524fbfad Mon Sep 17 00:00:00 2001 From: "henrik.lundin@webrtc.org" Date: Thu, 15 Sep 2011 08:25:45 +0000 Subject: [PATCH] Removing warnings in all NetEQ test targets Now all targets in neteq.gypi builds again. Also added payload type to the log produced by RTPanalyze. Review URL: http://webrtc-codereview.appspot.com/148001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@598 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/audio_coding/NetEQ/main/test/RTPanalyze.cc | 7 ++++--- src/modules/audio_coding/NetEQ/main/test/RTPchange.cc | 3 +-- src/modules/audio_coding/NetEQ/main/test/RTPencode.cc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/audio_coding/NetEQ/main/test/RTPanalyze.cc b/src/modules/audio_coding/NetEQ/main/test/RTPanalyze.cc index e8d843a96c..ded55e7689 100644 --- a/src/modules/audio_coding/NetEQ/main/test/RTPanalyze.cc +++ b/src/modules/audio_coding/NetEQ/main/test/RTPanalyze.cc @@ -40,7 +40,7 @@ int main(int argc, char* argv[]) printf("Output file: %s\n\n",argv[2]); // print file header - fprintf(outFile, "SeqNo TimeStamp SendTime Size\n"); + fprintf(outFile, "SeqNo TimeStamp SendTime Size PT\n"); // read file header @@ -53,8 +53,9 @@ int main(int argc, char* argv[]) while (packet.readFromFile(inFile) >= 0) { // write packet data to file - fprintf(outFile, "%5hu %10lu %10lu %5hi\n", - packet.sequenceNumber(), packet.timeStamp(), packet.time(), packet.dataLen()); + fprintf(outFile, "%5u %10u %10u %5i %5i\n", + packet.sequenceNumber(), packet.timeStamp(), packet.time(), + packet.dataLen(), packet.payloadType()); } fclose(inFile); diff --git a/src/modules/audio_coding/NetEQ/main/test/RTPchange.cc b/src/modules/audio_coding/NetEQ/main/test/RTPchange.cc index 5f693b8cb3..7dc80e692a 100644 --- a/src/modules/audio_coding/NetEQ/main/test/RTPchange.cc +++ b/src/modules/audio_coding/NetEQ/main/test/RTPchange.cc @@ -65,7 +65,7 @@ int main(int argc, char* argv[]) WebRtc_UWord32 ts; WebRtc_UWord32 sendTime; - while(fscanf(statFile, "%u %u %u %*i\n", &seqNo, &ts, &sendTime) == 3) + while(fscanf(statFile, "%hu %u %u %*i %*i\n", &seqNo, &ts, &sendTime) == 3) { std::pair tempPair = std::pair(seqNo, ts); @@ -83,7 +83,6 @@ int main(int argc, char* argv[]) fwrite(firstline, 4+4+4+2+2, 1, outFile); std::vector packetVec; - int i = 0; while (1) { diff --git a/src/modules/audio_coding/NetEQ/main/test/RTPencode.cc b/src/modules/audio_coding/NetEQ/main/test/RTPencode.cc index b87fae2753..e48d5b78c3 100644 --- a/src/modules/audio_coding/NetEQ/main/test/RTPencode.cc +++ b/src/modules/audio_coding/NetEQ/main/test/RTPencode.cc @@ -1610,7 +1610,7 @@ int NetEQTest_encode(int coder, WebRtc_Word16 *indata, int frameLen, unsigned ch int * vad, int useVAD, int bitrate, int numChannels){ short cdlen; - WebRtc_Word16 size_in_bytes, *tempdata; + WebRtc_Word16 *tempdata; static int first_cng=1; WebRtc_Word16 tempLen;