From f1f5654365a891309fb33135f8dbeb43acf84403 Mon Sep 17 00:00:00 2001 From: Lu Liu Date: Wed, 29 Nov 2017 22:10:34 +0000 Subject: [PATCH] Revert "Removes deprecated ADM APIs (reland)." This reverts commit 94f39301067b9fbf820100cbd4018aad3a32cc52. Reason for revert: Broke internal builds Original change's description: > Removes deprecated ADM APIs (reland). > > Usage should now be removed and this change can be relanded. > It was reverted here: https://webrtc-review.googlesource.com/c/src/+/25320 > > TBR=solenberg > > Bug: webrtc:7306 > Change-Id: I1afea773eff51bf5ec80711f0d7753ac0b7be77b > Reviewed-on: https://webrtc-review.googlesource.com/27000 > Reviewed-by: Henrik Andreassson > Commit-Queue: Henrik Andreassson > Cr-Commit-Position: refs/heads/master@{#20936} TBR=henrika@webrtc.org Change-Id: If91ff815fa69f7c36b0531e295f553a8c4a95590 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:7306 Reviewed-on: https://webrtc-review.googlesource.com/27221 Reviewed-by: Lu Liu Commit-Queue: Lu Liu Cr-Commit-Position: refs/heads/master@{#20944} --- 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;