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

Side by Side Diff: webrtc/media/engine/fakewebrtcvoiceengine.h

Issue 2060813002: Configure VoE NACK through AudioReceiveStream::Config. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@wvoe_config_nack
Patch Set: format Created 4 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 | « webrtc/audio_receive_stream.h ('k') | webrtc/media/engine/webrtcvoiceengine.h » ('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) 2010 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2010 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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 struct Channel { 127 struct Channel {
128 Channel() { 128 Channel() {
129 memset(&send_codec, 0, sizeof(send_codec)); 129 memset(&send_codec, 0, sizeof(send_codec));
130 } 130 }
131 bool playout = false; 131 bool playout = false;
132 float volume_scale = 1.0f; 132 float volume_scale = 1.0f;
133 bool vad = false; 133 bool vad = false;
134 bool codec_fec = false; 134 bool codec_fec = false;
135 int max_encoding_bandwidth = 0; 135 int max_encoding_bandwidth = 0;
136 bool opus_dtx = false; 136 bool opus_dtx = false;
137 bool nack = false;
138 int cn8_type = 13; 137 int cn8_type = 13;
139 int cn16_type = 105; 138 int cn16_type = 105;
140 int nack_max_packets = 0;
141 uint32_t send_ssrc = 0; 139 uint32_t send_ssrc = 0;
142 int associate_send_channel = -1; 140 int associate_send_channel = -1;
143 std::vector<webrtc::CodecInst> recv_codecs; 141 std::vector<webrtc::CodecInst> recv_codecs;
144 webrtc::CodecInst send_codec; 142 webrtc::CodecInst send_codec;
145 int neteq_capacity = -1; 143 int neteq_capacity = -1;
146 bool neteq_fast_accelerate = false; 144 bool neteq_fast_accelerate = false;
147 }; 145 };
148 146
149 FakeWebRtcVoiceEngine() { 147 FakeWebRtcVoiceEngine() {
150 memset(&agc_config_, 0, sizeof(agc_config_)); 148 memset(&agc_config_, 0, sizeof(agc_config_));
(...skipping 18 matching lines...) Expand all
169 } 167 }
170 bool GetOpusDtx(int channel) { 168 bool GetOpusDtx(int channel) {
171 return channels_[channel]->opus_dtx; 169 return channels_[channel]->opus_dtx;
172 } 170 }
173 bool GetCodecFEC(int channel) { 171 bool GetCodecFEC(int channel) {
174 return channels_[channel]->codec_fec; 172 return channels_[channel]->codec_fec;
175 } 173 }
176 int GetMaxEncodingBandwidth(int channel) { 174 int GetMaxEncodingBandwidth(int channel) {
177 return channels_[channel]->max_encoding_bandwidth; 175 return channels_[channel]->max_encoding_bandwidth;
178 } 176 }
179 bool GetNACK(int channel) {
180 return channels_[channel]->nack;
181 }
182 int GetNACKMaxPackets(int channel) {
183 return channels_[channel]->nack_max_packets;
184 }
185 int GetSendCNPayloadType(int channel, bool wideband) { 177 int GetSendCNPayloadType(int channel, bool wideband) {
186 return (wideband) ? 178 return (wideband) ?
187 channels_[channel]->cn16_type : 179 channels_[channel]->cn16_type :
188 channels_[channel]->cn8_type; 180 channels_[channel]->cn8_type;
189 } 181 }
190 void set_playout_fail_channel(int channel) { 182 void set_playout_fail_channel(int channel) {
191 playout_fail_channel_ = channel; 183 playout_fail_channel_ = channel;
192 } 184 }
193 void set_fail_create_channel(bool fail_create_channel) { 185 void set_fail_create_channel(bool fail_create_channel) {
194 fail_create_channel_ = fail_create_channel; 186 fail_create_channel_ = fail_create_channel;
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 unsigned int* jitter, 462 unsigned int* jitter,
471 unsigned short* fractionLost)); 463 unsigned short* fractionLost));
472 WEBRTC_STUB(GetRemoteRTCPReportBlocks, 464 WEBRTC_STUB(GetRemoteRTCPReportBlocks,
473 (int channel, std::vector<webrtc::ReportBlock>* receive_blocks)); 465 (int channel, std::vector<webrtc::ReportBlock>* receive_blocks));
474 WEBRTC_STUB(GetRTPStatistics, (int channel, unsigned int& averageJitterMs, 466 WEBRTC_STUB(GetRTPStatistics, (int channel, unsigned int& averageJitterMs,
475 unsigned int& maxJitterMs, 467 unsigned int& maxJitterMs,
476 unsigned int& discardedPackets)); 468 unsigned int& discardedPackets));
477 WEBRTC_STUB(GetRTCPStatistics, (int channel, webrtc::CallStatistics& stats)); 469 WEBRTC_STUB(GetRTCPStatistics, (int channel, webrtc::CallStatistics& stats));
478 WEBRTC_STUB(SetREDStatus, (int channel, bool enable, int redPayloadtype)); 470 WEBRTC_STUB(SetREDStatus, (int channel, bool enable, int redPayloadtype));
479 WEBRTC_STUB(GetREDStatus, (int channel, bool& enable, int& redPayloadtype)); 471 WEBRTC_STUB(GetREDStatus, (int channel, bool& enable, int& redPayloadtype));
480 WEBRTC_FUNC(SetNACKStatus, (int channel, bool enable, int maxNoPackets)) { 472 WEBRTC_STUB(SetNACKStatus, (int channel, bool enable, int maxNoPackets));
481 WEBRTC_CHECK_CHANNEL(channel);
482 channels_[channel]->nack = enable;
483 channels_[channel]->nack_max_packets = maxNoPackets;
484 return 0;
485 }
486 473
487 // webrtc::VoEVolumeControl 474 // webrtc::VoEVolumeControl
488 WEBRTC_STUB(SetSpeakerVolume, (unsigned int)); 475 WEBRTC_STUB(SetSpeakerVolume, (unsigned int));
489 WEBRTC_STUB(GetSpeakerVolume, (unsigned int&)); 476 WEBRTC_STUB(GetSpeakerVolume, (unsigned int&));
490 WEBRTC_STUB(SetMicVolume, (unsigned int)); 477 WEBRTC_STUB(SetMicVolume, (unsigned int));
491 WEBRTC_STUB(GetMicVolume, (unsigned int&)); 478 WEBRTC_STUB(GetMicVolume, (unsigned int&));
492 WEBRTC_STUB(SetInputMute, (int, bool)); 479 WEBRTC_STUB(SetInputMute, (int, bool));
493 WEBRTC_STUB(GetInputMute, (int, bool&)); 480 WEBRTC_STUB(GetInputMute, (int, bool&));
494 WEBRTC_STUB(GetSpeechInputLevel, (unsigned int&)); 481 WEBRTC_STUB(GetSpeechInputLevel, (unsigned int&));
495 WEBRTC_STUB(GetSpeechOutputLevel, (int, unsigned int&)); 482 WEBRTC_STUB(GetSpeechOutputLevel, (int, unsigned int&));
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 webrtc::NsModes ns_mode_ = webrtc::kNsDefault; 634 webrtc::NsModes ns_mode_ = webrtc::kNsDefault;
648 webrtc::AgcModes agc_mode_ = webrtc::kAgcDefault; 635 webrtc::AgcModes agc_mode_ = webrtc::kAgcDefault;
649 webrtc::AgcConfig agc_config_; 636 webrtc::AgcConfig agc_config_;
650 int playout_fail_channel_ = -1; 637 int playout_fail_channel_ = -1;
651 FakeAudioProcessing audio_processing_; 638 FakeAudioProcessing audio_processing_;
652 }; 639 };
653 640
654 } // namespace cricket 641 } // namespace cricket
655 642
656 #endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_ 643 #endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_
OLDNEW
« no previous file with comments | « webrtc/audio_receive_stream.h ('k') | webrtc/media/engine/webrtcvoiceengine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698