diff options
| author | mflodman@webrtc.org <mflodman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2012-10-25 11:30:29 +0000 |
|---|---|---|
| committer | mflodman@webrtc.org <mflodman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2012-10-25 11:30:29 +0000 |
| commit | b6d9cfc6347e490751e142ba5fb89e4a975ed442 (patch) | |
| tree | 00dbf087103185bf18bae5d983dca1979604e8be /video_engine/encoder_state_feedback_unittest.cc | |
| parent | 4dd77597fb230d3c98e6c166f9f4a00ede798337 (diff) | |
| download | webrtc-b6d9cfc6347e490751e142ba5fb89e4a975ed442.tar.gz | |
Revert the revert in r2988 since that wasn't the issue.
Review URL: https://webrtc-codereview.appspot.com/931005
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@2992 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'video_engine/encoder_state_feedback_unittest.cc')
| -rw-r--r-- | video_engine/encoder_state_feedback_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/video_engine/encoder_state_feedback_unittest.cc b/video_engine/encoder_state_feedback_unittest.cc index 07d1663e..4133a712 100644 --- a/video_engine/encoder_state_feedback_unittest.cc +++ b/video_engine/encoder_state_feedback_unittest.cc @@ -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 |