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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/modules/audio_device/win/audio_device_wave_win.h

Issue 2700983002: Remove the Windows Wave audio device implementation. (Closed)
Patch Set: Remove kAudioWindowsWave (silly me only removing kWindowsWaveAudio). Created 3 years, 10 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
« webrtc/modules/audio_device/test/audio_device_test_api.cc ('K') | « webrtc/modules/audio_device/test/audio_device_test_api.cc ('k') | webrtc/modules/audio_device/win/audio_device_wave_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_device/win/audio_device_wave_win.h
diff --git a/webrtc/modules/audio_device/win/audio_device_wave_win.h b/webrtc/modules/audio_device/win/audio_device_wave_win.h
deleted file mode 100644
index 6bb7c171e4541200ec2731512661d468eddc2ebe..0000000000000000000000000000000000000000
--- a/webrtc/modules/audio_device/win/audio_device_wave_win.h
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_WAVE_WIN_H
-#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_WAVE_WIN_H
-
-#include <memory>
-
-#include "webrtc/base/platform_thread.h"
-#include "webrtc/modules/audio_device/audio_device_generic.h"
-#include "webrtc/modules/audio_device/win/audio_mixer_manager_win.h"
-
-#pragma comment( lib, "winmm.lib" )
-
-namespace webrtc {
-class EventTimerWrapper;
-class EventWrapper;
-
-const uint32_t TIMER_PERIOD_MS = 2;
-const uint32_t REC_CHECK_TIME_PERIOD_MS = 4;
-const uint16_t REC_PUT_BACK_DELAY = 4;
-
-const uint32_t N_REC_SAMPLES_PER_SEC = 48000;
-const uint32_t N_PLAY_SAMPLES_PER_SEC = 48000;
-
-const uint32_t N_REC_CHANNELS = 1; // default is mono recording
-const uint32_t N_PLAY_CHANNELS = 2; // default is stereo playout
-
-// NOTE - CPU load will not be correct for other sizes than 10ms
-const uint32_t REC_BUF_SIZE_IN_SAMPLES = (N_REC_SAMPLES_PER_SEC/100);
-const uint32_t PLAY_BUF_SIZE_IN_SAMPLES = (N_PLAY_SAMPLES_PER_SEC/100);
-
-enum { N_BUFFERS_IN = 200 };
-enum { N_BUFFERS_OUT = 200 };
-
-class AudioDeviceWindowsWave : public AudioDeviceGeneric
-{
-public:
- AudioDeviceWindowsWave(const int32_t id);
- ~AudioDeviceWindowsWave();
-
- // Retrieve the currently utilized audio layer
- virtual int32_t ActiveAudioLayer(AudioDeviceModule::AudioLayer& audioLayer) const;
-
- // Main initializaton and termination
- virtual InitStatus Init();
- virtual int32_t Terminate();
- virtual bool Initialized() const;
-
- // Device enumeration
- virtual int16_t PlayoutDevices();
- virtual int16_t RecordingDevices();
- virtual int32_t PlayoutDeviceName(
- uint16_t index,
- char name[kAdmMaxDeviceNameSize],
- char guid[kAdmMaxGuidSize]);
- virtual int32_t RecordingDeviceName(
- uint16_t index,
- char name[kAdmMaxDeviceNameSize],
- char guid[kAdmMaxGuidSize]);
-
- // Device selection
- virtual int32_t SetPlayoutDevice(uint16_t index);
- virtual int32_t SetPlayoutDevice(AudioDeviceModule::WindowsDeviceType device);
- virtual int32_t SetRecordingDevice(uint16_t index);
- virtual int32_t SetRecordingDevice(AudioDeviceModule::WindowsDeviceType device);
-
- // Audio transport initialization
- virtual int32_t PlayoutIsAvailable(bool& available);
- virtual int32_t InitPlayout();
- virtual bool PlayoutIsInitialized() const;
- virtual int32_t RecordingIsAvailable(bool& available);
- virtual int32_t InitRecording();
- virtual bool RecordingIsInitialized() const;
-
- // Audio transport control
- virtual int32_t StartPlayout();
- virtual int32_t StopPlayout();
- virtual bool Playing() const;
- virtual int32_t StartRecording();
- virtual int32_t StopRecording();
- virtual bool Recording() const;
-
- // Microphone Automatic Gain Control (AGC)
- virtual int32_t SetAGC(bool enable);
- virtual bool AGC() const;
-
- // Volume control based on the Windows Wave API (Windows only)
- virtual int32_t SetWaveOutVolume(uint16_t volumeLeft, uint16_t volumeRight);
- virtual int32_t WaveOutVolume(uint16_t& volumeLeft, uint16_t& volumeRight) const;
-
- // Audio mixer initialization
- virtual int32_t InitSpeaker();
- virtual bool SpeakerIsInitialized() const;
- virtual int32_t InitMicrophone();
- virtual bool MicrophoneIsInitialized() const;
-
- // Speaker volume controls
- virtual int32_t SpeakerVolumeIsAvailable(bool& available);
- virtual int32_t SetSpeakerVolume(uint32_t volume);
- virtual int32_t SpeakerVolume(uint32_t& volume) const;
- virtual int32_t MaxSpeakerVolume(uint32_t& maxVolume) const;
- virtual int32_t MinSpeakerVolume(uint32_t& minVolume) const;
- virtual int32_t SpeakerVolumeStepSize(uint16_t& stepSize) const;
-
- // Microphone volume controls
- virtual int32_t MicrophoneVolumeIsAvailable(bool& available);
- virtual int32_t SetMicrophoneVolume(uint32_t volume);
- virtual int32_t MicrophoneVolume(uint32_t& volume) const;
- virtual int32_t MaxMicrophoneVolume(uint32_t& maxVolume) const;
- virtual int32_t MinMicrophoneVolume(uint32_t& minVolume) const;
- virtual int32_t MicrophoneVolumeStepSize(uint16_t& stepSize) const;
-
- // Speaker mute control
- virtual int32_t SpeakerMuteIsAvailable(bool& available);
- virtual int32_t SetSpeakerMute(bool enable);
- virtual int32_t SpeakerMute(bool& enabled) const;
-
- // Microphone mute control
- virtual int32_t MicrophoneMuteIsAvailable(bool& available);
- virtual int32_t SetMicrophoneMute(bool enable);
- virtual int32_t MicrophoneMute(bool& enabled) const;
-
- // Microphone boost control
- virtual int32_t MicrophoneBoostIsAvailable(bool& available);
- virtual int32_t SetMicrophoneBoost(bool enable);
- virtual int32_t MicrophoneBoost(bool& enabled) const;
-
- // Stereo support
- virtual int32_t StereoPlayoutIsAvailable(bool& available);
- virtual int32_t SetStereoPlayout(bool enable);
- virtual int32_t StereoPlayout(bool& enabled) const;
- virtual int32_t StereoRecordingIsAvailable(bool& available);
- virtual int32_t SetStereoRecording(bool enable);
- virtual int32_t StereoRecording(bool& enabled) const;
-
- // Delay information and control
- virtual int32_t SetPlayoutBuffer(const AudioDeviceModule::BufferType type, uint16_t sizeMS);
- virtual int32_t PlayoutBuffer(AudioDeviceModule::BufferType& type, uint16_t& sizeMS) const;
- virtual int32_t PlayoutDelay(uint16_t& delayMS) const;
- virtual int32_t RecordingDelay(uint16_t& delayMS) const;
-
- // CPU load
- virtual int32_t CPULoad(uint16_t& load) const;
-
-public:
- virtual bool PlayoutWarning() const;
- virtual bool PlayoutError() const;
- virtual bool RecordingWarning() const;
- virtual bool RecordingError() const;
- virtual void ClearPlayoutWarning();
- virtual void ClearPlayoutError();
- virtual void ClearRecordingWarning();
- virtual void ClearRecordingError();
-
-public:
- virtual void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer);
-
-private:
- void Lock() { _critSect.Enter(); };
- void UnLock() { _critSect.Leave(); };
- int32_t Id() {return _id;}
- bool IsUsingOutputDeviceIndex() const {return _usingOutputDeviceIndex;}
- AudioDeviceModule::WindowsDeviceType OutputDevice() const {return _outputDevice;}
- uint16_t OutputDeviceIndex() const {return _outputDeviceIndex;}
- bool IsUsingInputDeviceIndex() const {return _usingInputDeviceIndex;}
- AudioDeviceModule::WindowsDeviceType InputDevice() const {return _inputDevice;}
- uint16_t InputDeviceIndex() const {return _inputDeviceIndex;}
-
-private:
- inline int32_t InputSanityCheckAfterUnlockedPeriod() const;
- inline int32_t OutputSanityCheckAfterUnlockedPeriod() const;
-
-private:
- bool KeyPressed() const;
-
-private:
- int32_t EnumeratePlayoutDevices();
- int32_t EnumerateRecordingDevices();
- void TraceSupportFlags(DWORD dwSupport) const;
- void TraceWaveInError(MMRESULT error) const;
- void TraceWaveOutError(MMRESULT error) const;
- int32_t PrepareStartRecording();
- int32_t PrepareStartPlayout();
-
- int32_t RecProc(LONGLONG& consumedTime);
- int PlayProc(LONGLONG& consumedTime);
-
- int32_t GetPlayoutBufferDelay(uint32_t& writtenSamples, uint32_t& playedSamples);
- int32_t GetRecordingBufferDelay(uint32_t& readSamples, uint32_t& recSamples);
- int32_t Write(int8_t* data, uint16_t nSamples);
- int32_t GetClockDrift(const uint32_t plSamp, const uint32_t rcSamp);
- int32_t MonitorRecording(const uint32_t time);
- int32_t RestartTimerIfNeeded(const uint32_t time);
-
-private:
- static bool ThreadFunc(void*);
- bool ThreadProcess();
-
- static DWORD WINAPI GetCaptureVolumeThread(LPVOID context);
- DWORD DoGetCaptureVolumeThread();
-
- static DWORD WINAPI SetCaptureVolumeThread(LPVOID context);
- DWORD DoSetCaptureVolumeThread();
-
-private:
- AudioDeviceBuffer* _ptrAudioBuffer;
-
- CriticalSectionWrapper& _critSect;
- EventTimerWrapper& _timeEvent;
- EventWrapper& _recStartEvent;
- EventWrapper& _playStartEvent;
-
- HANDLE _hGetCaptureVolumeThread;
- HANDLE _hShutdownGetVolumeEvent;
- HANDLE _hSetCaptureVolumeThread;
- HANDLE _hShutdownSetVolumeEvent;
- HANDLE _hSetCaptureVolumeEvent;
-
- // TODO(pbos): Remove unique_ptr usage and use PlatformThread directly
- std::unique_ptr<rtc::PlatformThread> _ptrThread;
-
- CriticalSectionWrapper& _critSectCb;
-
- int32_t _id;
-
- AudioMixerManager _mixerManager;
-
- bool _usingInputDeviceIndex;
- bool _usingOutputDeviceIndex;
- AudioDeviceModule::WindowsDeviceType _inputDevice;
- AudioDeviceModule::WindowsDeviceType _outputDevice;
- uint16_t _inputDeviceIndex;
- uint16_t _outputDeviceIndex;
- bool _inputDeviceIsSpecified;
- bool _outputDeviceIsSpecified;
-
- WAVEFORMATEX _waveFormatIn;
- WAVEFORMATEX _waveFormatOut;
-
- HWAVEIN _hWaveIn;
- HWAVEOUT _hWaveOut;
-
- WAVEHDR _waveHeaderIn[N_BUFFERS_IN];
- WAVEHDR _waveHeaderOut[N_BUFFERS_OUT];
-
- uint8_t _recChannels;
- uint8_t _playChannels;
- uint16_t _recBufCount;
- uint16_t _recDelayCount;
- uint16_t _recPutBackDelay;
-
- int8_t _recBuffer[N_BUFFERS_IN][4*REC_BUF_SIZE_IN_SAMPLES];
- int8_t _playBuffer[N_BUFFERS_OUT][4*PLAY_BUF_SIZE_IN_SAMPLES];
-
- AudioDeviceModule::BufferType _playBufType;
-
-private:
- bool _initialized;
- bool _recording;
- bool _playing;
- bool _recIsInitialized;
- bool _playIsInitialized;
- bool _startRec;
- bool _stopRec;
- bool _startPlay;
- bool _stopPlay;
- bool _AGC;
-
-private:
- uint32_t _prevPlayTime;
- uint32_t _prevRecTime;
- uint32_t _prevTimerCheckTime;
-
- uint16_t _playBufCount; // playout buffer index
- uint16_t _dTcheckPlayBufDelay; // dT for check of play buffer, {2,5,10} [ms]
- uint16_t _playBufDelay; // playback delay
- uint16_t _playBufDelayFixed; // fixed playback delay
- uint16_t _minPlayBufDelay; // minimum playback delay
- uint16_t _MAX_minBuffer; // level of (adaptive) min threshold must be < _MAX_minBuffer
-
- int32_t _erZeroCounter; // counts "buffer-is-empty" events
- int32_t _intro;
- int32_t _waitCounter;
-
- uint32_t _writtenSamples;
- uint32_t _writtenSamplesOld;
- uint32_t _playedSamplesOld;
-
- uint32_t _sndCardPlayDelay;
- uint32_t _sndCardRecDelay;
-
- uint32_t _plSampOld;
- uint32_t _rcSampOld;
-
- uint32_t _read_samples;
- uint32_t _read_samples_old;
- uint32_t _rec_samples_old;
-
- // State that detects driver problems:
- int32_t _dc_diff_mean;
- int32_t _dc_y_prev;
- int32_t _dc_penalty_counter;
- int32_t _dc_prevtime;
- uint32_t _dc_prevplay;
-
- uint32_t _recordedBytes; // accumulated #recorded bytes (reset periodically)
- uint32_t _prevRecByteCheckTime; // time when we last checked the recording process
-
- // CPU load measurements
- LARGE_INTEGER _perfFreq;
- LONGLONG _playAcc; // accumulated time for playout callback
- float _avgCPULoad; // average total (rec+play) CPU load
-
- int32_t _wrapCounter;
-
- int32_t _useHeader;
- int16_t _timesdwBytes;
- int32_t _no_of_msecleft_warnings;
- int32_t _writeErrors;
- int32_t _timerFaults;
- int32_t _timerRestartAttempts;
-
- uint16_t _playWarning;
- uint16_t _playError;
- uint16_t _recWarning;
- uint16_t _recError;
-
- uint32_t _newMicLevel;
- uint32_t _minMicVolume;
- uint32_t _maxMicVolume;
-};
-
-} // namespace webrtc
-
-#endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_WAVE_WIN_H
« webrtc/modules/audio_device/test/audio_device_test_api.cc ('K') | « webrtc/modules/audio_device/test/audio_device_test_api.cc ('k') | webrtc/modules/audio_device/win/audio_device_wave_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698