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

Side by Side Diff: talk/media/webrtc/webrtcvoiceengine.h

Issue 1430433004: Replace rtc::cricket::Settable with rtc::Maybe (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 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
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2004 Google Inc. 3 * Copyright 2004 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 164
165 webrtc::Config voe_config_; 165 webrtc::Config voe_config_;
166 166
167 bool initialized_; 167 bool initialized_;
168 AudioOptions options_; 168 AudioOptions options_;
169 169
170 // Cache received extended_filter_aec, delay_agnostic_aec and experimental_ns 170 // Cache received extended_filter_aec, delay_agnostic_aec and experimental_ns
171 // values, and apply them in case they are missing in the audio options. We 171 // values, and apply them in case they are missing in the audio options. We
172 // need to do this because SetExtraOptions() will revert to defaults for 172 // need to do this because SetExtraOptions() will revert to defaults for
173 // options which are not provided. 173 // options which are not provided.
174 Settable<bool> extended_filter_aec_; 174 rtc::Maybe<bool> extended_filter_aec_;
175 Settable<bool> delay_agnostic_aec_; 175 rtc::Maybe<bool> delay_agnostic_aec_;
176 Settable<bool> experimental_ns_; 176 rtc::Maybe<bool> experimental_ns_;
177 177
178 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcVoiceEngine); 178 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcVoiceEngine);
179 }; 179 };
180 180
181 // WebRtcVoiceMediaChannel is an implementation of VoiceMediaChannel that uses 181 // WebRtcVoiceMediaChannel is an implementation of VoiceMediaChannel that uses
182 // WebRtc Voice Engine. 182 // WebRtc Voice Engine.
183 class WebRtcVoiceMediaChannel : public VoiceMediaChannel, 183 class WebRtcVoiceMediaChannel : public VoiceMediaChannel,
184 public webrtc::Transport { 184 public webrtc::Transport {
185 public: 185 public:
186 WebRtcVoiceMediaChannel(WebRtcVoiceEngine* engine, 186 WebRtcVoiceMediaChannel(WebRtcVoiceEngine* engine,
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 // Reads on the worker thread are ok. 339 // Reads on the worker thread are ok.
340 std::vector<RtpHeaderExtension> receive_extensions_; 340 std::vector<RtpHeaderExtension> receive_extensions_;
341 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; 341 std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
342 342
343 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WebRtcVoiceMediaChannel); 343 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WebRtcVoiceMediaChannel);
344 }; 344 };
345 345
346 } // namespace cricket 346 } // namespace cricket
347 347
348 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_ 348 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2_unittest.cc ('k') | talk/media/webrtc/webrtcvoiceengine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698