Chromium Code Reviews| 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 480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 491 ice_observer_(NULL), | 491 ice_observer_(NULL), |
| 492 ice_connection_state_(PeerConnectionInterface::kIceConnectionNew), | 492 ice_connection_state_(PeerConnectionInterface::kIceConnectionNew), |
| 493 older_version_remote_peer_(false), | 493 older_version_remote_peer_(false), |
| 494 dtls_enabled_(false), | 494 dtls_enabled_(false), |
| 495 data_channel_type_(cricket::DCT_NONE), | 495 data_channel_type_(cricket::DCT_NONE), |
| 496 ice_restart_latch_(new IceRestartAnswerLatch), | 496 ice_restart_latch_(new IceRestartAnswerLatch), |
| 497 metrics_observer_(NULL) { | 497 metrics_observer_(NULL) { |
| 498 } | 498 } |
| 499 | 499 |
| 500 WebRtcSession::~WebRtcSession() { | 500 WebRtcSession::~WebRtcSession() { |
| 501 ASSERT(signaling_thread()->IsCurrent()); | |
|
pbos-webrtc
2015/07/09 09:09:22
same
| |
| 501 // Destroy video_channel_ first since it may have a pointer to the | 502 // Destroy video_channel_ first since it may have a pointer to the |
| 502 // voice_channel_. | 503 // voice_channel_. |
| 503 if (video_channel_) { | 504 if (video_channel_) { |
| 504 SignalVideoChannelDestroyed(); | 505 SignalVideoChannelDestroyed(); |
| 505 channel_manager_->DestroyVideoChannel(video_channel_.release()); | 506 channel_manager_->DestroyVideoChannel(video_channel_.release()); |
| 506 } | 507 } |
| 507 if (voice_channel_) { | 508 if (voice_channel_) { |
| 508 SignalVoiceChannelDestroyed(); | 509 SignalVoiceChannelDestroyed(); |
| 509 channel_manager_->DestroyVoiceChannel(voice_channel_.release(), nullptr); | 510 channel_manager_->DestroyVoiceChannel(voice_channel_.release(), nullptr); |
| 510 } | 511 } |
| (...skipping 1422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1933 | 1934 |
| 1934 if (!srtp_cipher.empty()) { | 1935 if (!srtp_cipher.empty()) { |
| 1935 metrics_observer_->AddHistogramSample(srtp_name, srtp_cipher); | 1936 metrics_observer_->AddHistogramSample(srtp_name, srtp_cipher); |
| 1936 } | 1937 } |
| 1937 if (!ssl_cipher.empty()) { | 1938 if (!ssl_cipher.empty()) { |
| 1938 metrics_observer_->AddHistogramSample(ssl_name, ssl_cipher); | 1939 metrics_observer_->AddHistogramSample(ssl_name, ssl_cipher); |
| 1939 } | 1940 } |
| 1940 } | 1941 } |
| 1941 | 1942 |
| 1942 } // namespace webrtc | 1943 } // namespace webrtc |
| OLD | NEW |