OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 MEDIA_BASE_AUDIO_BUFFER_CONVERTER | 5 #ifndef MEDIA_BASE_AUDIO_BUFFER_CONVERTER |
6 #define MEDIA_BASE_AUDIO_BUFFER_CONVERTER | 6 #define MEDIA_BASE_AUDIO_BUFFER_CONVERTER |
7 | 7 |
8 #include <deque> | 8 #include <deque> |
| 9 #include <memory> |
9 | 10 |
10 #include "base/memory/ref_counted.h" | 11 #include "base/memory/ref_counted.h" |
11 #include "base/memory/scoped_ptr.h" | |
12 #include "base/time/time.h" | 12 #include "base/time/time.h" |
13 #include "media/base/audio_converter.h" | 13 #include "media/base/audio_converter.h" |
14 #include "media/base/audio_parameters.h" | 14 #include "media/base/audio_parameters.h" |
15 #include "media/base/audio_timestamp_helper.h" | 15 #include "media/base/audio_timestamp_helper.h" |
16 #include "media/base/media_export.h" | 16 #include "media/base/media_export.h" |
17 | 17 |
18 namespace media { | 18 namespace media { |
19 | 19 |
20 class AudioBuffer; | 20 class AudioBuffer; |
21 class AudioBus; | 21 class AudioBus; |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 double io_sample_rate_ratio_; | 93 double io_sample_rate_ratio_; |
94 | 94 |
95 // Computes timestamps in terms of the output sample rate. | 95 // Computes timestamps in terms of the output sample rate. |
96 AudioTimestampHelper timestamp_helper_; | 96 AudioTimestampHelper timestamp_helper_; |
97 | 97 |
98 // Are we flushing everything, without regard for providing AudioConverter | 98 // Are we flushing everything, without regard for providing AudioConverter |
99 // full AudioBuses in ProvideInput()? | 99 // full AudioBuses in ProvideInput()? |
100 bool is_flushing_; | 100 bool is_flushing_; |
101 | 101 |
102 // The AudioConverter which does the real work here. | 102 // The AudioConverter which does the real work here. |
103 scoped_ptr<AudioConverter> audio_converter_; | 103 std::unique_ptr<AudioConverter> audio_converter_; |
104 }; | 104 }; |
105 | 105 |
106 } // namespace media | 106 } // namespace media |
107 | 107 |
108 #endif // MEDIA_BASE_AUDIO_BUFFER_CONVERTER | 108 #endif // MEDIA_BASE_AUDIO_BUFFER_CONVERTER |
OLD | NEW |