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

Side by Side Diff: media/audio/android/audio_record_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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_AUDIO_RECORD_INPUT_H_ 5 #ifndef MEDIA_AUDIO_ANDROID_AUDIO_RECORD_INPUT_H_
6 #define MEDIA_AUDIO_ANDROID_AUDIO_RECORD_INPUT_H_ 6 #define MEDIA_AUDIO_ANDROID_AUDIO_RECORD_INPUT_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 base::android::ScopedJavaGlobalRef<jobject> j_audio_record_; 68 base::android::ScopedJavaGlobalRef<jobject> j_audio_record_;
69 69
70 // This is the only member accessed by both the Audio Manager and Java 70 // This is the only member accessed by both the Audio Manager and Java
71 // threads. Explanations for why we do not require explicit synchronization 71 // threads. Explanations for why we do not require explicit synchronization
72 // are given in the implementation. 72 // are given in the implementation.
73 AudioInputCallback* callback_; 73 AudioInputCallback* callback_;
74 74
75 // Owned by j_audio_record_. 75 // Owned by j_audio_record_.
76 uint8_t* direct_buffer_address_; 76 uint8_t* direct_buffer_address_;
77 77
78 scoped_ptr<media::AudioBus> audio_bus_; 78 std::unique_ptr<media::AudioBus> audio_bus_;
danakj 2016/04/22 22:47:35 include memory
dcheng 2016/04/22 23:13:19 Done.
79 int bytes_per_sample_; 79 int bytes_per_sample_;
80 80
81 DISALLOW_COPY_AND_ASSIGN(AudioRecordInputStream); 81 DISALLOW_COPY_AND_ASSIGN(AudioRecordInputStream);
82 }; 82 };
83 83
84 } // namespace media 84 } // namespace media
85 85
86 #endif // MEDIA_AUDIO_ANDROID_AUDIO_RECORD_INPUT_H_ 86 #endif // MEDIA_AUDIO_ANDROID_AUDIO_RECORD_INPUT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698