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
b6d3ec52
Commit
b6d3ec52
authored
Jun 11, 2022
by
xiongziliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
完善获取丢包率pull request; 新增MediaSource::getOwnerPoller接口
parent
be995f9c
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
51 行增加
和
21 行删除
+51
-21
src/Common/MediaSource.cpp
+18
-1
src/Common/MediaSource.h
+11
-3
webrtc/WebRtcPusher.cpp
+6
-2
webrtc/WebRtcPusher.h
+3
-1
webrtc/WebRtcTransport.cpp
+13
-14
没有找到文件。
src/Common/MediaSource.cpp
查看文件 @
b6d3ec52
/*
/*
* Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
*
* This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
...
...
@@ -221,6 +221,14 @@ int MediaSource::getLossRate(mediakit::TrackType type) {
return
listener
->
getLossRate
(
*
this
,
type
);
}
toolkit
::
EventPoller
::
Ptr
MediaSource
::
getOwnerPoller
()
{
auto
listener
=
_listener
.
lock
();
if
(
!
listener
)
{
return
nullptr
;
}
return
listener
->
getOwnerPoller
(
*
this
);
}
void
MediaSource
::
onReaderChanged
(
int
size
)
{
auto
listener
=
_listener
.
lock
();
if
(
listener
)
{
...
...
@@ -706,6 +714,15 @@ int MediaSourceEventInterceptor::getLossRate(MediaSource &sender, TrackType type
return
-
1
;
//异常返回-1
}
toolkit
::
EventPoller
::
Ptr
MediaSourceEventInterceptor
::
getOwnerPoller
(
MediaSource
&
sender
)
{
auto
listener
=
_listener
.
lock
();
if
(
listener
)
{
return
listener
->
getOwnerPoller
(
sender
);
}
return
nullptr
;
}
bool
MediaSourceEventInterceptor
::
setupRecord
(
MediaSource
&
sender
,
Recorder
::
type
type
,
bool
start
,
const
string
&
custom_path
,
size_t
max_second
)
{
auto
listener
=
_listener
.
lock
();
if
(
!
listener
)
{
...
...
src/Common/MediaSource.h
查看文件 @
b6d3ec52
/*
/*
* Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
*
* This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
...
...
@@ -77,8 +77,10 @@ public:
virtual
void
onReaderChanged
(
MediaSource
&
sender
,
int
size
);
//流注册或注销事件
virtual
void
onRegist
(
MediaSource
&
sender
,
bool
regist
)
{};
virtual
int
getLossRate
(
MediaSource
&
sender
,
TrackType
type
)
{
return
-
1
;};
// 获取丢包率
virtual
int
getLossRate
(
MediaSource
&
sender
,
TrackType
type
)
{
return
-
1
;
}
// 获取所在线程
virtual
toolkit
::
EventPoller
::
Ptr
getOwnerPoller
(
MediaSource
&
sender
)
{
return
nullptr
;
}
////////////////////////仅供MultiMediaSourceMuxer对象继承////////////////////////
// 开启或关闭录制
...
...
@@ -145,6 +147,8 @@ public:
void
startSendRtp
(
MediaSource
&
sender
,
const
SendRtpArgs
&
args
,
const
std
::
function
<
void
(
uint16_t
,
const
toolkit
::
SockException
&
)
>
cb
)
override
;
bool
stopSendRtp
(
MediaSource
&
sender
,
const
std
::
string
&
ssrc
)
override
;
int
getLossRate
(
MediaSource
&
sender
,
TrackType
type
)
override
;
toolkit
::
EventPoller
::
Ptr
getOwnerPoller
(
MediaSource
&
sender
)
override
;
private
:
std
::
weak_ptr
<
MediaSourceEvent
>
_listener
;
};
...
...
@@ -297,6 +301,10 @@ public:
void
startSendRtp
(
const
MediaSourceEvent
::
SendRtpArgs
&
args
,
const
std
::
function
<
void
(
uint16_t
,
const
toolkit
::
SockException
&
)
>
cb
);
// 停止发送ps-rtp
bool
stopSendRtp
(
const
std
::
string
&
ssrc
);
// 获取丢包率
int
getLossRate
(
mediakit
::
TrackType
type
);
// 获取所在线程
toolkit
::
EventPoller
::
Ptr
getOwnerPoller
();
////////////////static方法,查找或生成MediaSource////////////////
...
...
webrtc/WebRtcPusher.cpp
查看文件 @
b6d3ec52
...
...
@@ -150,4 +150,8 @@ void WebRtcPusher::onRtcConfigure(RtcConfigure &configure) const {
int
WebRtcPusher
::
getLossRate
(
MediaSource
&
sender
,
mediakit
::
TrackType
type
){
return
WebRtcTransportImp
::
getLossRate
(
type
);
}
\ No newline at end of file
}
toolkit
::
EventPoller
::
Ptr
WebRtcPusher
::
getOwnerPoller
(
mediakit
::
MediaSource
&
sender
)
{
return
getPoller
();
}
\ No newline at end of file
webrtc/WebRtcPusher.h
查看文件 @
b6d3ec52
...
...
@@ -39,8 +39,10 @@ protected:
std
::
string
getOriginUrl
(
mediakit
::
MediaSource
&
sender
)
const
override
;
// 获取媒体源客户端相关信息
std
::
shared_ptr
<
SockInfo
>
getOriginSock
(
mediakit
::
MediaSource
&
sender
)
const
override
;
// 获取丢包率
int
getLossRate
(
mediakit
::
MediaSource
&
sender
,
mediakit
::
TrackType
type
)
override
;
// 获取MediaSource归属线程
toolkit
::
EventPoller
::
Ptr
getOwnerPoller
(
mediakit
::
MediaSource
&
sender
)
override
;
private
:
WebRtcPusher
(
const
EventPoller
::
Ptr
&
poller
,
const
mediakit
::
RtspMediaSourceImp
::
Ptr
&
src
,
...
...
webrtc/WebRtcTransport.cpp
查看文件 @
b6d3ec52
...
...
@@ -612,10 +612,10 @@ public:
}
int
getLossRate
()
{
if
(
!
_rtcp_context
.
getExpectedPacketsInterval
())
//_rtcp_context.getExpectedPacketsInterval()取值总为零?
{
return
0
;
}
if
(
!
_rtcp_context
.
getExpectedPacketsInterval
())
{
//_rtcp_context.getExpectedPacketsInterval()取值总为零?
return
0
;
}
return
_rtcp_context
.
geLostInterval
()
*
100
/
_rtcp_context
.
getExpectedPacketsInterval
();
}
...
...
@@ -659,19 +659,18 @@ std::shared_ptr<RtpChannel> MediaTrack::getRtpChannel(uint32_t ssrc) const{
return
it_chn
->
second
;
}
int
WebRtcTransportImp
::
getLossRate
(
mediakit
::
TrackType
type
){
for
(
auto
it
:
_ssrc_to_track
){
auto
ssrc
=
it
.
first
;
auto
track
=
it
.
second
;
auto
rtp_chn
=
track
->
getRtpChannel
(
ssrc
);
if
(
rtp_chn
){
InfoL
<<
"-----------接收丢包率,ssrc------------- :"
<<
ssrc
<<
",loss rate(%):"
<<
rtp_chn
->
getLossRate
()
;
if
(
track
->
media
&&
type
==
track
->
media
->
type
){
int
WebRtcTransportImp
::
getLossRate
(
mediakit
::
TrackType
type
)
{
for
(
auto
&
pr
:
_ssrc_to_track
)
{
auto
ssrc
=
pr
.
first
;
auto
&
track
=
pr
.
second
;
auto
rtp_chn
=
track
->
getRtpChannel
(
ssrc
);
if
(
rtp_chn
)
{
if
(
track
->
media
&&
type
==
track
->
media
->
type
)
{
return
rtp_chn
->
getLossRate
();
}
}
}
}
return
-
1
;
return
-
1
;
}
void
WebRtcTransportImp
::
onRtcp
(
const
char
*
buf
,
size_t
len
)
{
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论