external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

RTC: Fix typo

Browse source
This commit is contained in:
winlin 2020-08-17 11:17:58 +08:00
parent 7069233783
commit fd69635052
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
trunk/src/kernel/srs_kernel_rtc_rtcp.cpp
View file

@ -707,7 +707,7 @@ void SrsRtcpTWCC::clear()
{ {
encoded_chucks_.clear(); encoded_chucks_.clear();
pkt_deltas_.clear(); pkt_deltas_.clear();
recv_packes_.clear(); recv_packets_.clear();
recv_sns_.clear(); recv_sns_.clear();
} }
@ -781,12 +781,12 @@ void SrsRtcpTWCC::add_recv_delta(uint16_t delta)
srs_error_t SrsRtcpTWCC::recv_packet(uint16_t sn, srs_utime_t ts) srs_error_t SrsRtcpTWCC::recv_packet(uint16_t sn, srs_utime_t ts)
{ {
map<uint16_t, srs_utime_t>::iterator it = recv_packes_.find(sn); map<uint16_t, srs_utime_t>::iterator it = recv_packets_.find(sn);
if(it != recv_packes_.end()) { if(it != recv_packets_.end()) {
return srs_error_new(ERROR_RTC_RTCP, "TWCC dup seq: %d", sn); return srs_error_new(ERROR_RTC_RTCP, "TWCC dup seq: %d", sn);
} }
recv_packes_[sn] = ts; recv_packets_[sn] = ts;
recv_sns_.insert(sn); recv_sns_.insert(sn);
return srs_success; return srs_success;
@ -1074,19 +1074,19 @@ srs_error_t SrsRtcpTWCC::do_encode(SrsBuffer *buffer)
pkt_len = kTwccFbPktHeaderSize; pkt_len = kTwccFbPktHeaderSize;
set<uint16_t, SrsSeqCompareLess>::iterator it_sn = recv_sns_.begin(); set<uint16_t, SrsSeqCompareLess>::iterator it_sn = recv_sns_.begin();
base_sn_ = *it_sn; base_sn_ = *it_sn;
map<uint16_t, srs_utime_t>::iterator it_ts = recv_packes_.find(base_sn_); map<uint16_t, srs_utime_t>::iterator it_ts = recv_packets_.find(base_sn_);
srs_utime_t ts = it_ts->second; srs_utime_t ts = it_ts->second;
reference_time_ = (ts % kTwccFbReferenceTimeDivisor) / kTwccFbTimeMultiplier; reference_time_ = (ts % kTwccFbReferenceTimeDivisor) / kTwccFbTimeMultiplier;
srs_utime_t last_ts = (srs_utime_t)(reference_time_) * kTwccFbTimeMultiplier; srs_utime_t last_ts = (srs_utime_t)(reference_time_) * kTwccFbTimeMultiplier;
uint16_t last_sn = base_sn_; uint16_t last_sn = base_sn_;
packet_count_ = recv_packes_.size(); packet_count_ = recv_packets_.size();
// encode chunk // encode chunk
SrsRtcpTWCC::SrsRtcpTWCCChunk chunk; SrsRtcpTWCC::SrsRtcpTWCCChunk chunk;
for(; it_sn != recv_sns_.end(); ++it_sn) { for(; it_sn != recv_sns_.end(); ++it_sn) {
uint16_t current_sn = *it_sn; uint16_t current_sn = *it_sn;
// calculate delta // calculate delta
it_ts = recv_packes_.find(current_sn); it_ts = recv_packets_.find(current_sn);
srs_utime_t delta_us = calculate_delta_us(it_ts->second, last_ts); srs_utime_t delta_us = calculate_delta_us(it_ts->second, last_ts);
int16_t delta = delta_us; int16_t delta = delta_us;
if(delta != delta_us) { if(delta != delta_us) {

2
trunk/src/kernel/srs_kernel_rtc_rtcp.hpp
View file

@ -254,7 +254,7 @@ private:
std::vector<uint16_t> encoded_chucks_; std::vector<uint16_t> encoded_chucks_;
std::vector<uint16_t> pkt_deltas_; std::vector<uint16_t> pkt_deltas_;
std::map<uint16_t, srs_utime_t> recv_packes_; std::map<uint16_t, srs_utime_t> recv_packets_;
std::set<uint16_t, SrsSeqCompareLess> recv_sns_; std::set<uint16_t, SrsSeqCompareLess> recv_sns_;
struct SrsRtcpTWCCChunk { struct SrsRtcpTWCCChunk {