mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2024-11-26 12:37:09 +08:00
some change
This commit is contained in:
parent
9fadc22c80
commit
ddc5b59a65
@ -263,6 +263,10 @@ void SrtTransport::handlePeerError(uint8_t *buf, int len, struct sockaddr_storag
|
|||||||
}
|
}
|
||||||
|
|
||||||
void SrtTransport::sendACKPacket() {
|
void SrtTransport::sendACKPacket() {
|
||||||
|
if(_last_ack_pkt_seq_num == _recv_buf->getExpectedSeq()){
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
ACKPacket::Ptr pkt=std::make_shared<ACKPacket>();
|
ACKPacket::Ptr pkt=std::make_shared<ACKPacket>();
|
||||||
auto now = SteadyClock::now();
|
auto now = SteadyClock::now();
|
||||||
pkt->dst_socket_id = _peer_socket_id;
|
pkt->dst_socket_id = _peer_socket_id;
|
||||||
@ -277,9 +281,14 @@ void SrtTransport::sendACKPacket() {
|
|||||||
pkt->recv_rate = _recv_rate_context.getRecvRate();
|
pkt->recv_rate = _recv_rate_context.getRecvRate();
|
||||||
pkt->storeToData();
|
pkt->storeToData();
|
||||||
_ack_send_timestamp[pkt->ack_number] = now;
|
_ack_send_timestamp[pkt->ack_number] = now;
|
||||||
|
_last_ack_pkt_seq_num = pkt->last_ack_pkt_seq_number;
|
||||||
sendControlPacket(pkt,true);
|
sendControlPacket(pkt,true);
|
||||||
|
TraceL<<"send ack";
|
||||||
}
|
}
|
||||||
void SrtTransport::sendLightACKPacket() {
|
void SrtTransport::sendLightACKPacket() {
|
||||||
|
if(_last_ack_pkt_seq_num == _recv_buf->getExpectedSeq()){
|
||||||
|
return;
|
||||||
|
}
|
||||||
ACKPacket::Ptr pkt=std::make_shared<ACKPacket>();
|
ACKPacket::Ptr pkt=std::make_shared<ACKPacket>();
|
||||||
auto now = SteadyClock::now();
|
auto now = SteadyClock::now();
|
||||||
pkt->dst_socket_id = _peer_socket_id;
|
pkt->dst_socket_id = _peer_socket_id;
|
||||||
@ -293,8 +302,9 @@ void SrtTransport::sendLightACKPacket() {
|
|||||||
pkt->estimated_link_capacity = 0;
|
pkt->estimated_link_capacity = 0;
|
||||||
pkt->recv_rate = 0;
|
pkt->recv_rate = 0;
|
||||||
pkt->storeToData();
|
pkt->storeToData();
|
||||||
|
_last_ack_pkt_seq_num = pkt->last_ack_pkt_seq_number;
|
||||||
sendControlPacket(pkt,true);
|
sendControlPacket(pkt,true);
|
||||||
|
TraceL<<"send light ack";
|
||||||
}
|
}
|
||||||
|
|
||||||
void SrtTransport::sendNAKPacket(std::list<PacketQueue::LostPair>& lost_list){
|
void SrtTransport::sendNAKPacket(std::list<PacketQueue::LostPair>& lost_list){
|
||||||
@ -307,27 +317,12 @@ void SrtTransport::sendNAKPacket(std::list<PacketQueue::LostPair>& lost_list){
|
|||||||
|
|
||||||
pkt->storeToData();
|
pkt->storeToData();
|
||||||
|
|
||||||
//TraceL<<"send NAK "<<pkt->dump();
|
TraceL<<"send NAK "<<pkt->dump();
|
||||||
sendControlPacket(pkt,true);
|
sendControlPacket(pkt,true);
|
||||||
}
|
}
|
||||||
void SrtTransport::handleDataPacket(uint8_t *buf, int len, struct sockaddr_storage *addr){
|
void SrtTransport::handleDataPacket(uint8_t *buf, int len, struct sockaddr_storage *addr){
|
||||||
DataPacket::Ptr pkt = std::make_shared<DataPacket>();
|
DataPacket::Ptr pkt = std::make_shared<DataPacket>();
|
||||||
pkt->loadFromData(buf,len);
|
pkt->loadFromData(buf,len);
|
||||||
if(_ack_ticker.elapsedTime()>=10){
|
|
||||||
_light_ack_pkt_count = 0;
|
|
||||||
_ack_ticker.resetTime();
|
|
||||||
// send a ack per 10 ms for receiver
|
|
||||||
sendACKPacket();
|
|
||||||
}else{
|
|
||||||
if(_light_ack_pkt_count >= 64){
|
|
||||||
// for high bitrate stream send light ack
|
|
||||||
// TODO
|
|
||||||
sendLightACKPacket();
|
|
||||||
}
|
|
||||||
_light_ack_pkt_count = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
_light_ack_pkt_count++;
|
|
||||||
|
|
||||||
//TraceL<<" seq="<< pkt->packet_seq_number<<" ts="<<pkt->timestamp<<" size="<<pkt->payloadSize()<<\
|
//TraceL<<" seq="<< pkt->packet_seq_number<<" ts="<<pkt->timestamp<<" size="<<pkt->payloadSize()<<\
|
||||||
" PP="<<(int)pkt->PP<<" O="<<(int)pkt->O<<" kK="<<(int)pkt->KK<<" R="<<(int)pkt->R;
|
" PP="<<(int)pkt->PP<<" O="<<(int)pkt->O<<" kK="<<(int)pkt->KK<<" R="<<(int)pkt->R;
|
||||||
@ -343,6 +338,11 @@ void SrtTransport::handleDataPacket(uint8_t *buf, int len, struct sockaddr_stora
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
//TraceL<<" data number size "<<list.size();
|
//TraceL<<" data number size "<<list.size();
|
||||||
|
auto list = _recv_buf->tryGetPacket();
|
||||||
|
|
||||||
|
for(auto data : list){
|
||||||
|
onSRTData(std::move(data),addr);
|
||||||
|
}
|
||||||
|
|
||||||
auto nak_interval = (_rtt+_rtt_variance*4)/2/1000;
|
auto nak_interval = (_rtt+_rtt_variance*4)/2/1000;
|
||||||
if(_nak_ticker.elapsedTime()>20 && _nak_ticker.elapsedTime()>nak_interval){
|
if(_nak_ticker.elapsedTime()>20 && _nak_ticker.elapsedTime()>nak_interval){
|
||||||
@ -353,11 +353,22 @@ void SrtTransport::handleDataPacket(uint8_t *buf, int len, struct sockaddr_stora
|
|||||||
}
|
}
|
||||||
_nak_ticker.resetTime();
|
_nak_ticker.resetTime();
|
||||||
}
|
}
|
||||||
auto list = _recv_buf->tryGetPacket();
|
|
||||||
|
|
||||||
for(auto data : list){
|
if(_ack_ticker.elapsedTime()>=10){
|
||||||
onSRTData(std::move(data),addr);
|
_light_ack_pkt_count = 0;
|
||||||
|
_ack_ticker.resetTime();
|
||||||
|
// send a ack per 10 ms for receiver
|
||||||
|
sendACKPacket();
|
||||||
|
}else{
|
||||||
|
if(_light_ack_pkt_count >= 64){
|
||||||
|
// for high bitrate stream send light ack
|
||||||
|
// TODO
|
||||||
|
sendLightACKPacket();
|
||||||
|
TraceL<<"send light ack";
|
||||||
|
}
|
||||||
|
_light_ack_pkt_count = 0;
|
||||||
}
|
}
|
||||||
|
_light_ack_pkt_count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SrtTransport::sendDataPacket(DataPacket::Ptr pkt,char* buf,int len, bool flush) {
|
void SrtTransport::sendDataPacket(DataPacket::Ptr pkt,char* buf,int len, bool flush) {
|
||||||
|
@ -101,6 +101,7 @@ private:
|
|||||||
uint32_t _rtt_variance =50*1000;
|
uint32_t _rtt_variance =50*1000;
|
||||||
uint32_t _light_ack_pkt_count = 0;
|
uint32_t _light_ack_pkt_count = 0;
|
||||||
uint32_t _ack_number_count = 0;
|
uint32_t _ack_number_count = 0;
|
||||||
|
uint32_t _last_ack_pkt_seq_num = 0;
|
||||||
Ticker _ack_ticker;
|
Ticker _ack_ticker;
|
||||||
std::map<uint32_t,TimePoint> _ack_send_timestamp;
|
std::map<uint32_t,TimePoint> _ack_send_timestamp;
|
||||||
|
|
||||||
|
@ -41,9 +41,14 @@ uint32_t EstimatedLinkCapacityContext::getEstimatedLinkCapacity() {
|
|||||||
}
|
}
|
||||||
std::sort(tmp.begin(),tmp.end());
|
std::sort(tmp.begin(),tmp.end());
|
||||||
if(tmp.empty()){
|
if(tmp.empty()){
|
||||||
return 0;
|
return 1000;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(tmp.size()<16){
|
||||||
|
return 1000;
|
||||||
|
}
|
||||||
|
return 1000;
|
||||||
|
|
||||||
double dur =DurationCountMicroseconds(tmp[tmp.size()/2])/1e6;
|
double dur =DurationCountMicroseconds(tmp[tmp.size()/2])/1e6;
|
||||||
|
|
||||||
return (uint32_t)(1.0/dur);
|
return (uint32_t)(1.0/dur);
|
||||||
|
Loading…
Reference in New Issue
Block a user