zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updating vp8 unit_test - fixing issue introduced in r2954

Browse Source 
TBR=Stefan

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2958 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mikhal@webrtc.org
2012-10-19 16:08:59 +00:00
parent bf0e5604c4
commit 4ee29c65d9
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/modules/video_coding/codecs/test_framework/unit_test.cc
View File

@ -434,12 +434,12 @@ UnitTest::Perform()
// Init then encode. // Init then encode.
_encodedVideoBuffer.SetLength(0); _encodedVideoBuffer.SetLength(0);
EXPECT_TRUE(_encoder->Encode(inputImage, NULL, NULL) == EXPECT_TRUE(_encoder->Encode(_inputVideoBuffer, NULL, NULL) ==
WEBRTC_VIDEO_CODEC_OK); WEBRTC_VIDEO_CODEC_OK);
EXPECT_TRUE(WaitForEncodedFrame() > 0); EXPECT_TRUE(WaitForEncodedFrame() > 0);
EXPECT_TRUE(_encoder->InitEncode(&_inst, 1, 1440) == WEBRTC_VIDEO_CODEC_OK); EXPECT_TRUE(_encoder->InitEncode(&_inst, 1, 1440) == WEBRTC_VIDEO_CODEC_OK);
_encoder->Encode(inputImage, NULL, NULL); _encoder->Encode(_inputVideoBuffer, NULL, NULL);
frameLength = WaitForEncodedFrame(); frameLength = WaitForEncodedFrame();
EXPECT_TRUE(frameLength > 0); EXPECT_TRUE(frameLength > 0);
EXPECT_TRUE(CheckIfBitExact(_refEncFrame, _refEncFrameLength, EXPECT_TRUE(CheckIfBitExact(_refEncFrame, _refEncFrameLength,
@ -447,11 +447,11 @@ UnitTest::Perform()
// Reset then encode. // Reset then encode.
_encodedVideoBuffer.SetLength(0); _encodedVideoBuffer.SetLength(0);
EXPECT_TRUE(_encoder->Encode(inputImage, NULL, NULL) == EXPECT_TRUE(_encoder->Encode(_inputVideoBuffer, NULL, NULL) ==
WEBRTC_VIDEO_CODEC_OK); WEBRTC_VIDEO_CODEC_OK);
WaitForEncodedFrame(); WaitForEncodedFrame();
EXPECT_TRUE(_encoder->InitEncode(&_inst, 1, 1440) == WEBRTC_VIDEO_CODEC_OK); EXPECT_TRUE(_encoder->InitEncode(&_inst, 1, 1440) == WEBRTC_VIDEO_CODEC_OK);
_encoder->Encode(inputImage, NULL, NULL); _encoder->Encode(_inputVideoBuffer, NULL, NULL);
frameLength = WaitForEncodedFrame(); frameLength = WaitForEncodedFrame();
EXPECT_TRUE(frameLength > 0); EXPECT_TRUE(frameLength > 0);
EXPECT_TRUE(CheckIfBitExact(_refEncFrame, _refEncFrameLength, EXPECT_TRUE(CheckIfBitExact(_refEncFrame, _refEncFrameLength,
@ -459,12 +459,12 @@ UnitTest::Perform()
// Release then encode. // Release then encode.
_encodedVideoBuffer.SetLength(0); _encodedVideoBuffer.SetLength(0);
EXPECT_TRUE(_encoder->Encode(inputImage, NULL, NULL) == EXPECT_TRUE(_encoder->Encode(_inputVideoBuffer, NULL, NULL) ==
WEBRTC_VIDEO_CODEC_OK); WEBRTC_VIDEO_CODEC_OK);
WaitForEncodedFrame(); WaitForEncodedFrame();
EXPECT_TRUE(_encoder->Release() == WEBRTC_VIDEO_CODEC_OK); EXPECT_TRUE(_encoder->Release() == WEBRTC_VIDEO_CODEC_OK);
EXPECT_TRUE(_encoder->InitEncode(&_inst, 1, 1440) == WEBRTC_VIDEO_CODEC_OK); EXPECT_TRUE(_encoder->InitEncode(&_inst, 1, 1440) == WEBRTC_VIDEO_CODEC_OK);
_encoder->Encode(inputImage, NULL, NULL); _encoder->Encode(_inputVideoBuffer, NULL, NULL);
frameLength = WaitForEncodedFrame(); frameLength = WaitForEncodedFrame();
EXPECT_TRUE(frameLength > 0); EXPECT_TRUE(frameLength > 0);
EXPECT_TRUE(CheckIfBitExact(_refEncFrame, _refEncFrameLength, EXPECT_TRUE(CheckIfBitExact(_refEncFrame, _refEncFrameLength,
@ -571,8 +571,8 @@ UnitTest::Perform()
EXPECT_TRUE(_encoder->InitEncode(&tempInst, 1, 1440) == EXPECT_TRUE(_encoder->InitEncode(&tempInst, 1, 1440) ==
WEBRTC_VIDEO_CODEC_OK); WEBRTC_VIDEO_CODEC_OK);
VideoFrame tempInput; VideoFrame tempInput;
unsigned int tmpLength = inputImage.Length() / 4; unsigned int tmpLength = _inputVideoBuffer.Length() / 4;
tempInput.CopyFrame(tmpLength, inputImage.Buffer()); tempInput.CopyFrame(tmpLength, _inputVideoBuffer.Buffer());
tempInput.SetWidth(tempInst.width); tempInput.SetWidth(tempInst.width);
tempInput.SetHeight(tempInst.height); tempInput.SetHeight(tempInst.height);
_encoder->Encode(tempInput, NULL, NULL); _encoder->Encode(tempInput, NULL, NULL);
@ -593,7 +593,7 @@ UnitTest::Perform()
EXPECT_TRUE(_encoder->Release() == WEBRTC_VIDEO_CODEC_OK); EXPECT_TRUE(_encoder->Release() == WEBRTC_VIDEO_CODEC_OK);
EXPECT_TRUE(_encoder->InitEncode(&_inst, 1, 1440) == EXPECT_TRUE(_encoder->InitEncode(&_inst, 1, 1440) ==
WEBRTC_VIDEO_CODEC_OK); WEBRTC_VIDEO_CODEC_OK);
_encoder->Encode(inputImage, NULL, NULL); _encoder->Encode(_inputVideoBuffer, NULL, NULL);
frameLength = WaitForEncodedFrame(); frameLength = WaitForEncodedFrame();
EXPECT_TRUE(frameLength > 0); EXPECT_TRUE(frameLength > 0);