media/audio/android/opensles_input.h - Issue 1911913002: Convert //media/audio from scoped_ptr to std::unique_ptr

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Fix cast + windows build 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

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 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>

(...skipping 80 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
91	91

92 // Audio buffers that are allocated in the constructor based on	92 // Audio buffers that are allocated in the constructor based on

93 // info from audio parameters.	93 // info from audio parameters.

94 uint8_t* audio_data_[kMaxNumOfBuffersInQueue];	94 uint8_t* audio_data_[kMaxNumOfBuffersInQueue];

95	95

96 int active_buffer_index_;	96 int active_buffer_index_;

97 int buffer_size_bytes_;	97 int buffer_size_bytes_;

98	98

99 bool started_;	99 bool started_;

100	100

101 scoped_ptr<media::AudioBus> audio_bus_;	101 std::unique_ptr<media::AudioBus> audio_bus_;
	danakj 2016/04/22 22:47:35 include memory include memory dcheng 2016/04/22 23:13:19 Done. Show quoted text On 2016/04/22 at 22:47:35, danakj wrote: > include memory Done.
102	102

103 DISALLOW_COPY_AND_ASSIGN(OpenSLESInputStream);	103 DISALLOW_COPY_AND_ASSIGN(OpenSLESInputStream);

104 };	104 };

105	105

106 } // namespace media	106 } // namespace media

107	107

108 #endif // MEDIA_AUDIO_ANDROID_OPENSLES_INPUT_H_	108 #endif // MEDIA_AUDIO_ANDROID_OPENSLES_INPUT_H_

OLD	NEW

« media/audio/android/audio_record_input.h ('K') | « media/audio/android/audio_record_input.h ('k') | media/audio/android/opensles_output.h » ('j') | media/audio/android/opensles_output.h » ('J')