2011-07-07 08:21:25 +00:00
|
|
|
/*
|
2012-01-24 17:16:59 +00:00
|
|
|
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
2011-07-07 08:21:25 +00:00
|
|
|
*
|
|
|
|
|
* 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.
|
|
|
|
|
*/
|
|
|
|
|
|
2012-11-13 21:12:39 +00:00
|
|
|
#include "webrtc/modules/rtp_rtcp/source/rtp_sender.h"
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2013-08-05 16:22:53 +00:00
|
|
|
#include <stdlib.h> // srand
|
2015-12-10 05:05:27 -08:00
|
|
|
#include <algorithm>
|
2015-04-21 20:24:50 +08:00
|
|
|
#include <utility>
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2015-04-21 20:24:50 +08:00
|
|
|
#include "webrtc/base/checks.h"
|
2015-10-28 16:39:33 +01:00
|
|
|
#include "webrtc/base/logging.h"
|
2015-10-20 23:00:48 -07:00
|
|
|
#include "webrtc/base/trace_event.h"
|
2016-01-21 05:42:04 -08:00
|
|
|
#include "webrtc/call.h"
|
|
|
|
|
#include "webrtc/call/rtc_event_log.h"
|
2015-11-04 08:31:52 +01:00
|
|
|
#include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h"
|
2015-03-17 16:42:49 +00:00
|
|
|
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
|
2012-11-13 21:12:39 +00:00
|
|
|
#include "webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h"
|
|
|
|
|
#include "webrtc/modules/rtp_rtcp/source/rtp_sender_video.h"
|
2015-12-21 11:06:50 -08:00
|
|
|
#include "webrtc/modules/rtp_rtcp/source/time_util.h"
|
2015-10-28 18:17:40 +01:00
|
|
|
#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
|
|
|
|
|
#include "webrtc/system_wrappers/include/tick_util.h"
|
2011-07-07 08:21:25 +00:00
|
|
|
|
|
|
|
|
namespace webrtc {
|
2013-01-25 10:53:38 +00:00
|
|
|
|
2013-06-04 13:47:36 +00:00
|
|
|
// Max in the RFC 3550 is 255 bytes, we limit it to be modulus 32 for SRTP.
|
2015-10-21 13:41:48 +02:00
|
|
|
static const size_t kMaxPaddingLength = 224;
|
|
|
|
|
static const int kSendSideDelayWindowMs = 1000;
|
|
|
|
|
static const uint32_t kAbsSendTimeFraction = 18;
|
2013-06-04 13:47:36 +00:00
|
|
|
|
2013-04-09 19:54:10 +00:00
|
|
|
namespace {
|
|
|
|
|
|
2015-03-04 22:55:15 +00:00
|
|
|
const size_t kRtpHeaderLength = 12;
|
2015-12-15 00:30:07 -08:00
|
|
|
const uint16_t kMaxInitRtpSeqNumber = 32767; // 2^15 -1.
|
2015-03-04 22:55:15 +00:00
|
|
|
|
2014-12-19 13:49:55 +00:00
|
|
|
const char* FrameTypeToString(FrameType frame_type) {
|
2013-04-09 19:54:10 +00:00
|
|
|
switch (frame_type) {
|
2015-10-19 02:39:06 -07:00
|
|
|
case kEmptyFrame:
|
|
|
|
|
return "empty";
|
2013-04-09 19:54:10 +00:00
|
|
|
case kAudioFrameSpeech: return "audio_speech";
|
|
|
|
|
case kAudioFrameCN: return "audio_cn";
|
|
|
|
|
case kVideoFrameKey: return "video_key";
|
|
|
|
|
case kVideoFrameDelta: return "video_delta";
|
|
|
|
|
}
|
|
|
|
|
return "";
|
|
|
|
|
}
|
|
|
|
|
|
2015-10-21 13:41:48 +02:00
|
|
|
// TODO(holmer): Merge this with the implementation in
|
|
|
|
|
// remote_bitrate_estimator_abs_send_time.cc.
|
|
|
|
|
uint32_t ConvertMsTo24Bits(int64_t time_ms) {
|
|
|
|
|
uint32_t time_24_bits =
|
|
|
|
|
static_cast<uint32_t>(
|
|
|
|
|
((static_cast<uint64_t>(time_ms) << kAbsSendTimeFraction) + 500) /
|
|
|
|
|
1000) &
|
|
|
|
|
0x00FFFFFF;
|
|
|
|
|
return time_24_bits;
|
|
|
|
|
}
|
2013-04-09 19:54:10 +00:00
|
|
|
} // namespace
|
|
|
|
|
|
2014-11-05 14:05:29 +00:00
|
|
|
class BitrateAggregator {
|
|
|
|
|
public:
|
|
|
|
|
explicit BitrateAggregator(BitrateStatisticsObserver* bitrate_callback)
|
|
|
|
|
: callback_(bitrate_callback),
|
|
|
|
|
total_bitrate_observer_(*this),
|
|
|
|
|
retransmit_bitrate_observer_(*this),
|
|
|
|
|
ssrc_(0) {}
|
|
|
|
|
|
|
|
|
|
void OnStatsUpdated() const {
|
|
|
|
|
if (callback_)
|
|
|
|
|
callback_->Notify(total_bitrate_observer_.statistics(),
|
|
|
|
|
retransmit_bitrate_observer_.statistics(),
|
|
|
|
|
ssrc_);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Bitrate::Observer* total_bitrate_observer() {
|
|
|
|
|
return &total_bitrate_observer_;
|
|
|
|
|
}
|
|
|
|
|
Bitrate::Observer* retransmit_bitrate_observer() {
|
|
|
|
|
return &retransmit_bitrate_observer_;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void set_ssrc(uint32_t ssrc) { ssrc_ = ssrc; }
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
// We assume that these observers are called on the same thread, which is
|
|
|
|
|
// true for RtpSender as they are called on the Process thread.
|
|
|
|
|
class BitrateObserver : public Bitrate::Observer {
|
|
|
|
|
public:
|
|
|
|
|
explicit BitrateObserver(const BitrateAggregator& aggregator)
|
|
|
|
|
: aggregator_(aggregator) {}
|
|
|
|
|
|
|
|
|
|
// Implements Bitrate::Observer.
|
2015-03-04 12:58:35 +00:00
|
|
|
void BitrateUpdated(const BitrateStatistics& stats) override {
|
2014-11-05 14:05:29 +00:00
|
|
|
statistics_ = stats;
|
|
|
|
|
aggregator_.OnStatsUpdated();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BitrateStatistics statistics() const { return statistics_; }
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
BitrateStatistics statistics_;
|
|
|
|
|
const BitrateAggregator& aggregator_;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
BitrateStatisticsObserver* const callback_;
|
|
|
|
|
BitrateObserver total_bitrate_observer_;
|
|
|
|
|
BitrateObserver retransmit_bitrate_observer_;
|
|
|
|
|
uint32_t ssrc_;
|
|
|
|
|
};
|
|
|
|
|
|
2015-09-21 15:11:14 -07:00
|
|
|
RTPSender::RTPSender(
|
|
|
|
|
bool audio,
|
|
|
|
|
Clock* clock,
|
|
|
|
|
Transport* transport,
|
|
|
|
|
RtpAudioFeedback* audio_feedback,
|
|
|
|
|
RtpPacketSender* paced_sender,
|
|
|
|
|
TransportSequenceNumberAllocator* sequence_number_allocator,
|
|
|
|
|
TransportFeedbackObserver* transport_feedback_observer,
|
|
|
|
|
BitrateStatisticsObserver* bitrate_callback,
|
|
|
|
|
FrameCountObserver* frame_count_observer,
|
2016-01-21 05:42:04 -08:00
|
|
|
SendSideDelayObserver* send_side_delay_observer,
|
|
|
|
|
RtcEventLog* event_log)
|
2013-12-13 09:46:59 +00:00
|
|
|
: clock_(clock),
|
2014-11-04 16:27:16 +00:00
|
|
|
// TODO(holmer): Remove this conversion when we remove the use of
|
|
|
|
|
// TickTime.
|
|
|
|
|
clock_delta_ms_(clock_->TimeInMilliseconds() -
|
|
|
|
|
TickTime::MillisecondTimestamp()),
|
2015-12-15 00:30:07 -08:00
|
|
|
random_(clock_->TimeInMicroseconds()),
|
2014-11-05 14:05:29 +00:00
|
|
|
bitrates_(new BitrateAggregator(bitrate_callback)),
|
|
|
|
|
total_bitrate_sent_(clock, bitrates_->total_bitrate_observer()),
|
2013-12-13 09:46:59 +00:00
|
|
|
audio_configured_(audio),
|
2015-09-17 23:03:57 +02:00
|
|
|
audio_(audio ? new RTPSenderAudio(clock, this, audio_feedback) : nullptr),
|
2015-02-12 12:20:08 +00:00
|
|
|
video_(audio ? nullptr : new RTPSenderVideo(clock, this)),
|
2013-12-13 09:46:59 +00:00
|
|
|
paced_sender_(paced_sender),
|
2015-09-21 15:11:14 -07:00
|
|
|
transport_sequence_number_allocator_(sequence_number_allocator),
|
2015-09-14 06:42:43 -07:00
|
|
|
transport_feedback_observer_(transport_feedback_observer),
|
2014-11-04 16:27:16 +00:00
|
|
|
last_capture_time_ms_sent_(0),
|
2013-01-25 10:53:38 +00:00
|
|
|
send_critsect_(CriticalSectionWrapper::CreateCriticalSection()),
|
2013-12-13 09:46:59 +00:00
|
|
|
transport_(transport),
|
|
|
|
|
sending_media_(true), // Default to sending media.
|
|
|
|
|
max_payload_length_(IP_PACKET_SIZE - 28), // Default is IP-v4/UDP.
|
|
|
|
|
packet_over_head_(28),
|
|
|
|
|
payload_type_(-1),
|
|
|
|
|
payload_type_map_(),
|
|
|
|
|
rtp_header_extension_map_(),
|
|
|
|
|
transmission_time_offset_(0),
|
|
|
|
|
absolute_send_time_(0),
|
2015-03-04 22:55:15 +00:00
|
|
|
rotation_(kVideoRotation_0),
|
2015-04-01 15:33:06 -07:00
|
|
|
cvo_mode_(kCVONone),
|
2015-03-17 14:33:12 +00:00
|
|
|
transport_sequence_number_(0),
|
2013-01-25 10:53:38 +00:00
|
|
|
// NACK.
|
2013-12-13 09:46:59 +00:00
|
|
|
nack_byte_count_times_(),
|
|
|
|
|
nack_byte_count_(),
|
2014-11-05 14:05:29 +00:00
|
|
|
nack_bitrate_(clock, bitrates_->retransmit_bitrate_observer()),
|
2013-12-04 10:24:26 +00:00
|
|
|
packet_history_(clock),
|
2013-01-25 10:53:38 +00:00
|
|
|
// Statistics
|
2013-09-10 11:29:17 +00:00
|
|
|
statistics_crit_(CriticalSectionWrapper::CreateCriticalSection()),
|
2013-12-13 09:46:59 +00:00
|
|
|
rtp_stats_callback_(NULL),
|
2014-07-10 09:39:23 +00:00
|
|
|
frame_count_observer_(frame_count_observer),
|
2014-07-11 13:44:02 +00:00
|
|
|
send_side_delay_observer_(send_side_delay_observer),
|
2016-01-21 05:42:04 -08:00
|
|
|
event_log_(event_log),
|
2013-12-05 14:29:02 +00:00
|
|
|
// RTP variables
|
2014-07-07 13:06:48 +00:00
|
|
|
start_timestamp_forced_(false),
|
|
|
|
|
start_timestamp_(0),
|
2013-12-13 09:46:59 +00:00
|
|
|
ssrc_db_(*SSRCDatabase::GetSSRCDatabase()),
|
|
|
|
|
remote_ssrc_(0),
|
|
|
|
|
sequence_number_forced_(false),
|
|
|
|
|
ssrc_forced_(false),
|
|
|
|
|
timestamp_(0),
|
|
|
|
|
capture_time_ms_(0),
|
|
|
|
|
last_timestamp_time_ms_(0),
|
2014-07-17 16:10:14 +00:00
|
|
|
media_has_been_sent_(false),
|
2013-12-13 09:46:59 +00:00
|
|
|
last_packet_marker_bit_(false),
|
|
|
|
|
csrcs_(),
|
|
|
|
|
rtx_(kRtxOff),
|
2015-04-21 20:24:50 +08:00
|
|
|
rtx_payload_type_(-1),
|
2014-03-26 14:27:34 +00:00
|
|
|
target_bitrate_critsect_(CriticalSectionWrapper::CreateCriticalSection()),
|
2014-06-17 17:32:05 +00:00
|
|
|
target_bitrate_(0) {
|
2013-01-25 10:53:38 +00:00
|
|
|
memset(nack_byte_count_times_, 0, sizeof(nack_byte_count_times_));
|
|
|
|
|
memset(nack_byte_count_, 0, sizeof(nack_byte_count_));
|
2012-11-07 17:01:04 +00:00
|
|
|
// We need to seed the random generator.
|
2013-04-08 11:08:41 +00:00
|
|
|
srand(static_cast<uint32_t>(clock_->TimeInMilliseconds()));
|
2013-01-25 10:53:38 +00:00
|
|
|
ssrc_ = ssrc_db_.CreateSSRC(); // Can't be 0.
|
2013-03-15 23:21:52 +00:00
|
|
|
ssrc_rtx_ = ssrc_db_.CreateSSRC(); // Can't be 0.
|
2014-11-05 14:05:29 +00:00
|
|
|
bitrates_->set_ssrc(ssrc_);
|
2013-03-15 23:21:52 +00:00
|
|
|
// Random start, 16 bits. Can't be 0.
|
2015-12-15 00:30:07 -08:00
|
|
|
sequence_number_rtx_ = random_.Rand(1, kMaxInitRtpSeqNumber);
|
|
|
|
|
sequence_number_ = random_.Rand(1, kMaxInitRtpSeqNumber);
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2012-01-19 15:56:10 +00:00
|
|
|
RTPSender::~RTPSender() {
|
2013-01-25 10:53:38 +00:00
|
|
|
if (remote_ssrc_ != 0) {
|
|
|
|
|
ssrc_db_.ReturnSSRC(remote_ssrc_);
|
2012-01-19 15:56:10 +00:00
|
|
|
}
|
2013-01-25 10:53:38 +00:00
|
|
|
ssrc_db_.ReturnSSRC(ssrc_);
|
2012-01-19 15:56:10 +00:00
|
|
|
|
|
|
|
|
SSRCDatabase::ReturnSSRCDatabase();
|
2013-01-25 10:53:38 +00:00
|
|
|
while (!payload_type_map_.empty()) {
|
2014-07-08 12:10:51 +00:00
|
|
|
std::map<int8_t, RtpUtility::Payload*>::iterator it =
|
2013-01-25 10:53:38 +00:00
|
|
|
payload_type_map_.begin();
|
2012-01-19 15:56:10 +00:00
|
|
|
delete it->second;
|
2013-01-25 10:53:38 +00:00
|
|
|
payload_type_map_.erase(it);
|
2012-01-19 15:56:10 +00:00
|
|
|
}
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2014-06-17 17:32:05 +00:00
|
|
|
void RTPSender::SetTargetBitrate(uint32_t bitrate) {
|
|
|
|
|
CriticalSectionScoped cs(target_bitrate_critsect_.get());
|
|
|
|
|
target_bitrate_ = bitrate;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
uint32_t RTPSender::GetTargetBitrate() {
|
|
|
|
|
CriticalSectionScoped cs(target_bitrate_critsect_.get());
|
|
|
|
|
return target_bitrate_;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
2011-10-14 14:24:54 +00:00
|
|
|
|
2013-04-08 11:08:41 +00:00
|
|
|
uint16_t RTPSender::ActualSendBitrateKbit() const {
|
2014-11-05 14:05:29 +00:00
|
|
|
return (uint16_t)(total_bitrate_sent_.BitrateNow() / 1000);
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-04-08 11:08:41 +00:00
|
|
|
uint32_t RTPSender::VideoBitrateSent() const {
|
2013-01-25 10:53:38 +00:00
|
|
|
if (video_) {
|
|
|
|
|
return video_->VideoBitrateSent();
|
2012-11-07 17:01:04 +00:00
|
|
|
}
|
|
|
|
|
return 0;
|
2011-10-27 16:08:29 +00:00
|
|
|
}
|
|
|
|
|
|
2013-04-08 11:08:41 +00:00
|
|
|
uint32_t RTPSender::FecOverheadRate() const {
|
2013-01-25 10:53:38 +00:00
|
|
|
if (video_) {
|
|
|
|
|
return video_->FecOverheadRate();
|
2012-11-07 17:01:04 +00:00
|
|
|
}
|
|
|
|
|
return 0;
|
2011-10-14 14:24:54 +00:00
|
|
|
}
|
|
|
|
|
|
2013-04-08 11:08:41 +00:00
|
|
|
uint32_t RTPSender::NackOverheadRate() const {
|
2013-01-25 10:53:38 +00:00
|
|
|
return nack_bitrate_.BitrateLast();
|
2011-10-14 14:24:54 +00:00
|
|
|
}
|
|
|
|
|
|
2014-12-19 13:49:55 +00:00
|
|
|
int32_t RTPSender::SetTransmissionTimeOffset(int32_t transmission_time_offset) {
|
2013-01-25 10:53:38 +00:00
|
|
|
if (transmission_time_offset > (0x800000 - 1) ||
|
|
|
|
|
transmission_time_offset < -(0x800000 - 1)) { // Word24.
|
2012-11-07 17:01:04 +00:00
|
|
|
return -1;
|
|
|
|
|
}
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2013-01-25 10:53:38 +00:00
|
|
|
transmission_time_offset_ = transmission_time_offset;
|
2012-11-07 17:01:04 +00:00
|
|
|
return 0;
|
2011-12-16 14:31:37 +00:00
|
|
|
}
|
|
|
|
|
|
2014-12-19 13:49:55 +00:00
|
|
|
int32_t RTPSender::SetAbsoluteSendTime(uint32_t absolute_send_time) {
|
2013-05-16 11:10:31 +00:00
|
|
|
if (absolute_send_time > 0xffffff) { // UWord24.
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2013-05-16 11:10:31 +00:00
|
|
|
absolute_send_time_ = absolute_send_time;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-04 22:55:15 +00:00
|
|
|
void RTPSender::SetVideoRotation(VideoRotation rotation) {
|
|
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
|
|
|
|
rotation_ = rotation;
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-17 14:33:12 +00:00
|
|
|
int32_t RTPSender::SetTransportSequenceNumber(uint16_t sequence_number) {
|
|
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
|
|
|
|
transport_sequence_number_ = sequence_number;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2014-12-19 13:49:55 +00:00
|
|
|
int32_t RTPSender::RegisterRtpHeaderExtension(RTPExtensionType type,
|
|
|
|
|
uint8_t id) {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2015-04-01 15:33:06 -07:00
|
|
|
if (type == kRtpExtensionVideoRotation) {
|
|
|
|
|
cvo_mode_ = kCVOInactive;
|
|
|
|
|
return rtp_header_extension_map_.RegisterInactive(type, id);
|
|
|
|
|
}
|
2013-01-25 10:53:38 +00:00
|
|
|
return rtp_header_extension_map_.Register(type, id);
|
2011-12-16 14:31:37 +00:00
|
|
|
}
|
|
|
|
|
|
2015-03-04 22:55:15 +00:00
|
|
|
bool RTPSender::IsRtpHeaderExtensionRegistered(RTPExtensionType type) {
|
|
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
|
|
|
|
return rtp_header_extension_map_.IsRegistered(type);
|
|
|
|
|
}
|
|
|
|
|
|
2014-12-19 13:49:55 +00:00
|
|
|
int32_t RTPSender::DeregisterRtpHeaderExtension(RTPExtensionType type) {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2013-01-25 10:53:38 +00:00
|
|
|
return rtp_header_extension_map_.Deregister(type);
|
2011-12-16 14:31:37 +00:00
|
|
|
}
|
|
|
|
|
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
size_t RTPSender::RtpHeaderExtensionTotalLength() const {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2013-01-25 10:53:38 +00:00
|
|
|
return rtp_header_extension_map_.GetTotalLengthInBytes();
|
2011-12-16 14:31:37 +00:00
|
|
|
}
|
|
|
|
|
|
2013-04-08 11:08:41 +00:00
|
|
|
int32_t RTPSender::RegisterPayload(
|
2013-01-25 10:53:38 +00:00
|
|
|
const char payload_name[RTP_PAYLOAD_NAME_SIZE],
|
2014-12-19 13:49:55 +00:00
|
|
|
int8_t payload_number,
|
|
|
|
|
uint32_t frequency,
|
Convert channel counts to size_t.
IIRC, this was originally requested by ajm during review of the other size_t conversions I did over the past year, and I agreed it made sense, but wanted to do it separately since those changes were already gargantuan.
BUG=chromium:81439
TEST=none
R=henrik.lundin@webrtc.org, henrika@webrtc.org, kjellander@webrtc.org, minyue@webrtc.org, perkj@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, tina.legrand@webrtc.org
Review URL: https://codereview.webrtc.org/1316523002 .
Cr-Commit-Position: refs/heads/master@{#11229}
2016-01-12 16:26:35 -08:00
|
|
|
size_t channels,
|
2014-12-19 13:49:55 +00:00
|
|
|
uint32_t rate) {
|
2013-01-25 10:53:38 +00:00
|
|
|
assert(payload_name);
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2013-01-25 10:53:38 +00:00
|
|
|
|
2014-07-08 12:10:51 +00:00
|
|
|
std::map<int8_t, RtpUtility::Payload*>::iterator it =
|
2013-01-25 10:53:38 +00:00
|
|
|
payload_type_map_.find(payload_number);
|
|
|
|
|
|
|
|
|
|
if (payload_type_map_.end() != it) {
|
|
|
|
|
// We already use this payload type.
|
2014-07-08 12:10:51 +00:00
|
|
|
RtpUtility::Payload* payload = it->second;
|
2012-01-19 15:56:10 +00:00
|
|
|
assert(payload);
|
|
|
|
|
|
2013-01-25 10:53:38 +00:00
|
|
|
// Check if it's the same as we already have.
|
2014-07-08 12:10:51 +00:00
|
|
|
if (RtpUtility::StringCompare(
|
|
|
|
|
payload->name, payload_name, RTP_PAYLOAD_NAME_SIZE - 1)) {
|
2013-01-25 10:53:38 +00:00
|
|
|
if (audio_configured_ && payload->audio &&
|
2012-01-19 15:56:10 +00:00
|
|
|
payload->typeSpecific.Audio.frequency == frequency &&
|
|
|
|
|
(payload->typeSpecific.Audio.rate == rate ||
|
2013-01-25 10:53:38 +00:00
|
|
|
payload->typeSpecific.Audio.rate == 0 || rate == 0)) {
|
2012-01-19 15:56:10 +00:00
|
|
|
payload->typeSpecific.Audio.rate = rate;
|
2013-01-25 10:53:38 +00:00
|
|
|
// Ensure that we update the rate if new or old is zero.
|
2012-01-19 15:56:10 +00:00
|
|
|
return 0;
|
|
|
|
|
}
|
2013-01-25 10:53:38 +00:00
|
|
|
if (!audio_configured_ && !payload->audio) {
|
2012-01-19 15:56:10 +00:00
|
|
|
return 0;
|
|
|
|
|
}
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
2012-01-19 15:56:10 +00:00
|
|
|
return -1;
|
|
|
|
|
}
|
2015-04-14 21:28:08 +02:00
|
|
|
int32_t ret_val = 0;
|
2015-12-15 02:54:47 -08:00
|
|
|
RtpUtility::Payload* payload = nullptr;
|
2013-01-25 10:53:38 +00:00
|
|
|
if (audio_configured_) {
|
2015-04-14 21:28:08 +02:00
|
|
|
// TODO(mflodman): Change to CreateAudioPayload and make static.
|
2013-01-25 10:53:38 +00:00
|
|
|
ret_val = audio_->RegisterAudioPayload(payload_name, payload_number,
|
2015-12-15 02:54:47 -08:00
|
|
|
frequency, channels, rate, &payload);
|
2012-01-19 15:56:10 +00:00
|
|
|
} else {
|
2015-04-14 21:28:08 +02:00
|
|
|
payload = video_->CreateVideoPayload(payload_name, payload_number, rate);
|
2012-01-19 15:56:10 +00:00
|
|
|
}
|
2012-11-07 17:01:04 +00:00
|
|
|
if (payload) {
|
2013-01-25 10:53:38 +00:00
|
|
|
payload_type_map_[payload_number] = payload;
|
2012-01-19 15:56:10 +00:00
|
|
|
}
|
2013-01-25 10:53:38 +00:00
|
|
|
return ret_val;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2014-12-19 13:49:55 +00:00
|
|
|
int32_t RTPSender::DeRegisterSendPayload(int8_t payload_type) {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped lock(send_critsect_.get());
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2014-07-08 12:10:51 +00:00
|
|
|
std::map<int8_t, RtpUtility::Payload*>::iterator it =
|
2013-01-25 10:53:38 +00:00
|
|
|
payload_type_map_.find(payload_type);
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2013-01-25 10:53:38 +00:00
|
|
|
if (payload_type_map_.end() == it) {
|
2012-11-07 17:01:04 +00:00
|
|
|
return -1;
|
|
|
|
|
}
|
2014-07-08 12:10:51 +00:00
|
|
|
RtpUtility::Payload* payload = it->second;
|
2012-01-19 15:56:10 +00:00
|
|
|
delete payload;
|
2013-01-25 10:53:38 +00:00
|
|
|
payload_type_map_.erase(it);
|
2012-01-19 15:56:10 +00:00
|
|
|
return 0;
|
|
|
|
|
}
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2014-08-27 09:39:43 +00:00
|
|
|
void RTPSender::SetSendPayloadType(int8_t payload_type) {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2014-08-27 09:39:43 +00:00
|
|
|
payload_type_ = payload_type;
|
|
|
|
|
}
|
|
|
|
|
|
2014-03-25 16:51:35 +00:00
|
|
|
int8_t RTPSender::SendPayloadType() const {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2014-03-25 16:51:35 +00:00
|
|
|
return payload_type_;
|
|
|
|
|
}
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2013-09-09 16:02:19 +00:00
|
|
|
int RTPSender::SendPayloadFrequency() const {
|
|
|
|
|
return audio_ != NULL ? audio_->AudioFrequency() : kVideoPayloadTypeFrequency;
|
|
|
|
|
}
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2014-12-19 13:49:55 +00:00
|
|
|
int32_t RTPSender::SetMaxPayloadLength(size_t max_payload_length,
|
|
|
|
|
uint16_t packet_over_head) {
|
2013-01-25 10:53:38 +00:00
|
|
|
// Sanity check.
|
2015-09-17 00:24:34 -07:00
|
|
|
RTC_DCHECK(max_payload_length >= 100 && max_payload_length <= IP_PACKET_SIZE)
|
2015-07-14 16:08:02 +02:00
|
|
|
<< "Invalid max payload length: " << max_payload_length;
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2013-01-25 10:53:38 +00:00
|
|
|
max_payload_length_ = max_payload_length;
|
|
|
|
|
packet_over_head_ = packet_over_head;
|
2012-11-07 17:01:04 +00:00
|
|
|
return 0;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
size_t RTPSender::MaxDataPayloadLength() const {
|
2014-07-07 13:06:48 +00:00
|
|
|
int rtx;
|
|
|
|
|
{
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped rtx_lock(send_critsect_.get());
|
2014-07-07 13:06:48 +00:00
|
|
|
rtx = rtx_;
|
|
|
|
|
}
|
2013-01-25 10:53:38 +00:00
|
|
|
if (audio_configured_) {
|
|
|
|
|
return max_payload_length_ - RTPHeaderLength();
|
2012-01-10 14:09:18 +00:00
|
|
|
} else {
|
2014-02-18 08:40:33 +00:00
|
|
|
return max_payload_length_ - RTPHeaderLength() // RTP overhead.
|
|
|
|
|
- video_->FECPacketOverhead() // FEC/ULP/RED overhead.
|
2014-07-07 13:06:48 +00:00
|
|
|
- ((rtx) ? 2 : 0); // RTX overhead.
|
2012-01-10 14:09:18 +00:00
|
|
|
}
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
size_t RTPSender::MaxPayloadLength() const {
|
2013-01-25 10:53:38 +00:00
|
|
|
return max_payload_length_;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-04-08 11:08:41 +00:00
|
|
|
uint16_t RTPSender::PacketOverHead() const { return packet_over_head_; }
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2015-01-13 14:15:15 +00:00
|
|
|
void RTPSender::SetRtxStatus(int mode) {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2013-03-15 23:21:52 +00:00
|
|
|
rtx_ = mode;
|
2014-06-05 08:25:29 +00:00
|
|
|
}
|
|
|
|
|
|
2015-01-13 14:15:15 +00:00
|
|
|
int RTPSender::RtxStatus() const {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2015-01-13 14:15:15 +00:00
|
|
|
return rtx_;
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-05 08:25:29 +00:00
|
|
|
void RTPSender::SetRtxSsrc(uint32_t ssrc) {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2014-06-05 08:25:29 +00:00
|
|
|
ssrc_rtx_ = ssrc;
|
2012-01-10 14:09:18 +00:00
|
|
|
}
|
|
|
|
|
|
2014-07-07 13:06:48 +00:00
|
|
|
uint32_t RTPSender::RtxSsrc() const {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2014-07-07 13:06:48 +00:00
|
|
|
return ssrc_rtx_;
|
|
|
|
|
}
|
|
|
|
|
|
2015-04-21 20:24:50 +08:00
|
|
|
void RTPSender::SetRtxPayloadType(int payload_type,
|
|
|
|
|
int associated_payload_type) {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2015-09-17 00:24:34 -07:00
|
|
|
RTC_DCHECK_LE(payload_type, 127);
|
|
|
|
|
RTC_DCHECK_LE(associated_payload_type, 127);
|
2015-04-21 20:24:50 +08:00
|
|
|
if (payload_type < 0) {
|
|
|
|
|
LOG(LS_ERROR) << "Invalid RTX payload type: " << payload_type;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rtx_payload_type_map_[associated_payload_type] = payload_type;
|
|
|
|
|
rtx_payload_type_ = payload_type;
|
2012-01-10 14:09:18 +00:00
|
|
|
}
|
|
|
|
|
|
2015-04-21 20:24:50 +08:00
|
|
|
std::pair<int, int> RTPSender::RtxPayloadType() const {
|
2015-04-13 17:48:08 +02:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2015-04-21 20:24:50 +08:00
|
|
|
for (const auto& kv : rtx_payload_type_map_) {
|
|
|
|
|
if (kv.second == rtx_payload_type_) {
|
|
|
|
|
return std::make_pair(rtx_payload_type_, kv.first);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return std::make_pair(-1, -1);
|
2015-04-13 17:48:08 +02:00
|
|
|
}
|
|
|
|
|
|
2014-12-19 13:49:55 +00:00
|
|
|
int32_t RTPSender::CheckPayloadType(int8_t payload_type,
|
|
|
|
|
RtpVideoCodecTypes* video_type) {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2013-01-25 10:53:38 +00:00
|
|
|
if (payload_type < 0) {
|
2014-04-08 11:06:12 +00:00
|
|
|
LOG(LS_ERROR) << "Invalid payload_type " << payload_type;
|
2012-01-19 15:56:10 +00:00
|
|
|
return -1;
|
|
|
|
|
}
|
2013-01-25 10:53:38 +00:00
|
|
|
if (audio_configured_) {
|
2013-04-08 11:08:41 +00:00
|
|
|
int8_t red_pl_type = -1;
|
2015-12-15 02:54:47 -08:00
|
|
|
if (audio_->RED(&red_pl_type) == 0) {
|
2012-01-19 15:56:10 +00:00
|
|
|
// We have configured RED.
|
2013-01-25 10:53:38 +00:00
|
|
|
if (red_pl_type == payload_type) {
|
2012-01-19 15:56:10 +00:00
|
|
|
// And it's a match...
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
2012-01-19 15:56:10 +00:00
|
|
|
}
|
2013-01-25 10:53:38 +00:00
|
|
|
if (payload_type_ == payload_type) {
|
|
|
|
|
if (!audio_configured_) {
|
|
|
|
|
*video_type = video_->VideoCodecType();
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
return 0;
|
2012-01-19 15:56:10 +00:00
|
|
|
}
|
2014-07-08 12:10:51 +00:00
|
|
|
std::map<int8_t, RtpUtility::Payload*>::iterator it =
|
2013-01-25 10:53:38 +00:00
|
|
|
payload_type_map_.find(payload_type);
|
|
|
|
|
if (it == payload_type_map_.end()) {
|
2015-12-07 10:26:18 +01:00
|
|
|
LOG(LS_WARNING) << "Payload type " << static_cast<int>(payload_type)
|
|
|
|
|
<< " not registered.";
|
2012-01-19 15:56:10 +00:00
|
|
|
return -1;
|
|
|
|
|
}
|
2014-08-27 09:39:43 +00:00
|
|
|
SetSendPayloadType(payload_type);
|
2014-07-08 12:10:51 +00:00
|
|
|
RtpUtility::Payload* payload = it->second;
|
2012-01-19 15:56:10 +00:00
|
|
|
assert(payload);
|
2013-01-25 10:53:38 +00:00
|
|
|
if (!payload->audio && !audio_configured_) {
|
|
|
|
|
video_->SetVideoCodecType(payload->typeSpecific.Video.videoCodecType);
|
|
|
|
|
*video_type = payload->typeSpecific.Video.videoCodecType;
|
|
|
|
|
video_->SetMaxConfiguredBitrateVideo(payload->typeSpecific.Video.maxRate);
|
2012-01-19 15:56:10 +00:00
|
|
|
}
|
|
|
|
|
return 0;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2015-04-01 15:33:06 -07:00
|
|
|
RTPSenderInterface::CVOMode RTPSender::ActivateCVORtpHeaderExtension() {
|
|
|
|
|
if (cvo_mode_ == kCVOInactive) {
|
|
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
|
|
|
|
if (rtp_header_extension_map_.SetActive(kRtpExtensionVideoRotation, true)) {
|
|
|
|
|
cvo_mode_ = kCVOActivated;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return cvo_mode_;
|
|
|
|
|
}
|
|
|
|
|
|
2014-12-19 13:49:55 +00:00
|
|
|
int32_t RTPSender::SendOutgoingData(FrameType frame_type,
|
|
|
|
|
int8_t payload_type,
|
|
|
|
|
uint32_t capture_timestamp,
|
|
|
|
|
int64_t capture_time_ms,
|
|
|
|
|
const uint8_t* payload_data,
|
|
|
|
|
size_t payload_size,
|
|
|
|
|
const RTPFragmentationHeader* fragmentation,
|
2015-03-04 22:55:15 +00:00
|
|
|
const RTPVideoHeader* rtp_hdr) {
|
2014-07-07 13:06:48 +00:00
|
|
|
uint32_t ssrc;
|
2012-11-07 17:01:04 +00:00
|
|
|
{
|
|
|
|
|
// Drop this packet if we're not sending media packets.
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2014-07-07 13:06:48 +00:00
|
|
|
ssrc = ssrc_;
|
2013-01-25 10:53:38 +00:00
|
|
|
if (!sending_media_) {
|
2012-11-07 17:01:04 +00:00
|
|
|
return 0;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
2012-11-07 17:01:04 +00:00
|
|
|
}
|
2013-08-15 23:38:54 +00:00
|
|
|
RtpVideoCodecTypes video_type = kRtpVideoGeneric;
|
2013-01-25 10:53:38 +00:00
|
|
|
if (CheckPayloadType(payload_type, &video_type) != 0) {
|
2015-12-07 10:26:18 +01:00
|
|
|
LOG(LS_ERROR) << "Don't send data with unknown payload type: "
|
|
|
|
|
<< static_cast<int>(payload_type) << ".";
|
2012-11-07 17:01:04 +00:00
|
|
|
return -1;
|
|
|
|
|
}
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2015-07-14 16:08:02 +02:00
|
|
|
int32_t ret_val;
|
2013-01-25 10:53:38 +00:00
|
|
|
if (audio_configured_) {
|
2013-07-08 21:31:18 +00:00
|
|
|
TRACE_EVENT_ASYNC_STEP1("webrtc", "Audio", capture_timestamp,
|
|
|
|
|
"Send", "type", FrameTypeToString(frame_type));
|
2013-01-25 10:53:38 +00:00
|
|
|
assert(frame_type == kAudioFrameSpeech || frame_type == kAudioFrameCN ||
|
2015-10-19 02:39:06 -07:00
|
|
|
frame_type == kEmptyFrame);
|
2012-05-31 10:47:35 +00:00
|
|
|
|
2013-12-04 15:09:27 +00:00
|
|
|
ret_val = audio_->SendAudio(frame_type, payload_type, capture_timestamp,
|
|
|
|
|
payload_data, payload_size, fragmentation);
|
2012-11-07 17:01:04 +00:00
|
|
|
} else {
|
2013-07-08 21:31:18 +00:00
|
|
|
TRACE_EVENT_ASYNC_STEP1("webrtc", "Video", capture_time_ms,
|
|
|
|
|
"Send", "type", FrameTypeToString(frame_type));
|
2013-01-25 10:53:38 +00:00
|
|
|
assert(frame_type != kAudioFrameSpeech && frame_type != kAudioFrameCN);
|
2012-11-07 17:01:04 +00:00
|
|
|
|
2015-10-19 02:39:06 -07:00
|
|
|
if (frame_type == kEmptyFrame)
|
2014-07-16 09:37:29 +00:00
|
|
|
return 0;
|
|
|
|
|
|
2015-03-04 22:55:15 +00:00
|
|
|
ret_val =
|
|
|
|
|
video_->SendVideo(video_type, frame_type, payload_type,
|
|
|
|
|
capture_timestamp, capture_time_ms, payload_data,
|
2015-04-14 21:28:08 +02:00
|
|
|
payload_size, fragmentation, rtp_hdr);
|
2013-12-04 15:09:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CriticalSectionScoped cs(statistics_crit_.get());
|
2014-12-18 13:50:16 +00:00
|
|
|
// Note: This is currently only counting for video.
|
|
|
|
|
if (frame_type == kVideoFrameKey) {
|
|
|
|
|
++frame_counts_.key_frames;
|
|
|
|
|
} else if (frame_type == kVideoFrameDelta) {
|
|
|
|
|
++frame_counts_.delta_frames;
|
|
|
|
|
}
|
2013-12-04 15:09:27 +00:00
|
|
|
if (frame_count_observer_) {
|
2014-12-18 13:50:16 +00:00
|
|
|
frame_count_observer_->FrameCountUpdated(frame_counts_, ssrc);
|
2012-11-07 17:01:04 +00:00
|
|
|
}
|
2013-12-04 15:09:27 +00:00
|
|
|
|
|
|
|
|
return ret_val;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
size_t RTPSender::TrySendRedundantPayloads(size_t bytes_to_send) {
|
2014-08-14 08:24:47 +00:00
|
|
|
{
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2014-08-14 08:24:47 +00:00
|
|
|
if ((rtx_ & kRtxRedundantPayloads) == 0)
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2013-12-04 10:24:26 +00:00
|
|
|
uint8_t buffer[IP_PACKET_SIZE];
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
int bytes_left = static_cast<int>(bytes_to_send);
|
2013-12-04 10:24:26 +00:00
|
|
|
while (bytes_left > 0) {
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
size_t length = bytes_left;
|
2013-12-04 10:24:26 +00:00
|
|
|
int64_t capture_time_ms;
|
|
|
|
|
if (!packet_history_.GetBestFittingPacket(buffer, &length,
|
|
|
|
|
&capture_time_ms)) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
2014-03-19 18:14:52 +00:00
|
|
|
if (!PrepareAndSendPacket(buffer, length, capture_time_ms, true, false))
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
break;
|
2014-07-08 12:10:51 +00:00
|
|
|
RtpUtility::RtpHeaderParser rtp_parser(buffer, length);
|
2013-12-04 10:24:26 +00:00
|
|
|
RTPHeader rtp_header;
|
2015-12-28 10:18:46 -08:00
|
|
|
rtp_parser.Parse(&rtp_header);
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
bytes_left -= static_cast<int>(length - rtp_header.headerLength);
|
2013-12-04 10:24:26 +00:00
|
|
|
}
|
|
|
|
|
return bytes_to_send - bytes_left;
|
|
|
|
|
}
|
|
|
|
|
|
2015-09-18 11:14:31 +02:00
|
|
|
void RTPSender::BuildPaddingPacket(uint8_t* packet,
|
|
|
|
|
size_t header_length,
|
|
|
|
|
size_t padding_length) {
|
2013-06-04 13:47:36 +00:00
|
|
|
packet[0] |= 0x20; // Set padding bit.
|
2015-12-28 10:18:46 -08:00
|
|
|
int32_t* data = reinterpret_cast<int32_t*>(&(packet[header_length]));
|
2013-06-04 13:47:36 +00:00
|
|
|
|
|
|
|
|
// Fill data buffer with random data.
|
2015-09-18 11:14:31 +02:00
|
|
|
for (size_t j = 0; j < (padding_length >> 2); ++j) {
|
2013-06-04 13:47:36 +00:00
|
|
|
data[j] = rand(); // NOLINT
|
|
|
|
|
}
|
|
|
|
|
// Set number of padding bytes in the last byte of the packet.
|
2015-09-18 11:14:31 +02:00
|
|
|
packet[header_length + padding_length - 1] =
|
|
|
|
|
static_cast<uint8_t>(padding_length);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
size_t RTPSender::SendPadData(size_t bytes,
|
|
|
|
|
bool timestamp_provided,
|
|
|
|
|
uint32_t timestamp,
|
|
|
|
|
int64_t capture_time_ms) {
|
2015-09-21 15:11:14 -07:00
|
|
|
// Always send full padding packets. This is accounted for by the
|
|
|
|
|
// RtpPacketSender,
|
2015-09-18 11:14:31 +02:00
|
|
|
// which will make sure we don't send too much padding even if a single packet
|
|
|
|
|
// is larger than requested.
|
|
|
|
|
size_t padding_bytes_in_packet =
|
|
|
|
|
std::min(MaxDataPayloadLength(), kMaxPaddingLength);
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
size_t bytes_sent = 0;
|
2015-08-03 04:38:41 -07:00
|
|
|
bool using_transport_seq = rtp_header_extension_map_.IsRegistered(
|
|
|
|
|
kRtpExtensionTransportSequenceNumber) &&
|
2015-09-21 15:11:14 -07:00
|
|
|
transport_sequence_number_allocator_;
|
2013-06-17 12:53:37 +00:00
|
|
|
for (; bytes > 0; bytes -= padding_bytes_in_packet) {
|
2015-09-18 11:14:31 +02:00
|
|
|
if (bytes < padding_bytes_in_packet)
|
|
|
|
|
bytes = padding_bytes_in_packet;
|
2014-07-16 09:37:29 +00:00
|
|
|
|
2013-06-19 14:13:42 +00:00
|
|
|
uint32_t ssrc;
|
|
|
|
|
uint16_t sequence_number;
|
2014-08-14 08:24:47 +00:00
|
|
|
int payload_type;
|
2014-07-16 09:37:29 +00:00
|
|
|
bool over_rtx;
|
2013-06-19 14:13:42 +00:00
|
|
|
{
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2015-09-18 11:14:31 +02:00
|
|
|
if (!timestamp_provided) {
|
|
|
|
|
timestamp = timestamp_;
|
|
|
|
|
capture_time_ms = capture_time_ms_;
|
|
|
|
|
}
|
2013-06-19 14:13:42 +00:00
|
|
|
if (rtx_ == kRtxOff) {
|
2014-07-16 09:37:29 +00:00
|
|
|
// Without RTX we can't send padding in the middle of frames.
|
|
|
|
|
if (!last_packet_marker_bit_)
|
2014-08-14 08:24:47 +00:00
|
|
|
return 0;
|
2013-06-19 14:13:42 +00:00
|
|
|
ssrc = ssrc_;
|
|
|
|
|
sequence_number = sequence_number_;
|
|
|
|
|
++sequence_number_;
|
2014-08-14 08:24:47 +00:00
|
|
|
payload_type = payload_type_;
|
2014-07-16 09:37:29 +00:00
|
|
|
over_rtx = false;
|
2013-06-19 14:13:42 +00:00
|
|
|
} else {
|
2014-07-17 16:10:14 +00:00
|
|
|
// Without abs-send-time a media packet must be sent before padding so
|
|
|
|
|
// that the timestamps used for estimation are correct.
|
|
|
|
|
if (!media_has_been_sent_ && !rtp_header_extension_map_.IsRegistered(
|
|
|
|
|
kRtpExtensionAbsoluteSendTime))
|
2014-08-14 08:24:47 +00:00
|
|
|
return 0;
|
2015-09-18 11:14:31 +02:00
|
|
|
// Only change change the timestamp of padding packets sent over RTX.
|
|
|
|
|
// Padding only packets over RTP has to be sent as part of a media
|
|
|
|
|
// frame (and therefore the same timestamp).
|
|
|
|
|
if (last_timestamp_time_ms_ > 0) {
|
|
|
|
|
timestamp +=
|
|
|
|
|
(clock_->TimeInMilliseconds() - last_timestamp_time_ms_) * 90;
|
|
|
|
|
capture_time_ms +=
|
|
|
|
|
(clock_->TimeInMilliseconds() - last_timestamp_time_ms_);
|
|
|
|
|
}
|
2013-06-19 14:13:42 +00:00
|
|
|
ssrc = ssrc_rtx_;
|
|
|
|
|
sequence_number = sequence_number_rtx_;
|
|
|
|
|
++sequence_number_rtx_;
|
2015-04-21 20:24:50 +08:00
|
|
|
payload_type = rtx_payload_type_;
|
2014-07-16 09:37:29 +00:00
|
|
|
over_rtx = true;
|
2013-06-19 14:13:42 +00:00
|
|
|
}
|
|
|
|
|
}
|
2014-07-07 13:06:48 +00:00
|
|
|
|
2013-06-19 14:13:42 +00:00
|
|
|
uint8_t padding_packet[IP_PACKET_SIZE];
|
2014-11-24 08:25:50 +00:00
|
|
|
size_t header_length =
|
|
|
|
|
CreateRtpHeader(padding_packet, payload_type, ssrc, false, timestamp,
|
|
|
|
|
sequence_number, std::vector<uint32_t>());
|
2015-09-18 11:14:31 +02:00
|
|
|
BuildPaddingPacket(padding_packet, header_length, padding_bytes_in_packet);
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
size_t length = padding_bytes_in_packet + header_length;
|
2014-07-10 16:24:54 +00:00
|
|
|
int64_t now_ms = clock_->TimeInMilliseconds();
|
|
|
|
|
|
|
|
|
|
RtpUtility::RtpHeaderParser rtp_parser(padding_packet, length);
|
|
|
|
|
RTPHeader rtp_header;
|
2015-12-28 10:18:46 -08:00
|
|
|
rtp_parser.Parse(&rtp_header);
|
2014-07-10 16:24:54 +00:00
|
|
|
|
|
|
|
|
if (capture_time_ms > 0) {
|
|
|
|
|
UpdateTransmissionTimeOffset(
|
|
|
|
|
padding_packet, length, rtp_header, now_ms - capture_time_ms);
|
2012-01-05 10:54:44 +00:00
|
|
|
}
|
2014-07-10 16:24:54 +00:00
|
|
|
|
|
|
|
|
UpdateAbsoluteSendTime(padding_packet, length, rtp_header, now_ms);
|
2015-08-03 04:38:41 -07:00
|
|
|
|
2015-10-02 03:39:33 -07:00
|
|
|
PacketOptions options;
|
2015-08-03 04:38:41 -07:00
|
|
|
if (using_transport_seq) {
|
2015-10-02 03:39:33 -07:00
|
|
|
options.packet_id =
|
2015-08-03 04:38:41 -07:00
|
|
|
UpdateTransportSequenceNumber(padding_packet, length, rtp_header);
|
|
|
|
|
}
|
|
|
|
|
|
2015-09-14 06:42:43 -07:00
|
|
|
if (using_transport_seq && transport_feedback_observer_) {
|
2015-10-23 02:05:40 -07:00
|
|
|
transport_feedback_observer_->AddPacket(options.packet_id, length, true);
|
2015-09-14 06:42:43 -07:00
|
|
|
}
|
2015-08-03 04:38:41 -07:00
|
|
|
|
2015-10-27 08:29:42 -07:00
|
|
|
if (!SendPacketToNetwork(padding_packet, length, options))
|
|
|
|
|
break;
|
|
|
|
|
|
2013-06-17 12:53:37 +00:00
|
|
|
bytes_sent += padding_bytes_in_packet;
|
2014-07-10 16:24:54 +00:00
|
|
|
UpdateRtpStats(padding_packet, length, rtp_header, over_rtx, false);
|
2012-01-05 10:54:44 +00:00
|
|
|
}
|
2014-07-10 16:24:54 +00:00
|
|
|
|
2013-06-17 12:53:37 +00:00
|
|
|
return bytes_sent;
|
2012-01-05 10:54:44 +00:00
|
|
|
}
|
|
|
|
|
|
2014-12-19 13:49:55 +00:00
|
|
|
void RTPSender::SetStorePacketsStatus(bool enable, uint16_t number_to_store) {
|
2013-12-04 10:24:26 +00:00
|
|
|
packet_history_.SetStorePacketsStatus(enable, number_to_store);
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-04-27 00:41:08 +00:00
|
|
|
bool RTPSender::StorePackets() const {
|
2013-12-04 10:24:26 +00:00
|
|
|
return packet_history_.StorePackets();
|
2013-04-27 00:41:08 +00:00
|
|
|
}
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2015-01-12 21:51:21 +00:00
|
|
|
int32_t RTPSender::ReSendPacket(uint16_t packet_id, int64_t min_resend_time) {
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
size_t length = IP_PACKET_SIZE;
|
2013-04-08 11:08:41 +00:00
|
|
|
uint8_t data_buffer[IP_PACKET_SIZE];
|
2013-04-27 00:41:08 +00:00
|
|
|
int64_t capture_time_ms;
|
2015-10-16 10:01:21 -07:00
|
|
|
|
2013-12-04 10:24:26 +00:00
|
|
|
if (!packet_history_.GetPacketAndSetSendTime(packet_id, min_resend_time, true,
|
|
|
|
|
data_buffer, &length,
|
|
|
|
|
&capture_time_ms)) {
|
2012-01-16 11:06:31 +00:00
|
|
|
// Packet not found.
|
2012-04-23 12:43:05 +00:00
|
|
|
return 0;
|
2012-01-16 11:06:31 +00:00
|
|
|
}
|
2013-04-27 00:41:08 +00:00
|
|
|
|
|
|
|
|
if (paced_sender_) {
|
2014-07-08 12:10:51 +00:00
|
|
|
RtpUtility::RtpHeaderParser rtp_parser(data_buffer, length);
|
2014-03-19 18:14:52 +00:00
|
|
|
RTPHeader header;
|
2015-12-28 10:18:46 -08:00
|
|
|
if (!rtp_parser.Parse(&header)) {
|
2014-03-19 18:14:52 +00:00
|
|
|
assert(false);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2014-07-04 09:20:42 +00:00
|
|
|
// Convert from TickTime to Clock since capture_time_ms is based on
|
|
|
|
|
// TickTime.
|
2014-11-04 16:27:16 +00:00
|
|
|
int64_t corrected_capture_tims_ms = capture_time_ms + clock_delta_ms_;
|
2015-10-08 11:44:14 +02:00
|
|
|
paced_sender_->InsertPacket(
|
2015-12-07 10:26:18 +01:00
|
|
|
RtpPacketSender::kNormalPriority, header.ssrc, header.sequenceNumber,
|
2015-10-08 11:44:14 +02:00
|
|
|
corrected_capture_tims_ms, length - header.headerLength, true);
|
|
|
|
|
|
|
|
|
|
return length;
|
2013-04-27 00:41:08 +00:00
|
|
|
}
|
2014-07-17 16:10:14 +00:00
|
|
|
int rtx = kRtxOff;
|
|
|
|
|
{
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped lock(send_critsect_.get());
|
2014-07-17 16:10:14 +00:00
|
|
|
rtx = rtx_;
|
|
|
|
|
}
|
2015-08-03 04:38:41 -07:00
|
|
|
if (!PrepareAndSendPacket(data_buffer, length, capture_time_ms,
|
|
|
|
|
(rtx & kRtxRetransmitted) > 0, true)) {
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
return static_cast<int32_t>(length);
|
2012-01-10 14:09:18 +00:00
|
|
|
}
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2015-10-02 03:39:33 -07:00
|
|
|
bool RTPSender::SendPacketToNetwork(const uint8_t* packet,
|
|
|
|
|
size_t size,
|
|
|
|
|
const PacketOptions& options) {
|
2013-04-27 00:41:08 +00:00
|
|
|
int bytes_sent = -1;
|
2013-01-25 10:53:38 +00:00
|
|
|
if (transport_) {
|
2015-10-02 03:39:33 -07:00
|
|
|
bytes_sent = transport_->SendRtp(packet, size, options)
|
|
|
|
|
? static_cast<int>(size)
|
|
|
|
|
: -1;
|
2016-01-21 05:42:04 -08:00
|
|
|
if (event_log_ && bytes_sent > 0) {
|
|
|
|
|
event_log_->LogRtpHeader(kOutgoingPacket, MediaType::ANY, packet, size);
|
|
|
|
|
}
|
2012-01-10 14:09:18 +00:00
|
|
|
}
|
2015-02-16 12:06:00 +00:00
|
|
|
TRACE_EVENT_INSTANT2(TRACE_DISABLED_BY_DEFAULT("webrtc_rtp"),
|
|
|
|
|
"RTPSender::SendPacketToNetwork", "size", size, "sent",
|
|
|
|
|
bytes_sent);
|
2014-04-08 11:06:12 +00:00
|
|
|
// TODO(pwestin): Add a separate bitrate for sent bitrate after pacer.
|
2012-01-16 11:06:31 +00:00
|
|
|
if (bytes_sent <= 0) {
|
2014-04-08 11:06:12 +00:00
|
|
|
LOG(LS_WARNING) << "Transport failed to send packet";
|
2013-04-27 00:41:08 +00:00
|
|
|
return false;
|
2012-01-10 14:09:18 +00:00
|
|
|
}
|
2013-04-27 00:41:08 +00:00
|
|
|
return true;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2011-12-22 12:52:41 +00:00
|
|
|
int RTPSender::SelectiveRetransmissions() const {
|
2013-01-25 10:53:38 +00:00
|
|
|
if (!video_)
|
|
|
|
|
return -1;
|
|
|
|
|
return video_->SelectiveRetransmissions();
|
2011-12-22 12:52:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int RTPSender::SetSelectiveRetransmissions(uint8_t settings) {
|
2013-01-25 10:53:38 +00:00
|
|
|
if (!video_)
|
|
|
|
|
return -1;
|
2015-04-14 21:28:08 +02:00
|
|
|
video_->SetSelectiveRetransmissions(settings);
|
|
|
|
|
return 0;
|
2011-12-22 12:52:41 +00:00
|
|
|
}
|
|
|
|
|
|
2014-12-19 13:49:55 +00:00
|
|
|
void RTPSender::OnReceivedNACK(const std::list<uint16_t>& nack_sequence_numbers,
|
2015-01-12 21:51:21 +00:00
|
|
|
int64_t avg_rtt) {
|
2015-02-16 12:06:00 +00:00
|
|
|
TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("webrtc_rtp"),
|
|
|
|
|
"RTPSender::OnReceivedNACK", "num_seqnum",
|
|
|
|
|
nack_sequence_numbers.size(), "avg_rtt", avg_rtt);
|
2013-04-08 11:08:41 +00:00
|
|
|
const int64_t now = clock_->TimeInMilliseconds();
|
2014-12-19 09:52:24 +00:00
|
|
|
uint32_t bytes_re_sent = 0;
|
2014-06-17 17:32:05 +00:00
|
|
|
uint32_t target_bitrate = GetTargetBitrate();
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2012-01-16 11:06:31 +00:00
|
|
|
// Enough bandwidth to send NACK?
|
2012-01-10 14:09:18 +00:00
|
|
|
if (!ProcessNACKBitRate(now)) {
|
2014-04-08 11:06:12 +00:00
|
|
|
LOG(LS_INFO) << "NACK bitrate reached. Skip sending NACK response. Target "
|
2014-06-17 17:32:05 +00:00
|
|
|
<< target_bitrate;
|
2012-01-10 14:09:18 +00:00
|
|
|
return;
|
|
|
|
|
}
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2013-02-01 15:09:57 +00:00
|
|
|
for (std::list<uint16_t>::const_iterator it = nack_sequence_numbers.begin();
|
|
|
|
|
it != nack_sequence_numbers.end(); ++it) {
|
2013-04-08 11:08:41 +00:00
|
|
|
const int32_t bytes_sent = ReSendPacket(*it, 5 + avg_rtt);
|
2013-01-25 10:53:38 +00:00
|
|
|
if (bytes_sent > 0) {
|
|
|
|
|
bytes_re_sent += bytes_sent;
|
|
|
|
|
} else if (bytes_sent == 0) {
|
2012-01-10 14:09:18 +00:00
|
|
|
// The packet has previously been resent.
|
|
|
|
|
// Try resending next packet in the list.
|
|
|
|
|
continue;
|
2014-12-19 09:52:24 +00:00
|
|
|
} else {
|
2012-01-10 14:09:18 +00:00
|
|
|
// Failed to send one Sequence number. Give up the rest in this nack.
|
2014-04-08 11:06:12 +00:00
|
|
|
LOG(LS_WARNING) << "Failed resending RTP packet " << *it
|
|
|
|
|
<< ", Discard rest of packets";
|
2012-01-10 14:09:18 +00:00
|
|
|
break;
|
|
|
|
|
}
|
2013-01-25 10:53:38 +00:00
|
|
|
// Delay bandwidth estimate (RTT * BW).
|
2014-06-17 17:32:05 +00:00
|
|
|
if (target_bitrate != 0 && avg_rtt) {
|
2012-01-10 14:09:18 +00:00
|
|
|
// kbits/s * ms = bits => bits/8 = bytes
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
size_t target_bytes =
|
|
|
|
|
(static_cast<size_t>(target_bitrate / 1000) * avg_rtt) >> 3;
|
2013-01-25 10:53:38 +00:00
|
|
|
if (bytes_re_sent > target_bytes) {
|
|
|
|
|
break; // Ignore the rest of the packets in the list.
|
2012-01-10 14:09:18 +00:00
|
|
|
}
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
2012-01-10 14:09:18 +00:00
|
|
|
}
|
2013-01-25 10:53:38 +00:00
|
|
|
if (bytes_re_sent > 0) {
|
|
|
|
|
UpdateNACKBitRate(bytes_re_sent, now);
|
2012-01-10 14:09:18 +00:00
|
|
|
}
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2014-12-19 13:49:55 +00:00
|
|
|
bool RTPSender::ProcessNACKBitRate(uint32_t now) {
|
2013-04-08 11:08:41 +00:00
|
|
|
uint32_t num = 0;
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
size_t byte_count = 0;
|
2014-06-25 20:59:51 +00:00
|
|
|
const uint32_t kAvgIntervalMs = 1000;
|
2014-06-17 17:32:05 +00:00
|
|
|
uint32_t target_bitrate = GetTargetBitrate();
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2014-06-17 17:32:05 +00:00
|
|
|
if (target_bitrate == 0) {
|
2012-01-10 14:09:18 +00:00
|
|
|
return true;
|
|
|
|
|
}
|
2013-01-25 10:53:38 +00:00
|
|
|
for (num = 0; num < NACK_BYTECOUNT_SIZE; ++num) {
|
2014-06-17 17:32:05 +00:00
|
|
|
if ((now - nack_byte_count_times_[num]) > kAvgIntervalMs) {
|
2013-01-25 10:53:38 +00:00
|
|
|
// Don't use data older than 1sec.
|
2012-01-10 14:09:18 +00:00
|
|
|
break;
|
|
|
|
|
} else {
|
2013-01-25 10:53:38 +00:00
|
|
|
byte_count += nack_byte_count_[num];
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
2012-01-10 14:09:18 +00:00
|
|
|
}
|
2014-06-25 20:59:51 +00:00
|
|
|
uint32_t time_interval = kAvgIntervalMs;
|
2012-01-10 14:09:18 +00:00
|
|
|
if (num == NACK_BYTECOUNT_SIZE) {
|
|
|
|
|
// More than NACK_BYTECOUNT_SIZE nack messages has been received
|
2013-01-25 10:53:38 +00:00
|
|
|
// during the last msg_interval.
|
2014-06-25 20:59:51 +00:00
|
|
|
if (nack_byte_count_times_[num - 1] <= now) {
|
|
|
|
|
time_interval = now - nack_byte_count_times_[num - 1];
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
2012-01-10 14:09:18 +00:00
|
|
|
}
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
return (byte_count * 8) < (target_bitrate / 1000 * time_interval);
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2014-12-19 09:52:24 +00:00
|
|
|
void RTPSender::UpdateNACKBitRate(uint32_t bytes, int64_t now) {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2014-12-19 09:52:24 +00:00
|
|
|
if (bytes == 0)
|
|
|
|
|
return;
|
|
|
|
|
nack_bitrate_.Update(bytes);
|
2013-01-25 10:53:38 +00:00
|
|
|
// Save bitrate statistics.
|
2014-12-19 09:52:24 +00:00
|
|
|
// Shift all but first time.
|
|
|
|
|
for (int i = NACK_BYTECOUNT_SIZE - 2; i >= 0; i--) {
|
|
|
|
|
nack_byte_count_[i + 1] = nack_byte_count_[i];
|
|
|
|
|
nack_byte_count_times_[i + 1] = nack_byte_count_times_[i];
|
2012-01-10 14:09:18 +00:00
|
|
|
}
|
2014-12-19 09:52:24 +00:00
|
|
|
nack_byte_count_[0] = bytes;
|
|
|
|
|
nack_byte_count_times_[0] = now;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-04-27 00:41:08 +00:00
|
|
|
// Called from pacer when we can send the packet.
|
2013-06-20 20:18:31 +00:00
|
|
|
bool RTPSender::TimeToSendPacket(uint16_t sequence_number,
|
2013-11-13 15:29:21 +00:00
|
|
|
int64_t capture_time_ms,
|
|
|
|
|
bool retransmission) {
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
size_t length = IP_PACKET_SIZE;
|
2012-11-13 21:12:39 +00:00
|
|
|
uint8_t data_buffer[IP_PACKET_SIZE];
|
2013-04-27 00:41:08 +00:00
|
|
|
int64_t stored_time_ms;
|
2012-01-16 11:06:31 +00:00
|
|
|
|
2013-12-04 10:24:26 +00:00
|
|
|
if (!packet_history_.GetPacketAndSetSendTime(sequence_number,
|
|
|
|
|
0,
|
|
|
|
|
retransmission,
|
|
|
|
|
data_buffer,
|
|
|
|
|
&length,
|
|
|
|
|
&stored_time_ms)) {
|
2013-06-20 20:18:31 +00:00
|
|
|
// Packet cannot be found. Allow sending to continue.
|
|
|
|
|
return true;
|
2012-11-13 21:12:39 +00:00
|
|
|
}
|
2013-12-05 14:05:07 +00:00
|
|
|
if (!retransmission && capture_time_ms > 0) {
|
|
|
|
|
UpdateDelayStatistics(capture_time_ms, clock_->TimeInMilliseconds());
|
|
|
|
|
}
|
2014-07-07 13:06:48 +00:00
|
|
|
int rtx;
|
|
|
|
|
{
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped lock(send_critsect_.get());
|
2014-07-07 13:06:48 +00:00
|
|
|
rtx = rtx_;
|
|
|
|
|
}
|
|
|
|
|
return PrepareAndSendPacket(data_buffer,
|
|
|
|
|
length,
|
|
|
|
|
capture_time_ms,
|
|
|
|
|
retransmission && (rtx & kRtxRetransmitted) > 0,
|
2014-03-19 18:14:52 +00:00
|
|
|
retransmission);
|
2013-12-04 10:24:26 +00:00
|
|
|
}
|
2012-01-16 11:06:31 +00:00
|
|
|
|
2013-12-04 10:24:26 +00:00
|
|
|
bool RTPSender::PrepareAndSendPacket(uint8_t* buffer,
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
size_t length,
|
2013-12-04 10:24:26 +00:00
|
|
|
int64_t capture_time_ms,
|
2014-03-19 18:14:52 +00:00
|
|
|
bool send_over_rtx,
|
|
|
|
|
bool is_retransmit) {
|
2015-12-28 10:18:46 -08:00
|
|
|
uint8_t* buffer_to_send_ptr = buffer;
|
2013-12-04 10:24:26 +00:00
|
|
|
|
2014-07-08 12:10:51 +00:00
|
|
|
RtpUtility::RtpHeaderParser rtp_parser(buffer, length);
|
2013-05-29 12:12:51 +00:00
|
|
|
RTPHeader rtp_header;
|
2015-12-28 10:18:46 -08:00
|
|
|
rtp_parser.Parse(&rtp_header);
|
2014-11-04 16:27:16 +00:00
|
|
|
if (!is_retransmit && rtp_header.markerBit) {
|
2015-02-16 12:06:00 +00:00
|
|
|
TRACE_EVENT_ASYNC_END0(TRACE_DISABLED_BY_DEFAULT("webrtc_rtp"), "PacedSend",
|
|
|
|
|
capture_time_ms);
|
2014-11-04 16:27:16 +00:00
|
|
|
}
|
|
|
|
|
|
2015-02-16 12:06:00 +00:00
|
|
|
TRACE_EVENT_INSTANT2(
|
|
|
|
|
TRACE_DISABLED_BY_DEFAULT("webrtc_rtp"), "PrepareAndSendPacket",
|
|
|
|
|
"timestamp", rtp_header.timestamp, "seqnum", rtp_header.sequenceNumber);
|
2011-12-22 12:52:41 +00:00
|
|
|
|
2013-11-13 15:29:21 +00:00
|
|
|
uint8_t data_buffer_rtx[IP_PACKET_SIZE];
|
2013-12-04 10:24:26 +00:00
|
|
|
if (send_over_rtx) {
|
|
|
|
|
BuildRtxPacket(buffer, &length, data_buffer_rtx);
|
2013-11-13 15:29:21 +00:00
|
|
|
buffer_to_send_ptr = data_buffer_rtx;
|
|
|
|
|
}
|
|
|
|
|
|
2013-05-16 11:10:31 +00:00
|
|
|
int64_t now_ms = clock_->TimeInMilliseconds();
|
|
|
|
|
int64_t diff_ms = now_ms - capture_time_ms;
|
2014-05-30 12:17:15 +00:00
|
|
|
UpdateTransmissionTimeOffset(buffer_to_send_ptr, length, rtp_header,
|
|
|
|
|
diff_ms);
|
|
|
|
|
UpdateAbsoluteSendTime(buffer_to_send_ptr, length, rtp_header, now_ms);
|
2015-08-03 04:38:41 -07:00
|
|
|
|
2015-09-14 06:42:43 -07:00
|
|
|
// TODO(sprang): Potentially too much overhead in IsRegistered()?
|
2015-08-03 04:38:41 -07:00
|
|
|
bool using_transport_seq = rtp_header_extension_map_.IsRegistered(
|
|
|
|
|
kRtpExtensionTransportSequenceNumber) &&
|
2015-10-16 10:01:21 -07:00
|
|
|
transport_sequence_number_allocator_;
|
|
|
|
|
|
2015-10-02 03:39:33 -07:00
|
|
|
PacketOptions options;
|
2015-08-03 04:38:41 -07:00
|
|
|
if (using_transport_seq) {
|
2015-10-02 03:39:33 -07:00
|
|
|
options.packet_id =
|
2015-08-03 04:38:41 -07:00
|
|
|
UpdateTransportSequenceNumber(buffer_to_send_ptr, length, rtp_header);
|
|
|
|
|
}
|
|
|
|
|
|
2015-10-27 08:29:42 -07:00
|
|
|
if (using_transport_seq && transport_feedback_observer_) {
|
|
|
|
|
transport_feedback_observer_->AddPacket(options.packet_id, length, true);
|
|
|
|
|
}
|
|
|
|
|
|
2015-10-02 03:39:33 -07:00
|
|
|
bool ret = SendPacketToNetwork(buffer_to_send_ptr, length, options);
|
2014-07-17 16:10:14 +00:00
|
|
|
if (ret) {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped lock(send_critsect_.get());
|
2014-07-17 16:10:14 +00:00
|
|
|
media_has_been_sent_ = true;
|
|
|
|
|
}
|
2014-03-19 18:14:52 +00:00
|
|
|
UpdateRtpStats(buffer_to_send_ptr, length, rtp_header, send_over_rtx,
|
|
|
|
|
is_retransmit);
|
2013-12-05 14:29:02 +00:00
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void RTPSender::UpdateRtpStats(const uint8_t* buffer,
|
2014-12-09 09:47:53 +00:00
|
|
|
size_t packet_length,
|
2013-12-05 14:29:02 +00:00
|
|
|
const RTPHeader& header,
|
|
|
|
|
bool is_rtx,
|
|
|
|
|
bool is_retransmit) {
|
|
|
|
|
StreamDataCounters* counters;
|
2014-01-27 13:20:36 +00:00
|
|
|
// Get ssrc before taking statistics_crit_ to avoid possible deadlock.
|
2014-07-07 13:06:48 +00:00
|
|
|
uint32_t ssrc = is_rtx ? RtxSsrc() : SSRC();
|
2014-01-27 13:20:36 +00:00
|
|
|
|
|
|
|
|
CriticalSectionScoped lock(statistics_crit_.get());
|
2013-12-05 14:29:02 +00:00
|
|
|
if (is_rtx) {
|
|
|
|
|
counters = &rtx_rtp_stats_;
|
|
|
|
|
} else {
|
|
|
|
|
counters = &rtp_stats_;
|
|
|
|
|
}
|
|
|
|
|
|
2014-12-09 09:47:53 +00:00
|
|
|
total_bitrate_sent_.Update(packet_length);
|
2015-02-04 08:34:47 +00:00
|
|
|
|
2015-01-22 09:39:59 +00:00
|
|
|
if (counters->first_packet_time_ms == -1) {
|
2014-12-16 12:03:11 +00:00
|
|
|
counters->first_packet_time_ms = clock_->TimeInMilliseconds();
|
|
|
|
|
}
|
2013-12-05 14:29:02 +00:00
|
|
|
if (IsFecPacket(buffer, header)) {
|
2015-02-04 08:34:47 +00:00
|
|
|
counters->fec.AddPacket(packet_length, header);
|
2013-12-05 14:29:02 +00:00
|
|
|
}
|
|
|
|
|
if (is_retransmit) {
|
2015-02-04 08:34:47 +00:00
|
|
|
counters->retransmitted.AddPacket(packet_length, header);
|
|
|
|
|
}
|
|
|
|
|
counters->transmitted.AddPacket(packet_length, header);
|
2013-12-05 14:29:02 +00:00
|
|
|
|
|
|
|
|
if (rtp_stats_callback_) {
|
|
|
|
|
rtp_stats_callback_->DataCountersUpdated(*counters, ssrc);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool RTPSender::IsFecPacket(const uint8_t* buffer,
|
|
|
|
|
const RTPHeader& header) const {
|
|
|
|
|
if (!video_) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
bool fec_enabled;
|
|
|
|
|
uint8_t pt_red;
|
|
|
|
|
uint8_t pt_fec;
|
2015-12-15 02:54:47 -08:00
|
|
|
video_->GenericFECStatus(&fec_enabled, &pt_red, &pt_fec);
|
2013-12-05 14:29:02 +00:00
|
|
|
return fec_enabled &&
|
|
|
|
|
header.payloadType == pt_red &&
|
|
|
|
|
buffer[header.headerLength] == pt_fec;
|
2012-01-16 11:06:31 +00:00
|
|
|
}
|
|
|
|
|
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
size_t RTPSender::TimeToSendPadding(size_t bytes) {
|
2015-12-07 10:26:18 +01:00
|
|
|
if (audio_configured_ || bytes == 0)
|
2015-07-01 06:31:06 -07:00
|
|
|
return 0;
|
2013-06-17 12:53:37 +00:00
|
|
|
{
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2015-08-03 04:38:41 -07:00
|
|
|
if (!sending_media_)
|
|
|
|
|
return 0;
|
2014-08-14 08:24:47 +00:00
|
|
|
}
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
size_t bytes_sent = TrySendRedundantPayloads(bytes);
|
|
|
|
|
if (bytes_sent < bytes)
|
2015-09-18 11:14:31 +02:00
|
|
|
bytes_sent += SendPadData(bytes - bytes_sent, false, 0, 0);
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
return bytes_sent;
|
2013-06-17 12:53:37 +00:00
|
|
|
}
|
|
|
|
|
|
2014-07-08 12:10:51 +00:00
|
|
|
// TODO(pwestin): send in the RtpHeaderParser to avoid parsing it again.
|
2015-09-21 15:11:14 -07:00
|
|
|
int32_t RTPSender::SendToNetwork(uint8_t* buffer,
|
|
|
|
|
size_t payload_length,
|
|
|
|
|
size_t rtp_header_length,
|
|
|
|
|
int64_t capture_time_ms,
|
|
|
|
|
StorageType storage,
|
|
|
|
|
RtpPacketSender::Priority priority) {
|
2016-01-21 05:42:04 -08:00
|
|
|
size_t length = payload_length + rtp_header_length;
|
|
|
|
|
RtpUtility::RtpHeaderParser rtp_parser(buffer, length);
|
|
|
|
|
|
2013-05-29 12:12:51 +00:00
|
|
|
RTPHeader rtp_header;
|
2015-12-28 10:18:46 -08:00
|
|
|
rtp_parser.Parse(&rtp_header);
|
2012-11-13 21:12:39 +00:00
|
|
|
|
2013-05-16 11:10:31 +00:00
|
|
|
int64_t now_ms = clock_->TimeInMilliseconds();
|
|
|
|
|
|
2012-08-28 15:20:39 +00:00
|
|
|
// |capture_time_ms| <= 0 is considered invalid.
|
|
|
|
|
// TODO(holmer): This should be changed all over Video Engine so that negative
|
|
|
|
|
// time is consider invalid, while 0 is considered a valid time.
|
|
|
|
|
if (capture_time_ms > 0) {
|
2016-01-21 05:42:04 -08:00
|
|
|
UpdateTransmissionTimeOffset(buffer, length, rtp_header,
|
|
|
|
|
now_ms - capture_time_ms);
|
2012-11-13 21:12:39 +00:00
|
|
|
}
|
2013-05-16 11:10:31 +00:00
|
|
|
|
2016-01-21 05:42:04 -08:00
|
|
|
UpdateAbsoluteSendTime(buffer, length, rtp_header, now_ms);
|
2013-05-16 11:10:31 +00:00
|
|
|
|
2012-11-13 21:12:39 +00:00
|
|
|
// Used for NACK and to spread out the transmission of packets.
|
2016-01-21 05:42:04 -08:00
|
|
|
if (packet_history_.PutRTPPacket(buffer, length, capture_time_ms, storage) !=
|
|
|
|
|
0) {
|
2012-11-13 21:12:39 +00:00
|
|
|
return -1;
|
|
|
|
|
}
|
2013-03-15 23:21:52 +00:00
|
|
|
|
2015-10-08 11:44:14 +02:00
|
|
|
if (paced_sender_) {
|
2014-11-04 16:27:16 +00:00
|
|
|
// Correct offset between implementations of millisecond time stamps in
|
|
|
|
|
// TickTime and Clock.
|
|
|
|
|
int64_t corrected_time_ms = capture_time_ms + clock_delta_ms_;
|
2015-10-08 11:44:14 +02:00
|
|
|
paced_sender_->InsertPacket(priority, rtp_header.ssrc,
|
|
|
|
|
rtp_header.sequenceNumber, corrected_time_ms,
|
|
|
|
|
payload_length, false);
|
|
|
|
|
if (last_capture_time_ms_sent_ == 0 ||
|
|
|
|
|
corrected_time_ms > last_capture_time_ms_sent_) {
|
|
|
|
|
last_capture_time_ms_sent_ = corrected_time_ms;
|
|
|
|
|
TRACE_EVENT_ASYNC_BEGIN1(TRACE_DISABLED_BY_DEFAULT("webrtc_rtp"),
|
|
|
|
|
"PacedSend", corrected_time_ms,
|
|
|
|
|
"capture_time_ms", corrected_time_ms);
|
2012-11-06 13:09:39 +00:00
|
|
|
}
|
2015-10-08 11:44:14 +02:00
|
|
|
return 0;
|
2012-07-03 13:21:22 +00:00
|
|
|
}
|
2013-12-05 14:05:07 +00:00
|
|
|
if (capture_time_ms > 0) {
|
|
|
|
|
UpdateDelayStatistics(capture_time_ms, now_ms);
|
|
|
|
|
}
|
2015-01-29 09:09:17 +00:00
|
|
|
|
2015-10-02 03:39:33 -07:00
|
|
|
bool sent = SendPacketToNetwork(buffer, length, PacketOptions());
|
2015-02-02 13:08:02 +00:00
|
|
|
|
2015-10-08 11:44:14 +02:00
|
|
|
// Mark the packet as sent in the history even if send failed. Dropping a
|
|
|
|
|
// packet here should be treated as any other packet drop so we should be
|
|
|
|
|
// ready for a retransmission.
|
|
|
|
|
packet_history_.SetSent(rtp_header.sequenceNumber);
|
|
|
|
|
|
2015-02-02 13:08:02 +00:00
|
|
|
if (!sent)
|
2013-12-05 14:29:02 +00:00
|
|
|
return -1;
|
2015-02-02 13:08:02 +00:00
|
|
|
|
2014-07-17 16:10:14 +00:00
|
|
|
{
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped lock(send_critsect_.get());
|
2014-07-17 16:10:14 +00:00
|
|
|
media_has_been_sent_ = true;
|
|
|
|
|
}
|
2013-12-05 14:29:02 +00:00
|
|
|
UpdateRtpStats(buffer, length, rtp_header, false, false);
|
|
|
|
|
return 0;
|
2011-12-22 12:52:41 +00:00
|
|
|
}
|
|
|
|
|
|
2013-12-05 14:05:07 +00:00
|
|
|
void RTPSender::UpdateDelayStatistics(int64_t capture_time_ms, int64_t now_ms) {
|
2015-05-28 14:45:36 +02:00
|
|
|
if (!send_side_delay_observer_)
|
|
|
|
|
return;
|
|
|
|
|
|
2014-07-11 13:44:02 +00:00
|
|
|
uint32_t ssrc;
|
|
|
|
|
int avg_delay_ms = 0;
|
|
|
|
|
int max_delay_ms = 0;
|
|
|
|
|
{
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped lock(send_critsect_.get());
|
2014-07-11 13:44:02 +00:00
|
|
|
ssrc = ssrc_;
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
CriticalSectionScoped cs(statistics_crit_.get());
|
|
|
|
|
// TODO(holmer): Compute this iteratively instead.
|
|
|
|
|
send_delays_[now_ms] = now_ms - capture_time_ms;
|
|
|
|
|
send_delays_.erase(send_delays_.begin(),
|
|
|
|
|
send_delays_.lower_bound(now_ms -
|
|
|
|
|
kSendSideDelayWindowMs));
|
2015-05-28 14:45:36 +02:00
|
|
|
int num_delays = 0;
|
|
|
|
|
for (auto it = send_delays_.upper_bound(now_ms - kSendSideDelayWindowMs);
|
|
|
|
|
it != send_delays_.end(); ++it) {
|
|
|
|
|
max_delay_ms = std::max(max_delay_ms, it->second);
|
|
|
|
|
avg_delay_ms += it->second;
|
|
|
|
|
++num_delays;
|
|
|
|
|
}
|
|
|
|
|
if (num_delays == 0)
|
|
|
|
|
return;
|
|
|
|
|
avg_delay_ms = (avg_delay_ms + num_delays / 2) / num_delays;
|
2014-07-11 13:44:02 +00:00
|
|
|
}
|
2015-05-28 14:45:36 +02:00
|
|
|
send_side_delay_observer_->SendSideDelayUpdated(avg_delay_ms, max_delay_ms,
|
|
|
|
|
ssrc);
|
2013-12-05 14:05:07 +00:00
|
|
|
}
|
|
|
|
|
|
2012-11-07 17:01:04 +00:00
|
|
|
void RTPSender::ProcessBitrate() {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2014-11-05 14:05:29 +00:00
|
|
|
total_bitrate_sent_.Process();
|
2013-01-25 10:53:38 +00:00
|
|
|
nack_bitrate_.Process();
|
|
|
|
|
if (audio_configured_) {
|
2012-11-07 17:01:04 +00:00
|
|
|
return;
|
|
|
|
|
}
|
2013-01-25 10:53:38 +00:00
|
|
|
video_->ProcessBitrate();
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
size_t RTPSender::RTPHeaderLength() const {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped lock(send_critsect_.get());
|
2015-03-04 22:55:15 +00:00
|
|
|
size_t rtp_header_length = kRtpHeaderLength;
|
2014-11-24 08:25:50 +00:00
|
|
|
rtp_header_length += sizeof(uint32_t) * csrcs_.size();
|
2013-01-25 10:53:38 +00:00
|
|
|
rtp_header_length += RtpHeaderExtensionTotalLength();
|
|
|
|
|
return rtp_header_length;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2015-04-14 21:28:08 +02:00
|
|
|
uint16_t RTPSender::AllocateSequenceNumber(uint16_t packets_to_send) {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2015-04-14 21:28:08 +02:00
|
|
|
uint16_t first_allocated_sequence_number = sequence_number_;
|
|
|
|
|
sequence_number_ += packets_to_send;
|
|
|
|
|
return first_allocated_sequence_number;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2014-07-15 15:25:39 +00:00
|
|
|
void RTPSender::GetDataCounters(StreamDataCounters* rtp_stats,
|
|
|
|
|
StreamDataCounters* rtx_stats) const {
|
2013-09-10 11:29:17 +00:00
|
|
|
CriticalSectionScoped lock(statistics_crit_.get());
|
2014-07-15 15:25:39 +00:00
|
|
|
*rtp_stats = rtp_stats_;
|
|
|
|
|
*rtx_stats = rtx_rtp_stats_;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2014-11-24 08:25:50 +00:00
|
|
|
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 {
|
2013-06-04 13:47:36 +00:00
|
|
|
header[0] = 0x80; // version 2.
|
|
|
|
|
header[1] = static_cast<uint8_t>(payload_type);
|
2013-01-25 10:53:38 +00:00
|
|
|
if (marker_bit) {
|
2013-06-04 13:47:36 +00:00
|
|
|
header[1] |= kRtpMarkerBitMask; // Marker bit is set.
|
2012-11-07 17:01:04 +00:00
|
|
|
}
|
2015-03-17 16:42:49 +00:00
|
|
|
ByteWriter<uint16_t>::WriteBigEndian(header + 2, sequence_number);
|
|
|
|
|
ByteWriter<uint32_t>::WriteBigEndian(header + 4, timestamp);
|
|
|
|
|
ByteWriter<uint32_t>::WriteBigEndian(header + 8, ssrc);
|
2015-03-04 22:55:15 +00:00
|
|
|
int32_t rtp_header_length = kRtpHeaderLength;
|
2012-11-07 17:01:04 +00:00
|
|
|
|
2014-11-24 08:25:50 +00:00
|
|
|
if (csrcs.size() > 0) {
|
2015-12-28 10:18:46 -08:00
|
|
|
uint8_t* ptr = &header[rtp_header_length];
|
2014-11-24 08:25:50 +00:00
|
|
|
for (size_t i = 0; i < csrcs.size(); ++i) {
|
2015-03-17 16:42:49 +00:00
|
|
|
ByteWriter<uint32_t>::WriteBigEndian(ptr, csrcs[i]);
|
2013-01-25 10:53:38 +00:00
|
|
|
ptr += 4;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
2014-11-24 08:25:50 +00:00
|
|
|
header[0] = (header[0] & 0xf0) | csrcs.size();
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2013-01-25 10:53:38 +00:00
|
|
|
// Update length of header.
|
2014-11-24 08:25:50 +00:00
|
|
|
rtp_header_length += sizeof(uint32_t) * csrcs.size();
|
2012-11-07 17:01:04 +00:00
|
|
|
}
|
2011-12-16 14:31:37 +00:00
|
|
|
|
2015-03-04 22:55:15 +00:00
|
|
|
uint16_t len =
|
|
|
|
|
BuildRTPHeaderExtension(header + rtp_header_length, marker_bit);
|
2013-06-04 13:47:36 +00:00
|
|
|
if (len > 0) {
|
|
|
|
|
header[0] |= 0x10; // Set extension bit.
|
2013-01-25 10:53:38 +00:00
|
|
|
rtp_header_length += len;
|
2012-11-07 17:01:04 +00:00
|
|
|
}
|
2013-01-25 10:53:38 +00:00
|
|
|
return rtp_header_length;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2014-07-07 13:06:48 +00:00
|
|
|
int32_t RTPSender::BuildRTPheader(uint8_t* data_buffer,
|
2014-12-19 13:49:55 +00:00
|
|
|
int8_t payload_type,
|
|
|
|
|
bool marker_bit,
|
|
|
|
|
uint32_t capture_timestamp,
|
2014-07-07 13:06:48 +00:00
|
|
|
int64_t capture_time_ms,
|
2014-12-19 13:49:55 +00:00
|
|
|
bool timestamp_provided,
|
|
|
|
|
bool inc_sequence_number) {
|
2013-06-04 13:47:36 +00:00
|
|
|
assert(payload_type >= 0);
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2013-06-04 13:47:36 +00:00
|
|
|
|
2014-07-07 13:06:48 +00:00
|
|
|
if (timestamp_provided) {
|
|
|
|
|
timestamp_ = start_timestamp_ + capture_timestamp;
|
2013-06-04 13:47:36 +00:00
|
|
|
} else {
|
|
|
|
|
// Make a unique time stamp.
|
|
|
|
|
// We can't inc by the actual time, since then we increase the risk of back
|
|
|
|
|
// timing.
|
|
|
|
|
timestamp_++;
|
|
|
|
|
}
|
2013-11-15 08:59:19 +00:00
|
|
|
last_timestamp_time_ms_ = clock_->TimeInMilliseconds();
|
2013-06-04 13:47:36 +00:00
|
|
|
uint32_t sequence_number = sequence_number_++;
|
2013-06-19 14:13:42 +00:00
|
|
|
capture_time_ms_ = capture_time_ms;
|
|
|
|
|
last_packet_marker_bit_ = marker_bit;
|
2014-11-24 08:25:50 +00:00
|
|
|
return CreateRtpHeader(data_buffer, payload_type, ssrc_, marker_bit,
|
|
|
|
|
timestamp_, sequence_number, csrcs_);
|
2013-06-04 13:47:36 +00:00
|
|
|
}
|
|
|
|
|
|
2015-03-04 22:55:15 +00:00
|
|
|
uint16_t RTPSender::BuildRTPHeaderExtension(uint8_t* data_buffer,
|
|
|
|
|
bool marker_bit) const {
|
2013-01-25 10:53:38 +00:00
|
|
|
if (rtp_header_extension_map_.Size() <= 0) {
|
2012-11-07 17:01:04 +00:00
|
|
|
return 0;
|
|
|
|
|
}
|
2013-01-25 10:53:38 +00:00
|
|
|
// 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 |
|
|
|
|
|
// | .... |
|
|
|
|
|
//
|
2013-04-08 11:08:41 +00:00
|
|
|
const uint32_t kPosLength = 2;
|
2013-05-07 12:36:21 +00:00
|
|
|
const uint32_t kHeaderLength = kRtpOneByteHeaderLength;
|
2012-11-07 17:01:04 +00:00
|
|
|
|
|
|
|
|
// Add extension ID (0xBEDE).
|
2015-03-17 16:42:49 +00:00
|
|
|
ByteWriter<uint16_t>::WriteBigEndian(data_buffer,
|
|
|
|
|
kRtpOneByteHeaderExtensionId);
|
2012-11-07 17:01:04 +00:00
|
|
|
|
|
|
|
|
// Add extensions.
|
2013-04-08 11:08:41 +00:00
|
|
|
uint16_t total_block_length = 0;
|
2012-11-07 17:01:04 +00:00
|
|
|
|
2013-01-25 10:53:38 +00:00
|
|
|
RTPExtensionType type = rtp_header_extension_map_.First();
|
2012-11-07 17:01:04 +00:00
|
|
|
while (type != kRtpExtensionNone) {
|
2013-04-08 11:08:41 +00:00
|
|
|
uint8_t block_length = 0;
|
2015-03-17 14:33:12 +00:00
|
|
|
uint8_t* extension_data = &data_buffer[kHeaderLength + total_block_length];
|
2013-05-16 11:10:31 +00:00
|
|
|
switch (type) {
|
|
|
|
|
case kRtpExtensionTransmissionTimeOffset:
|
2015-03-17 14:33:12 +00:00
|
|
|
block_length = BuildTransmissionTimeOffsetExtension(extension_data);
|
2013-05-16 11:10:31 +00:00
|
|
|
break;
|
2013-05-20 20:55:07 +00:00
|
|
|
case kRtpExtensionAudioLevel:
|
2015-03-17 14:33:12 +00:00
|
|
|
block_length = BuildAudioLevelExtension(extension_data);
|
2013-05-20 20:55:07 +00:00
|
|
|
break;
|
2013-05-16 11:10:31 +00:00
|
|
|
case kRtpExtensionAbsoluteSendTime:
|
2015-03-17 14:33:12 +00:00
|
|
|
block_length = BuildAbsoluteSendTimeExtension(extension_data);
|
2013-05-16 11:10:31 +00:00
|
|
|
break;
|
2015-03-04 22:55:15 +00:00
|
|
|
case kRtpExtensionVideoRotation:
|
2015-04-01 15:33:06 -07:00
|
|
|
block_length = BuildVideoRotationExtension(extension_data);
|
2015-03-17 14:33:12 +00:00
|
|
|
break;
|
|
|
|
|
case kRtpExtensionTransportSequenceNumber:
|
2015-08-03 04:38:41 -07:00
|
|
|
block_length = BuildTransportSequenceNumberExtension(
|
|
|
|
|
extension_data, transport_sequence_number_);
|
2015-03-04 22:55:15 +00:00
|
|
|
break;
|
2013-05-16 11:10:31 +00:00
|
|
|
default:
|
|
|
|
|
assert(false);
|
2012-11-07 17:01:04 +00:00
|
|
|
}
|
|
|
|
|
total_block_length += block_length;
|
2013-01-25 10:53:38 +00:00
|
|
|
type = rtp_header_extension_map_.Next(type);
|
2012-11-07 17:01:04 +00:00
|
|
|
}
|
|
|
|
|
if (total_block_length == 0) {
|
|
|
|
|
// No extension added.
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2015-03-17 14:33:12 +00:00
|
|
|
// 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;
|
|
|
|
|
}
|
2012-11-07 17:01:04 +00:00
|
|
|
// Set header length (in number of Word32, header excluded).
|
2015-03-17 16:42:49 +00:00
|
|
|
ByteWriter<uint16_t>::WriteBigEndian(data_buffer + kPosLength,
|
|
|
|
|
total_block_length / 4);
|
2012-11-07 17:01:04 +00:00
|
|
|
// Total added length.
|
|
|
|
|
return kHeaderLength + total_block_length;
|
|
|
|
|
}
|
|
|
|
|
|
2013-04-08 11:08:41 +00:00
|
|
|
uint8_t RTPSender::BuildTransmissionTimeOffsetExtension(
|
|
|
|
|
uint8_t* data_buffer) const {
|
2012-11-07 17:01:04 +00:00
|
|
|
// 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.
|
2013-04-08 11:08:41 +00:00
|
|
|
uint8_t id;
|
2013-01-25 10:53:38 +00:00
|
|
|
if (rtp_header_extension_map_.GetId(kRtpExtensionTransmissionTimeOffset,
|
|
|
|
|
&id) != 0) {
|
2012-11-07 17:01:04 +00:00
|
|
|
// Not registered.
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2013-05-07 12:36:21 +00:00
|
|
|
size_t pos = 0;
|
2013-04-08 11:08:41 +00:00
|
|
|
const uint8_t len = 2;
|
2013-01-25 10:53:38 +00:00
|
|
|
data_buffer[pos++] = (id << 4) + len;
|
2015-03-17 16:42:49 +00:00
|
|
|
ByteWriter<int32_t, 3>::WriteBigEndian(data_buffer + pos,
|
|
|
|
|
transmission_time_offset_);
|
2012-11-07 17:01:04 +00:00
|
|
|
pos += 3;
|
2013-05-07 12:36:21 +00:00
|
|
|
assert(pos == kTransmissionTimeOffsetLength);
|
|
|
|
|
return kTransmissionTimeOffsetLength;
|
2011-12-16 14:31:37 +00:00
|
|
|
}
|
|
|
|
|
|
2014-03-06 23:49:08 +00:00
|
|
|
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:
|
|
|
|
|
//
|
2015-03-17 14:33:12 +00:00
|
|
|
// 0 1
|
|
|
|
|
// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
|
|
|
|
|
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
|
|
|
// | ID | len=0 |V| level |
|
|
|
|
|
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
2014-03-06 23:49:08 +00:00
|
|
|
//
|
|
|
|
|
|
|
|
|
|
// 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 {
|
2013-05-16 11:10:31 +00:00
|
|
|
// 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;
|
2015-03-17 16:42:49 +00:00
|
|
|
ByteWriter<uint32_t, 3>::WriteBigEndian(data_buffer + pos,
|
|
|
|
|
absolute_send_time_);
|
2013-05-16 11:10:31 +00:00
|
|
|
pos += 3;
|
|
|
|
|
assert(pos == kAbsoluteSendTimeLength);
|
|
|
|
|
return kAbsoluteSendTimeLength;
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-04 22:55:15 +00:00
|
|
|
uint8_t RTPSender::BuildVideoRotationExtension(uint8_t* data_buffer) const {
|
|
|
|
|
// Coordination of Video Orientation in RTP streams.
|
|
|
|
|
//
|
2015-03-17 14:33:12 +00:00
|
|
|
// Coordination of Video Orientation consists in signaling of the current
|
2015-03-04 22:55:15 +00:00
|
|
|
// orientation of the image captured on the sender side to the receiver for
|
|
|
|
|
// appropriate rendering and displaying.
|
|
|
|
|
//
|
2015-03-17 14:33:12 +00:00
|
|
|
// 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|
|
|
|
|
|
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
2015-03-04 22:55:15 +00:00
|
|
|
//
|
|
|
|
|
|
|
|
|
|
// 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;
|
2015-03-12 20:50:57 +00:00
|
|
|
data_buffer[pos++] = ConvertVideoRotationToCVOByte(rotation_);
|
2015-03-04 22:55:15 +00:00
|
|
|
assert(pos == kVideoRotationLength);
|
|
|
|
|
return kVideoRotationLength;
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-17 14:33:12 +00:00
|
|
|
uint8_t RTPSender::BuildTransportSequenceNumberExtension(
|
2015-08-03 04:38:41 -07:00
|
|
|
uint8_t* data_buffer,
|
|
|
|
|
uint16_t sequence_number) const {
|
2015-03-17 14:33:12 +00:00
|
|
|
// 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;
|
2015-08-03 04:38:41 -07:00
|
|
|
ByteWriter<uint16_t>::WriteBigEndian(data_buffer + pos, sequence_number);
|
2015-03-17 14:33:12 +00:00
|
|
|
pos += 2;
|
|
|
|
|
assert(pos == kTransportSequenceNumberLength);
|
|
|
|
|
return kTransportSequenceNumberLength;
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-04 22:55:15 +00:00
|
|
|
bool RTPSender::FindHeaderExtensionPosition(RTPExtensionType type,
|
|
|
|
|
const uint8_t* rtp_packet,
|
|
|
|
|
size_t rtp_packet_length,
|
|
|
|
|
const RTPHeader& rtp_header,
|
|
|
|
|
size_t* position) const {
|
|
|
|
|
// Get length until start of header extension block.
|
|
|
|
|
int extension_block_pos =
|
|
|
|
|
rtp_header_extension_map_.GetLengthUntilBlockStartInBytes(type);
|
|
|
|
|
if (extension_block_pos < 0) {
|
|
|
|
|
LOG(LS_WARNING) << "Failed to find extension position for " << type
|
|
|
|
|
<< " as it is not registered.";
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
HeaderExtension header_extension(type);
|
|
|
|
|
|
2016-01-14 14:55:19 -08:00
|
|
|
size_t extension_pos =
|
|
|
|
|
kRtpHeaderLength + rtp_header.numCSRCs * sizeof(uint32_t);
|
|
|
|
|
size_t block_pos = extension_pos + extension_block_pos;
|
2015-03-04 22:55:15 +00:00
|
|
|
if (rtp_packet_length < block_pos + header_extension.length ||
|
|
|
|
|
rtp_header.headerLength < block_pos + header_extension.length) {
|
|
|
|
|
LOG(LS_WARNING) << "Failed to find extension position for " << type
|
|
|
|
|
<< " as the length is invalid.";
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Verify that header contains extension.
|
2016-01-14 14:55:19 -08:00
|
|
|
if (!(rtp_packet[extension_pos] == 0xBE &&
|
|
|
|
|
rtp_packet[extension_pos + 1] == 0xDE)) {
|
2015-03-04 22:55:15 +00:00
|
|
|
LOG(LS_WARNING) << "Failed to find extension position for " << type
|
|
|
|
|
<< "as hdr extension not found.";
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*position = block_pos;
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2015-08-03 04:38:41 -07:00
|
|
|
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 {
|
2014-04-15 12:28:46 +00:00
|
|
|
// Get id.
|
|
|
|
|
uint8_t id = 0;
|
2015-08-03 04:38:41 -07:00
|
|
|
if (rtp_header_extension_map_.GetId(extension_type, &id) != 0)
|
|
|
|
|
return ExtensionStatus::kNotRegistered;
|
2015-03-04 22:55:15 +00:00
|
|
|
|
|
|
|
|
size_t block_pos = 0;
|
2015-08-03 04:38:41 -07:00
|
|
|
if (!FindHeaderExtensionPosition(extension_type, rtp_packet,
|
|
|
|
|
rtp_packet_length, rtp_header, &block_pos))
|
|
|
|
|
return ExtensionStatus::kError;
|
|
|
|
|
|
2012-01-16 11:06:31 +00:00
|
|
|
// Verify first byte in block.
|
2015-08-03 04:38:41 -07:00
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void RTPSender::UpdateTransmissionTimeOffset(uint8_t* rtp_packet,
|
|
|
|
|
size_t rtp_packet_length,
|
|
|
|
|
const RTPHeader& rtp_header,
|
|
|
|
|
int64_t time_diff_ms) const {
|
|
|
|
|
size_t offset;
|
|
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
|
|
|
|
switch (VerifyExtension(kRtpExtensionTransmissionTimeOffset, rtp_packet,
|
|
|
|
|
rtp_packet_length, rtp_header,
|
|
|
|
|
kTransmissionTimeOffsetLength, &offset)) {
|
|
|
|
|
case ExtensionStatus::kNotRegistered:
|
|
|
|
|
return;
|
|
|
|
|
case ExtensionStatus::kError:
|
|
|
|
|
LOG(LS_WARNING) << "Failed to update transmission time offset.";
|
|
|
|
|
return;
|
|
|
|
|
case ExtensionStatus::kOk:
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
RTC_NOTREACHED();
|
2012-01-16 11:06:31 +00:00
|
|
|
}
|
2015-08-03 04:38:41 -07:00
|
|
|
|
2013-05-16 11:10:31 +00:00
|
|
|
// Update transmission offset field (converting to a 90 kHz timestamp).
|
2015-08-03 04:38:41 -07:00
|
|
|
ByteWriter<int32_t, 3>::WriteBigEndian(rtp_packet + offset + 1,
|
2015-03-17 16:42:49 +00:00
|
|
|
time_diff_ms * 90); // RTP timestamp.
|
2012-01-16 11:06:31 +00:00
|
|
|
}
|
|
|
|
|
|
2014-12-19 13:49:55 +00:00
|
|
|
bool RTPSender::UpdateAudioLevel(uint8_t* rtp_packet,
|
|
|
|
|
size_t rtp_packet_length,
|
|
|
|
|
const RTPHeader& rtp_header,
|
|
|
|
|
bool is_voiced,
|
|
|
|
|
uint8_t dBov) const {
|
2015-08-03 04:38:41 -07:00
|
|
|
size_t offset;
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2014-03-06 23:49:08 +00:00
|
|
|
|
2015-08-03 04:38:41 -07:00
|
|
|
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();
|
2015-03-04 22:55:15 +00:00
|
|
|
}
|
|
|
|
|
|
2015-08-03 04:38:41 -07:00
|
|
|
rtp_packet[offset + 1] = (is_voiced ? 0x80 : 0x00) + (dBov & 0x7f);
|
2015-03-04 22:55:15 +00:00
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool RTPSender::UpdateVideoRotation(uint8_t* rtp_packet,
|
|
|
|
|
size_t rtp_packet_length,
|
|
|
|
|
const RTPHeader& rtp_header,
|
|
|
|
|
VideoRotation rotation) const {
|
2015-08-03 04:38:41 -07:00
|
|
|
size_t offset;
|
2015-03-04 22:55:15 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
|
|
|
|
|
2015-08-03 04:38:41 -07:00
|
|
|
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();
|
2014-03-06 23:49:08 +00:00
|
|
|
}
|
2015-03-04 22:55:15 +00:00
|
|
|
|
2015-08-03 04:38:41 -07:00
|
|
|
rtp_packet[offset + 1] = ConvertVideoRotationToCVOByte(rotation);
|
2014-03-06 23:49:08 +00:00
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2014-12-19 13:49:55 +00:00
|
|
|
void RTPSender::UpdateAbsoluteSendTime(uint8_t* rtp_packet,
|
|
|
|
|
size_t rtp_packet_length,
|
|
|
|
|
const RTPHeader& rtp_header,
|
|
|
|
|
int64_t now_ms) const {
|
2015-08-03 04:38:41 -07:00
|
|
|
size_t offset;
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2013-05-16 11:10:31 +00:00
|
|
|
|
2015-08-03 04:38:41 -07:00
|
|
|
switch (VerifyExtension(kRtpExtensionAbsoluteSendTime, rtp_packet,
|
|
|
|
|
rtp_packet_length, rtp_header,
|
|
|
|
|
kAbsoluteSendTimeLength, &offset)) {
|
|
|
|
|
case ExtensionStatus::kNotRegistered:
|
|
|
|
|
return;
|
|
|
|
|
case ExtensionStatus::kError:
|
|
|
|
|
LOG(LS_WARNING) << "Failed to update absolute send time";
|
|
|
|
|
return;
|
|
|
|
|
case ExtensionStatus::kOk:
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
RTC_NOTREACHED();
|
2013-05-16 11:10:31 +00:00
|
|
|
}
|
2015-08-03 04:38:41 -07:00
|
|
|
|
2013-05-16 11:10:31 +00:00
|
|
|
// Update absolute send time field (convert ms to 24-bit unsigned with 18 bit
|
|
|
|
|
// fractional part).
|
2015-08-03 04:38:41 -07:00
|
|
|
ByteWriter<uint32_t, 3>::WriteBigEndian(rtp_packet + offset + 1,
|
2015-10-21 13:41:48 +02:00
|
|
|
ConvertMsTo24Bits(now_ms));
|
2013-05-16 11:10:31 +00:00
|
|
|
}
|
|
|
|
|
|
2015-08-03 04:38:41 -07:00
|
|
|
uint16_t RTPSender::UpdateTransportSequenceNumber(
|
|
|
|
|
uint8_t* rtp_packet,
|
|
|
|
|
size_t rtp_packet_length,
|
|
|
|
|
const RTPHeader& rtp_header) const {
|
|
|
|
|
size_t offset;
|
|
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
|
|
|
|
|
|
|
|
|
switch (VerifyExtension(kRtpExtensionTransportSequenceNumber, rtp_packet,
|
|
|
|
|
rtp_packet_length, rtp_header,
|
|
|
|
|
kTransportSequenceNumberLength, &offset)) {
|
|
|
|
|
case ExtensionStatus::kNotRegistered:
|
|
|
|
|
return 0;
|
|
|
|
|
case ExtensionStatus::kError:
|
|
|
|
|
LOG(LS_WARNING) << "Failed to update transport sequence number";
|
|
|
|
|
return 0;
|
|
|
|
|
case ExtensionStatus::kOk:
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
RTC_NOTREACHED();
|
|
|
|
|
}
|
|
|
|
|
|
2015-09-21 15:11:14 -07:00
|
|
|
uint16_t seq = transport_sequence_number_allocator_->AllocateSequenceNumber();
|
2015-08-03 04:38:41 -07:00
|
|
|
BuildTransportSequenceNumberExtension(rtp_packet + offset, seq);
|
|
|
|
|
return seq;
|
|
|
|
|
}
|
|
|
|
|
|
2013-09-09 16:02:19 +00:00
|
|
|
void RTPSender::SetSendingStatus(bool enabled) {
|
2012-11-07 17:01:04 +00:00
|
|
|
if (enabled) {
|
2013-09-09 16:02:19 +00:00
|
|
|
uint32_t frequency_hz = SendPayloadFrequency();
|
2015-12-21 11:06:50 -08:00
|
|
|
uint32_t RTPtime = CurrentRtp(*clock_, frequency_hz);
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2013-01-25 10:53:38 +00:00
|
|
|
// Will be ignored if it's already configured via API.
|
2012-11-07 17:01:04 +00:00
|
|
|
SetStartTimestamp(RTPtime, false);
|
|
|
|
|
} else {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped lock(send_critsect_.get());
|
2013-01-25 10:53:38 +00:00
|
|
|
if (!ssrc_forced_) {
|
|
|
|
|
// Generate a new SSRC.
|
|
|
|
|
ssrc_db_.ReturnSSRC(ssrc_);
|
|
|
|
|
ssrc_ = ssrc_db_.CreateSSRC(); // Can't be 0.
|
2014-11-05 14:05:29 +00:00
|
|
|
bitrates_->set_ssrc(ssrc_);
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
2012-11-07 17:01:04 +00:00
|
|
|
// Don't initialize seq number if SSRC passed externally.
|
2013-01-25 10:53:38 +00:00
|
|
|
if (!sequence_number_forced_ && !ssrc_forced_) {
|
|
|
|
|
// Generate a new sequence number.
|
2015-12-15 00:30:07 -08:00
|
|
|
sequence_number_ = random_.Rand(1, kMaxInitRtpSeqNumber);
|
2012-11-07 17:01:04 +00:00
|
|
|
}
|
|
|
|
|
}
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2014-12-19 13:49:55 +00:00
|
|
|
void RTPSender::SetSendingMediaStatus(bool enabled) {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2013-01-25 10:53:38 +00:00
|
|
|
sending_media_ = enabled;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2012-11-07 17:01:04 +00:00
|
|
|
bool RTPSender::SendingMedia() const {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2013-01-25 10:53:38 +00:00
|
|
|
return sending_media_;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-04-08 11:08:41 +00:00
|
|
|
uint32_t RTPSender::Timestamp() const {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2013-06-04 13:47:36 +00:00
|
|
|
return timestamp_;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-04-08 11:08:41 +00:00
|
|
|
void RTPSender::SetStartTimestamp(uint32_t timestamp, bool force) {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2012-11-07 17:01:04 +00:00
|
|
|
if (force) {
|
2014-07-07 13:06:48 +00:00
|
|
|
start_timestamp_forced_ = true;
|
|
|
|
|
start_timestamp_ = timestamp;
|
2012-11-07 17:01:04 +00:00
|
|
|
} else {
|
2014-07-07 13:06:48 +00:00
|
|
|
if (!start_timestamp_forced_) {
|
|
|
|
|
start_timestamp_ = timestamp;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
2012-11-07 17:01:04 +00:00
|
|
|
}
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-04-08 11:08:41 +00:00
|
|
|
uint32_t RTPSender::StartTimestamp() const {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2014-07-07 13:06:48 +00:00
|
|
|
return start_timestamp_;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-04-08 11:08:41 +00:00
|
|
|
uint32_t RTPSender::GenerateNewSSRC() {
|
2013-01-25 10:53:38 +00:00
|
|
|
// If configured via API, return 0.
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2013-01-25 10:53:38 +00:00
|
|
|
if (ssrc_forced_) {
|
2012-11-07 17:01:04 +00:00
|
|
|
return 0;
|
|
|
|
|
}
|
2013-01-25 10:53:38 +00:00
|
|
|
ssrc_ = ssrc_db_.CreateSSRC(); // Can't be 0.
|
2014-11-05 14:05:29 +00:00
|
|
|
bitrates_->set_ssrc(ssrc_);
|
2013-01-25 10:53:38 +00:00
|
|
|
return ssrc_;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-04-08 11:08:41 +00:00
|
|
|
void RTPSender::SetSSRC(uint32_t ssrc) {
|
2013-01-25 10:53:38 +00:00
|
|
|
// This is configured via the API.
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2013-01-25 10:53:38 +00:00
|
|
|
if (ssrc_ == ssrc && ssrc_forced_) {
|
|
|
|
|
return; // Since it's same ssrc, don't reset anything.
|
2012-11-07 17:01:04 +00:00
|
|
|
}
|
2013-01-25 10:53:38 +00:00
|
|
|
ssrc_forced_ = true;
|
|
|
|
|
ssrc_db_.ReturnSSRC(ssrc_);
|
|
|
|
|
ssrc_db_.RegisterSSRC(ssrc);
|
|
|
|
|
ssrc_ = ssrc;
|
2014-11-05 14:05:29 +00:00
|
|
|
bitrates_->set_ssrc(ssrc_);
|
2013-01-25 10:53:38 +00:00
|
|
|
if (!sequence_number_forced_) {
|
2015-12-15 00:30:07 -08:00
|
|
|
sequence_number_ = random_.Rand(1, kMaxInitRtpSeqNumber);
|
2012-11-07 17:01:04 +00:00
|
|
|
}
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-04-08 11:08:41 +00:00
|
|
|
uint32_t RTPSender::SSRC() const {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2013-01-25 10:53:38 +00:00
|
|
|
return ssrc_;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2014-11-24 08:25:50 +00:00
|
|
|
void RTPSender::SetCsrcs(const std::vector<uint32_t>& csrcs) {
|
|
|
|
|
assert(csrcs.size() <= kRtpCsrcSize);
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2014-11-24 08:25:50 +00:00
|
|
|
csrcs_ = csrcs;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-04-08 11:08:41 +00:00
|
|
|
void RTPSender::SetSequenceNumber(uint16_t seq) {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2013-01-25 10:53:38 +00:00
|
|
|
sequence_number_forced_ = true;
|
|
|
|
|
sequence_number_ = seq;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-04-08 11:08:41 +00:00
|
|
|
uint16_t RTPSender::SequenceNumber() const {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2013-01-25 10:53:38 +00:00
|
|
|
return sequence_number_;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-01-25 10:53:38 +00:00
|
|
|
// Audio.
|
2014-12-19 13:49:55 +00:00
|
|
|
int32_t RTPSender::SendTelephoneEvent(uint8_t key,
|
|
|
|
|
uint16_t time_ms,
|
|
|
|
|
uint8_t level) {
|
2013-01-25 10:53:38 +00:00
|
|
|
if (!audio_configured_) {
|
2012-11-07 17:01:04 +00:00
|
|
|
return -1;
|
|
|
|
|
}
|
2013-01-25 10:53:38 +00:00
|
|
|
return audio_->SendTelephoneEvent(key, time_ms, level);
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2014-12-19 13:49:55 +00:00
|
|
|
int32_t RTPSender::SetAudioPacketSize(uint16_t packet_size_samples) {
|
2013-01-25 10:53:38 +00:00
|
|
|
if (!audio_configured_) {
|
2012-11-07 17:01:04 +00:00
|
|
|
return -1;
|
|
|
|
|
}
|
2013-01-25 10:53:38 +00:00
|
|
|
return audio_->SetAudioPacketSize(packet_size_samples);
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2014-12-19 13:49:55 +00:00
|
|
|
int32_t RTPSender::SetAudioLevel(uint8_t level_d_bov) {
|
2013-01-25 10:53:38 +00:00
|
|
|
return audio_->SetAudioLevel(level_d_bov);
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2014-12-19 13:49:55 +00:00
|
|
|
int32_t RTPSender::SetRED(int8_t payload_type) {
|
2013-01-25 10:53:38 +00:00
|
|
|
if (!audio_configured_) {
|
2012-11-07 17:01:04 +00:00
|
|
|
return -1;
|
|
|
|
|
}
|
2013-01-25 10:53:38 +00:00
|
|
|
return audio_->SetRED(payload_type);
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-04-08 11:08:41 +00:00
|
|
|
int32_t RTPSender::RED(int8_t *payload_type) const {
|
2013-01-25 10:53:38 +00:00
|
|
|
if (!audio_configured_) {
|
2012-11-07 17:01:04 +00:00
|
|
|
return -1;
|
|
|
|
|
}
|
2015-12-15 02:54:47 -08:00
|
|
|
return audio_->RED(payload_type);
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2012-11-07 17:01:04 +00:00
|
|
|
RtpVideoCodecTypes RTPSender::VideoCodecType() const {
|
2013-03-18 16:39:03 +00:00
|
|
|
assert(!audio_configured_ && "Sender is an audio stream!");
|
2013-01-25 10:53:38 +00:00
|
|
|
return video_->VideoCodecType();
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-04-08 11:08:41 +00:00
|
|
|
uint32_t RTPSender::MaxConfiguredBitrateVideo() const {
|
2013-01-25 10:53:38 +00:00
|
|
|
if (audio_configured_) {
|
2012-11-07 17:01:04 +00:00
|
|
|
return 0;
|
|
|
|
|
}
|
2013-01-25 10:53:38 +00:00
|
|
|
return video_->MaxConfiguredBitrateVideo();
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2015-07-14 09:36:34 -07:00
|
|
|
void RTPSender::SetGenericFECStatus(bool enable,
|
|
|
|
|
uint8_t payload_type_red,
|
|
|
|
|
uint8_t payload_type_fec) {
|
2015-09-17 00:24:34 -07:00
|
|
|
RTC_DCHECK(!audio_configured_);
|
2015-04-14 21:28:08 +02:00
|
|
|
video_->SetGenericFECStatus(enable, payload_type_red, payload_type_fec);
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2015-07-14 09:36:34 -07:00
|
|
|
void RTPSender::GenericFECStatus(bool* enable,
|
2015-02-23 21:28:22 +00:00
|
|
|
uint8_t* payload_type_red,
|
|
|
|
|
uint8_t* payload_type_fec) const {
|
2015-09-17 00:24:34 -07:00
|
|
|
RTC_DCHECK(!audio_configured_);
|
2015-12-15 02:54:47 -08:00
|
|
|
video_->GenericFECStatus(enable, payload_type_red, payload_type_fec);
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-04-08 11:08:41 +00:00
|
|
|
int32_t RTPSender::SetFecParameters(
|
2013-01-25 10:53:38 +00:00
|
|
|
const FecProtectionParams *delta_params,
|
|
|
|
|
const FecProtectionParams *key_params) {
|
|
|
|
|
if (audio_configured_) {
|
2012-03-20 22:10:56 +00:00
|
|
|
return -1;
|
|
|
|
|
}
|
2015-04-14 21:28:08 +02:00
|
|
|
video_->SetFecParameters(delta_params, key_params);
|
|
|
|
|
return 0;
|
2011-07-15 21:32:40 +00:00
|
|
|
}
|
2013-01-25 10:53:38 +00:00
|
|
|
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
void RTPSender::BuildRtxPacket(uint8_t* buffer, size_t* length,
|
2013-04-08 11:08:41 +00:00
|
|
|
uint8_t* buffer_rtx) {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped cs(send_critsect_.get());
|
2013-04-08 11:08:41 +00:00
|
|
|
uint8_t* data_buffer_rtx = buffer_rtx;
|
2013-03-15 23:21:52 +00:00
|
|
|
// Add RTX header.
|
2014-07-08 12:10:51 +00:00
|
|
|
RtpUtility::RtpHeaderParser rtp_parser(
|
|
|
|
|
reinterpret_cast<const uint8_t*>(buffer), *length);
|
2013-03-15 23:21:52 +00:00
|
|
|
|
2013-05-29 12:12:51 +00:00
|
|
|
RTPHeader rtp_header;
|
2015-12-28 10:18:46 -08:00
|
|
|
rtp_parser.Parse(&rtp_header);
|
2013-03-15 23:21:52 +00:00
|
|
|
|
|
|
|
|
// Add original RTP header.
|
2013-05-29 12:12:51 +00:00
|
|
|
memcpy(data_buffer_rtx, buffer, rtp_header.headerLength);
|
2013-03-15 23:21:52 +00:00
|
|
|
|
2015-01-09 20:22:46 +00:00
|
|
|
// Replace payload type, if a specific type is set for RTX.
|
2015-04-21 20:24:50 +08:00
|
|
|
if (rtx_payload_type_ != -1) {
|
|
|
|
|
data_buffer_rtx[1] = static_cast<uint8_t>(rtx_payload_type_);
|
2013-05-29 12:12:51 +00:00
|
|
|
if (rtp_header.markerBit)
|
2013-04-12 14:55:46 +00:00
|
|
|
data_buffer_rtx[1] |= kRtpMarkerBitMask;
|
|
|
|
|
}
|
|
|
|
|
|
2013-03-15 23:21:52 +00:00
|
|
|
// Replace sequence number.
|
2015-12-28 10:18:46 -08:00
|
|
|
uint8_t* ptr = data_buffer_rtx + 2;
|
2015-03-17 16:42:49 +00:00
|
|
|
ByteWriter<uint16_t>::WriteBigEndian(ptr, sequence_number_rtx_++);
|
2013-03-15 23:21:52 +00:00
|
|
|
|
|
|
|
|
// Replace SSRC.
|
|
|
|
|
ptr += 6;
|
2015-03-17 16:42:49 +00:00
|
|
|
ByteWriter<uint32_t>::WriteBigEndian(ptr, ssrc_rtx_);
|
2013-03-15 23:21:52 +00:00
|
|
|
|
|
|
|
|
// Add OSN (original sequence number).
|
2013-05-29 12:12:51 +00:00
|
|
|
ptr = data_buffer_rtx + rtp_header.headerLength;
|
2015-03-17 16:42:49 +00:00
|
|
|
ByteWriter<uint16_t>::WriteBigEndian(ptr, rtp_header.sequenceNumber);
|
2013-03-15 23:21:52 +00:00
|
|
|
ptr += 2;
|
|
|
|
|
|
|
|
|
|
// Add original payload data.
|
2013-05-29 12:12:51 +00:00
|
|
|
memcpy(ptr, buffer + rtp_header.headerLength,
|
|
|
|
|
*length - rtp_header.headerLength);
|
2013-03-15 23:21:52 +00:00
|
|
|
*length += 2;
|
|
|
|
|
}
|
|
|
|
|
|
2013-12-05 14:29:02 +00:00
|
|
|
void RTPSender::RegisterRtpStatisticsCallback(
|
|
|
|
|
StreamDataCountersCallback* callback) {
|
|
|
|
|
CriticalSectionScoped cs(statistics_crit_.get());
|
|
|
|
|
rtp_stats_callback_ = callback;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
StreamDataCountersCallback* RTPSender::GetRtpStatisticsCallback() const {
|
|
|
|
|
CriticalSectionScoped cs(statistics_crit_.get());
|
|
|
|
|
return rtp_stats_callback_;
|
|
|
|
|
}
|
|
|
|
|
|
2014-11-05 14:05:29 +00:00
|
|
|
uint32_t RTPSender::BitrateSent() const {
|
|
|
|
|
return total_bitrate_sent_.BitrateLast();
|
2013-12-13 09:46:59 +00:00
|
|
|
}
|
2014-07-07 13:06:48 +00:00
|
|
|
|
|
|
|
|
void RTPSender::SetRtpState(const RtpState& rtp_state) {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped lock(send_critsect_.get());
|
2014-07-07 13:06:48 +00:00
|
|
|
sequence_number_ = rtp_state.sequence_number;
|
|
|
|
|
sequence_number_forced_ = true;
|
|
|
|
|
timestamp_ = rtp_state.timestamp;
|
|
|
|
|
capture_time_ms_ = rtp_state.capture_time_ms;
|
|
|
|
|
last_timestamp_time_ms_ = rtp_state.last_timestamp_time_ms;
|
2014-07-17 16:10:14 +00:00
|
|
|
media_has_been_sent_ = rtp_state.media_has_been_sent;
|
2014-07-07 13:06:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
RtpState RTPSender::GetRtpState() const {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped lock(send_critsect_.get());
|
2014-07-07 13:06:48 +00:00
|
|
|
|
|
|
|
|
RtpState state;
|
|
|
|
|
state.sequence_number = sequence_number_;
|
|
|
|
|
state.start_timestamp = start_timestamp_;
|
|
|
|
|
state.timestamp = timestamp_;
|
|
|
|
|
state.capture_time_ms = capture_time_ms_;
|
|
|
|
|
state.last_timestamp_time_ms = last_timestamp_time_ms_;
|
2014-07-17 16:10:14 +00:00
|
|
|
state.media_has_been_sent = media_has_been_sent_;
|
2014-07-07 13:06:48 +00:00
|
|
|
|
|
|
|
|
return state;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void RTPSender::SetRtxRtpState(const RtpState& rtp_state) {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped lock(send_critsect_.get());
|
2014-07-07 13:06:48 +00:00
|
|
|
sequence_number_rtx_ = rtp_state.sequence_number;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
RtpState RTPSender::GetRtxRtpState() const {
|
2015-02-12 12:20:08 +00:00
|
|
|
CriticalSectionScoped lock(send_critsect_.get());
|
2014-07-07 13:06:48 +00:00
|
|
|
|
|
|
|
|
RtpState state;
|
|
|
|
|
state.sequence_number = sequence_number_rtx_;
|
|
|
|
|
state.start_timestamp = start_timestamp_;
|
|
|
|
|
|
|
|
|
|
return state;
|
|
|
|
|
}
|
|
|
|
|
|
2012-11-07 17:01:04 +00:00
|
|
|
} // namespace webrtc
|