385a722646
- Removes a strong-reference cycle between RTCPeerConnection and RTCPeerConnectionObserver - Gives RTCPeerConnectionObserver a virtual dtor - Ensures RTCPeerConnectionTest tears down correctly - Ensures AppRTCDemo tears down correctly This is the talk/ half; the webrtc/ half is in https://webrtc-codereview.appspot.com/10539005 BUG=3054,3055,3100 R=noahric@google.com Review URL: https://webrtc-codereview.appspot.com/10499005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5771 4adac7df-926f-26a2-2b94-8c16560cd09d
84 lines
3.4 KiB
Objective-C
84 lines
3.4 KiB
Objective-C
/*
|
|
* libjingle
|
|
* Copyright 2013, Google Inc.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright notice,
|
|
* this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
* and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
* EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "talk/app/webrtc/peerconnectioninterface.h"
|
|
|
|
#import "RTCPeerConnection.h"
|
|
#import "RTCPeerConnectionDelegate.h"
|
|
|
|
// These objects are created by RTCPeerConnectionFactory to wrap an
|
|
// id<RTCPeerConnectionDelegate> and call methods on that interface.
|
|
|
|
namespace webrtc {
|
|
|
|
class RTCPeerConnectionObserver : public PeerConnectionObserver {
|
|
|
|
public:
|
|
explicit RTCPeerConnectionObserver(id<RTCPeerConnectionDelegate> delegate);
|
|
virtual ~RTCPeerConnectionObserver();
|
|
|
|
// |peerConnection| owns |this|, so outlives it.
|
|
void SetPeerConnection(RTCPeerConnection *peerConnection);
|
|
|
|
virtual void OnError() OVERRIDE;
|
|
|
|
// Triggered when the SignalingState changed.
|
|
virtual void OnSignalingChange(
|
|
PeerConnectionInterface::SignalingState new_state) OVERRIDE;
|
|
|
|
// Triggered when media is received on a new stream from remote peer.
|
|
virtual void OnAddStream(MediaStreamInterface* stream) OVERRIDE;
|
|
|
|
// Triggered when a remote peer close a stream.
|
|
virtual void OnRemoveStream(MediaStreamInterface* stream) OVERRIDE;
|
|
|
|
// Triggered when a remote peer open a data channel.
|
|
virtual void OnDataChannel(DataChannelInterface* data_channel) OVERRIDE;
|
|
|
|
// Triggered when renegotiation is needed, for example the ICE has restarted.
|
|
virtual void OnRenegotiationNeeded() OVERRIDE;
|
|
|
|
// Called any time the ICEConnectionState changes
|
|
virtual void OnIceConnectionChange(
|
|
PeerConnectionInterface::IceConnectionState new_state) OVERRIDE;
|
|
|
|
// Called any time the ICEGatheringState changes
|
|
virtual void OnIceGatheringChange(
|
|
PeerConnectionInterface::IceGatheringState new_state) OVERRIDE;
|
|
|
|
// New Ice candidate have been found.
|
|
virtual void OnIceCandidate(const IceCandidateInterface* candidate) OVERRIDE;
|
|
|
|
private:
|
|
id<RTCPeerConnectionDelegate> _delegate;
|
|
// __unsafe_unretained is in fact safe because |_peerConnection| owns |this|;
|
|
// see comment on SetPeerConnection() above.
|
|
__unsafe_unretained RTCPeerConnection *_peerConnection;
|
|
};
|
|
|
|
} // namespace webrtc
|