zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removes more unused ADM APIs:

Browse Source 
- RecordingDelay()
- LastError()

Bug: webrtc:7306
Change-Id: I3bb9cd243a1464f0ba612787c854eeb6602c7e38
Reviewed-on: https://webrtc-review.googlesource.com/12060
Commit-Queue: Henrik Andreassson <henrika@webrtc.org>
Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20326}
This commit is contained in:
henrika
2017-10-17 14:47:44 +02:00
committed by Commit Bot
parent 0743814fb8
commit 6592f2cfd2
25 changed files with 13 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/audio_device/include/audio_device.h
View File

@ -19,6 +19,8 @@ namespace webrtc {
class AudioDeviceModule : public rtc::RefCountInterface {
public:
// Deprecated.
// TODO(henrika): to be removed.
enum ErrorCode {
kAdmErrNone = 0,
kAdmErrArgument = 1
@ -48,6 +50,7 @@ class AudioDeviceModule : public rtc::RefCountInterface {
public:
// Create an ADM.
// TODO(henrika): remove |id|.
static rtc::scoped_refptr<AudioDeviceModule> Create(
const int32_t id,
const AudioLayer audio_layer);
@ -55,8 +58,9 @@ class AudioDeviceModule : public rtc::RefCountInterface {
// Retrieve the currently utilized audio layer
virtual int32_t ActiveAudioLayer(AudioLayer* audioLayer) const = 0;
// Error handling
virtual ErrorCode LastError() const = 0;
// Deprecated.
// TODO(henrika): to be removed.
virtual ErrorCode LastError() const { return kAdmErrNone; }
// Full-duplex transportation of PCM audio
virtual int32_t RegisterAudioCallback(AudioTransport* audioCallback) = 0;
@ -142,9 +146,12 @@ class AudioDeviceModule : public rtc::RefCountInterface {
virtual int32_t SetRecordingChannel(const ChannelType channel) = 0;
virtual int32_t RecordingChannel(ChannelType* channel) const = 0;
// Delay information and control
// Playout delay
virtual int32_t PlayoutDelay(uint16_t* delayMS) const = 0;
virtual int32_t RecordingDelay(uint16_t* delayMS) const = 0;
// Deprecated.
// TODO(henrika): to be removed.
virtual int32_t RecordingDelay(uint16_t* delayMS) const { return -1; }
// Native sample rate controls (samples/sec)
virtual int32_t SetRecordingSampleRate(const uint32_t samplesPerSec) = 0;