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

Fixing VCM tests for VP8

Browse Source 
Removing asserts since the PictureID (and other parameters)
is now piped through codecSpecific. Also made sure the VCM
send callbacks (test code) copies the appropriate paramters.
Finally, enabling I420 in tests.

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@553 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrik.lundin@webrtc.org 2011-09-07 15:20:17 +00:00
parent 73d65513f1
commit ea05973e68
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -580,8 +580,5 @@ VCMEncComplete_KeyReqTest::SendData(
_timeStamp += 3000;
rtpInfo.type.Video.isFirstPacket = false;
rtpInfo.frameType = kVideoFrameKey;
// TODO(hlundin): Remove assert once we've piped PictureID into VCM
// through the WebRtcRTPHeader.
assert(rtpInfo.type.Video.codec != kRTPVideoVP8);
return _vcm.IncomingPacket(payloadData, payloadSize, rtpInfo);
}

7
src/modules/video_coding/main/test/normal_test.cc
View File

@ -99,6 +99,10 @@ VCMNTEncodeCompleteCallback::SendData(
break;
case kVideoCodecVP8:
rtpInfo.type.Video.codec = kRTPVideoVP8;
rtpInfo.type.Video.codecHeader.VP8.nonReference =
videoTypeHdr->VP8.nonReference;
rtpInfo.type.Video.codecHeader.VP8.pictureId =
videoTypeHdr->VP8.pictureId;
break;
case kVideoCodecI420:
rtpInfo.type.Video.codec = kRTPVideoI420;
@ -121,9 +125,6 @@ VCMNTEncodeCompleteCallback::SendData(
{
_skipCnt++;
}
// TODO(hlundin): Remove assert once we've piped PictureID into VCM
// through the WebRtcRTPHeader.
assert(rtpInfo.type.Video.codec != kRTPVideoVP8);
_VCMReceiver->IncomingPacket(payloadData, payloadSize, rtpInfo);
return 0;
}

9
src/modules/video_coding/main/test/test_util.cc
View File

@ -83,6 +83,12 @@ VCMEncodeCompleteCallback::SendData(
rtpInfo.type.Video.width = (WebRtc_UWord16)_width;
break;
case webrtc::kRTPVideoVP8:
rtpInfo.type.Video.codecHeader.VP8.nonReference =
videoTypeHdr->VP8.nonReference;
rtpInfo.type.Video.codecHeader.VP8.pictureId =
videoTypeHdr->VP8.pictureId;
break;
case webrtc::kRTPVideoI420:
break;
default:
assert(false);
@ -99,9 +105,6 @@ VCMEncodeCompleteCallback::SendData(
_encodedBytes += payloadSize;
// directly to receiver
// TODO(hlundin): Remove assert once we've piped PictureID into VCM
// through the WebRtcRTPHeader.
assert(rtpInfo.type.Video.codec != kRTPVideoVP8);
int ret = _VCMReceiver->IncomingPacket(payloadData, payloadSize, rtpInfo);
_encodeComplete = true;