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

remoting/client/audio_player.h

 // 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.
 
 #ifndef REMOTING_CLIENT_AUDIO_PLAYER_H_
 #define REMOTING_CLIENT_AUDIO_PLAYER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <list>
 #include <memory>
 
 #include "base/macros.h"
 #include "base/synchronization/lock.h"
+#include "remoting/client/audio_consumer.h"
 #include "remoting/proto/audio.pb.h"
 
 namespace remoting {
 
-class AudioPlayer {
+class AudioPlayer : public AudioConsumer {
  public:
   // The number of channels in the audio stream (only supporting stereo audio
   // for now).
   static const int kChannels = 2;
   static const int kSampleSizeBytes = 2;
 
-  virtual ~AudioPlayer();
+  ~AudioPlayer() override;
 
   void ProcessAudioPacket(std::unique_ptr<AudioPacket> packet);

[Sergey Ulanov, 2016/06/18 00:43:38]

Why do we need to both ProcessAudioPacket() and AddAudioPacket()? I think you
can just remove ProcessAudioPacket().

[nicholss, 2016/06/20 17:47:52]

Process is the deprecated way for the audio player, I choose the Add* type
method to be inline with the Consumer/Producer pattern. Let me just remove it. I
was attempting to move to the new one without breaking interfaces but I can just
refactor the existing usages... Thanks for reminding me.

 
+  // AudioConsumer implementation.
+  void AddAudioPacket(std::unique_ptr<AudioPacket> packet) override;
+
  protected:
   AudioPlayer();
 
   // Return the recommended number of samples to include in a frame.
   virtual uint32_t GetSamplesPerFrame() = 0;
 
   // Resets the audio player and starts playback.
   // Returns true on success.
   virtual bool ResetAudioPlayer(AudioPacket::SamplingRate sampling_rate) = 0;
 
   // Function called by the browser when it needs more audio samples.
   static void AudioPlayerCallback(void* samples,
                                   uint32_t buffer_size,
                                   void* data);
 
   // Function called by the subclass when it needs more audio samples to fill
   // its buffer. Will fill the buffer with 0's if no sample is available.
   void FillWithSamples(void* samples, uint32_t buffer_size);
 
  private:
   friend class AudioPlayerTest;
 
-  typedef std::list<AudioPacket*> AudioPacketQueue;
+  typedef std::list<std::unique_ptr<AudioPacket>> AudioPacketQueue;
 
   void ResetQueue();
 
   AudioPacket::SamplingRate sampling_rate_;
 
   bool start_failed_;
 
   // Protects |queued_packets_|, |queued_samples_ and |bytes_consumed_|. This is
   // necessary to prevent races, because Pepper will call the  callback on a
   // separate thread.
   base::Lock lock_;
 
   AudioPacketQueue queued_packets_;
   int queued_bytes_;
 
   // The number of bytes from |queued_packets_| that have been consumed.
   size_t bytes_consumed_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioPlayer);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_AUDIO_PLAYER_H_