diff options
Diffstat (limited to 'webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc')
| -rw-r--r-- | webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc index 66062771de..5a565dfa99 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc @@ -18,7 +18,7 @@ #include "webrtc/base/checks.h" #include "webrtc/base/logging.h" #include "webrtc/base/trace_event.h" -#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" +#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/producer_fec.h" #include "webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h" @@ -42,13 +42,13 @@ RTPSenderVideo::RTPSenderVideo(Clock* clock, RTPSenderInterface* rtpSender) _retransmissionSettings(kRetransmitBaseLayer), // Generic FEC - _fec(), - _fecEnabled(false), - _payloadTypeRED(-1), - _payloadTypeFEC(-1), + fec_(), + fec_enabled_(false), + red_payload_type_(-1), + fec_payload_type_(-1), delta_fec_params_(), key_fec_params_(), - producer_fec_(&_fec), + producer_fec_(&fec_), _fecOverheadRate(clock, NULL), _videoBitrate(clock, NULL) { memset(&delta_fec_params_, 0, sizeof(delta_fec_params_)); @@ -104,7 +104,7 @@ void RTPSenderVideo::SendVideoPacket(uint8_t* data_buffer, StorageType storage) { if (_rtpSender.SendToNetwork(data_buffer, payload_length, rtp_header_length, capture_time_ms, storage, - RtpPacketSender::kNormalPriority) == 0) { + RtpPacketSender::kLowPriority) == 0) { _videoBitrate.Update(payload_length + rtp_header_length); TRACE_EVENT_INSTANT2(TRACE_DISABLED_BY_DEFAULT("webrtc_rtp"), "Video::PacketNormal", "timestamp", capture_timestamp, @@ -130,7 +130,7 @@ void RTPSenderVideo::SendVideoPacketAsRed(uint8_t* data_buffer, // Only protect while creating RED and FEC packets, not when sending. CriticalSectionScoped cs(crit_.get()); red_packet.reset(producer_fec_.BuildRedPacket( - data_buffer, payload_length, rtp_header_length, _payloadTypeRED)); + data_buffer, payload_length, rtp_header_length, red_payload_type_)); if (protect) { producer_fec_.AddRtpPacketAndGenerateFec(data_buffer, payload_length, rtp_header_length); @@ -140,7 +140,7 @@ void RTPSenderVideo::SendVideoPacketAsRed(uint8_t* data_buffer, next_fec_sequence_number = _rtpSender.AllocateSequenceNumber(num_fec_packets); fec_packets = producer_fec_.GetFecPackets( - _payloadTypeRED, _payloadTypeFEC, next_fec_sequence_number, + red_payload_type_, fec_payload_type_, next_fec_sequence_number, rtp_header_length); RTC_DCHECK_EQ(num_fec_packets, fec_packets.size()); if (_retransmissionSettings & kRetransmitFECPackets) @@ -150,7 +150,7 @@ void RTPSenderVideo::SendVideoPacketAsRed(uint8_t* data_buffer, if (_rtpSender.SendToNetwork( red_packet->data(), red_packet->length() - rtp_header_length, rtp_header_length, capture_time_ms, media_packet_storage, - RtpPacketSender::kNormalPriority) == 0) { + RtpPacketSender::kLowPriority) == 0) { _videoBitrate.Update(red_packet->length()); TRACE_EVENT_INSTANT2(TRACE_DISABLED_BY_DEFAULT("webrtc_rtp"), "Video::PacketRed", "timestamp", capture_timestamp, @@ -162,7 +162,7 @@ void RTPSenderVideo::SendVideoPacketAsRed(uint8_t* data_buffer, if (_rtpSender.SendToNetwork( fec_packet->data(), fec_packet->length() - rtp_header_length, rtp_header_length, capture_time_ms, fec_storage, - RtpPacketSender::kNormalPriority) == 0) { + RtpPacketSender::kLowPriority) == 0) { _fecOverheadRate.Update(fec_packet->length()); TRACE_EVENT_INSTANT2(TRACE_DISABLED_BY_DEFAULT("webrtc_rtp"), "Video::PacketFec", "timestamp", capture_timestamp, @@ -180,9 +180,9 @@ void RTPSenderVideo::SetGenericFECStatus(const bool enable, const uint8_t payloadTypeRED, const uint8_t payloadTypeFEC) { CriticalSectionScoped cs(crit_.get()); - _fecEnabled = enable; - _payloadTypeRED = payloadTypeRED; - _payloadTypeFEC = payloadTypeFEC; + fec_enabled_ = enable; + red_payload_type_ = payloadTypeRED; + fec_payload_type_ = payloadTypeFEC; memset(&delta_fec_params_, 0, sizeof(delta_fec_params_)); memset(&key_fec_params_, 0, sizeof(key_fec_params_)); delta_fec_params_.max_fec_frames = key_fec_params_.max_fec_frames = 1; @@ -190,18 +190,18 @@ void RTPSenderVideo::SetGenericFECStatus(const bool enable, kFecMaskRandom; } -void RTPSenderVideo::GenericFECStatus(bool& enable, - uint8_t& payloadTypeRED, - uint8_t& payloadTypeFEC) const { +void RTPSenderVideo::GenericFECStatus(bool* enable, + uint8_t* payloadTypeRED, + uint8_t* payloadTypeFEC) const { CriticalSectionScoped cs(crit_.get()); - enable = _fecEnabled; - payloadTypeRED = _payloadTypeRED; - payloadTypeFEC = _payloadTypeFEC; + *enable = fec_enabled_; + *payloadTypeRED = red_payload_type_; + *payloadTypeFEC = fec_payload_type_; } size_t RTPSenderVideo::FECPacketOverhead() const { CriticalSectionScoped cs(crit_.get()); - if (_fecEnabled) { + if (fec_enabled_) { // Overhead is FEC headers plus RED for FEC header plus anything in RTP // header beyond the 12 bytes base header (CSRC list, extensions...) // This reason for the header extensions to be included here is that @@ -247,7 +247,7 @@ int32_t RTPSenderVideo::SendVideo(const RtpVideoCodecTypes videoType, frameType == kVideoFrameKey ? &key_fec_params_ : &delta_fec_params_; producer_fec_.SetFecParameters(fec_params, 0); storage = packetizer->GetStorageType(_retransmissionSettings); - fec_enabled = _fecEnabled; + fec_enabled = fec_enabled_; } // Register CVO rtp header extension at the first time when we receive a frame @@ -304,7 +304,7 @@ int32_t RTPSenderVideo::SendVideo(const RtpVideoCodecTypes videoType, size_t packetSize = payloadSize + rtp_header_length; RtpUtility::RtpHeaderParser rtp_parser(dataBuffer, packetSize); RTPHeader rtp_header; - rtp_parser.Parse(rtp_header); + rtp_parser.Parse(&rtp_header); _rtpSender.UpdateVideoRotation(dataBuffer, packetSize, rtp_header, rtpHdr->rotation); } |