From 952f601405add90b19678f6764604fdd29d19049 Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Tue, 27 Mar 2012 18:30:26 +0000 Subject: [PATCH] Fix Linux-release errors and Valgrind errors. BUG= TEST=build on Linux release. TBR=tina.legrand@webrtc.org Review URL: https://webrtc-codereview.appspot.com/456008 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1949 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../audio_coding/neteq/test/NETEQTEST_NetEQClass.cc | 3 ++- src/modules/audio_coding/neteq/test/rtp_to_text.cc | 13 +++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/modules/audio_coding/neteq/test/NETEQTEST_NetEQClass.cc b/src/modules/audio_coding/neteq/test/NETEQTEST_NetEQClass.cc index 6ff6a46589..0d8be0027b 100644 --- a/src/modules/audio_coding/neteq/test/NETEQTEST_NetEQClass.cc +++ b/src/modules/audio_coding/neteq/test/NETEQTEST_NetEQClass.cc @@ -37,7 +37,8 @@ NETEQTEST_NetEQClass::NETEQTEST_NetEQClass(enum WebRtcNetEQDecoder *usedCodec, i _bufferMem(NULL), _preparseRTP(false), _fsmult(1), - _isMaster(true) + _isMaster(true), + _noDecode(false) { #ifdef WINDOWS_TIMING _totTimeRecIn.QuadPart = 0; diff --git a/src/modules/audio_coding/neteq/test/rtp_to_text.cc b/src/modules/audio_coding/neteq/test/rtp_to_text.cc index 7e9f4f59cf..1112d79c87 100644 --- a/src/modules/audio_coding/neteq/test/rtp_to_text.cc +++ b/src/modules/audio_coding/neteq/test/rtp_to_text.cc @@ -89,9 +89,18 @@ int main(int argc, char* argv[]) // read file header char firstline[FIRSTLINELEN]; - fgets(firstline, FIRSTLINELEN, inFile); + if (fgets(firstline, FIRSTLINELEN, inFile) == NULL) + { + std::cout << "Error reading file " << input_filename << std::endl; + return -1; + } + // start_sec + start_usec + source + port + padding - fread(firstline, 4+4+4+2+2, 1, inFile); + if (fread(firstline, 4+4+4+2+2, 1, inFile) != 1) + { + std::cout << "Error reading file " << input_filename << std::endl; + return -1; + } while (packet->readFromFile(inFile) >= 0) {