Support for both 44.1 kHz and 48 kHz on the client.

remoting/client/plugin/pepper_audio_player.h

Index: remoting/client/plugin/pepper_audio_player.h
diff --git a/remoting/client/plugin/pepper_audio_player.h b/remoting/client/plugin/pepper_audio_player.h
index 925b0dcda7deba659eae63093b992d90fac3104e..19f6dd6f714f1734f98985adc76c59f49d23f539 100644
--- a/remoting/client/plugin/pepper_audio_player.h
+++ b/remoting/client/plugin/pepper_audio_player.h
@@ -15,26 +15,24 @@
 #include "ppapi/cpp/audio.h"
 #include "ppapi/cpp/instance.h"
 #include "remoting/client/audio_player.h"
+#include "remoting/proto/audio.pb.h"
 
 namespace remoting {
 
-class AudioPacket;
-
 class PepperAudioPlayer : public AudioPlayer {
  public:
   explicit PepperAudioPlayer(pp::Instance* instance);
   virtual ~PepperAudioPlayer();
 
-  // Returns true if successful, false otherwise.
-  virtual bool Start() OVERRIDE;
-
   virtual void ProcessAudioPacket(scoped_ptr<AudioPacket> packet) OVERRIDE;
 
-  virtual bool IsRunning() const OVERRIDE;
-
  private:
   typedef std::list<AudioPacket*> AudioPacketQueue;
 
+  bool StartPlayback();
+
+  void ResetAudioPlayer(AudioPacket::SamplingRate sampling_rate);
+
   // Function called by the browser when it needs more audio samples.
   static void PepperAudioPlayerCallback(void* samples,
                                         uint32_t buffer_size,
@@ -42,8 +40,11 @@ class PepperAudioPlayer : public AudioPlayer {
 
   void FillWithSamples(void* samples, uint32_t buffer_size);
 
+  pp::Instance* instance_;
   pp::Audio audio_;
 
+  AudioPacket::SamplingRate sampling_rate_;
+
   // The count of sample frames per channel in an audio buffer.
   uint32_t samples_per_frame_;
 
@@ -57,7 +58,7 @@ class PepperAudioPlayer : public AudioPlayer {
   // The number of bytes from |queued_packets_| that have been consumed.
   size_t bytes_consumed_;
 
-  bool running_;
+  bool failed_playback_;

[Sergey Ulanov, 2012/07/24 18:10:03]

start_failed_?

[kxing, 2012/07/24 18:32:01]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(PepperAudioPlayer);
 };