Chromium Code Reviews

Side by Side Diff: webrtc/pc/channelmanager.cc

Issue 2958683002: Remove unused "crypto_options_" field. (Closed)
Patch Set: Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
« no previous file with comments | « webrtc/pc/channelmanager.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2004 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 35 matching lines...)
46 rtc::Thread* worker_thread, 46 rtc::Thread* worker_thread,
47 rtc::Thread* network_thread) { 47 rtc::Thread* network_thread) {
48 media_engine_ = std::move(me); 48 media_engine_ = std::move(me);
49 data_media_engine_ = std::move(dme); 49 data_media_engine_ = std::move(dme);
50 initialized_ = false; 50 initialized_ = false;
51 main_thread_ = rtc::Thread::Current(); 51 main_thread_ = rtc::Thread::Current();
52 worker_thread_ = worker_thread; 52 worker_thread_ = worker_thread;
53 network_thread_ = network_thread; 53 network_thread_ = network_thread;
54 capturing_ = false; 54 capturing_ = false;
55 enable_rtx_ = false; 55 enable_rtx_ = false;
56 crypto_options_ = rtc::CryptoOptions::NoGcm();
57 } 56 }
58 57
59 ChannelManager::~ChannelManager() { 58 ChannelManager::~ChannelManager() {
60 if (initialized_) { 59 if (initialized_) {
61 Terminate(); 60 Terminate();
62 // If srtp is initialized (done by the Channel) then we must call 61 // If srtp is initialized (done by the Channel) then we must call
63 // srtp_shutdown to free all crypto kernel lists. But we need to make sure 62 // srtp_shutdown to free all crypto kernel lists. But we need to make sure
64 // shutdown always called at the end, after channels are destroyed. 63 // shutdown always called at the end, after channels are destroyed.
65 // ChannelManager d'tor is always called last, it's safe place to call 64 // ChannelManager d'tor is always called last, it's safe place to call
66 // shutdown. 65 // shutdown.
(...skipping 383 matching lines...)
450 media_engine_.get(), file, max_size_bytes)); 449 media_engine_.get(), file, max_size_bytes));
451 } 450 }
452 451
453 void ChannelManager::StopAecDump() { 452 void ChannelManager::StopAecDump() {
454 worker_thread_->Invoke<void>( 453 worker_thread_->Invoke<void>(
455 RTC_FROM_HERE, 454 RTC_FROM_HERE,
456 Bind(&MediaEngineInterface::StopAecDump, media_engine_.get())); 455 Bind(&MediaEngineInterface::StopAecDump, media_engine_.get()));
457 } 456 }
458 457
459 } // namespace cricket 458 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/pc/channelmanager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine