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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_sender_video.h

Issue 2491293002: Make FlexFEC packets paceable through RTPSender. (Closed)
Patch Set: EXPECT -> ASSERT Created 4 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_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_ 11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_
12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_ 12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_
13 13
14 #include <list> 14 #include <list>
15 #include <memory> 15 #include <memory>
16 #include <vector> 16 #include <vector>
17 17
18 #include "webrtc/base/criticalsection.h" 18 #include "webrtc/base/criticalsection.h"
19 #include "webrtc/base/onetimeevent.h" 19 #include "webrtc/base/onetimeevent.h"
20 #include "webrtc/base/optional.h"
20 #include "webrtc/base/rate_statistics.h" 21 #include "webrtc/base/rate_statistics.h"
21 #include "webrtc/base/sequenced_task_checker.h" 22 #include "webrtc/base/sequenced_task_checker.h"
22 #include "webrtc/base/thread_annotations.h" 23 #include "webrtc/base/thread_annotations.h"
23 #include "webrtc/common_types.h" 24 #include "webrtc/common_types.h"
24 #include "webrtc/modules/rtp_rtcp/include/flexfec_sender.h" 25 #include "webrtc/modules/rtp_rtcp/include/flexfec_sender.h"
25 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 26 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
26 #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h" 27 #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h"
27 #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" 28 #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h"
28 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" 29 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
29 #include "webrtc/modules/rtp_rtcp/source/ulpfec_generator.h" 30 #include "webrtc/modules/rtp_rtcp/source/ulpfec_generator.h"
(...skipping 29 matching lines...) Expand all
59 const RTPVideoHeader* video_header); 60 const RTPVideoHeader* video_header);
60 61
61 int32_t SendRTPIntraRequest(); 62 int32_t SendRTPIntraRequest();
62 63
63 void SetVideoCodecType(RtpVideoCodecTypes type); 64 void SetVideoCodecType(RtpVideoCodecTypes type);
64 65
65 // ULPFEC. 66 // ULPFEC.
66 void SetUlpfecConfig(int red_payload_type, int ulpfec_payload_type); 67 void SetUlpfecConfig(int red_payload_type, int ulpfec_payload_type);
67 void GetUlpfecConfig(int* red_payload_type, int* ulpfec_payload_type) const; 68 void GetUlpfecConfig(int* red_payload_type, int* ulpfec_payload_type) const;
68 69
70 // FlexFEC/ULPFEC.
69 void SetFecParameters(const FecProtectionParams& delta_params, 71 void SetFecParameters(const FecProtectionParams& delta_params,
70 const FecProtectionParams& key_params); 72 const FecProtectionParams& key_params);
71 73
74 // FlexFEC.
75 rtc::Optional<uint32_t> FlexfecSsrc() const;
76
72 uint32_t VideoBitrateSent() const; 77 uint32_t VideoBitrateSent() const;
73 uint32_t FecOverheadRate() const; 78 uint32_t FecOverheadRate() const;
74 79
75 int SelectiveRetransmissions() const; 80 int SelectiveRetransmissions() const;
76 void SetSelectiveRetransmissions(uint8_t settings); 81 void SetSelectiveRetransmissions(uint8_t settings);
77 82
78 private: 83 private:
79 void SendVideoPacket(std::unique_ptr<RtpPacketToSend> packet, 84 void SendVideoPacket(std::unique_ptr<RtpPacketToSend> packet,
80 StorageType storage); 85 StorageType storage);
81 86
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 // and any padding overhead. 133 // and any padding overhead.
129 RateStatistics fec_bitrate_ GUARDED_BY(stats_crit_); 134 RateStatistics fec_bitrate_ GUARDED_BY(stats_crit_);
130 // Bitrate used for video payload and RTP headers. 135 // Bitrate used for video payload and RTP headers.
131 RateStatistics video_bitrate_ GUARDED_BY(stats_crit_); 136 RateStatistics video_bitrate_ GUARDED_BY(stats_crit_);
132 OneTimeEvent first_frame_sent_; 137 OneTimeEvent first_frame_sent_;
133 }; 138 };
134 139
135 } // namespace webrtc 140 } // namespace webrtc
136 141
137 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_ 142 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698