OLD | NEW |
---|---|
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2012 Google Inc. | 3 * Copyright 2012 Google Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
331 : factory_(factory), | 331 : factory_(factory), |
332 observer_(NULL), | 332 observer_(NULL), |
333 uma_observer_(NULL), | 333 uma_observer_(NULL), |
334 signaling_state_(kStable), | 334 signaling_state_(kStable), |
335 ice_state_(kIceNew), | 335 ice_state_(kIceNew), |
336 ice_connection_state_(kIceConnectionNew), | 336 ice_connection_state_(kIceConnectionNew), |
337 ice_gathering_state_(kIceGatheringNew) { | 337 ice_gathering_state_(kIceGatheringNew) { |
338 } | 338 } |
339 | 339 |
340 PeerConnection::~PeerConnection() { | 340 PeerConnection::~PeerConnection() { |
341 ASSERT(signaling_thread()->IsCurrent()); | |
pbos-webrtc
2015/07/09 09:09:22
CHECK/DCHECK?
tommi
2015/07/09 09:18:15
We might need to merge this change to other branch
| |
341 if (mediastream_signaling_) | 342 if (mediastream_signaling_) |
342 mediastream_signaling_->TearDown(); | 343 mediastream_signaling_->TearDown(); |
343 if (stream_handler_container_) | 344 if (stream_handler_container_) |
344 stream_handler_container_->TearDown(); | 345 stream_handler_container_->TearDown(); |
345 } | 346 } |
346 | 347 |
347 bool PeerConnection::Initialize( | 348 bool PeerConnection::Initialize( |
348 const PeerConnectionInterface::RTCConfiguration& configuration, | 349 const PeerConnectionInterface::RTCConfiguration& configuration, |
349 const MediaConstraintsInterface* constraints, | 350 const MediaConstraintsInterface* constraints, |
350 PortAllocatorFactoryInterface* allocator_factory, | 351 PortAllocatorFactoryInterface* allocator_factory, |
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
895 if (ice_gathering_state_ != kIceGatheringComplete) { | 896 if (ice_gathering_state_ != kIceGatheringComplete) { |
896 ice_gathering_state_ = kIceGatheringComplete; | 897 ice_gathering_state_ = kIceGatheringComplete; |
897 observer_->OnIceGatheringChange(ice_gathering_state_); | 898 observer_->OnIceGatheringChange(ice_gathering_state_); |
898 } | 899 } |
899 } | 900 } |
900 observer_->OnSignalingChange(signaling_state_); | 901 observer_->OnSignalingChange(signaling_state_); |
901 observer_->OnStateChange(PeerConnectionObserver::kSignalingState); | 902 observer_->OnStateChange(PeerConnectionObserver::kSignalingState); |
902 } | 903 } |
903 | 904 |
904 } // namespace webrtc | 905 } // namespace webrtc |
OLD | NEW |