OLD | NEW |
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_MERGE_H_ | 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MERGE_H_ |
12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MERGE_H_ | 12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MERGE_H_ |
13 | 13 |
14 #include <assert.h> | 14 #include <assert.h> |
15 | 15 |
| 16 #include "webrtc/base/constructormagic.h" |
16 #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" | 17 #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" |
17 #include "webrtc/rtc_base/constructormagic.h" | |
18 #include "webrtc/typedefs.h" | 18 #include "webrtc/typedefs.h" |
19 | 19 |
20 namespace webrtc { | 20 namespace webrtc { |
21 | 21 |
22 // Forward declarations. | 22 // Forward declarations. |
23 class Expand; | 23 class Expand; |
24 class SyncBuffer; | 24 class SyncBuffer; |
25 | 25 |
26 // This class handles the transition from expansion to normal operation. | 26 // This class handles the transition from expansion to normal operation. |
27 // When a packet is not available for decoding when needed, the expand operation | 27 // When a packet is not available for decoding when needed, the expand operation |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 int16_t expanded_downsampled_[kExpandDownsampLength]; | 93 int16_t expanded_downsampled_[kExpandDownsampLength]; |
94 int16_t input_downsampled_[kInputDownsampLength]; | 94 int16_t input_downsampled_[kInputDownsampLength]; |
95 AudioMultiVector expanded_; | 95 AudioMultiVector expanded_; |
96 std::vector<int16_t> temp_data_; | 96 std::vector<int16_t> temp_data_; |
97 | 97 |
98 RTC_DISALLOW_COPY_AND_ASSIGN(Merge); | 98 RTC_DISALLOW_COPY_AND_ASSIGN(Merge); |
99 }; | 99 }; |
100 | 100 |
101 } // namespace webrtc | 101 } // namespace webrtc |
102 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MERGE_H_ | 102 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MERGE_H_ |
OLD | NEW |