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

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

Issue 1476453002: Clean up PlatformThread. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: IsRunning DCHECK Created 5 years 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/video_quality_test.cc ('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 #include <map> 15 #include <map>
16 #include <vector> 16 #include <vector>
17 17
18 #include "webrtc/base/platform_thread.h"
18 #include "webrtc/base/scoped_ptr.h" 19 #include "webrtc/base/scoped_ptr.h"
19 #include "webrtc/base/scoped_ref_ptr.h" 20 #include "webrtc/base/scoped_ref_ptr.h"
20 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimat or.h" 21 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimat or.h"
21 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" 22 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
22 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 23 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
23 #include "webrtc/modules/video_coding/include/video_coding_defines.h" 24 #include "webrtc/modules/video_coding/include/video_coding_defines.h"
24 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" 25 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
25 #include "webrtc/system_wrappers/include/tick_util.h" 26 #include "webrtc/system_wrappers/include/tick_util.h"
26 #include "webrtc/typedefs.h" 27 #include "webrtc/typedefs.h"
27 #include "webrtc/video_engine/vie_receiver.h" 28 #include "webrtc/video_engine/vie_receiver.h"
28 #include "webrtc/video_engine/vie_sync_module.h" 29 #include "webrtc/video_engine/vie_sync_module.h"
29 30
30 namespace webrtc { 31 namespace webrtc {
31 32
32 class CallStatsObserver; 33 class CallStatsObserver;
33 class ChannelStatsObserver; 34 class ChannelStatsObserver;
34 class Config; 35 class Config;
35 class CriticalSectionWrapper; 36 class CriticalSectionWrapper;
36 class EncodedImageCallback; 37 class EncodedImageCallback;
37 class I420FrameCallback; 38 class I420FrameCallback;
38 class IncomingVideoStream; 39 class IncomingVideoStream;
39 class PacedSender; 40 class PacedSender;
40 class PacketRouter; 41 class PacketRouter;
41 class PayloadRouter; 42 class PayloadRouter;
42 class ProcessThread; 43 class ProcessThread;
43 class ReceiveStatisticsProxy; 44 class ReceiveStatisticsProxy;
44 class ReportBlockStats; 45 class ReportBlockStats;
45 class RtcpRttStats; 46 class RtcpRttStats;
46 class PlatformThread;
47 class ViEChannelProtectionCallback; 47 class ViEChannelProtectionCallback;
48 class ViERTPObserver; 48 class ViERTPObserver;
49 class VideoCodingModule; 49 class VideoCodingModule;
50 class VideoDecoder; 50 class VideoDecoder;
51 class VideoRenderCallback; 51 class VideoRenderCallback;
52 class VoEVideoSync; 52 class VoEVideoSync;
53 53
54 enum StreamType { 54 enum StreamType {
55 kViEStreamTypeNormal = 0, // Normal media stream 55 kViEStreamTypeNormal = 0, // Normal media stream
56 kViEStreamTypeRtx = 1 // Retransmission media stream 56 kViEStreamTypeRtx = 1 // Retransmission media stream
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 FrameCounts receive_frame_counts_ GUARDED_BY(crit_); 428 FrameCounts receive_frame_counts_ GUARDED_BY(crit_);
429 IncomingVideoStream* incoming_video_stream_ GUARDED_BY(crit_); 429 IncomingVideoStream* incoming_video_stream_ GUARDED_BY(crit_);
430 RtcpIntraFrameObserver* const intra_frame_observer_; 430 RtcpIntraFrameObserver* const intra_frame_observer_;
431 RtcpRttStats* const rtt_stats_; 431 RtcpRttStats* const rtt_stats_;
432 PacedSender* const paced_sender_; 432 PacedSender* const paced_sender_;
433 PacketRouter* const packet_router_; 433 PacketRouter* const packet_router_;
434 434
435 const rtc::scoped_ptr<RtcpBandwidthObserver> bandwidth_observer_; 435 const rtc::scoped_ptr<RtcpBandwidthObserver> bandwidth_observer_;
436 TransportFeedbackObserver* const transport_feedback_observer_; 436 TransportFeedbackObserver* const transport_feedback_observer_;
437 437
438 rtc::scoped_ptr<PlatformThread> decode_thread_; 438 rtc::PlatformThread decode_thread_;
439 439
440 int nack_history_size_sender_; 440 int nack_history_size_sender_;
441 int max_nack_reordering_threshold_; 441 int max_nack_reordering_threshold_;
442 I420FrameCallback* pre_render_callback_ GUARDED_BY(crit_); 442 I420FrameCallback* pre_render_callback_ GUARDED_BY(crit_);
443 443
444 const rtc::scoped_ptr<ReportBlockStats> report_block_stats_sender_; 444 const rtc::scoped_ptr<ReportBlockStats> report_block_stats_sender_;
445 445
446 int64_t time_of_first_rtt_ms_ GUARDED_BY(crit_); 446 int64_t time_of_first_rtt_ms_ GUARDED_BY(crit_);
447 int64_t rtt_sum_ms_ GUARDED_BY(crit_); 447 int64_t rtt_sum_ms_ GUARDED_BY(crit_);
448 int64_t last_rtt_ms_ GUARDED_BY(crit_); 448 int64_t last_rtt_ms_ GUARDED_BY(crit_);
449 size_t num_rtts_ GUARDED_BY(crit_); 449 size_t num_rtts_ GUARDED_BY(crit_);
450 450
451 // RtpRtcp modules, declared last as they use other members on construction. 451 // RtpRtcp modules, declared last as they use other members on construction.
452 const std::vector<RtpRtcp*> rtp_rtcp_modules_; 452 const std::vector<RtpRtcp*> rtp_rtcp_modules_;
453 size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_); 453 size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_);
454 }; 454 };
455 455
456 } // namespace webrtc 456 } // namespace webrtc
457 457
458 #endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_ 458 #endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/video/video_quality_test.cc ('k') | webrtc/video_engine/vie_channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698