| Index: remoting/host/audio_capturer_win.cc
|
| diff --git a/remoting/host/audio_capturer_win.cc b/remoting/host/audio_capturer_win.cc
|
| index 8a256454fac9362d4a5774fb85a00c1cc1cd4328..26e06fb02504ed1500eab087a953b48908c39692 100644
|
| --- a/remoting/host/audio_capturer_win.cc
|
| +++ b/remoting/host/audio_capturer_win.cc
|
| @@ -18,6 +18,7 @@
|
| #include "base/win/scoped_com_initializer.h"
|
| #include "base/win/scoped_comptr.h"
|
| #include "remoting/host/audio_capturer.h"
|
| +#include "remoting/host/audio_capturer_util.h"
|
| #include "remoting/proto/audio.pb.h"
|
|
|
| namespace {
|
| @@ -133,7 +134,7 @@ bool AudioCapturerWin::Start(const PacketCapturedCallback& callback) {
|
| case WAVE_FORMAT_IEEE_FLOAT:
|
| // Intentional fall-through.
|
| case WAVE_FORMAT_PCM:
|
| - if (!AudioCapturer::IsValidSampleRate(wave_format_ex_->nSamplesPerSec)) {
|
| + if (!IsValidSampleRate(wave_format_ex_->nSamplesPerSec)) {
|
| LOG(ERROR) << "Host sampling rate is neither 44.1 kHz nor 48 kHz.";
|
| return false;
|
| }
|
| @@ -153,8 +154,7 @@ bool AudioCapturerWin::Start(const PacketCapturedCallback& callback) {
|
| static_cast<WAVEFORMATEX*>(wave_format_ex_));
|
| if (IsEqualGUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT,
|
| wave_format_extensible->SubFormat)) {
|
| - if (!AudioCapturer::IsValidSampleRate(
|
| - wave_format_extensible->Format.nSamplesPerSec)) {
|
| + if (!IsValidSampleRate(wave_format_extensible->Format.nSamplesPerSec)) {
|
| LOG(ERROR) << "Host sampling rate is neither 44.1 kHz nor 48 kHz.";
|
| return false;
|
| }
|
| @@ -237,7 +237,7 @@ bool AudioCapturerWin::IsRunning() {
|
| }
|
|
|
| void AudioCapturerWin::DoCapture() {
|
| - DCHECK(AudioCapturer::IsValidSampleRate(sampling_rate_));
|
| + DCHECK(IsValidSampleRate(sampling_rate_));
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| DCHECK(IsRunning());
|
|
|
| @@ -268,7 +268,8 @@ void AudioCapturerWin::DoCapture() {
|
| packet->set_data(data, frames * wave_format_ex_->nBlockAlign);
|
| packet->set_sampling_rate(sampling_rate_);
|
|
|
| - callback_.Run(packet.Pass());
|
| + if (!IsPacketOfSilence(packet.get()))
|
| + callback_.Run(packet.Pass());
|
|
|
| hr = audio_capture_client_->ReleaseBuffer(frames);
|
| if (FAILED(hr)) {
|
|
|