Prepare for removal of PeerConnectionObserver::OnError.
Prepare for removal of constraints to PeerConnection::AddStream.
OnError has never been implemented and has been removed from the spec.
Also, constraints to PeerConnection::AddStream has also been removed from the spec and have never been implemented.
R=pbos@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/23319004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7605 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/examples/android/src/org/appspot/apprtc/PeerConnectionClient.java b/talk/examples/android/src/org/appspot/apprtc/PeerConnectionClient.java
index daea5fb..9c917bb 100644
--- a/talk/examples/android/src/org/appspot/apprtc/PeerConnectionClient.java
+++ b/talk/examples/android/src/org/appspot/apprtc/PeerConnectionClient.java
@@ -110,7 +110,7 @@
if (videoConstraints != null) {
videoMediaStream = factory.createLocalMediaStream("ARDAMSVideo");
videoMediaStream.addTrack(createVideoTrack(useFrontFacingCamera));
- pc.addStream(videoMediaStream, new MediaConstraints());
+ pc.addStream(videoMediaStream);
}
if (appRtcParameters.audioConstraints != null) {
@@ -118,7 +118,7 @@
lMS.addTrack(factory.createAudioTrack(
"ARDAMSa0",
factory.createAudioSource(appRtcParameters.audioConstraints)));
- pc.addStream(lMS, new MediaConstraints());
+ pc.addStream(lMS);
}
}
@@ -409,7 +409,7 @@
useFrontFacingCamera = !useFrontFacingCamera;
VideoTrack newTrack = createVideoTrack(useFrontFacingCamera);
videoMediaStream.addTrack(newTrack);
- pc.addStream(videoMediaStream, new MediaConstraints());
+ pc.addStream(videoMediaStream);
SessionDescription remoteDesc = pc.getRemoteDescription();
if (localSdp == null || remoteDesc == null) {
@@ -441,11 +441,6 @@
}
@Override
- public void onError() {
- reportError("PeerConnection error!");
- }
-
- @Override
public void onSignalingChange(
PeerConnection.SignalingState newState) {
Log.d(TAG, "SignalingState: " + newState);
diff --git a/talk/examples/objc/AppRTCDemo/APPRTCConnectionManager.m b/talk/examples/objc/AppRTCDemo/APPRTCConnectionManager.m
index b411a62..9a39528 100644
--- a/talk/examples/objc/AppRTCDemo/APPRTCConnectionManager.m
+++ b/talk/examples/objc/AppRTCDemo/APPRTCConnectionManager.m
@@ -170,7 +170,7 @@
#endif
[lms addAudioTrack:[self.peerConnectionFactory audioTrackWithID:@"ARDAMSa0"]];
- [self.peerConnection addStream:lms constraints:constraints];
+ [self.peerConnection addStream:lms];
[self.logger logMessage:@"onICEServers - added local stream."];
}
@@ -243,16 +243,6 @@
#pragma mark - RTCPeerConnectionDelegate
-- (void)peerConnectionOnError:(RTCPeerConnection*)peerConnection {
- dispatch_async(dispatch_get_main_queue(), ^{
- NSString* message = @"PeerConnection error";
- NSLog(@"%@", message);
- NSAssert(NO, @"PeerConnection failed.");
- [self.delegate connectionManager:self
- didErrorWithMessage:message];
- });
-}
-
- (void)peerConnection:(RTCPeerConnection*)peerConnection
signalingStateChanged:(RTCSignalingState)stateChanged {
dispatch_async(dispatch_get_main_queue(), ^{
diff --git a/talk/examples/peerconnection/client/conductor.cc b/talk/examples/peerconnection/client/conductor.cc
index f49aee6..e81f7fc 100644
--- a/talk/examples/peerconnection/client/conductor.cc
+++ b/talk/examples/peerconnection/client/conductor.cc
@@ -137,11 +137,6 @@
// PeerConnectionObserver implementation.
//
-void Conductor::OnError() {
- LOG(LS_ERROR) << __FUNCTION__;
- main_wnd_->QueueUIThreadCallback(PEER_CONNECTION_ERROR, NULL);
-}
-
// Called when a remote stream is added
void Conductor::OnAddStream(webrtc::MediaStreamInterface* stream) {
LOG(INFO) << __FUNCTION__ << " " << stream->label();
@@ -373,7 +368,7 @@
stream->AddTrack(audio_track);
stream->AddTrack(video_track);
- if (!peer_connection_->AddStream(stream, NULL)) {
+ if (!peer_connection_->AddStream(stream)) {
LOG(LS_ERROR) << "Adding stream to PeerConnection failed";
}
typedef std::pair<std::string,
@@ -440,10 +435,6 @@
break;
}
- case PEER_CONNECTION_ERROR:
- main_wnd_->MessageBox("Error", "an unknown error occurred", true);
- break;
-
case NEW_STREAM_ADDED: {
webrtc::MediaStreamInterface* stream =
reinterpret_cast<webrtc::MediaStreamInterface*>(
diff --git a/talk/examples/peerconnection/client/conductor.h b/talk/examples/peerconnection/client/conductor.h
index 0aff531..3ef5253 100644
--- a/talk/examples/peerconnection/client/conductor.h
+++ b/talk/examples/peerconnection/client/conductor.h
@@ -58,7 +58,6 @@
MEDIA_CHANNELS_INITIALIZED = 1,
PEER_CONNECTION_CLOSED,
SEND_MESSAGE_TO_PEER,
- PEER_CONNECTION_ERROR,
NEW_STREAM_ADDED,
STREAM_REMOVED,
};
@@ -80,11 +79,11 @@
//
// PeerConnectionObserver implementation.
//
- virtual void OnError();
virtual void OnStateChange(
webrtc::PeerConnectionObserver::StateType state_changed) {}
virtual void OnAddStream(webrtc::MediaStreamInterface* stream);
virtual void OnRemoveStream(webrtc::MediaStreamInterface* stream);
+ virtual void OnDataChannel(webrtc::DataChannelInterface* channel) {}
virtual void OnRenegotiationNeeded() {}
virtual void OnIceChange() {}
virtual void OnIceCandidate(const webrtc::IceCandidateInterface* candidate);