Changed AudioPacket data to a repeated field.

remoting/host/audio_capturer_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <windows.h>
 #include <audioclient.h>
 #include <avrt.h>
 #include <mmdeviceapi.h>
 #include <mmreg.h>
 #include <mmsystem.h>
@@ skipping 35 matching lines @@
   // AudioCapturer interface.
   virtual bool Start(const PacketCapturedCallback& callback) OVERRIDE;
   virtual void Stop() OVERRIDE;
   virtual bool IsRunning() OVERRIDE;
 
  private:
   // Receives all packets from the audio capture endpoint buffer and pushes them
   // to the network.
   void DoCapture();
 
-  static bool IsPacketOfSilence(const AudioPacket* packet);
+  static bool IsPacketOfSilence(const int16* samples, int number_of_samples);
 
   PacketCapturedCallback callback_;
 
   AudioPacket::SamplingRate sampling_rate_;
 
   scoped_ptr<base::RepeatingTimer<AudioCapturerWin> > capture_timer_;
   base::TimeDelta audio_device_period_;
 
   base::win::ScopedCoMem<WAVEFORMATEX> wave_format_ex_;
   base::win::ScopedComPtr<IAudioCaptureClient> audio_capture_client_;
@@ skipping 200 matching lines @@
     BYTE* data;
     UINT32 frames;
     DWORD flags;
     hr = audio_capture_client_->GetBuffer(
         &data, &frames, &flags, NULL, NULL);
     if (FAILED(hr)) {
       LOG(ERROR) << "Failed to GetBuffer. Error " << hr;
       return;
     }
 
-    scoped_ptr<AudioPacket> packet = scoped_ptr<AudioPacket>(new AudioPacket());
-    packet->set_data(data, frames * wave_format_ex_->nBlockAlign);
-    packet->set_sampling_rate(sampling_rate_);
-    packet->set_bytes_per_sample(
-        static_cast<AudioPacket::BytesPerSample>(sizeof(int16)));
-    packet->set_encoding(AudioPacket::ENCODING_RAW);
+    if (!IsPacketOfSilence(
+        reinterpret_cast<const int16*>(data),

[Sergey Ulanov, 2012/08/15 17:38:10]

nit: incorrect indentation. This line should be indented 4 spaces relative to
the first ( on the previous line. Or it can fit on the previous line.

[kxing, 2012/08/15 18:41:55]

Done.

+        frames * kChannels)) {
+      scoped_ptr<AudioPacket> packet =
+          scoped_ptr<AudioPacket>(new AudioPacket());
+      packet->add_data(data, frames * wave_format_ex_->nBlockAlign);
+      packet->set_sampling_rate(sampling_rate_);
+      packet->set_bytes_per_sample(
+          static_cast<AudioPacket::BytesPerSample>(sizeof(int16)));
+      packet->set_encoding(AudioPacket::ENCODING_RAW);
 
-    if (!IsPacketOfSilence(packet.get()))
       callback_.Run(packet.Pass());
+    }
 
     hr = audio_capture_client_->ReleaseBuffer(frames);
     if (FAILED(hr)) {
       LOG(ERROR) << "Failed to ReleaseBuffer. Error " << hr;
       return;
     }
   }
 }
 
 // Detects whether there is audio playing in a packet of samples.
 // Windows can give nonzero samples, even when there is no audio playing, so
 // extremely low amplitude samples are counted as silence.
-bool AudioCapturerWin::IsPacketOfSilence(const AudioPacket* packet) {
-  DCHECK_EQ(static_cast<AudioPacket::BytesPerSample>(sizeof(int16)),
-            packet->bytes_per_sample());
-  const int16* data = reinterpret_cast<const int16*>(packet->data().data());
-  int number_of_samples = packet->data().size() * kBitsPerByte / kBitsPerSample;
-
+bool AudioCapturerWin::IsPacketOfSilence(
+    const int16* samples,

[Sergey Ulanov, 2012/08/15 17:38:10]

nit: can this fit on the previous line.

[kxing, 2012/08/15 18:41:55]

Done.

+    int number_of_samples) {
   for (int i = 0; i < number_of_samples; i++) {
-    if (abs(data[i]) > kSilenceThreshold)
+    if (abs(samples[i]) > kSilenceThreshold)
       return false;
   }
   return true;
 }
 
 scoped_ptr<AudioCapturer> AudioCapturer::Create() {
   return scoped_ptr<AudioCapturer>(new AudioCapturerWin());
 }
 
 }  // namespace remoting