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

Side by Side Diff: webrtc/video_engine/vie_channel.h

Issue 1411573007: Removed vie_defines.h (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase 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
« no previous file with comments | « webrtc/video/webrtc_video.gypi ('k') | webrtc/video_engine/vie_channel.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_VIDEO_ENGINE_VIE_CHANNEL_H_ 11 #ifndef WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_
12 #define WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_ 12 #define WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_
13 13
14 #include <list> 14 #include <list>
15 15
16 #include "webrtc/base/scoped_ptr.h" 16 #include "webrtc/base/scoped_ptr.h"
17 #include "webrtc/base/scoped_ref_ptr.h" 17 #include "webrtc/base/scoped_ref_ptr.h"
18 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimat or.h" 18 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimat or.h"
19 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" 19 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
20 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 20 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
21 #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" 21 #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h"
22 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" 22 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
23 #include "webrtc/system_wrappers/include/tick_util.h" 23 #include "webrtc/system_wrappers/include/tick_util.h"
24 #include "webrtc/typedefs.h" 24 #include "webrtc/typedefs.h"
25 #include "webrtc/video_engine/vie_defines.h"
26 #include "webrtc/video_engine/vie_receiver.h" 25 #include "webrtc/video_engine/vie_receiver.h"
27 #include "webrtc/video_engine/vie_sync_module.h" 26 #include "webrtc/video_engine/vie_sync_module.h"
28 27
29 namespace webrtc { 28 namespace webrtc {
30 29
31 class CallStatsObserver; 30 class CallStatsObserver;
32 class ChannelStatsObserver; 31 class ChannelStatsObserver;
33 class Config; 32 class Config;
34 class CriticalSectionWrapper; 33 class CriticalSectionWrapper;
35 class EncodedImageCallback; 34 class EncodedImageCallback;
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 size_t num_rtts_ GUARDED_BY(crit_); 447 size_t num_rtts_ GUARDED_BY(crit_);
449 448
450 // RtpRtcp modules, declared last as they use other members on construction. 449 // RtpRtcp modules, declared last as they use other members on construction.
451 const std::vector<RtpRtcp*> rtp_rtcp_modules_; 450 const std::vector<RtpRtcp*> rtp_rtcp_modules_;
452 size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_); 451 size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_);
453 }; 452 };
454 453
455 } // namespace webrtc 454 } // namespace webrtc
456 455
457 #endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_ 456 #endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/video/webrtc_video.gypi ('k') | webrtc/video_engine/vie_channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698