admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing -Wno-reorder from audio_device.

Browse Source 
Bug: webrtc:9251
Change-Id: I5717af1056d432413d448cea0fb562856b364d46
Reviewed-on: https://webrtc-review.googlesource.com/88360
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23948}
This commit is contained in:
Mirko Bonadei 2018-07-12 10:08:03 +02:00 committed by Commit Bot
parent 865feabca9
commit 574e69ace1
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/audio_device/BUILD.gn
View File

@ -28,7 +28,6 @@ config("audio_device_warnings_config") {
# https://bugs.chromium.org/p/webrtc/issues/detail?id=5366
"-Wno-delete-non-virtual-dtor",
"-Wno-microsoft-goto",
"-Wno-reorder",
]
}
}

24
modules/audio_device/win/audio_device_core_win.cc
View File

@ -381,7 +381,9 @@ bool AudioDeviceWindowsCore::CoreAudioIsSupported() {
// ----------------------------------------------------------------------------
AudioDeviceWindowsCore::AudioDeviceWindowsCore()
: _comInit(ScopedCOMInitializer::kMTA),
: _avrtLibrary(NULL),
_winSupportAvrt(false),
_comInit(ScopedCOMInitializer::kMTA),
_ptrAudioBuffer(NULL),
_ptrEnumerator(NULL),
_ptrRenderCollection(NULL),
@ -397,6 +399,15 @@ AudioDeviceWindowsCore::AudioDeviceWindowsCore()
_dmo(NULL),
_mediaBuffer(NULL),
_builtInAecEnabled(false),
_hRenderSamplesReadyEvent(NULL),
_hPlayThread(NULL),
_hRenderStartedEvent(NULL),
_hShutdownRenderEvent(NULL),
_hCaptureSamplesReadyEvent(NULL),
_hRecThread(NULL),
_hCaptureStartedEvent(NULL),
_hShutdownCaptureEvent(NULL),
_hMmTask(NULL),
_playAudioFrameSize(0),
_playSampleRate(0),
_playBlockSize(0),
@ -409,17 +420,6 @@ AudioDeviceWindowsCore::AudioDeviceWindowsCore()
_recSampleRate(0),
_recBlockSize(0),
_recChannels(2),
_avrtLibrary(NULL),
_winSupportAvrt(false),
_hRenderSamplesReadyEvent(NULL),
_hPlayThread(NULL),
_hCaptureSamplesReadyEvent(NULL),
_hRecThread(NULL),
_hShutdownRenderEvent(NULL),
_hShutdownCaptureEvent(NULL),
_hRenderStartedEvent(NULL),
_hCaptureStartedEvent(NULL),
_hMmTask(NULL),
_initialized(false),
_recording(false),
_playing(false),

4
modules/audio_device/win/audio_device_core_win.h
View File

@ -281,14 +281,14 @@ class AudioDeviceWindowsCore : public AudioDeviceGeneric {
uint32_t _devicePlayBlockSize;
uint32_t _playChannels;
uint32_t _sndCardPlayDelay;
uint32_t _sndCardRecDelay;
UINT64 _writtenSamples;
UINT64 _readSamples;
UINT _recAudioFrameSize;
uint32_t _recSampleRate;
uint32_t _recBlockSize;
uint32_t _recChannels;
UINT64 _readSamples;
uint32_t _sndCardRecDelay;
uint16_t _recChannelsPrioList[3];
uint16_t _playChannelsPrioList[2];