media/audio/mac/audio_input_mac.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/mac/audio_input_mac.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

« media/audio/mac/audio_auhal_mac_unittest.cc ('K') | « media/audio/mac/audio_device_listener_mac_unittest.cc ('k') | media/audio/mac/audio_low_latency_input_mac.h » ('j') | media/audio/mac/audio_low_latency_input_mac_unittest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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_MAC_AUDIO_INPUT_MAC_H_	5 #ifndef MEDIA_AUDIO_MAC_AUDIO_INPUT_MAC_H_

6 #define MEDIA_AUDIO_MAC_AUDIO_INPUT_MAC_H_	6 #define MEDIA_AUDIO_MAC_AUDIO_INPUT_MAC_H_

7	7

8 #include <AudioToolbox/AudioFormat.h>	8 #include <AudioToolbox/AudioFormat.h>

9 #include <AudioToolbox/AudioQueue.h>	9 #include <AudioToolbox/AudioQueue.h>

10 #include <stdint.h>	10 #include <stdint.h>

(...skipping 69 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
80 AudioQueueRef audio_queue_;	80 AudioQueueRef audio_queue_;

81 // Size of each of the buffers in \|audio_buffers_\|	81 // Size of each of the buffers in \|audio_buffers_\|

82 uint32_t buffer_size_bytes_;	82 uint32_t buffer_size_bytes_;

83 // True iff Start() has been called successfully.	83 // True iff Start() has been called successfully.

84 bool started_;	84 bool started_;

85 // Used to determine if we need to slow down \|callback_\| calls.	85 // Used to determine if we need to slow down \|callback_\| calls.

86 base::TimeTicks last_fill_;	86 base::TimeTicks last_fill_;

87 // Used to defer Start() to workaround http://crbug.com/160920.	87 // Used to defer Start() to workaround http://crbug.com/160920.

88 base::CancelableClosure deferred_start_cb_;	88 base::CancelableClosure deferred_start_cb_;

89	89

90 scoped_ptr<media::AudioBus> audio_bus_;	90 std::unique_ptr<media::AudioBus> audio_bus_;
	danakj 2016/04/22 22:47:37 include memory include memory dcheng 2016/04/22 23:13:20 Done. Show quoted text On 2016/04/22 at 22:47:37, danakj wrote: > include memory Done.
91	91

92 DISALLOW_COPY_AND_ASSIGN(PCMQueueInAudioInputStream);	92 DISALLOW_COPY_AND_ASSIGN(PCMQueueInAudioInputStream);

93 };	93 };

94	94

95 } // namespace media	95 } // namespace media

96	96

97 #endif // MEDIA_AUDIO_MAC_AUDIO_INPUT_MAC_H_	97 #endif // MEDIA_AUDIO_MAC_AUDIO_INPUT_MAC_H_

OLD	NEW