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

Revert the revert in r2988 since that wasn't the issue.

Browse Source 
Review URL: https://webrtc-codereview.appspot.com/931005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2992 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mflodman@webrtc.org
2012-10-25 11:30:29 +00:00
parent cf21686cd5
commit d6ec386ff5
11 changed files with 171 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/video_engine/encoder_state_feedback_unittest.cc
View File

@ -81,7 +81,7 @@ TEST_F(VieKeyRequestTest, CreateAndTriggerRequests) {
encoder_state_feedback_->GetRtcpIntraFrameObserver()->OnReceivedRPSI(
ssrc, rpsi_picture_id);
encoder_state_feedback_->RemoveEncoder(ssrc);
encoder_state_feedback_->RemoveEncoder(&encoder);
}
// Register multiple encoders and make sure the request is relayed to correct
@ -125,12 +125,12 @@ TEST_F(VieKeyRequestTest, MultipleEncoders) {
encoder_state_feedback_->GetRtcpIntraFrameObserver()->OnReceivedRPSI(
ssrc_2, rpsi_pid_2);
encoder_state_feedback_->RemoveEncoder(ssrc_1);
encoder_state_feedback_->RemoveEncoder(&encoder_1);
EXPECT_CALL(encoder_2, OnReceivedIntraFrameRequest(ssrc_2))
.Times(1);
encoder_state_feedback_->GetRtcpIntraFrameObserver()->
OnReceivedIntraFrameRequest(ssrc_2);
encoder_state_feedback_->RemoveEncoder(ssrc_2);
encoder_state_feedback_->RemoveEncoder(&encoder_2);
}
TEST_F(VieKeyRequestTest, AddTwiceError) {
@ -138,7 +138,7 @@ TEST_F(VieKeyRequestTest, AddTwiceError) {
MockVieEncoder encoder(process_thread_.get());
EXPECT_TRUE(encoder_state_feedback_->AddEncoder(ssrc, &encoder));
EXPECT_FALSE(encoder_state_feedback_->AddEncoder(ssrc, &encoder));
encoder_state_feedback_->RemoveEncoder(ssrc);
encoder_state_feedback_->RemoveEncoder(&encoder);
}
} // namespace webrtc