Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(445)

Side by Side Diff: media/base/audio_buffer_converter.h

Issue 1906423005: Replace scoped_ptr with std::unique_ptr in //media/base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-media-base: android Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/base/audio_buffer.h ('k') | media/base/audio_buffer_converter.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
OLDNEW
« no previous file with comments | « media/base/audio_buffer.h ('k') | media/base/audio_buffer_converter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698