| Index: webrtc/modules/rtp_rtcp/source/rtp_sender.h
|
| diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.h b/webrtc/modules/rtp_rtcp/source/rtp_sender.h
|
| index cf19aa04fcd6e93d044b382bd0c10ac5171dd00b..6b5a6c740a94d7c73d7e60358b972941fe593f32 100644
|
| --- a/webrtc/modules/rtp_rtcp/source/rtp_sender.h
|
| +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.h
|
| @@ -112,66 +112,12 @@ class RTPSender {
|
| uint32_t* transport_frame_id_out);
|
|
|
| // 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);
|
| int32_t DeregisterRtpHeaderExtension(RTPExtensionType type);
|
|
|
| size_t RtpHeaderExtensionLength() const;
|
|
|
| - uint16_t BuildRtpHeaderExtension(uint8_t* data_buffer, bool marker_bit) const
|
| - EXCLUSIVE_LOCKS_REQUIRED(send_critsect_);
|
| -
|
| - uint8_t BuildTransmissionTimeOffsetExtension(uint8_t* data_buffer) const
|
| - EXCLUSIVE_LOCKS_REQUIRED(send_critsect_);
|
| - uint8_t BuildAudioLevelExtension(uint8_t* data_buffer) const
|
| - EXCLUSIVE_LOCKS_REQUIRED(send_critsect_);
|
| - uint8_t BuildAbsoluteSendTimeExtension(uint8_t* data_buffer) const
|
| - EXCLUSIVE_LOCKS_REQUIRED(send_critsect_);
|
| - uint8_t BuildVideoRotationExtension(uint8_t* data_buffer) const
|
| - EXCLUSIVE_LOCKS_REQUIRED(send_critsect_);
|
| - uint8_t BuildTransportSequenceNumberExtension(uint8_t* data_buffer,
|
| - uint16_t sequence_number) const
|
| - EXCLUSIVE_LOCKS_REQUIRED(send_critsect_);
|
| - uint8_t BuildPlayoutDelayExtension(uint8_t* data_buffer,
|
| - uint16_t min_playout_delay_ms,
|
| - uint16_t max_playout_delay_ms) const
|
| - EXCLUSIVE_LOCKS_REQUIRED(send_critsect_);
|
| -
|
| - // Verifies that the specified extension is registered, and that it is
|
| - // present in rtp packet. If extension is not registered kNotRegistered is
|
| - // returned. If extension cannot be found in the rtp header, or if it is
|
| - // malformed, kError is returned. Otherwise *extension_offset is set to the
|
| - // offset of the extension from the beginning of the rtp packet and kOk is
|
| - // returned.
|
| - enum class ExtensionStatus {
|
| - kNotRegistered,
|
| - kOk,
|
| - kError,
|
| - };
|
| - ExtensionStatus VerifyExtension(RTPExtensionType extension_type,
|
| - uint8_t* rtp_packet,
|
| - size_t rtp_packet_length,
|
| - const RTPHeader& rtp_header,
|
| - size_t extension_length_bytes,
|
| - size_t* extension_offset) const
|
| - EXCLUSIVE_LOCKS_REQUIRED(send_critsect_);
|
| -
|
| - bool UpdateAudioLevel(uint8_t* rtp_packet,
|
| - size_t rtp_packet_length,
|
| - const RTPHeader& rtp_header,
|
| - bool is_voiced,
|
| - uint8_t dBov) const;
|
| -
|
| - bool UpdateVideoRotation(uint8_t* rtp_packet,
|
| - size_t rtp_packet_length,
|
| - const RTPHeader& rtp_header,
|
| - VideoRotation rotation) const;
|
| -
|
| bool TimeToSendPacket(uint16_t sequence_number,
|
| int64_t capture_time_ms,
|
| bool retransmission,
|
| @@ -210,33 +156,12 @@ class RTPSender {
|
| // Return false if sending was turned off.
|
| bool AssignSequenceNumber(RtpPacketToSend* packet);
|
|
|
| - // Functions wrapping RTPSenderInterface.
|
| - 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);
|
| - int32_t BuildRtpHeader(uint8_t* data_buffer,
|
| - int8_t payload_type,
|
| - bool marker_bit,
|
| - uint32_t capture_timestamp,
|
| - int64_t capture_time_ms);
|
| -
|
| size_t RtpHeaderLength() const;
|
| uint16_t AllocateSequenceNumber(uint16_t packets_to_send);
|
| size_t MaxPayloadLength() const;
|
|
|
| uint32_t SSRC() const;
|
|
|
| - // Deprecated. Create RtpPacketToSend instead and use next function.
|
| - bool SendToNetwork(uint8_t* data_buffer,
|
| - size_t payload_length,
|
| - size_t rtp_header_length,
|
| - int64_t capture_time_ms,
|
| - StorageType storage,
|
| - RtpPacketSender::Priority priority);
|
| bool SendToNetwork(std::unique_ptr<RtpPacketToSend> packet,
|
| StorageType storage,
|
| RtpPacketSender::Priority priority);
|
| @@ -305,15 +230,6 @@ class RTPSender {
|
| int64_t capture_time_ms,
|
| int probe_cluster_id);
|
|
|
| - size_t CreateRtpHeader(uint8_t* header,
|
| - int8_t payload_type,
|
| - uint32_t ssrc,
|
| - bool marker_bit,
|
| - uint32_t timestamp,
|
| - uint16_t sequence_number,
|
| - const std::vector<uint32_t>& csrcs) const
|
| - EXCLUSIVE_LOCKS_REQUIRED(send_critsect_);
|
| -
|
| bool PrepareAndSendPacket(std::unique_ptr<RtpPacketToSend> packet,
|
| bool send_over_rtx,
|
| bool is_retransmit,
|
| @@ -380,11 +296,7 @@ class RTPSender {
|
| std::map<int8_t, RtpUtility::Payload*> payload_type_map_;
|
|
|
| RtpHeaderExtensionMap rtp_header_extension_map_ GUARDED_BY(send_critsect_);
|
| - int32_t transmission_time_offset_;
|
| - uint32_t absolute_send_time_;
|
| - VideoRotation rotation_;
|
| bool video_rotation_active_;
|
| - uint16_t transport_sequence_number_;
|
|
|
| // Tracks the current request for playout delay limits from application
|
| // and decides whether the current RTP frame should include the playout
|
|
|