Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(379)

Unified Diff: content/renderer/media/mock_peer_connection_impl.cc

Issue 10703095: New PeerConnection handler in Chrome to support latest PeerConnection draft (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed code review comments by Ronghua. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/mock_peer_connection_impl.cc
diff --git a/content/renderer/media/mock_peer_connection_impl.cc b/content/renderer/media/mock_peer_connection_impl.cc
index 6f86e08e6c421a3bc9a422a4fda1adad35fa9bee..ce726785717139333d56be0284943171c6d37e13 100644
--- a/content/renderer/media/mock_peer_connection_impl.cc
+++ b/content/renderer/media/mock_peer_connection_impl.cc
@@ -29,12 +29,23 @@ class MockStreamCollection : public StreamCollectionInterface {
void AddStream(MediaStreamInterface* stream) {
streams_.push_back(stream);
}
+ void RemoveStream(MediaStreamInterface* stream) {
+ StreamVector::iterator it = streams_.begin();
+ for (; it != streams_.end(); ++it) {
+ if (it->get() == stream) {
+ streams_.erase(it);
+ break;
+ }
+ }
+ }
protected:
virtual ~MockStreamCollection() {}
private:
- std::vector<talk_base::scoped_refptr<MediaStreamInterface> > streams_;
+ typedef std::vector<talk_base::scoped_refptr<MediaStreamInterface> >
+ StreamVector;
+ StreamVector streams_;
};
const char MockPeerConnectionImpl::kDummyOffer[] = "dummy offer";
@@ -48,7 +59,9 @@ MockPeerConnectionImpl::MockPeerConnectionImpl(
hint_video_(false),
action_(kAnswer),
ice_options_(kOnlyRelay),
- ready_state_(kNew) {
+ sdp_mline_index_(-1),
+ ready_state_(kNew),
+ ice_state_(kIceNew) {
}
MockPeerConnectionImpl::~MockPeerConnectionImpl() {}
@@ -82,6 +95,7 @@ void MockPeerConnectionImpl::RemoveStream(
MediaStreamInterface* local_stream) {
DCHECK_EQ(stream_label_, local_stream->label());
stream_label_.clear();
+ local_streams_->RemoveStream(local_stream);
}
MockPeerConnectionImpl::ReadyState MockPeerConnectionImpl::ready_state() {
@@ -127,9 +141,7 @@ bool MockPeerConnectionImpl::SetRemoteDescription(
bool MockPeerConnectionImpl::ProcessIceMessage(
const webrtc::IceCandidateInterface* ice_candidate) {
- sdp_mid_ = ice_candidate->sdp_mid();
- sdp_mline_index_ = ice_candidate->sdp_mline_index();
- return ice_candidate->ToString(&ice_sdp_);
+ return AddIceCandidate(ice_candidate);
}
const webrtc::SessionDescriptionInterface*
@@ -149,43 +161,48 @@ void MockPeerConnectionImpl::AddRemoteStream(MediaStreamInterface* stream) {
void MockPeerConnectionImpl::CreateOffer(
CreateSessionDescriptionObserver* observer,
const MediaConstraintsInterface* constraints) {
- NOTIMPLEMENTED();
+ DCHECK(observer);
+ created_sessiondescription_.reset(
+ dependency_factory_->CreateSessionDescription(kDummyOffer));
}
void MockPeerConnectionImpl::CreateAnswer(
CreateSessionDescriptionObserver* observer,
const MediaConstraintsInterface* constraints) {
- NOTIMPLEMENTED();
+ DCHECK(observer);
+ created_sessiondescription_.reset(
+ dependency_factory_->CreateSessionDescription(kDummyOffer));
Ronghua Wu (Left Chromium) 2012/08/15 00:57:32 Using kDummyOffer here is confusing. Let's have a
perkj_chrome 2012/08/15 09:12:30 Done.
}
void MockPeerConnectionImpl::SetLocalDescription(
SetSessionDescriptionObserver* observer,
SessionDescriptionInterface* desc) {
- NOTIMPLEMENTED();
+ desc->ToString(&description_sdp_);
+ local_desc_.reset(desc);
}
void MockPeerConnectionImpl::SetRemoteDescription(
SetSessionDescriptionObserver* observer,
SessionDescriptionInterface* desc) {
- NOTIMPLEMENTED();
+ desc->ToString(&description_sdp_);
+ remote_desc_.reset(desc);
}
bool MockPeerConnectionImpl::UpdateIce(
const IceServers& configuration,
const MediaConstraintsInterface* constraints) {
- NOTIMPLEMENTED();
- return false;
+ return true;
}
bool MockPeerConnectionImpl::AddIceCandidate(
const IceCandidateInterface* candidate) {
- NOTIMPLEMENTED();
- return false;
+ sdp_mid_ = candidate->sdp_mid();
+ sdp_mline_index_ = candidate->sdp_mline_index();
+ return candidate->ToString(&ice_sdp_);
}
PeerConnectionInterface::IceState MockPeerConnectionImpl::ice_state() {
- NOTIMPLEMENTED();
- return kIceNew;
+ return ice_state_;
}
} // namespace webrtc

Powered by Google App Engine
This is Rietveld 408576698