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

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

Issue 2461523002: Remove usage of VoEBase::AssociateSendChannel() from WVoMC. (Closed)
Patch Set: rebase Created 4 years, 1 month 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 | « webrtc/test/mock_voice_engine.h ('k') | 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 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 // does not go through transmit_mixer and APM. 398 // does not go through transmit_mixer and APM.
399 void Demultiplex(const int16_t* audio_data, 399 void Demultiplex(const int16_t* audio_data,
400 int sample_rate, 400 int sample_rate,
401 size_t number_of_frames, 401 size_t number_of_frames,
402 size_t number_of_channels); 402 size_t number_of_channels);
403 uint32_t PrepareEncodeAndSend(int mixingFrequency); 403 uint32_t PrepareEncodeAndSend(int mixingFrequency);
404 uint32_t EncodeAndSend(); 404 uint32_t EncodeAndSend();
405 405
406 // Associate to a send channel. 406 // Associate to a send channel.
407 // Used for obtaining RTT for a receive-only channel. 407 // Used for obtaining RTT for a receive-only channel.
408 void set_associate_send_channel(const ChannelOwner& channel) { 408 void set_associate_send_channel(const ChannelOwner& channel);
409 assert(_channelId != channel.channel()->ChannelId());
410 rtc::CritScope lock(&assoc_send_channel_lock_);
411 associate_send_channel_ = channel;
412 }
413
414 // Disassociate a send channel if it was associated. 409 // Disassociate a send channel if it was associated.
415 void DisassociateSendChannel(int channel_id); 410 void DisassociateSendChannel(int channel_id);
416 411
417 // Set a RtcEventLog logging object. 412 // Set a RtcEventLog logging object.
418 void SetRtcEventLog(RtcEventLog* event_log); 413 void SetRtcEventLog(RtcEventLog* event_log);
419 414
420 void SetTransportOverhead(int transport_overhead_per_packet); 415 void SetTransportOverhead(int transport_overhead_per_packet);
421 416
422 protected: 417 protected:
423 void OnIncomingFractionLoss(int fraction_lost); 418 void OnIncomingFractionLoss(int fraction_lost);
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 std::unique_ptr<RateLimiter> retransmission_rate_limiter_; 542 std::unique_ptr<RateLimiter> retransmission_rate_limiter_;
548 543
549 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed. 544 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed.
550 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_; 545 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
551 }; 546 };
552 547
553 } // namespace voe 548 } // namespace voe
554 } // namespace webrtc 549 } // namespace webrtc
555 550
556 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ 551 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/test/mock_voice_engine.h ('k') | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698