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
68ea5465
Commit
68ea5465
authored
Nov 29, 2022
by
monktan89
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复addStreamProxy后,马上startSendRtp,触发的无人观看事件回调是MediaSourceNull的信息,导致无法关闭流bug(#2120)
parent
75407391
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
5 行增加
和
4 行删除
+5
-4
src/Common/MultiMediaSourceMuxer.cpp
+5
-4
没有找到文件。
src/Common/MultiMediaSourceMuxer.cpp
查看文件 @
68ea5465
...
@@ -245,8 +245,9 @@ bool MultiMediaSourceMuxer::isRecording(MediaSource &sender, Recorder::type type
...
@@ -245,8 +245,9 @@ bool MultiMediaSourceMuxer::isRecording(MediaSource &sender, Recorder::type type
void
MultiMediaSourceMuxer
::
startSendRtp
(
MediaSource
&
sender
,
const
MediaSourceEvent
::
SendRtpArgs
&
args
,
const
std
::
function
<
void
(
uint16_t
,
const
toolkit
::
SockException
&
)
>
cb
)
{
void
MultiMediaSourceMuxer
::
startSendRtp
(
MediaSource
&
sender
,
const
MediaSourceEvent
::
SendRtpArgs
&
args
,
const
std
::
function
<
void
(
uint16_t
,
const
toolkit
::
SockException
&
)
>
cb
)
{
#if defined(ENABLE_RTPPROXY)
#if defined(ENABLE_RTPPROXY)
auto
rtp_sender
=
std
::
make_shared
<
RtpSender
>
(
getOwnerPoller
(
sender
));
auto
rtp_sender
=
std
::
make_shared
<
RtpSender
>
(
getOwnerPoller
(
sender
));
auto
sender_ptr
=
sender
.
shared_from_this
();
weak_ptr
<
MultiMediaSourceMuxer
>
weak_self
=
shared_from_this
();
weak_ptr
<
MultiMediaSourceMuxer
>
weak_self
=
shared_from_this
();
rtp_sender
->
startSend
(
args
,
[
args
,
weak_self
,
rtp_sender
,
cb
](
uint16_t
local_port
,
const
SockException
&
ex
)
mutable
{
rtp_sender
->
startSend
(
args
,
[
args
,
weak_self
,
rtp_sender
,
cb
,
sender_ptr
](
uint16_t
local_port
,
const
SockException
&
ex
)
mutable
{
cb
(
local_port
,
ex
);
cb
(
local_port
,
ex
);
auto
strong_self
=
weak_self
.
lock
();
auto
strong_self
=
weak_self
.
lock
();
if
(
!
strong_self
||
ex
)
{
if
(
!
strong_self
||
ex
)
{
...
@@ -258,17 +259,17 @@ void MultiMediaSourceMuxer::startSendRtp(MediaSource &sender, const MediaSourceE
...
@@ -258,17 +259,17 @@ void MultiMediaSourceMuxer::startSendRtp(MediaSource &sender, const MediaSourceE
rtp_sender
->
addTrackCompleted
();
rtp_sender
->
addTrackCompleted
();
auto
ssrc
=
args
.
ssrc
;
auto
ssrc
=
args
.
ssrc
;
rtp_sender
->
setOnClose
([
weak_self
,
ssrc
](
const
toolkit
::
SockException
&
ex
)
{
rtp_sender
->
setOnClose
([
weak_self
,
ssrc
,
sender_ptr
](
const
toolkit
::
SockException
&
ex
)
{
if
(
auto
strong_self
=
weak_self
.
lock
())
{
if
(
auto
strong_self
=
weak_self
.
lock
())
{
WarnL
<<
"stream:"
<<
strong_self
->
shortUrl
()
<<
" stop send rtp:"
<<
ssrc
<<
", reason:"
<<
ex
.
what
();
WarnL
<<
"stream:"
<<
strong_self
->
shortUrl
()
<<
" stop send rtp:"
<<
ssrc
<<
", reason:"
<<
ex
.
what
();
strong_self
->
_rtp_sender
.
erase
(
ssrc
);
strong_self
->
_rtp_sender
.
erase
(
ssrc
);
//触发观看人数统计
//触发观看人数统计
strong_self
->
onReaderChanged
(
MediaSource
::
NullMediaSource
()
,
strong_self
->
totalReaderCount
());
strong_self
->
onReaderChanged
(
*
sender_ptr
,
strong_self
->
totalReaderCount
());
NoticeCenter
::
Instance
().
emitEvent
(
Broadcast
::
kBroadcastSendRtpStopped
,
*
strong_self
,
ssrc
,
ex
);
NoticeCenter
::
Instance
().
emitEvent
(
Broadcast
::
kBroadcastSendRtpStopped
,
*
strong_self
,
ssrc
,
ex
);
}
}
});
});
strong_self
->
_rtp_sender
[
args
.
ssrc
]
=
std
::
move
(
rtp_sender
);
strong_self
->
_rtp_sender
[
args
.
ssrc
]
=
std
::
move
(
rtp_sender
);
strong_self
->
onReaderChanged
(
MediaSource
::
NullMediaSource
()
,
strong_self
->
totalReaderCount
());
strong_self
->
onReaderChanged
(
*
sender_ptr
,
strong_self
->
totalReaderCount
());
});
});
#else
#else
cb
(
0
,
SockException
(
Err_other
,
"该功能未启用,编译时请打开ENABLE_RTPPROXY宏"
));
cb
(
0
,
SockException
(
Err_other
,
"该功能未启用,编译时请打开ENABLE_RTPPROXY宏"
));
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论