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

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

Issue 1417173004: audio_coding: rename interface -> include (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Restored incorrectly renamed header guards and fixed an old error Created 5 years, 1 month 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_NETEQ_IMPL_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_
13 13
14 #include "webrtc/base/constructormagic.h" 14 #include "webrtc/base/constructormagic.h"
15 #include "webrtc/base/scoped_ptr.h" 15 #include "webrtc/base/scoped_ptr.h"
16 #include "webrtc/base/thread_annotations.h" 16 #include "webrtc/base/thread_annotations.h"
17 #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" 17 #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
18 #include "webrtc/modules/audio_coding/neteq/defines.h" 18 #include "webrtc/modules/audio_coding/neteq/defines.h"
19 #include "webrtc/modules/audio_coding/neteq/interface/neteq.h" 19 #include "webrtc/modules/audio_coding/neteq/include/neteq.h"
20 #include "webrtc/modules/audio_coding/neteq/packet.h" // Declare PacketList. 20 #include "webrtc/modules/audio_coding/neteq/packet.h" // Declare PacketList.
21 #include "webrtc/modules/audio_coding/neteq/random_vector.h" 21 #include "webrtc/modules/audio_coding/neteq/random_vector.h"
22 #include "webrtc/modules/audio_coding/neteq/rtcp.h" 22 #include "webrtc/modules/audio_coding/neteq/rtcp.h"
23 #include "webrtc/modules/audio_coding/neteq/statistics_calculator.h" 23 #include "webrtc/modules/audio_coding/neteq/statistics_calculator.h"
24 #include "webrtc/typedefs.h" 24 #include "webrtc/typedefs.h"
25 25
26 namespace webrtc { 26 namespace webrtc {
27 27
28 // Forward declarations. 28 // Forward declarations.
29 class Accelerate; 29 class Accelerate;
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 // module is designed to compensate for this. 403 // module is designed to compensate for this.
404 int decoded_packet_sequence_number_ GUARDED_BY(crit_sect_); 404 int decoded_packet_sequence_number_ GUARDED_BY(crit_sect_);
405 uint32_t decoded_packet_timestamp_ GUARDED_BY(crit_sect_); 405 uint32_t decoded_packet_timestamp_ GUARDED_BY(crit_sect_);
406 406
407 private: 407 private:
408 RTC_DISALLOW_COPY_AND_ASSIGN(NetEqImpl); 408 RTC_DISALLOW_COPY_AND_ASSIGN(NetEqImpl);
409 }; 409 };
410 410
411 } // namespace webrtc 411 } // namespace webrtc
412 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_ 412 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/neteq/neteq.gypi ('k') | webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698