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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/modules/rtp_rtcp/source/rtp_sender.cc

Issue 2399463009: Delete RTPSender::BuildRtpHeader function (Closed)
Patch Set: . Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_sender.h ('k') | webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/rtp_rtcp/source/rtp_sender.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc
index 2aaa58e38ff06fb33a0db02c8c08326b8617d826..3e364021ab0adcd7e06e8f1291bd2454bdcef626 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc
@@ -92,11 +92,7 @@ RTPSender::RTPSender(
payload_type_(-1),
payload_type_map_(),
rtp_header_extension_map_(),
- transmission_time_offset_(0),
- absolute_send_time_(0),
- rotation_(kVideoRotation_0),
video_rotation_active_(false),
- transport_sequence_number_(0),
playout_delay_active_(false),
packet_history_(clock),
// Statistics
@@ -184,36 +180,6 @@ uint32_t RTPSender::NackOverheadRate() const {
return nack_bitrate_sent_.Rate(clock_->TimeInMilliseconds()).value_or(0);
}
-int32_t RTPSender::SetTransmissionTimeOffset(int32_t transmission_time_offset) {
- if (transmission_time_offset > (0x800000 - 1) ||
- transmission_time_offset < -(0x800000 - 1)) { // Word24.
- return -1;
- }
- rtc::CritScope lock(&send_critsect_);
- transmission_time_offset_ = transmission_time_offset;
- return 0;
-}
-
-int32_t RTPSender::SetAbsoluteSendTime(uint32_t absolute_send_time) {
- if (absolute_send_time > 0xffffff) { // UWord24.
- return -1;
- }
- rtc::CritScope lock(&send_critsect_);
- absolute_send_time_ = absolute_send_time;
- return 0;
-}
-
-void RTPSender::SetVideoRotation(VideoRotation rotation) {
- rtc::CritScope lock(&send_critsect_);
- rotation_ = rotation;
-}
-
-int32_t RTPSender::SetTransportSequenceNumber(uint16_t sequence_number) {
- rtc::CritScope lock(&send_critsect_);
- transport_sequence_number_ = sequence_number;
- return 0;
-}
-
int32_t RTPSender::RegisterRtpHeaderExtension(RTPExtensionType type,
uint8_t id) {
rtc::CritScope lock(&send_critsect_);
@@ -868,20 +834,6 @@ size_t RTPSender::TimeToSendPadding(size_t bytes, int probe_cluster_id) {
return bytes_sent;
}
-bool RTPSender::SendToNetwork(uint8_t* buffer,
- size_t payload_length,
- size_t rtp_header_length,
- int64_t capture_time_ms,
- StorageType storage,
- RtpPacketSender::Priority priority) {
- size_t length = payload_length + rtp_header_length;
- std::unique_ptr<RtpPacketToSend> packet(
- new RtpPacketToSend(&rtp_header_extension_map_, length));
- RTC_CHECK(packet->Parse(buffer, length));
- packet->set_capture_time_ms(capture_time_ms);
- return SendToNetwork(std::move(packet), storage, priority);
-}
-
bool RTPSender::SendToNetwork(std::unique_ptr<RtpPacketToSend> packet,
StorageType storage,
RtpPacketSender::Priority priority) {
@@ -1041,44 +993,6 @@ void RTPSender::GetDataCounters(StreamDataCounters* rtp_stats,
*rtx_stats = rtx_rtp_stats_;
}
-size_t RTPSender::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 {
- header[0] = 0x80; // version 2.
- header[1] = static_cast<uint8_t>(payload_type);
- if (marker_bit) {
- header[1] |= kRtpMarkerBitMask; // Marker bit is set.
- }
- ByteWriter<uint16_t>::WriteBigEndian(header + 2, sequence_number);
- ByteWriter<uint32_t>::WriteBigEndian(header + 4, timestamp);
- ByteWriter<uint32_t>::WriteBigEndian(header + 8, ssrc);
- int32_t rtp_header_length = kRtpHeaderLength;
-
- if (csrcs.size() > 0) {
- uint8_t* ptr = &header[rtp_header_length];
- for (size_t i = 0; i < csrcs.size(); ++i) {
- ByteWriter<uint32_t>::WriteBigEndian(ptr, csrcs[i]);
- ptr += 4;
- }
- header[0] = (header[0] & 0xf0) | csrcs.size();
-
- // Update length of header.
- rtp_header_length += sizeof(uint32_t) * csrcs.size();
- }
-
- uint16_t len =
- BuildRtpHeaderExtension(header + rtp_header_length, marker_bit);
- if (len > 0) {
- header[0] |= 0x10; // Set extension bit.
- rtp_header_length += len;
- }
- return rtp_header_length;
-}
-
std::unique_ptr<RtpPacketToSend> RTPSender::AllocatePacket() const {
rtc::CritScope lock(&send_critsect_);
std::unique_ptr<RtpPacketToSend> packet(
@@ -1113,293 +1027,6 @@ bool RTPSender::AssignSequenceNumber(RtpPacketToSend* packet) {
return true;
}
-int32_t RTPSender::BuildRTPheader(uint8_t* data_buffer,
- int8_t payload_type,
- bool marker_bit,
- uint32_t capture_timestamp,
- int64_t capture_time_ms,
- bool timestamp_provided,
- bool inc_sequence_number) {
- return BuildRtpHeader(data_buffer, payload_type, marker_bit,
- capture_timestamp, capture_time_ms);
-}
-
-int32_t RTPSender::BuildRtpHeader(uint8_t* data_buffer,
- int8_t payload_type,
- bool marker_bit,
- uint32_t rtp_timestamp,
- int64_t capture_time_ms) {
- assert(payload_type >= 0);
- rtc::CritScope lock(&send_critsect_);
- if (!sending_media_)
- return -1;
-
- last_rtp_timestamp_ = rtp_timestamp;
- last_timestamp_time_ms_ = clock_->TimeInMilliseconds();
- uint32_t sequence_number = sequence_number_++;
- capture_time_ms_ = capture_time_ms;
- last_packet_marker_bit_ = marker_bit;
- return CreateRtpHeader(data_buffer, payload_type, ssrc_, marker_bit,
- rtp_timestamp, sequence_number, csrcs_);
-}
-
-uint16_t RTPSender::BuildRtpHeaderExtension(uint8_t* data_buffer,
- bool marker_bit) const {
- if (rtp_header_extension_map_.Size() <= 0) {
- return 0;
- }
- // RTP header extension, RFC 3550.
- // 0 1 2 3
- // 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- // | defined by profile | length |
- // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- // | header extension |
- // | .... |
- //
- const uint32_t kPosLength = 2;
- const uint32_t kHeaderLength = kRtpOneByteHeaderLength;
-
- // Add extension ID (0xBEDE).
- ByteWriter<uint16_t>::WriteBigEndian(data_buffer,
- kRtpOneByteHeaderExtensionId);
-
- // Add extensions.
- uint16_t total_block_length = 0;
-
- RTPExtensionType type = rtp_header_extension_map_.First();
- while (type != kRtpExtensionNone) {
- uint8_t block_length = 0;
- uint8_t* extension_data = &data_buffer[kHeaderLength + total_block_length];
- switch (type) {
- case kRtpExtensionTransmissionTimeOffset:
- block_length = BuildTransmissionTimeOffsetExtension(extension_data);
- break;
- case kRtpExtensionAudioLevel:
- block_length = BuildAudioLevelExtension(extension_data);
- break;
- case kRtpExtensionAbsoluteSendTime:
- block_length = BuildAbsoluteSendTimeExtension(extension_data);
- break;
- case kRtpExtensionVideoRotation:
- block_length = BuildVideoRotationExtension(extension_data);
- break;
- case kRtpExtensionTransportSequenceNumber:
- block_length = BuildTransportSequenceNumberExtension(
- extension_data, transport_sequence_number_);
- break;
- case kRtpExtensionPlayoutDelay: {
- PlayoutDelay playout_delay = playout_delay_oracle_.playout_delay();
- block_length = BuildPlayoutDelayExtension(
- extension_data, playout_delay.min_ms, playout_delay.max_ms);
- break;
- }
- default:
- assert(false);
- }
- total_block_length += block_length;
- type = rtp_header_extension_map_.Next(type);
- }
- if (total_block_length == 0) {
- // No extension added.
- return 0;
- }
- // Add padding elements until we've filled a 32 bit block.
- size_t padding_bytes =
- RtpUtility::Word32Align(total_block_length) - total_block_length;
- if (padding_bytes > 0) {
- memset(&data_buffer[kHeaderLength + total_block_length], 0, padding_bytes);
- total_block_length += padding_bytes;
- }
- // Set header length (in number of Word32, header excluded).
- ByteWriter<uint16_t>::WriteBigEndian(data_buffer + kPosLength,
- total_block_length / 4);
- // Total added length.
- return kHeaderLength + total_block_length;
-}
-
-uint8_t RTPSender::BuildTransmissionTimeOffsetExtension(
- uint8_t* data_buffer) const {
- // From RFC 5450: Transmission Time Offsets in RTP Streams.
- //
- // The transmission time is signaled to the receiver in-band using the
- // general mechanism for RTP header extensions [RFC5285]. The payload
- // of this extension (the transmitted value) is a 24-bit signed integer.
- // When added to the RTP timestamp of the packet, it represents the
- // "effective" RTP transmission time of the packet, on the RTP
- // timescale.
- //
- // The form of the transmission offset extension block:
- //
- // 0 1 2 3
- // 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- // | ID | len=2 | transmission offset |
- // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
- // Get id defined by user.
- uint8_t id;
- if (rtp_header_extension_map_.GetId(kRtpExtensionTransmissionTimeOffset,
- &id) != 0) {
- // Not registered.
- return 0;
- }
- size_t pos = 0;
- const uint8_t len = 2;
- data_buffer[pos++] = (id << 4) + len;
- ByteWriter<int32_t, 3>::WriteBigEndian(data_buffer + pos,
- transmission_time_offset_);
- pos += 3;
- assert(pos == kTransmissionTimeOffsetLength);
- return kTransmissionTimeOffsetLength;
-}
-
-uint8_t RTPSender::BuildAudioLevelExtension(uint8_t* data_buffer) const {
- // An RTP Header Extension for Client-to-Mixer Audio Level Indication
- //
- // https://datatracker.ietf.org/doc/draft-lennox-avt-rtp-audio-level-exthdr/
- //
- // The form of the audio level extension block:
- //
- // 0 1
- // 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
- // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- // | ID | len=0 |V| level |
- // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- //
-
- // Get id defined by user.
- uint8_t id;
- if (rtp_header_extension_map_.GetId(kRtpExtensionAudioLevel, &id) != 0) {
- // Not registered.
- return 0;
- }
- size_t pos = 0;
- const uint8_t len = 0;
- data_buffer[pos++] = (id << 4) + len;
- data_buffer[pos++] = (1 << 7) + 0; // Voice, 0 dBov.
- assert(pos == kAudioLevelLength);
- return kAudioLevelLength;
-}
-
-uint8_t RTPSender::BuildAbsoluteSendTimeExtension(uint8_t* data_buffer) const {
- // Absolute send time in RTP streams.
- //
- // The absolute send time is signaled to the receiver in-band using the
- // general mechanism for RTP header extensions [RFC5285]. The payload
- // of this extension (the transmitted value) is a 24-bit unsigned integer
- // containing the sender's current time in seconds as a fixed point number
- // with 18 bits fractional part.
- //
- // The form of the absolute send time extension block:
- //
- // 0 1 2 3
- // 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- // | ID | len=2 | absolute send time |
- // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
- // Get id defined by user.
- uint8_t id;
- if (rtp_header_extension_map_.GetId(kRtpExtensionAbsoluteSendTime,
- &id) != 0) {
- // Not registered.
- return 0;
- }
- size_t pos = 0;
- const uint8_t len = 2;
- data_buffer[pos++] = (id << 4) + len;
- ByteWriter<uint32_t, 3>::WriteBigEndian(data_buffer + pos,
- absolute_send_time_);
- pos += 3;
- assert(pos == kAbsoluteSendTimeLength);
- return kAbsoluteSendTimeLength;
-}
-
-uint8_t RTPSender::BuildVideoRotationExtension(uint8_t* data_buffer) const {
- // Coordination of Video Orientation in RTP streams.
- //
- // Coordination of Video Orientation consists in signaling of the current
- // orientation of the image captured on the sender side to the receiver for
- // appropriate rendering and displaying.
- //
- // 0 1
- // 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
- // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- // | ID | len=0 |0 0 0 0 C F R R|
- // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- //
-
- // Get id defined by user.
- uint8_t id;
- if (rtp_header_extension_map_.GetId(kRtpExtensionVideoRotation, &id) != 0) {
- // Not registered.
- return 0;
- }
- size_t pos = 0;
- const uint8_t len = 0;
- data_buffer[pos++] = (id << 4) + len;
- data_buffer[pos++] = ConvertVideoRotationToCVOByte(rotation_);
- assert(pos == kVideoRotationLength);
- return kVideoRotationLength;
-}
-
-uint8_t RTPSender::BuildTransportSequenceNumberExtension(
- uint8_t* data_buffer,
- uint16_t sequence_number) const {
- // 0 1 2
- // 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3
- // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- // | ID | L=1 |transport wide sequence number |
- // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
- // Get id defined by user.
- uint8_t id;
- if (rtp_header_extension_map_.GetId(kRtpExtensionTransportSequenceNumber,
- &id) != 0) {
- // Not registered.
- return 0;
- }
- size_t pos = 0;
- const uint8_t len = 1;
- data_buffer[pos++] = (id << 4) + len;
- ByteWriter<uint16_t>::WriteBigEndian(data_buffer + pos, sequence_number);
- pos += 2;
- assert(pos == kTransportSequenceNumberLength);
- return kTransportSequenceNumberLength;
-}
-
-uint8_t RTPSender::BuildPlayoutDelayExtension(
- uint8_t* data_buffer,
- uint16_t min_playout_delay_ms,
- uint16_t max_playout_delay_ms) const {
- RTC_DCHECK_LE(min_playout_delay_ms, kPlayoutDelayMaxMs);
- RTC_DCHECK_LE(max_playout_delay_ms, kPlayoutDelayMaxMs);
- RTC_DCHECK_LE(min_playout_delay_ms, max_playout_delay_ms);
- // 0 1 2 3
- // 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- // | ID | len=2 | MIN delay | MAX delay |
- // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- uint8_t id;
- if (rtp_header_extension_map_.GetId(kRtpExtensionPlayoutDelay, &id) != 0) {
- // Not registered.
- return 0;
- }
- size_t pos = 0;
- const uint8_t len = 2;
- // Convert MS to value to be sent on extension header.
- uint16_t min_playout = min_playout_delay_ms / kPlayoutDelayGranularityMs;
- uint16_t max_playout = max_playout_delay_ms / kPlayoutDelayGranularityMs;
-
- data_buffer[pos++] = (id << 4) + len;
- data_buffer[pos++] = min_playout >> 4;
- data_buffer[pos++] = ((min_playout & 0xf) << 4) | (max_playout >> 8);
- data_buffer[pos++] = max_playout & 0xff;
- assert(pos == kPlayoutDelayLength);
- return kPlayoutDelayLength;
-}
-
bool RTPSender::FindHeaderExtensionPosition(RTPExtensionType type,
const uint8_t* rtp_packet,
size_t rtp_packet_length,
@@ -1438,83 +1065,6 @@ bool RTPSender::FindHeaderExtensionPosition(RTPExtensionType type,
return true;
}
-RTPSender::ExtensionStatus RTPSender::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 {
- // Get id.
- uint8_t id = 0;
- if (rtp_header_extension_map_.GetId(extension_type, &id) != 0)
- return ExtensionStatus::kNotRegistered;
-
- size_t block_pos = 0;
- if (!FindHeaderExtensionPosition(extension_type, rtp_packet,
- rtp_packet_length, rtp_header, &block_pos))
- return ExtensionStatus::kError;
-
- // Verify first byte in block.
- const uint8_t first_block_byte = (id << 4) + (extension_length_bytes - 2);
- if (rtp_packet[block_pos] != first_block_byte)
- return ExtensionStatus::kError;
-
- *extension_offset = block_pos;
- return ExtensionStatus::kOk;
-}
-
-bool RTPSender::UpdateAudioLevel(uint8_t* rtp_packet,
- size_t rtp_packet_length,
- const RTPHeader& rtp_header,
- bool is_voiced,
- uint8_t dBov) const {
- size_t offset;
- rtc::CritScope lock(&send_critsect_);
-
- switch (VerifyExtension(kRtpExtensionAudioLevel, rtp_packet,
- rtp_packet_length, rtp_header, kAudioLevelLength,
- &offset)) {
- case ExtensionStatus::kNotRegistered:
- return false;
- case ExtensionStatus::kError:
- LOG(LS_WARNING) << "Failed to update audio level.";
- return false;
- case ExtensionStatus::kOk:
- break;
- default:
- RTC_NOTREACHED();
- }
-
- rtp_packet[offset + 1] = (is_voiced ? 0x80 : 0x00) + (dBov & 0x7f);
- return true;
-}
-
-bool RTPSender::UpdateVideoRotation(uint8_t* rtp_packet,
- size_t rtp_packet_length,
- const RTPHeader& rtp_header,
- VideoRotation rotation) const {
- size_t offset;
- rtc::CritScope lock(&send_critsect_);
-
- switch (VerifyExtension(kRtpExtensionVideoRotation, rtp_packet,
- rtp_packet_length, rtp_header, kVideoRotationLength,
- &offset)) {
- case ExtensionStatus::kNotRegistered:
- return false;
- case ExtensionStatus::kError:
- LOG(LS_WARNING) << "Failed to update CVO.";
- return false;
- case ExtensionStatus::kOk:
- break;
- default:
- RTC_NOTREACHED();
- }
-
- rtp_packet[offset + 1] = ConvertVideoRotationToCVOByte(rotation);
- return true;
-}
-
bool RTPSender::UpdateTransportSequenceNumber(RtpPacketToSend* packet,
int* packet_id) const {
RTC_DCHECK(packet);
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_sender.h ('k') | webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698