OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef REMOTING_CODEC_AUDIO_DECODER_OPUS_H_ | 5 #ifndef REMOTING_CODEC_AUDIO_DECODER_OPUS_H_ |
6 #define REMOTING_CODEC_AUDIO_DECODER_OPUS_H_ | 6 #define REMOTING_CODEC_AUDIO_DECODER_OPUS_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "base/macros.h" | 10 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | |
10 #include "remoting/codec/audio_decoder.h" | 11 #include "remoting/codec/audio_decoder.h" |
11 | 12 |
12 struct OpusDecoder; | 13 struct OpusDecoder; |
13 | 14 |
14 namespace remoting { | 15 namespace remoting { |
15 | 16 |
16 class AudioPacket; | 17 class AudioPacket; |
17 | 18 |
18 class AudioDecoderOpus : public AudioDecoder { | 19 class AudioDecoderOpus : public AudioDecoder { |
19 public: | 20 public: |
20 AudioDecoderOpus(); | 21 AudioDecoderOpus(); |
21 ~AudioDecoderOpus() override; | 22 ~AudioDecoderOpus() override; |
22 | 23 |
23 // AudioDecoder interface. | 24 // AudioDecoder interface. |
24 scoped_ptr<AudioPacket> Decode(scoped_ptr<AudioPacket> packet) override; | 25 std::unique_ptr<AudioPacket> Decode( |
| 26 std::unique_ptr<AudioPacket> packet) override; |
25 | 27 |
26 private: | 28 private: |
27 void InitDecoder(); | 29 void InitDecoder(); |
28 void DestroyDecoder(); | 30 void DestroyDecoder(); |
29 bool ResetForPacket(AudioPacket* packet); | 31 bool ResetForPacket(AudioPacket* packet); |
30 | 32 |
31 int sampling_rate_; | 33 int sampling_rate_; |
32 int channels_; | 34 int channels_; |
33 OpusDecoder* decoder_; | 35 OpusDecoder* decoder_; |
34 | 36 |
35 DISALLOW_COPY_AND_ASSIGN(AudioDecoderOpus); | 37 DISALLOW_COPY_AND_ASSIGN(AudioDecoderOpus); |
36 }; | 38 }; |
37 | 39 |
38 } // namespace remoting | 40 } // namespace remoting |
39 | 41 |
40 #endif // REMOTING_CODEC_AUDIO_DECODER_OPUS_H_ | 42 #endif // REMOTING_CODEC_AUDIO_DECODER_OPUS_H_ |
OLD | NEW |