webrtc/modules/audio_coding/neteq/merge.h - Issue 1345433002: Add RTC_ prefix to contructormagic macros.

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: webrtc/modules/audio_coding/neteq/merge.h

Issue 1345433002: Add RTC_ prefix to contructormagic macros. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Formatting fix. Created 5 years, 3 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

« no previous file with comments | « webrtc/modules/audio_coding/neteq/interface/neteq.h ('k') | webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

(...skipping 78 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
89 size_t expand_period) const;	89 size_t expand_period) const;

90	90

91 const int fs_mult_; // fs_hz_ / 8000.	91 const int fs_mult_; // fs_hz_ / 8000.

92 const size_t timestamps_per_call_;	92 const size_t timestamps_per_call_;

93 Expand* expand_;	93 Expand* expand_;

94 SyncBuffer* sync_buffer_;	94 SyncBuffer* sync_buffer_;

95 int16_t expanded_downsampled_[kExpandDownsampLength];	95 int16_t expanded_downsampled_[kExpandDownsampLength];

96 int16_t input_downsampled_[kInputDownsampLength];	96 int16_t input_downsampled_[kInputDownsampLength];

97 AudioMultiVector expanded_;	97 AudioMultiVector expanded_;

98	98

99 DISALLOW_COPY_AND_ASSIGN(Merge);	99 RTC_DISALLOW_COPY_AND_ASSIGN(Merge);

100 };	100 };

101	101

102 } // namespace webrtc	102 } // namespace webrtc

103 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MERGE_H_	103 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MERGE_H_

OLD	NEW