From 2efe87f8f696c85ea83d76c76fc37c7164f34220 Mon Sep 17 00:00:00 2001 From: Zhi Huang Date: Wed, 22 Nov 2017 18:40:05 +0000 Subject: [PATCH] Revert "Removes deprecated ADM APIs." This reverts commit 1882d8509a138468c6dd8437506973d236c80e62. Reason for revert: Broke the internal projects. Original change's description: > Removes deprecated ADM APIs. > > Final stage since these APIs are no longer used in Chrome. > > Bug: webrtc:7306 > Change-Id: Ia116671bc888daa75c4105ad1ebeb21833f5d090 > Reviewed-on: https://webrtc-review.googlesource.com/25220 > Reviewed-by: Fredrik Solenberg > Commit-Queue: Henrik Andreassson > Cr-Commit-Position: refs/heads/master@{#20836} TBR=solenberg@webrtc.org,henrika@webrtc.org Change-Id: If8dd4212fb3e8c6944643d3794f673837977bf4e No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:7306 Reviewed-on: https://webrtc-review.googlesource.com/25320 Reviewed-by: Zhi Huang Commit-Queue: Zhi Huang Cr-Commit-Position: refs/heads/master@{#20840} --- modules/audio_device/include/audio_device.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/modules/audio_device/include/audio_device.h b/modules/audio_device/include/audio_device.h index 3a02589255..c096a8398c 100644 --- a/modules/audio_device/include/audio_device.h +++ b/modules/audio_device/include/audio_device.h @@ -142,10 +142,31 @@ class AudioDeviceModule : public rtc::RefCountInterface { virtual int32_t StereoRecordingIsAvailable(bool* available) const = 0; virtual int32_t SetStereoRecording(bool enable) = 0; virtual int32_t StereoRecording(bool* enabled) const = 0; + // TODO(bugs.webrtc.org/7306): deprecated. + virtual int32_t SetRecordingChannel(const ChannelType channel) { return -1; } + virtual int32_t RecordingChannel(ChannelType* channel) const { return -1; } // Playout delay virtual int32_t PlayoutDelay(uint16_t* delayMS) const = 0; + // TODO(bugs.webrtc.org/7306): deprecated (to be removed). + virtual int32_t SetRecordingSampleRate(const uint32_t samplesPerSec) { + return -1; + } + virtual int32_t RecordingSampleRate(uint32_t* samplesPerSec) const { + return -1; + } + virtual int32_t SetPlayoutSampleRate(const uint32_t samplesPerSec) { + return -1; + } + virtual int32_t PlayoutSampleRate(uint32_t* samplesPerSec) const { + return -1; + } + + // TODO(bugs.webrtc.org/7306): deprecated (to be removed). + virtual int32_t SetLoudspeakerStatus(bool enable) { return -1; } + virtual int32_t GetLoudspeakerStatus(bool* enabled) const { return -1; } + // Only supported on Android. virtual bool BuiltInAECIsAvailable() const = 0; virtual bool BuiltInAGCIsAvailable() const = 0;