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

Unified Diff: webrtc/voice_engine/channel.h

Issue 2295113002: Removing the RX processing APIs from VoEAudioProcessing: (Closed)
Patch Set: rebase Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/voice_engine/channel.h
diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h
index 1cf49d993233c6e93b1792488198bbec517df1f2..3a00c2c37dcf84ff280d97ead71e9ebc5850127a 100644
--- a/webrtc/voice_engine/channel.h
+++ b/webrtc/voice_engine/channel.h
@@ -83,22 +83,12 @@ class VoERtcpObserver;
class ChannelState {
public:
struct State {
- State()
- : rx_apm_is_enabled(false),
- input_external_media(false),
- output_file_playing(false),
- input_file_playing(false),
- playing(false),
- sending(false),
- receiving(false) {}
-
- bool rx_apm_is_enabled;
- bool input_external_media;
- bool output_file_playing;
- bool input_file_playing;
- bool playing;
- bool sending;
- bool receiving;
+ bool input_external_media = false;
+ bool output_file_playing = false;
+ bool input_file_playing = false;
+ bool playing = false;
+ bool sending = false;
+ bool receiving = false;
};
ChannelState() {}
@@ -114,11 +104,6 @@ class ChannelState {
return state_;
}
- void SetRxApmIsEnabled(bool enable) {
- rtc::CritScope lock(&lock_);
- state_.rx_apm_is_enabled = enable;
- }
-
void SetInputExternalMedia(bool enable) {
rtc::CritScope lock(&lock_);
state_.input_external_media = enable;
@@ -310,20 +295,7 @@ class Channel
int SetSendTelephoneEventPayloadType(int payload_type);
// VoEAudioProcessingImpl
- int UpdateRxVadDetection(AudioFrame& audioFrame);
- int RegisterRxVadObserver(VoERxVadCallback& observer);
- int DeRegisterRxVadObserver();
int VoiceActivityIndicator(int& activity);
-#ifdef WEBRTC_VOICE_ENGINE_AGC
- int SetRxAgcStatus(bool enable, AgcModes mode);
- int GetRxAgcStatus(bool& enabled, AgcModes& mode);
- int SetRxAgcConfig(AgcConfig config);
- int GetRxAgcConfig(AgcConfig& config);
-#endif
-#ifdef WEBRTC_VOICE_ENGINE_NR
- int SetRxNsStatus(bool enable, NsModes mode);
- int GetRxNsStatus(bool& enabled, NsModes& mode);
-#endif
// VoERTP_RTCP
int SetLocalSSRC(unsigned int ssrc);
@@ -377,8 +349,6 @@ class Channel
// From ACMVADCallback in the ACM
int32_t InFrameType(FrameType frame_type) override;
- int32_t OnRxVadDetected(int vadDecision);
-
// From RtpData in the RTP/RTCP module
int32_t OnReceivedPayloadData(const uint8_t* payloadData,
size_t payloadSize,
@@ -543,9 +513,6 @@ class Channel
rtc::CriticalSection* _callbackCritSectPtr; // owned by base
Transport* _transportPtr; // WebRtc socket or external transport
RMSLevel rms_level_;
- std::unique_ptr<AudioProcessing> rx_audioproc_; // far end AudioProcessing
- VoERxVadCallback* _rxVadObserverPtr;
- int32_t _oldVadDecision;
int32_t _sendFrameType; // Send data is voice, 1-voice, 0-otherwise
// VoEBase
bool _externalMixing;
@@ -565,9 +532,6 @@ class Channel
// VoEVideoSync
rtc::CriticalSection video_sync_lock_;
// VoEAudioProcessing
- bool _RxVadDetection;
- bool _rxAgcIsEnabled;
- bool _rxNsIsEnabled;
bool restored_packet_in_use_;
// RtcpBandwidthObserver
std::unique_ptr<VoERtcpObserver> rtcp_observer_;

Powered by Google App Engine
This is Rietveld 408576698