generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing Release compilation errors

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/267026

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1000 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org
2011-11-23 12:20:35 +00:00
parent 89ab652250
commit 543c3eaa46
38 changed files with 221 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/video_coding/main/test/generic_codec_test.cc
View File

@@ -143,7 +143,7 @@ GenericCodecTest::Perform(CmdArgs& args)
_vcm->RegisterReceiveCodec(&receiveCodec, 1);
}
WebRtc_UWord8* tmpBuffer = new WebRtc_UWord8[_lengthSourceFrame];
fread(tmpBuffer, 1, _lengthSourceFrame, _sourceFile);
TEST(fread(tmpBuffer, 1, _lengthSourceFrame, _sourceFile) > 0);
// building source frame
sourceFrame.CopyFrame(_lengthSourceFrame, tmpBuffer);
sourceFrame.SetHeight(_height);
@@ -191,7 +191,7 @@ GenericCodecTest::Perform(CmdArgs& args)
//encoding 1 second of video
for (i = 0; i < _frameRate; i++)
{
fread(tmpBuffer, 1, _lengthSourceFrame, _sourceFile);
TEST(fread(tmpBuffer, 1, _lengthSourceFrame, _sourceFile) > 0);
sourceFrame.CopyFrame(_lengthSourceFrame, tmpBuffer);
sourceFrame.SetHeight(_height);
sourceFrame.SetWidth(_width);
@@ -265,7 +265,7 @@ GenericCodecTest::Perform(CmdArgs& args)
sourceFrame.VerifyAndAllocate(_lengthSourceFrame);
const float bitRate[] = {100, 400, 600, 1000, 2000, 3000};
const float nBitrates = sizeof(bitRate)/sizeof(*bitRate);
float _bitRate;
float _bitRate = 0;
int _frameCnt = 0;
WebRtc_Word64 startTime, currentTime, oneSecTime;
float totalBytesOneSec;//, totalBytesTenSec;
@@ -377,7 +377,7 @@ GenericCodecTest::Perform(CmdArgs& args)
encodeComplete = false;
while (encodeComplete == false)
{
fread(tmpBuffer, 1, _lengthSourceFrame, _sourceFile);
TEST(fread(tmpBuffer, 1, _lengthSourceFrame, _sourceFile) > 0);
_frameCnt++;
sourceFrame.CopyFrame(_lengthSourceFrame, tmpBuffer);
sourceFrame.SetHeight(_height);
@@ -467,7 +467,7 @@ GenericCodecTest::Perform(CmdArgs& args)
rewind(_sourceFile);
while (!feof(_sourceFile))
{
fread(tmpBuffer, 1, _lengthSourceFrame, _sourceFile);
TEST(fread(tmpBuffer, 1, _lengthSourceFrame, _sourceFile) > 0);
sourceFrame.CopyFrame(_lengthSourceFrame, tmpBuffer);
sourceFrame.SetHeight(_height);
sourceFrame.SetWidth(_width);