Move audio decoding to protocol layer

remoting/client/audio_player.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 "remoting/client/audio_player.h"
 
 #include <algorithm>
 #include <string>
 
+#include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 
 // If queue grows bigger than 150ms we start dropping packets.
 const int kMaxQueueLatencyMs = 150;
 
 namespace remoting {
 
 AudioPlayer::AudioPlayer()
     : sampling_rate_(AudioPacket::SAMPLING_RATE_INVALID),
       start_failed_(false),
       queued_bytes_(0),
-      bytes_consumed_(0) {
-}
+      bytes_consumed_(0) {}
 
 AudioPlayer::~AudioPlayer() {}
 
-void AudioPlayer::AddAudioPacket(std::unique_ptr<AudioPacket> packet) {
+void AudioPlayer::ProcessAudioPacket(std::unique_ptr<AudioPacket> packet,
+                                     const base::Closure& done) {
   CHECK_EQ(1, packet->data_size());
   DCHECK_EQ(AudioPacket::ENCODING_RAW, packet->encoding());
   DCHECK_NE(AudioPacket::SAMPLING_RATE_INVALID, packet->sampling_rate());
   DCHECK_EQ(kSampleSizeBytes, static_cast<int>(packet->bytes_per_sample()));
   DCHECK_EQ(kChannels, static_cast<int>(packet->channels()));
   DCHECK_EQ(packet->data(0).size() % (kChannels * kSampleSizeBytes), 0u);
 
+  base::ScopedClosureRunner done_runner(done);
+
   // No-op if the Pepper player won't start.
   if (start_failed_) {
     return;
   }
 
   // Start the Pepper audio player if this is the first packet.
   if (sampling_rate_ != packet->sampling_rate()) {
     // Drop all packets currently in the queue, since they are sampled at the
     // wrong rate.
     {
@@ skipping 74 matching lines @@
 
     next_sample += bytes_to_copy;
     bytes_consumed_ += bytes_to_copy;
     bytes_extracted += bytes_to_copy;
     queued_bytes_ -= bytes_to_copy;
     DCHECK_GE(queued_bytes_, 0);
   }
 }
 
 }  // namespace remoting