Reverse Merged r2884 & r2888 from trunk.
Review URL: https://webrtc-codereview.appspot.com/929005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2988 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/video_engine/encoder_state_feedback_unittest.cc b/webrtc/video_engine/encoder_state_feedback_unittest.cc
index 4133a71..07d1663 100644
--- a/webrtc/video_engine/encoder_state_feedback_unittest.cc
+++ b/webrtc/video_engine/encoder_state_feedback_unittest.cc
@@ -81,7 +81,7 @@
encoder_state_feedback_->GetRtcpIntraFrameObserver()->OnReceivedRPSI(
ssrc, rpsi_picture_id);
- encoder_state_feedback_->RemoveEncoder(&encoder);
+ encoder_state_feedback_->RemoveEncoder(ssrc);
}
// Register multiple encoders and make sure the request is relayed to correct
@@ -125,12 +125,12 @@
encoder_state_feedback_->GetRtcpIntraFrameObserver()->OnReceivedRPSI(
ssrc_2, rpsi_pid_2);
- encoder_state_feedback_->RemoveEncoder(&encoder_1);
+ encoder_state_feedback_->RemoveEncoder(ssrc_1);
EXPECT_CALL(encoder_2, OnReceivedIntraFrameRequest(ssrc_2))
.Times(1);
encoder_state_feedback_->GetRtcpIntraFrameObserver()->
OnReceivedIntraFrameRequest(ssrc_2);
- encoder_state_feedback_->RemoveEncoder(&encoder_2);
+ encoder_state_feedback_->RemoveEncoder(ssrc_2);
}
TEST_F(VieKeyRequestTest, AddTwiceError) {
@@ -138,7 +138,7 @@
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(&encoder);
+ encoder_state_feedback_->RemoveEncoder(ssrc);
}
} // namespace webrtc