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

Fix bug introduced when enabling VP8 frame dropping.

Browse Source 
Also fixes two unit test mismatches.

BUG=
TEST=

Review URL: http://webrtc-codereview.appspot.com/299002

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1061 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
stefan@webrtc.org 2011-11-30 14:41:58 +00:00
parent ac2c677bf6
commit 0c2adf0b75
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -514,8 +514,8 @@ UnitTest::Perform()
//-- Decode() errors -- //-- Decode() errors --
// Unallocated encodedVideoBuffer. // Unallocated encodedVideoBuffer.
_encodedVideoBuffer.Free(); _encodedVideoBuffer.Free();
//_encodedVideoBuffer.UpdateLength(10); // Buffer NULL but length > 0
VideoEncodedBufferToEncodedImage(_encodedVideoBuffer, encodedImage); VideoEncodedBufferToEncodedImage(_encodedVideoBuffer, encodedImage);
encodedImage._length = 10; // Buffer NULL but length > 0
VIDEO_TEST(_decoder->Decode(encodedImage, false, NULL) == VIDEO_TEST(_decoder->Decode(encodedImage, false, NULL) ==
WEBRTC_VIDEO_CODEC_ERR_PARAMETER); WEBRTC_VIDEO_CODEC_ERR_PARAMETER);
_encodedVideoBuffer.VerifyAndAllocate(_lengthSourceFrame); _encodedVideoBuffer.VerifyAndAllocate(_lengthSourceFrame);
@ -789,8 +789,7 @@ UnitTest::RateControlTests()
&videoFrameType) == &videoFrameType) ==
WEBRTC_VIDEO_CODEC_OK); WEBRTC_VIDEO_CODEC_OK);
frameLength = WaitForEncodedFrame(); frameLength = WaitForEncodedFrame();
VIDEO_TEST_EXIT_ON_ERR(frameLength > 0); VIDEO_TEST_EXIT_ON_ERR(frameLength >= 0);
//VIDEO_TEST(frameLength > 0);
totalBytes += frameLength; totalBytes += frameLength;
frames++; frames++;
@ -804,9 +803,8 @@ UnitTest::RateControlTests()
printf("Target bitrate: %d kbps, actual bitrate: %d kbps\n", _bitRate, printf("Target bitrate: %d kbps, actual bitrate: %d kbps\n", _bitRate,
actualBitrate); actualBitrate);
// Test for close match over reasonable range. // Test for close match over reasonable range.
if (_bitRate >= 100 && _bitRate <= 4000) if (_bitRate >= 100 && _bitRate <= 2500)
{ {
//VIDEO_TEST(fabs(actualBitrate - _bitRate) < 0.05 * _bitRate);
VIDEO_TEST(abs(WebRtc_Word32(actualBitrate - _bitRate)) < VIDEO_TEST(abs(WebRtc_Word32(actualBitrate - _bitRate)) <
0.1 * _bitRate); // for VP8 0.1 * _bitRate); // for VP8
} }

14
src/modules/video_coding/codecs/vp8/main/source/vp8.cc
View File

@ -706,13 +706,13 @@ VP8Encoder::GetEncodedPartitions(const RawImage& input_image) {
break; break;
} }
} }
if (_encodedImage._length == 0) if (_encodedImage._length > 0) {
return WEBRTC_VIDEO_CODEC_ERROR; _encodedImage._timeStamp = input_image._timeStamp;
_encodedImage._timeStamp = input_image._timeStamp; _encodedImage._encodedHeight = _raw->h;
_encodedImage._encodedHeight = _raw->h; _encodedImage._encodedWidth = _raw->w;
_encodedImage._encodedWidth = _raw->w; _encodedCompleteCallback->Encoded(_encodedImage, &codecSpecific,
_encodedCompleteCallback->Encoded(_encodedImage, &codecSpecific, &frag_info);
&frag_info); }
return WEBRTC_VIDEO_CODEC_OK; return WEBRTC_VIDEO_CODEC_OK;
} }
#endif #endif