diff --git a/talk/app/webrtc/peerconnection.cc b/talk/app/webrtc/peerconnection.cc index 64ddcad1b2..b64caf7dd3 100644 --- a/talk/app/webrtc/peerconnection.cc +++ b/talk/app/webrtc/peerconnection.cc @@ -420,6 +420,11 @@ bool PeerConnection::AddStream(MediaStreamInterface* local_stream) { return true; } +bool PeerConnection::AddStream(MediaStreamInterface* local_stream, + const MediaConstraintsInterface* constraints) { + return AddStream(local_stream); +} + void PeerConnection::RemoveStream(MediaStreamInterface* local_stream) { mediastream_signaling_->RemoveLocalStream(local_stream); if (IsClosed()) { diff --git a/talk/app/webrtc/peerconnection.h b/talk/app/webrtc/peerconnection.h index 68aa154653..355211c354 100644 --- a/talk/app/webrtc/peerconnection.h +++ b/talk/app/webrtc/peerconnection.h @@ -66,6 +66,8 @@ class PeerConnection : public PeerConnectionInterface, virtual rtc::scoped_refptr local_streams(); virtual rtc::scoped_refptr remote_streams(); virtual bool AddStream(MediaStreamInterface* local_stream); + virtual bool AddStream(MediaStreamInterface* local_stream, + const MediaConstraintsInterface* constraints); virtual void RemoveStream(MediaStreamInterface* local_stream); virtual rtc::scoped_refptr CreateDtmfSender( diff --git a/talk/app/webrtc/peerconnectioninterface.h b/talk/app/webrtc/peerconnectioninterface.h index edbf6e31c1..68b78798fc 100644 --- a/talk/app/webrtc/peerconnectioninterface.h +++ b/talk/app/webrtc/peerconnectioninterface.h @@ -252,17 +252,18 @@ class PeerConnectionInterface : public rtc::RefCountInterface { virtual rtc::scoped_refptr remote_streams() = 0; - // Deprecated: - // TODO(perkj): Remove once its not used by Chrome. - virtual bool AddStream(MediaStreamInterface* stream, - const MediaConstraintsInterface* constraints) { - return AddStream(stream); - } - // Add a new MediaStream to be sent on this PeerConnection. // Note that a SessionDescription negotiation is needed before the // remote peer can receive the stream. - virtual bool AddStream(MediaStreamInterface* stream) = 0; + // TODO(perkj): Make pure virtual once Chrome mocks have implemented. + virtual bool AddStream(MediaStreamInterface* stream) { return false;} + + // Deprecated: + // TODO(perkj): Remove once its not used by Chrome. + virtual bool AddStream(MediaStreamInterface* stream, + const MediaConstraintsInterface* constraints) { + return false; + } // Remove a MediaStream from this PeerConnection. // Note that a SessionDescription negotiation is need before the diff --git a/talk/app/webrtc/peerconnectionproxy.h b/talk/app/webrtc/peerconnectionproxy.h index 852d8520ed..571c676117 100644 --- a/talk/app/webrtc/peerconnectionproxy.h +++ b/talk/app/webrtc/peerconnectionproxy.h @@ -40,6 +40,8 @@ BEGIN_PROXY_MAP(PeerConnection) PROXY_METHOD0(rtc::scoped_refptr, remote_streams) PROXY_METHOD1(bool, AddStream, MediaStreamInterface*) + PROXY_METHOD2(bool, AddStream, MediaStreamInterface*, + const MediaConstraintsInterface*); PROXY_METHOD1(void, RemoveStream, MediaStreamInterface*) PROXY_METHOD1(rtc::scoped_refptr, CreateDtmfSender, AudioTrackInterface*)