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 257 matching lines @@
     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->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) {

[Sergey Ulanov, 2012/08/14 18:50:05]

Maybe change this method to look at raw data instead of AudioPacket? That would
allow to avoid copying data to AudioPacket for silent packets.

[kxing, 2012/08/14 20:56:15]

Done.

   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;
+  DCHECK_EQ(1, packet->data_size());
+  const int16* data = reinterpret_cast<const int16*>(packet->data(0).data());
+  int number_of_samples =
+      packet->data(0).size() * kBitsPerByte / kBitsPerSample;
 
   for (int i = 0; i < number_of_samples; i++) {
     if (abs(data[i]) > kSilenceThreshold)
       return false;
   }
   return true;
 }
 
 scoped_ptr<AudioCapturer> AudioCapturer::Create() {
   return scoped_ptr<AudioCapturer>(new AudioCapturerWin());
 }
 
 }  // namespace remoting