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
dd2abd79
Commit
dd2abd79
authored
4 years ago
by
xiongziliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复拼写错误
parent
c5f1b4cd
显示空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
6 行增加
和
6 行删除
+6
-6
src/Player/MediaPlayer.cpp
+1
-1
src/Player/PlayerBase.h
+3
-3
src/Player/PlayerProxy.cpp
+2
-2
没有找到文件。
src/Player/MediaPlayer.cpp
查看文件 @
dd2abd79
...
...
@@ -37,7 +37,7 @@ void MediaPlayer::play(const string &url) {
_delegate
->
setOnShutdown
(
_shutdownCB
);
_delegate
->
setOnPlayResult
(
_playResultCB
);
_delegate
->
setOnResume
(
_resumeCB
);
_delegate
->
setMediaSouce
(
_pMediaSrc
);
_delegate
->
setMediaSou
r
ce
(
_pMediaSrc
);
_delegate
->
mINI
::
operator
=
(
*
this
);
_delegate
->
play
(
url
);
}
...
...
This diff is collapsed.
Click to expand it.
src/Player/PlayerBase.h
查看文件 @
dd2abd79
...
...
@@ -103,7 +103,7 @@ public:
* 设置一个MediaSource,直接生产rtsp/rtmp代理
* @param src
*/
virtual
void
setMediaSouce
(
const
MediaSource
::
Ptr
&
src
)
{}
virtual
void
setMediaSou
r
ce
(
const
MediaSource
::
Ptr
&
src
)
{}
/**
* 获取丢包率,只支持rtsp
...
...
@@ -181,9 +181,9 @@ public:
return
Parent
::
seekTo
(
fProgress
);
}
void
setMediaSouce
(
const
MediaSource
::
Ptr
&
src
)
override
{
void
setMediaSou
r
ce
(
const
MediaSource
::
Ptr
&
src
)
override
{
if
(
_delegate
)
{
_delegate
->
setMediaSouce
(
src
);
_delegate
->
setMediaSou
r
ce
(
src
);
}
_pMediaSrc
=
src
;
}
...
...
This diff is collapsed.
Click to expand it.
src/Player/PlayerProxy.cpp
查看文件 @
dd2abd79
...
...
@@ -126,7 +126,7 @@ void PlayerProxy::play(const string &strUrlTmp) {
mediaSource
=
std
::
make_shared
<
RtmpMediaSource
>
(
_vhost
,
_app
,
_stream_id
);
}
if
(
mediaSource
){
setMediaSouce
(
mediaSource
);
setMediaSou
r
ce
(
mediaSource
);
mediaSource
->
setListener
(
shared_from_this
());
}
}
...
...
@@ -163,7 +163,7 @@ bool PlayerProxy::close(MediaSource &sender,bool force) {
return
;
}
strongSelf
->
_muxer
.
reset
();
strongSelf
->
setMediaSouce
(
nullptr
);
strongSelf
->
setMediaSou
r
ce
(
nullptr
);
strongSelf
->
teardown
();
if
(
strongSelf
->
_on_close
)
{
strongSelf
->
_on_close
();
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论