Adding an interface to allow extension of the audio player for CRD and iOS.

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/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) {
 }
 
-AudioPlayer::~AudioPlayer() {
-}
+AudioPlayer::~AudioPlayer() {}
 
 void AudioPlayer::AddAudioPacket(std::unique_ptr<AudioPacket> packet) {
   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);
 
   // No-op if the Pepper player won't start.
@@ skipping 27 matching lines @@
       kMaxQueueLatencyMs * sampling_rate_ * kSampleSizeBytes * kChannels /
       base::Time::kMillisecondsPerSecond;
   while (queued_bytes_ > max_buffer_size_) {
     queued_bytes_ -= queued_packets_.front()->data(0).size() - bytes_consumed_;
     DCHECK_GE(queued_bytes_, 0);
     queued_packets_.pop_front();
     bytes_consumed_ = 0;
   }
 }
 
-void AudioPlayer::ProcessAudioPacket(std::unique_ptr<AudioPacket> packet) {
-  AddAudioPacket(std::move(packet));
-}
-
 // static
 void AudioPlayer::AudioPlayerCallback(void* samples,
                                       uint32_t buffer_size,
                                       void* data) {
   AudioPlayer* audio_player = static_cast<AudioPlayer*>(data);
   audio_player->FillWithSamples(samples, buffer_size);
 }
 
 void AudioPlayer::ResetQueue() {
   lock_.AssertAcquired();
@@ skipping 36 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