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

Unified Diff: webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc

Issue 3006803002: Removes unused APIs from the ADM (part II) (Closed)
Patch Set: nit Created 3 years, 4 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/modules/audio_device/linux/audio_device_pulse_linux.cc
diff --git a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc
index 87609805437d8e6b797f96654130b4d972cb0284..0e03932f18c34334f4fb0269ab4560be99d28b4e 100644
--- a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc
+++ b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc
@@ -40,7 +40,6 @@ AudioDeviceLinuxPulse::AudioDeviceLinuxPulse()
sample_rate_hz_(0),
_recChannels(1),
_playChannels(1),
- _playBufType(AudioDeviceModule::kFixedBufferSize),
_initialized(false),
_recording(false),
_playing(false),
@@ -52,7 +51,6 @@ AudioDeviceLinuxPulse::AudioDeviceLinuxPulse()
_stopPlay(false),
_AGC(false),
update_speaker_volume_at_startup_(false),
- _playBufDelayFixed(20),
_sndCardPlayDelay(0),
_sndCardRecDelay(0),
_writeErrors(0),
@@ -398,19 +396,6 @@ int32_t AudioDeviceLinuxPulse::MinSpeakerVolume(uint32_t& minVolume) const {
return 0;
}
-int32_t AudioDeviceLinuxPulse::SpeakerVolumeStepSize(uint16_t& stepSize) const {
- RTC_DCHECK(thread_checker_.CalledOnValidThread());
- uint16_t delta(0);
-
- if (_mixerManager.SpeakerVolumeStepSize(delta) == -1) {
- return -1;
- }
-
- stepSize = delta;
-
- return 0;
-}
-
int32_t AudioDeviceLinuxPulse::SpeakerMuteIsAvailable(bool& available) {
RTC_DCHECK(thread_checker_.CalledOnValidThread());
bool isAvailable(false);
@@ -502,52 +487,6 @@ int32_t AudioDeviceLinuxPulse::MicrophoneMute(bool& enabled) const {
return 0;
}
-int32_t AudioDeviceLinuxPulse::MicrophoneBoostIsAvailable(bool& available) {
- RTC_DCHECK(thread_checker_.CalledOnValidThread());
- bool isAvailable(false);
- bool wasInitialized = _mixerManager.MicrophoneIsInitialized();
-
- // Enumerate all avaliable microphone and make an attempt to open up the
- // input mixer corresponding to the currently selected input device.
- //
- if (!wasInitialized && InitMicrophone() == -1) {
- // If we end up here it means that the selected microphone has no
- // volume control, hence it is safe to state that there is no
- // boost control already at this stage.
- available = false;
- return 0;
- }
-
- // Check if the selected microphone has a boost control
- _mixerManager.MicrophoneBoostIsAvailable(isAvailable);
- available = isAvailable;
-
- // Close the initialized input mixer
- if (!wasInitialized) {
- _mixerManager.CloseMicrophone();
- }
-
- return 0;
-}
-
-int32_t AudioDeviceLinuxPulse::SetMicrophoneBoost(bool enable) {
- RTC_DCHECK(thread_checker_.CalledOnValidThread());
- return (_mixerManager.SetMicrophoneBoost(enable));
-}
-
-int32_t AudioDeviceLinuxPulse::MicrophoneBoost(bool& enabled) const {
- RTC_DCHECK(thread_checker_.CalledOnValidThread());
- bool onOff(0);
-
- if (_mixerManager.MicrophoneBoost(onOff) == -1) {
- return -1;
- }
-
- enabled = onOff;
-
- return 0;
-}
-
int32_t AudioDeviceLinuxPulse::StereoRecordingIsAvailable(bool& available) {
RTC_DCHECK(thread_checker_.CalledOnValidThread());
if (_recChannels == 2 && _recording) {
@@ -727,20 +666,6 @@ int32_t AudioDeviceLinuxPulse::MinMicrophoneVolume(uint32_t& minVolume) const {
return 0;
}
-int32_t AudioDeviceLinuxPulse::MicrophoneVolumeStepSize(
- uint16_t& stepSize) const {
- RTC_DCHECK(thread_checker_.CalledOnValidThread());
- uint16_t delta(0);
-
- if (_mixerManager.MicrophoneVolumeStepSize(delta) == -1) {
- return -1;
- }
-
- stepSize = delta;
-
- return 0;
-}
-
int16_t AudioDeviceLinuxPulse::PlayoutDevices() {
PaLock();
@@ -1367,36 +1292,6 @@ bool AudioDeviceLinuxPulse::Playing() const {
return (_playing);
}
-int32_t AudioDeviceLinuxPulse::SetPlayoutBuffer(
- const AudioDeviceModule::BufferType type,
- uint16_t sizeMS) {
- RTC_DCHECK(thread_checker_.CalledOnValidThread());
- if (type != AudioDeviceModule::kFixedBufferSize) {
- LOG(LS_ERROR) << "Adaptive buffer size not supported on this platform";
- return -1;
- }
-
- _playBufType = type;
- _playBufDelayFixed = sizeMS;
-
- return 0;
-}
-
-int32_t AudioDeviceLinuxPulse::PlayoutBuffer(
- AudioDeviceModule::BufferType& type,
- uint16_t& sizeMS) const {
- RTC_DCHECK(thread_checker_.CalledOnValidThread());
- type = _playBufType;
- sizeMS = _playBufDelayFixed;
-
- return 0;
-}
-
-int32_t AudioDeviceLinuxPulse::CPULoad(uint16_t& /*load*/) const {
- LOG(LS_WARNING) << "API call not supported on this platform";
- return -1;
-}
-
bool AudioDeviceLinuxPulse::PlayoutWarning() const {
rtc::CritScope lock(&_critSect);
return (_playWarning > 0);

Powered by Google App Engine
This is Rietveld 408576698