1 files changed, 12 insertions, 41 deletions
diff --git a/chromium/third_party/webrtc/voice_engine/include/voe_hardware.h b/chromium/third_party/webrtc/voice_engine/include/voe_hardware.h
index 5c247d74362..23255a8a032 100644
--- a/chromium/third_party/webrtc/voice_engine/include/voe_hardware.h
+++ b/chromium/third_party/webrtc/voice_engine/include/voe_hardware.h
@@ -70,12 +70,6 @@ public:
     virtual int GetPlayoutDeviceName(int index, char strNameUTF8[128],
                                      char strGuidUTF8[128]) = 0;
 
-    // Checks if the sound card is available to be opened for recording.
-    virtual int GetRecordingDeviceStatus(bool& isAvailable) = 0;
-
-    // Checks if the sound card is available to be opened for playout.
-    virtual int GetPlayoutDeviceStatus(bool& isAvailable) = 0;
-
     // Sets the audio device used for recording.
     virtual int SetRecordingDevice(
         int index, StereoChannel recordingChannel = kStereoBoth) = 0;
@@ -89,47 +83,24 @@ public:
     // Gets the currently used (active) audio device layer.
     virtual int GetAudioDeviceLayer(AudioLayers& audioLayer) = 0;
 
-    // Gets the VoiceEngine's current CPU consumption in terms of the percent
-    // of total CPU availability. [Windows only]
-    virtual int GetCPULoad(int& loadPercent) = 0;
-
-    // Not supported
-    virtual int ResetAudioDevice() = 0;
-
-    // Not supported
-    virtual int AudioDeviceControl(
-        unsigned int par1, unsigned int par2, unsigned int par3) = 0;
-
-    // Not supported
-    virtual int SetLoudspeakerStatus(bool enable) = 0;
-
-    // Not supported
-    virtual int GetLoudspeakerStatus(bool& enabled) = 0;
-
     // Native sample rate controls (samples/sec)
     virtual int SetRecordingSampleRate(unsigned int samples_per_sec) = 0;
     virtual int RecordingSampleRate(unsigned int* samples_per_sec) const = 0;
     virtual int SetPlayoutSampleRate(unsigned int samples_per_sec) = 0;
     virtual int PlayoutSampleRate(unsigned int* samples_per_sec) const = 0;
 
-    // *Experimental - not recommended for use.*
-    // Enables the Windows Core Audio built-in AEC. Fails on other platforms.
-    //
-    // Currently incompatible with the standard VoE AEC and AGC; don't attempt
-    // to enable them while this is active.
-    //
-    // Must be called before VoEBase::StartSend(). When enabled:
-    // 1. VoEBase::StartPlayout() must be called before VoEBase::StartSend().
-    // 2. VoEBase::StopSend() should be called before VoEBase::StopPlayout().
-    //    The reverse order may cause garbage audio to be rendered or the
-    //    capture side to halt until StopSend() is called.
-    //
-    //    As a consequence, SetPlayoutDevice() should be used with caution
-    //    during a call. It will function, but may cause the above issues for
-    //    the duration it takes to complete. (In practice, it should complete
-    //    fast enough to avoid audible degradation).
-    virtual int EnableBuiltInAEC(bool enable) = 0;
-    virtual bool BuiltInAECIsEnabled() const = 0;
+    // To be removed. Don't use.
+    virtual int EnableBuiltInAEC(bool enable) { return -1; }
+    virtual bool BuiltInAECIsEnabled() const { return false; }
+    virtual int GetRecordingDeviceStatus(bool& isAvailable) { return -1; }
+    virtual int GetPlayoutDeviceStatus(bool& isAvailable) { return -1; }
+    virtual int ResetAudioDevice() { return -1; }
+    virtual int AudioDeviceControl(unsigned int par1, unsigned int par2,
+            unsigned int par3) { return -1; }
+    virtual int SetLoudspeakerStatus(bool enable) { return -1; }
+    virtual int GetLoudspeakerStatus(bool& enabled) { return -1; }
+    virtual int GetCPULoad(int& loadPercent) { return -1; }
+
 
 protected:
     VoEHardware() {}