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

Remove deprecated PeerConnection APIs.

Browse Source 
Removes PeerConnectionObserver::OnError.
Removes MediaConstraints argument to PeerConnection::AddStream.
None of these have ever been implemented and have been removed from the spec.

R=tommi@chromium.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7650 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
perkj@webrtc.org 2014-11-06 12:16:36 +00:00
parent 19b4741004
commit fd0efb694a
4 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -420,11 +420,6 @@ bool PeerConnection::AddStream(MediaStreamInterface* local_stream) {
return true; return true;
} }
bool PeerConnection::AddStream(MediaStreamInterface* local_stream,
const MediaConstraintsInterface* constraints) {
return AddStream(local_stream);
}
void PeerConnection::RemoveStream(MediaStreamInterface* local_stream) { void PeerConnection::RemoveStream(MediaStreamInterface* local_stream) {
mediastream_signaling_->RemoveLocalStream(local_stream); mediastream_signaling_->RemoveLocalStream(local_stream);
if (IsClosed()) { if (IsClosed()) {

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

@ -66,8 +66,6 @@ class PeerConnection : public PeerConnectionInterface,
virtual rtc::scoped_refptr<StreamCollectionInterface> local_streams(); virtual rtc::scoped_refptr<StreamCollectionInterface> local_streams();
virtual rtc::scoped_refptr<StreamCollectionInterface> remote_streams(); virtual rtc::scoped_refptr<StreamCollectionInterface> remote_streams();
virtual bool AddStream(MediaStreamInterface* local_stream); virtual bool AddStream(MediaStreamInterface* local_stream);
virtual bool AddStream(MediaStreamInterface* local_stream,
const MediaConstraintsInterface* constraints);
virtual void RemoveStream(MediaStreamInterface* local_stream); virtual void RemoveStream(MediaStreamInterface* local_stream);
virtual rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender( virtual rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender(

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

@ -255,15 +255,7 @@ class PeerConnectionInterface : public rtc::RefCountInterface {
// Add a new MediaStream to be sent on this PeerConnection. // Add a new MediaStream to be sent on this PeerConnection.
// Note that a SessionDescription negotiation is needed before the // Note that a SessionDescription negotiation is needed before the
// remote peer can receive the stream. // remote peer can receive the stream.
// TODO(perkj): Make pure virtual once Chrome mocks have implemented. virtual bool AddStream(MediaStreamInterface* stream) = 0;
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. // Remove a MediaStream from this PeerConnection.
// Note that a SessionDescription negotiation is need before the // Note that a SessionDescription negotiation is need before the
@ -351,10 +343,6 @@ class PeerConnectionObserver {
kIceState, kIceState,
}; };
// Deprecated.
// TODO(perkj): Remove once its not used by Chrome.
virtual void OnError() {}
// Triggered when the SignalingState changed. // Triggered when the SignalingState changed.
virtual void OnSignalingChange( virtual void OnSignalingChange(
PeerConnectionInterface::SignalingState new_state) {} PeerConnectionInterface::SignalingState new_state) {}

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

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