Remove hardcoded kValueSizeBytes values from variable-length header extensions.

webrtc/modules/rtp_rtcp/source/rtp_sender.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_
 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_
 
 #include <map>
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "webrtc/api/call/transport.h"
 #include "webrtc/base/constructormagic.h"

[danilchap, 2017/05/09 12:33:49]

#include "webrtc/base/array_view.h"

[erikvarga1, 2017/05/09 13:30:30]

Oops, I forgot that. Done now.

 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/deprecation.h"
 #include "webrtc/base/optional.h"
 #include "webrtc/base/random.h"
 #include "webrtc/base/rate_statistics.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/rtp_rtcp/include/flexfec_sender.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h"
@@ skipping 25 matching lines @@
             BitrateStatisticsObserver* bitrate_callback,
             FrameCountObserver* frame_count_observer,
             SendSideDelayObserver* send_side_delay_observer,
             RtcEventLog* event_log,
             SendPacketObserver* send_packet_observer,
             RateLimiter* nack_rate_limiter,
             OverheadObserver* overhead_observer);
 
   ~RTPSender();
 
+  // Size info for header extensions used by FEC packets.
+  static rtc::ArrayView<const RtpExtensionSize> FecExtensionSizes();

[danilchap, 2017/05/09 12:33:49]

may be declare it it near AllocatePacket function, since this return sizes for
same extensions AllocatePacket aware about.

[erikvarga1, 2017/05/09 13:30:31]

Done. I thought for some reason that static functions needed to be placed at the
top, but now that I checked, I don't see anything like that in the style guide.

[danilchap, 2017/05/09 14:45:22]

Factory methods should be placed at the top (and factory methods are common
reason to use static functions)

+
   void ProcessBitrate();
 
   uint16_t ActualSendBitrateKbit() const;
 
   uint32_t VideoBitrateSent() const;
   uint32_t FecOverheadRate() const;
   uint32_t NackOverheadRate() const;
 
   // Excluding size of RTP and FEC headers.
-  size_t MaxPayloadSize() const;
+  size_t MaxPayloadSize(
+      rtc::ArrayView<const RtpExtensionSize> extension_sizes) const;
 
   int32_t RegisterPayload(const char* payload_name,
                           const int8_t payload_type,
                           const uint32_t frequency,
                           const size_t channels,
                           const uint32_t rate);
 
   int32_t DeRegisterSendPayload(const int8_t payload_type);
 
   void SetSendPayloadType(int8_t payload_type);
@@ skipping 63 matching lines @@
   void SetRtxPayloadType(int payload_type, int associated_payload_type);
 
   // Create empty packet, fills ssrc, csrcs and reserve place for header
   // extensions RtpSender updates before sending.
   std::unique_ptr<RtpPacketToSend> AllocatePacket() const;
   // Allocate sequence number for provided packet.
   // Save packet's fields to generate padding that doesn't break media stream.
   // Return false if sending was turned off.
   bool AssignSequenceNumber(RtpPacketToSend* packet);
 
-  size_t RtpHeaderLength() const;
+  size_t RtpHeaderLength(
+      rtc::ArrayView<const RtpExtensionSize> extension_sizes) const;
   uint16_t AllocateSequenceNumber(uint16_t packets_to_send);
   // Including RTP headers.
   size_t MaxRtpPacketSize() const;
 
   uint32_t SSRC() const;
 
   rtc::Optional<uint32_t> FlexfecSsrc() const;
 
   bool SendToNetwork(std::unique_ptr<RtpPacketToSend> packet,
                      StorageType storage,
@@ skipping 154 matching lines @@
   OverheadObserver* overhead_observer_;
 
   const bool send_side_bwe_with_overhead_;
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RTPSender);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_