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

Side by Side Diff: media/audio/android/opensles_input.h

Issue 1911913002: Convert //media/audio from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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/audio/android/audio_record_input.h ('k') | media/audio/android/opensles_output.h » ('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 (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 MEDIA_AUDIO_ANDROID_OPENSLES_INPUT_H_ 5 #ifndef MEDIA_AUDIO_ANDROID_OPENSLES_INPUT_H_
6 #define MEDIA_AUDIO_ANDROID_OPENSLES_INPUT_H_ 6 #define MEDIA_AUDIO_ANDROID_OPENSLES_INPUT_H_
7 7
8 #include <SLES/OpenSLES.h> 8 #include <SLES/OpenSLES.h>
9 #include <SLES/OpenSLES_Android.h> 9 #include <SLES/OpenSLES_Android.h>
10 #include <stdint.h> 10 #include <stdint.h>
11 11
12 #include <memory>
13
12 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
13 #include "base/macros.h" 15 #include "base/macros.h"
14 #include "base/synchronization/lock.h" 16 #include "base/synchronization/lock.h"
15 #include "base/threading/thread_checker.h" 17 #include "base/threading/thread_checker.h"
16 #include "media/audio/android/opensles_util.h" 18 #include "media/audio/android/opensles_util.h"
17 #include "media/audio/audio_io.h" 19 #include "media/audio/audio_io.h"
18 #include "media/base/audio_parameters.h" 20 #include "media/base/audio_parameters.h"
19 21
20 namespace media { 22 namespace media {
21 23
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 93
92 // Audio buffers that are allocated in the constructor based on 94 // Audio buffers that are allocated in the constructor based on
93 // info from audio parameters. 95 // info from audio parameters.
94 uint8_t* audio_data_[kMaxNumOfBuffersInQueue]; 96 uint8_t* audio_data_[kMaxNumOfBuffersInQueue];
95 97
96 int active_buffer_index_; 98 int active_buffer_index_;
97 int buffer_size_bytes_; 99 int buffer_size_bytes_;
98 100
99 bool started_; 101 bool started_;
100 102
101 scoped_ptr<media::AudioBus> audio_bus_; 103 std::unique_ptr<media::AudioBus> audio_bus_;
102 104
103 DISALLOW_COPY_AND_ASSIGN(OpenSLESInputStream); 105 DISALLOW_COPY_AND_ASSIGN(OpenSLESInputStream);
104 }; 106 };
105 107
106 } // namespace media 108 } // namespace media
107 109
108 #endif // MEDIA_AUDIO_ANDROID_OPENSLES_INPUT_H_ 110 #endif // MEDIA_AUDIO_ANDROID_OPENSLES_INPUT_H_
OLDNEW
« no previous file with comments | « media/audio/android/audio_record_input.h ('k') | media/audio/android/opensles_output.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698