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

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

Issue 2924363004: Fix Channel::GetSendCodec when used together with SetEncoder. (Closed)
Patch Set: Remove RTC_DCHECK(false) used for debugging. :) Created 3 years, 6 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') | webrtc/voice_engine/channel.cc » ('J')
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 525 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 bool pacing_enabled_; 536 bool pacing_enabled_;
537 PacketRouter* packet_router_ = nullptr; 537 PacketRouter* packet_router_ = nullptr;
538 std::unique_ptr<TransportFeedbackProxy> feedback_observer_proxy_; 538 std::unique_ptr<TransportFeedbackProxy> feedback_observer_proxy_;
539 std::unique_ptr<TransportSequenceNumberProxy> seq_num_allocator_proxy_; 539 std::unique_ptr<TransportSequenceNumberProxy> seq_num_allocator_proxy_;
540 std::unique_ptr<RtpPacketSenderProxy> rtp_packet_sender_proxy_; 540 std::unique_ptr<RtpPacketSenderProxy> rtp_packet_sender_proxy_;
541 std::unique_ptr<RateLimiter> retransmission_rate_limiter_; 541 std::unique_ptr<RateLimiter> retransmission_rate_limiter_;
542 542
543 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed. 543 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed.
544 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_; 544 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
545 545
546 rtc::Optional<CodecInst> cached_send_codec_;
547
546 rtc::ThreadChecker construction_thread_; 548 rtc::ThreadChecker construction_thread_;
547 549
548 const bool use_twcc_plr_for_ana_; 550 const bool use_twcc_plr_for_ana_;
549 551
550 rtc::CriticalSection encoder_queue_lock_; 552 rtc::CriticalSection encoder_queue_lock_;
551 553
552 bool encoder_queue_is_active_ GUARDED_BY(encoder_queue_lock_) = false; 554 bool encoder_queue_is_active_ GUARDED_BY(encoder_queue_lock_) = false;
553 555
554 rtc::TaskQueue* encoder_queue_ = nullptr; 556 rtc::TaskQueue* encoder_queue_ = nullptr;
555 }; 557 };
556 558
557 } // namespace voe 559 } // namespace voe
558 } // namespace webrtc 560 } // namespace webrtc
559 561
560 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ 562 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/voice_engine/channel.cc » ('j') | webrtc/voice_engine/channel.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698