| Index: remoting/client/audio_player.h
|
| diff --git a/remoting/client/audio_player.h b/remoting/client/audio_player.h
|
| index ea0b789d75c5b20b7b5c7947446865a59d90178b..88fad4e37855212db5b2cac1bfcee6254c03fdf6 100644
|
| --- a/remoting/client/audio_player.h
|
| +++ b/remoting/client/audio_player.h
|
| @@ -13,23 +13,23 @@
|
|
|
| #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();
|
| -
|
| void ProcessAudioPacket(std::unique_ptr<AudioPacket> packet);
|
|
|
| protected:
|
| AudioPlayer();
|
| + ~AudioPlayer() override;
|
|
|
| // Return the recommended number of samples to include in a frame.
|
| virtual uint32_t GetSamplesPerFrame() = 0;
|
| @@ -47,6 +47,8 @@ class AudioPlayer {
|
| // its buffer. Will fill the buffer with 0's if no sample is available.
|
| void FillWithSamples(void* samples, uint32_t buffer_size);
|
|
|
| + void AddAudioPacket(std::unique_ptr<AudioPacket> packet) override;
|
| +
|
| private:
|
| friend class AudioPlayerTest;
|
|
|
|
|