Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
Z
ZLMediaKit
概览
Overview
Details
Activity
Cycle Analytics
版本库
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
问题
0
Issues
0
列表
Board
标记
里程碑
合并请求
0
Merge Requests
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
Snippets
成员
Collapse sidebar
Close sidebar
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
张翔宇
ZLMediaKit
Commits
ddc5b59a
Commit
ddc5b59a
authored
Jun 03, 2022
by
xiongguangjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some change
parent
9fadc22c
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
38 行增加
和
21 行删除
+38
-21
srt/SrtTransport.cpp
+31
-20
srt/SrtTransport.hpp
+1
-0
srt/Statistic.cpp
+6
-1
没有找到文件。
srt/SrtTransport.cpp
查看文件 @
ddc5b59a
...
...
@@ -263,6 +263,10 @@ void SrtTransport::handlePeerError(uint8_t *buf, int len, struct sockaddr_storag
}
void
SrtTransport
::
sendACKPacket
()
{
if
(
_last_ack_pkt_seq_num
==
_recv_buf
->
getExpectedSeq
()){
return
;
}
ACKPacket
::
Ptr
pkt
=
std
::
make_shared
<
ACKPacket
>
();
auto
now
=
SteadyClock
::
now
();
pkt
->
dst_socket_id
=
_peer_socket_id
;
...
...
@@ -277,9 +281,14 @@ void SrtTransport::sendACKPacket() {
pkt
->
recv_rate
=
_recv_rate_context
.
getRecvRate
();
pkt
->
storeToData
();
_ack_send_timestamp
[
pkt
->
ack_number
]
=
now
;
_last_ack_pkt_seq_num
=
pkt
->
last_ack_pkt_seq_number
;
sendControlPacket
(
pkt
,
true
);
TraceL
<<
"send ack"
;
}
void
SrtTransport
::
sendLightACKPacket
()
{
if
(
_last_ack_pkt_seq_num
==
_recv_buf
->
getExpectedSeq
()){
return
;
}
ACKPacket
::
Ptr
pkt
=
std
::
make_shared
<
ACKPacket
>
();
auto
now
=
SteadyClock
::
now
();
pkt
->
dst_socket_id
=
_peer_socket_id
;
...
...
@@ -293,8 +302,9 @@ void SrtTransport::sendLightACKPacket() {
pkt
->
estimated_link_capacity
=
0
;
pkt
->
recv_rate
=
0
;
pkt
->
storeToData
();
_last_ack_pkt_seq_num
=
pkt
->
last_ack_pkt_seq_number
;
sendControlPacket
(
pkt
,
true
);
TraceL
<<
"send light ack"
;
}
void
SrtTransport
::
sendNAKPacket
(
std
::
list
<
PacketQueue
::
LostPair
>&
lost_list
){
...
...
@@ -307,27 +317,12 @@ void SrtTransport::sendNAKPacket(std::list<PacketQueue::LostPair>& lost_list){
pkt
->
storeToData
();
//
TraceL<<"send NAK "<<pkt->dump();
TraceL
<<
"send NAK "
<<
pkt
->
dump
();
sendControlPacket
(
pkt
,
true
);
}
void
SrtTransport
::
handleDataPacket
(
uint8_t
*
buf
,
int
len
,
struct
sockaddr_storage
*
addr
){
DataPacket
::
Ptr
pkt
=
std
::
make_shared
<
DataPacket
>
();
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()<<\
" 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
//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
;
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
();
}
auto
list
=
_recv_buf
->
tryGetPacket
();
for
(
auto
data
:
list
){
onSRTData
(
std
::
move
(
data
),
addr
);
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
();
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
)
{
...
...
srt/SrtTransport.hpp
查看文件 @
ddc5b59a
...
...
@@ -101,6 +101,7 @@ private:
uint32_t
_rtt_variance
=
50
*
1000
;
uint32_t
_light_ack_pkt_count
=
0
;
uint32_t
_ack_number_count
=
0
;
uint32_t
_last_ack_pkt_seq_num
=
0
;
Ticker
_ack_ticker
;
std
::
map
<
uint32_t
,
TimePoint
>
_ack_send_timestamp
;
...
...
srt/Statistic.cpp
查看文件 @
ddc5b59a
...
...
@@ -41,9 +41,14 @@ uint32_t EstimatedLinkCapacityContext::getEstimatedLinkCapacity() {
}
std
::
sort
(
tmp
.
begin
(),
tmp
.
end
());
if
(
tmp
.
empty
()){
return
0
;
return
100
0
;
}
if
(
tmp
.
size
()
<
16
){
return
1000
;
}
return
1000
;
double
dur
=
DurationCountMicroseconds
(
tmp
[
tmp
.
size
()
/
2
])
/
1e6
;
return
(
uint32_t
)(
1.0
/
dur
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论