Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(909)

Side by Side Diff: webrtc/voice_engine/channel.h

Issue 2861583005: Resolves race between Channel::ProcessAndEncodeAudio() and Channel::StopSend() (Closed)
Patch Set: Added one extra lock Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/voice_engine/channel.cc » ('j') | 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 (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 std::unique_ptr<RtpPacketSenderProxy> rtp_packet_sender_proxy_; 539 std::unique_ptr<RtpPacketSenderProxy> rtp_packet_sender_proxy_;
540 std::unique_ptr<RateLimiter> retransmission_rate_limiter_; 540 std::unique_ptr<RateLimiter> retransmission_rate_limiter_;
541 541
542 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed. 542 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed.
543 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_; 543 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
544 544
545 rtc::ThreadChecker construction_thread_; 545 rtc::ThreadChecker construction_thread_;
546 546
547 const bool use_twcc_plr_for_ana_; 547 const bool use_twcc_plr_for_ana_;
548 548
549 rtc::CriticalSection encoder_queue_lock_;
550
551 bool encoder_queue_is_active_ GUARDED_BY(encoder_queue_lock_) = false;
552
549 rtc::TaskQueue* encoder_queue_ = nullptr; 553 rtc::TaskQueue* encoder_queue_ = nullptr;
550 }; 554 };
551 555
552 } // namespace voe 556 } // namespace voe
553 } // namespace webrtc 557 } // namespace webrtc
554 558
555 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ 559 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698