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_RTP_RTCP_INCLUDE_RTP_RTCP_H_ | 11 #ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_H_ |
12 #define WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_H_ | 12 #define WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_H_ |
13 | 13 |
14 #include <set> | 14 #include <set> |
15 #include <string> | 15 #include <string> |
16 #include <utility> | 16 #include <utility> |
17 #include <vector> | 17 #include <vector> |
18 | 18 |
19 #include "webrtc/base/constructormagic.h" | 19 #include "webrtc/base/constructormagic.h" |
20 #include "webrtc/base/deprecation.h" | 20 #include "webrtc/base/deprecation.h" |
21 #include "webrtc/base/optional.h" | 21 #include "webrtc/base/optional.h" |
22 #include "webrtc/modules/include/module.h" | 22 #include "webrtc/modules/include/module.h" |
23 #include "webrtc/modules/rtp_rtcp/include/flexfec_sender.h" | 23 #include "webrtc/modules/rtp_rtcp/include/flexfec_sender.h" |
24 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" | 24 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" |
25 #include "webrtc/video_send_stream.h" | |
åsapersson
2017/07/03 13:39:17
avoid include of video_send_stream
sprang_webrtc
2017/07/05 13:29:59
Done. Moved to struct to common_types.h
| |
25 | 26 |
26 namespace webrtc { | 27 namespace webrtc { |
27 | 28 |
28 // Forward declarations. | 29 // Forward declarations. |
29 class OverheadObserver; | 30 class OverheadObserver; |
30 class RateLimiter; | 31 class RateLimiter; |
31 class ReceiveStatistics; | 32 class ReceiveStatistics; |
32 class RemoteBitrateEstimator; | 33 class RemoteBitrateEstimator; |
33 class RtcEventLog; | 34 class RtcEventLog; |
34 class RtpReceiver; | 35 class RtpReceiver; |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
85 | 86 |
86 TransportSequenceNumberAllocator* transport_sequence_number_allocator = | 87 TransportSequenceNumberAllocator* transport_sequence_number_allocator = |
87 nullptr; | 88 nullptr; |
88 BitrateStatisticsObserver* send_bitrate_observer = nullptr; | 89 BitrateStatisticsObserver* send_bitrate_observer = nullptr; |
89 FrameCountObserver* send_frame_count_observer = nullptr; | 90 FrameCountObserver* send_frame_count_observer = nullptr; |
90 SendSideDelayObserver* send_side_delay_observer = nullptr; | 91 SendSideDelayObserver* send_side_delay_observer = nullptr; |
91 RtcEventLog* event_log = nullptr; | 92 RtcEventLog* event_log = nullptr; |
92 SendPacketObserver* send_packet_observer = nullptr; | 93 SendPacketObserver* send_packet_observer = nullptr; |
93 RateLimiter* retransmission_rate_limiter = nullptr; | 94 RateLimiter* retransmission_rate_limiter = nullptr; |
94 OverheadObserver* overhead_observer = nullptr; | 95 OverheadObserver* overhead_observer = nullptr; |
96 VideoSendStream::Config::Rtp::KeepAlive keepalive_config; | |
95 | 97 |
96 private: | 98 private: |
97 RTC_DISALLOW_COPY_AND_ASSIGN(Configuration); | 99 RTC_DISALLOW_COPY_AND_ASSIGN(Configuration); |
98 }; | 100 }; |
99 | 101 |
100 // Create a RTP/RTCP module object using the system clock. | 102 // Create a RTP/RTCP module object using the system clock. |
101 // |configuration| - Configuration of the RTP/RTCP module. | 103 // |configuration| - Configuration of the RTP/RTCP module. |
102 static RtpRtcp* CreateRtpRtcp(const RtpRtcp::Configuration& configuration); | 104 static RtpRtcp* CreateRtpRtcp(const RtpRtcp::Configuration& configuration); |
103 | 105 |
104 // ************************************************************************** | 106 // ************************************************************************** |
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
461 virtual int32_t SetKeyFrameRequestMethod(KeyFrameRequestMethod method) = 0; | 463 virtual int32_t SetKeyFrameRequestMethod(KeyFrameRequestMethod method) = 0; |
462 | 464 |
463 // Sends a request for a keyframe. | 465 // Sends a request for a keyframe. |
464 // Returns -1 on failure else 0. | 466 // Returns -1 on failure else 0. |
465 virtual int32_t RequestKeyFrame() = 0; | 467 virtual int32_t RequestKeyFrame() = 0; |
466 }; | 468 }; |
467 | 469 |
468 } // namespace webrtc | 470 } // namespace webrtc |
469 | 471 |
470 #endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_H_ | 472 #endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_H_ |
OLD | NEW |