From ea05973e686e86e88cdbd581aec68b11caf071fe Mon Sep 17 00:00:00 2001 From: "henrik.lundin@webrtc.org" Date: Wed, 7 Sep 2011 15:20:17 +0000 Subject: [PATCH] Fixing VCM tests for VP8 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 --- src/modules/video_coding/main/test/generic_codec_test.cc | 3 --- src/modules/video_coding/main/test/normal_test.cc | 7 ++++--- src/modules/video_coding/main/test/test_util.cc | 9 ++++++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/modules/video_coding/main/test/generic_codec_test.cc b/src/modules/video_coding/main/test/generic_codec_test.cc index 78eefe858a..f3c47c0fed 100644 --- a/src/modules/video_coding/main/test/generic_codec_test.cc +++ b/src/modules/video_coding/main/test/generic_codec_test.cc @@ -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); } diff --git a/src/modules/video_coding/main/test/normal_test.cc b/src/modules/video_coding/main/test/normal_test.cc index 3453602b52..e4f4fcf94f 100644 --- a/src/modules/video_coding/main/test/normal_test.cc +++ b/src/modules/video_coding/main/test/normal_test.cc @@ -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; } diff --git a/src/modules/video_coding/main/test/test_util.cc b/src/modules/video_coding/main/test/test_util.cc index d102699db9..8e1c192d2d 100644 --- a/src/modules/video_coding/main/test/test_util.cc +++ b/src/modules/video_coding/main/test/test_util.cc @@ -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;