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

Side by Side Diff: webrtc/modules/rtp_rtcp/include/flexfec_sender.h

Issue 2867713003: Remove hardcoded kValueSizeBytes values from variable-length header extensions. (Closed)
Patch Set: Patch 5 Created 3 years, 7 months 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) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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_FLEXFEC_SENDER_H_ 11 #ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_FLEXFEC_SENDER_H_
12 #define WEBRTC_MODULES_RTP_RTCP_INCLUDE_FLEXFEC_SENDER_H_ 12 #define WEBRTC_MODULES_RTP_RTCP_INCLUDE_FLEXFEC_SENDER_H_
13 13
14 #include <memory> 14 #include <memory>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/base/array_view.h"
17 #include "webrtc/base/basictypes.h" 18 #include "webrtc/base/basictypes.h"
18 #include "webrtc/base/random.h" 19 #include "webrtc/base/random.h"
19 #include "webrtc/base/sequenced_task_checker.h" 20 #include "webrtc/base/sequenced_task_checker.h"
20 #include "webrtc/config.h" 21 #include "webrtc/config.h"
21 #include "webrtc/modules/include/module_common_types.h" 22 #include "webrtc/modules/include/module_common_types.h"
22 #include "webrtc/modules/rtp_rtcp/include/flexfec_sender.h" 23 #include "webrtc/modules/rtp_rtcp/include/flexfec_sender.h"
23 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h" 24 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h"
24 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" 25 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h"
25 #include "webrtc/modules/rtp_rtcp/source/ulpfec_generator.h" 26 #include "webrtc/modules/rtp_rtcp/source/ulpfec_generator.h"
26 #include "webrtc/system_wrappers/include/clock.h" 27 #include "webrtc/system_wrappers/include/clock.h"
27 28
28 namespace webrtc { 29 namespace webrtc {
29 30
30 class RtpPacketToSend; 31 class RtpPacketToSend;
31 32
32 // Note that this class is not thread safe, and thus requires external 33 // Note that this class is not thread safe, and thus requires external
33 // synchronization. Currently, this is done using the lock in PayloadRouter. 34 // synchronization. Currently, this is done using the lock in PayloadRouter.
34 35
35 class FlexfecSender { 36 class FlexfecSender {
36 public: 37 public:
37 FlexfecSender(int payload_type, 38 FlexfecSender(int payload_type,
38 uint32_t ssrc, 39 uint32_t ssrc,
39 uint32_t protected_media_ssrc, 40 uint32_t protected_media_ssrc,
40 const std::vector<RtpExtension>& rtp_header_extensions, 41 const std::vector<RtpExtension>& rtp_header_extensions,
42 rtc::ArrayView<const RtpExtensionSize> extension_sizes,
41 Clock* clock); 43 Clock* clock);
42 ~FlexfecSender(); 44 ~FlexfecSender();
43 45
44 uint32_t ssrc() const { return ssrc_; } 46 uint32_t ssrc() const { return ssrc_; }
45 47
46 // Sets the FEC rate, max frames sent before FEC packets are sent, 48 // Sets the FEC rate, max frames sent before FEC packets are sent,
47 // and what type of generator matrices are used. 49 // and what type of generator matrices are used.
48 void SetFecParameters(const FecProtectionParams& params); 50 void SetFecParameters(const FecProtectionParams& params);
49 51
50 // Adds a media packet to the internal buffer. When enough media packets 52 // Adds a media packet to the internal buffer. When enough media packets
(...skipping 21 matching lines...) Expand all
72 const int payload_type_; 74 const int payload_type_;
73 const uint32_t timestamp_offset_; 75 const uint32_t timestamp_offset_;
74 const uint32_t ssrc_; 76 const uint32_t ssrc_;
75 const uint32_t protected_media_ssrc_; 77 const uint32_t protected_media_ssrc_;
76 // Sequence number of next packet to generate. 78 // Sequence number of next packet to generate.
77 uint16_t seq_num_; 79 uint16_t seq_num_;
78 80
79 // Implementation. 81 // Implementation.
80 UlpfecGenerator ulpfec_generator_; 82 UlpfecGenerator ulpfec_generator_;
81 const RtpHeaderExtensionMap rtp_header_extension_map_; 83 const RtpHeaderExtensionMap rtp_header_extension_map_;
84 const size_t header_extensions_size_;
82 }; 85 };
83 86
84 } // namespace webrtc 87 } // namespace webrtc
85 88
86 #endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_FLEXFEC_SENDER_H_ 89 #endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_FLEXFEC_SENDER_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/rtp_rtcp/include/rtp_rtcp.h » ('j') | webrtc/modules/rtp_rtcp/source/flexfec_sender_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698