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

Side by Side Diff: webrtc/modules/audio_coding/neteq/audio_vector.h

Issue 1697823002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_coding/neteq/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up-codecs
Patch Set: Created 4 years, 10 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 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_
13 13
14 #include <string.h> // Access to size_t. 14 #include <string.h> // Access to size_t.
15 #include <memory>
15 16
16 #include "webrtc/base/constructormagic.h" 17 #include "webrtc/base/constructormagic.h"
17 #include "webrtc/base/scoped_ptr.h"
18 #include "webrtc/typedefs.h" 18 #include "webrtc/typedefs.h"
19 19
20 namespace webrtc { 20 namespace webrtc {
21 21
22 class AudioVector { 22 class AudioVector {
23 public: 23 public:
24 // Creates an empty AudioVector. 24 // Creates an empty AudioVector.
25 AudioVector(); 25 AudioVector();
26 26
27 // Creates an AudioVector with an initial size. 27 // Creates an AudioVector with an initial size.
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 93
94 // Accesses and modifies an element of AudioVector. 94 // Accesses and modifies an element of AudioVector.
95 const int16_t& operator[](size_t index) const; 95 const int16_t& operator[](size_t index) const;
96 int16_t& operator[](size_t index); 96 int16_t& operator[](size_t index);
97 97
98 private: 98 private:
99 static const size_t kDefaultInitialSize = 10; 99 static const size_t kDefaultInitialSize = 10;
100 100
101 void Reserve(size_t n); 101 void Reserve(size_t n);
102 102
103 rtc::scoped_ptr<int16_t[]> array_; 103 std::unique_ptr<int16_t[]> array_;
104 size_t first_free_ix_; // The first index after the last sample in array_. 104 size_t first_free_ix_; // The first index after the last sample in array_.
105 // Note that this index may point outside of array_. 105 // Note that this index may point outside of array_.
106 size_t capacity_; // Allocated number of samples in the array. 106 size_t capacity_; // Allocated number of samples in the array.
107 107
108 RTC_DISALLOW_COPY_AND_ASSIGN(AudioVector); 108 RTC_DISALLOW_COPY_AND_ASSIGN(AudioVector);
109 }; 109 };
110 110
111 } // namespace webrtc 111 } // namespace webrtc
112 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_ 112 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc ('k') | webrtc/modules/audio_coding/neteq/audio_vector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698