Style cleanups in RtpSender.

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.
  */
 
@@ skipping 28 matching lines @@
 class RtcEventLog;
 
 class RTPSenderInterface {
  public:
   RTPSenderInterface() {}
   virtual ~RTPSenderInterface() {}
 
   virtual uint32_t SSRC() const = 0;
   virtual uint32_t Timestamp() const = 0;
 
-  virtual int32_t BuildRTPheader(uint8_t* data_buffer,

[danilchap, 2016/06/15 13:40:01]

this function (with this spelling) is used outside webrtc.
may be deprecated the spelling instead of just changing it.

[Sergey Ulanov, 2016/06/15 18:27:53]

Done.

+  virtual int32_t BuildRtpHeader(uint8_t* data_buffer,
                                  int8_t payload_type,
                                  bool marker_bit,
                                  uint32_t capture_timestamp,
-                                 int64_t capture_time_ms,
-                                 bool timestamp_provided = true,
-                                 bool inc_sequence_number = true) = 0;
+                                 int64_t capture_time_ms) = 0;
 
   // This returns the expected header length taking into consideration
   // the optional RTP header extensions that may not be currently active.
   virtual size_t RtpHeaderLength() const = 0;
   // Returns the next sequence number to use for a packet and allocates
   // 'packets_to_send' number of sequence numbers. It's important all allocated
   // sequence numbers are used in sequence to avoid perceived packet loss.
   virtual uint16_t AllocateSequenceNumber(uint16_t packets_to_send) = 0;
   virtual uint16_t SequenceNumber() const = 0;
   virtual size_t MaxPayloadLength() const = 0;
@@ skipping 80 matching lines @@
 
   void SetMaxPayloadLength(size_t max_payload_length);
 
   int32_t SendOutgoingData(FrameType frame_type,
                            int8_t payload_type,
                            uint32_t timestamp,
                            int64_t capture_time_ms,
                            const uint8_t* payload_data,
                            size_t payload_size,
                            const RTPFragmentationHeader* fragmentation,
-                           const RTPVideoHeader* rtp_hdr = NULL);
+                           const RTPVideoHeader* rtp_header);
 
   // RTP header extension
   int32_t SetTransmissionTimeOffset(int32_t transmission_time_offset);
   int32_t SetAbsoluteSendTime(uint32_t absolute_send_time);
   void SetVideoRotation(VideoRotation rotation);
   int32_t SetTransportSequenceNumber(uint16_t sequence_number);
 
   int32_t RegisterRtpHeaderExtension(RTPExtensionType type, uint8_t id);
   bool IsRtpHeaderExtensionRegistered(RTPExtensionType type) override;
   int32_t DeregisterRtpHeaderExtension(RTPExtensionType type);
 
   size_t RtpHeaderExtensionLength() const;
 
-  uint16_t BuildRTPHeaderExtension(uint8_t* data_buffer, bool marker_bit) const;
+  uint16_t BuildRtpHeaderExtension(uint8_t* data_buffer, bool marker_bit) const;
 
   uint8_t BuildTransmissionTimeOffsetExtension(uint8_t *data_buffer) const;
   uint8_t BuildAudioLevelExtension(uint8_t* data_buffer) const;
   uint8_t BuildAbsoluteSendTimeExtension(uint8_t* data_buffer) const;
   uint8_t BuildVideoRotationExtension(uint8_t* data_buffer) const;
   uint8_t BuildTransportSequenceNumberExtension(uint8_t* data_buffer,
                                                 uint16_t sequence_number) const;
   uint8_t BuildPlayoutDelayExtension(uint8_t* data_buffer,
                                      uint16_t min_playout_delay_ms,
                                      uint16_t max_playout_delay_ms) const;
@@ skipping 54 matching lines @@
   // RTX.
   void SetRtxStatus(int mode);
   int RtxStatus() const;
 
   uint32_t RtxSsrc() const;
   void SetRtxSsrc(uint32_t ssrc);
 
   void SetRtxPayloadType(int payload_type, int associated_payload_type);
 
   // Functions wrapping RTPSenderInterface.
-  int32_t BuildRTPheader(uint8_t* data_buffer,
+  int32_t BuildRtpHeader(uint8_t* data_buffer,
                          int8_t payload_type,
                          bool marker_bit,
                          uint32_t capture_timestamp,
-                         int64_t capture_time_ms,
-                         const bool timestamp_provided = true,

[danilchap, 2016/06/15 13:40:01]

there is use (outside webrtc) of this function with timestamp_provided = false,
inc_sequence_number = false

[Sergey Ulanov, 2016/06/15 18:27:53]

Added deprecated version with these parameters. Note that inc_sequence_number is
currently ignored and I kept that behavior.

-                         const bool inc_sequence_number = true) override;
+                         int64_t capture_time_ms) override;
 
   size_t RtpHeaderLength() const override;
   uint16_t AllocateSequenceNumber(uint16_t packets_to_send) override;
   size_t MaxPayloadLength() const override;
 
   // Current timestamp.
   uint32_t Timestamp() const override;
   uint32_t SSRC() const override;
 
   int32_t SendToNetwork(uint8_t* data_buffer,
@@ skipping 31 matching lines @@
                            uint8_t payload_type_red,
                            uint8_t payload_type_fec);
 
   void GenericFECStatus(bool* enable,
                         uint8_t* payload_type_red,
                         uint8_t* payload_type_fec) const;
 
   int32_t SetFecParameters(const FecProtectionParams *delta_params,
                            const FecProtectionParams *key_params);
 
-  size_t SendPadData(size_t bytes,

[danilchap, 2016/06/15 13:40:01]

this version is used outside webrtc, (with timestamp provided), do not remove it

[Sergey Ulanov, 2016/06/15 18:27:53]

Done.

-                     bool timestamp_provided,
-                     uint32_t timestamp,
-                     int64_t capture_time_ms);
-
-  size_t SendPadData(size_t bytes,
-                     bool timestamp_provided,
-                     uint32_t timestamp,
-                     int64_t capture_time_ms,
-                     int probe_cluster_id);
+  size_t SendPadData(size_t bytes, int probe_cluster_id);
 
   // Called on update of RTP statistics.
   void RegisterRtpStatisticsCallback(StreamDataCountersCallback* callback);
   StreamDataCountersCallback* GetRtpStatisticsCallback() const;
 
   uint32_t BitrateSent() const;
 
   void SetRtpState(const RtpState& rtp_state);
   RtpState GetRtpState() const;
   void SetRtxRtpState(const RtpState& rtp_state);
@@ skipping 199 matching lines @@
   // that the target bitrate is still valid.
   rtc::CriticalSection target_bitrate_critsect_;
   uint32_t target_bitrate_ GUARDED_BY(target_bitrate_critsect_);
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RTPSender);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_