generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ReAdd PeerConnectionInterface::AddStream to fix Chrome build.

Browse Source 
AddStream(MediaStreamInterface* stream, const MediaConstraintsInterface* constraints);
This will be removed once Chrome has been updated.

R=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/27919004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7608 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
perkj@webrtc.org 2014-11-04 13:01:33 +00:00
parent 18de6f9622
commit b5d045e94d
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
talk/app/webrtc/peerconnection.cc
View File

@ -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()) {

2
talk/app/webrtc/peerconnection.h
View File

@ -66,6 +66,8 @@ class PeerConnection : public PeerConnectionInterface,
virtual rtc::scoped_refptr<StreamCollectionInterface> local_streams();
virtual rtc::scoped_refptr<StreamCollectionInterface> 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<DtmfSenderInterface> CreateDtmfSender(

17
talk/app/webrtc/peerconnectioninterface.h
View File

@ -252,17 +252,18 @@ class PeerConnectionInterface : public rtc::RefCountInterface {
virtual rtc::scoped_refptr<StreamCollectionInterface>
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

2
talk/app/webrtc/peerconnectionproxy.h
View File

@ -40,6 +40,8 @@ BEGIN_PROXY_MAP(PeerConnection)
PROXY_METHOD0(rtc::scoped_refptr<StreamCollectionInterface>,
remote_streams)
PROXY_METHOD1(bool, AddStream, MediaStreamInterface*)
PROXY_METHOD2(bool, AddStream, MediaStreamInterface*,
const MediaConstraintsInterface*);
PROXY_METHOD1(void, RemoveStream, MediaStreamInterface*)
PROXY_METHOD1(rtc::scoped_refptr<DtmfSenderInterface>,
CreateDtmfSender, AudioTrackInterface*)