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
13bbb7b0
Commit
13bbb7b0
authored
6 years ago
by
xiongziliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复播放器析构时调用虚函数的bug
parent
84129aef
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
9 行增加
和
8 行删除
+9
-8
src/Player/MediaPlayer.cpp
+0
-1
src/Player/PlayerBase.cpp
+9
-3
src/Rtmp/RtmpPlayer.cpp
+0
-1
src/Rtmp/RtmpPlayerImp.h
+0
-1
src/Rtsp/RtspPlayer.cpp
+0
-1
src/Rtsp/RtspPlayerImp.h
+0
-1
没有找到文件。
src/Player/MediaPlayer.cpp
查看文件 @
13bbb7b0
...
...
@@ -36,7 +36,6 @@ MediaPlayer::MediaPlayer() {
}
MediaPlayer
::~
MediaPlayer
()
{
teardown
();
}
void
MediaPlayer
::
play
(
const
char
*
strUrl
)
{
string
strPrefix
=
FindField
(
strUrl
,
NULL
,
"://"
);
...
...
This diff is collapsed.
Click to expand it.
src/Player/PlayerBase.cpp
查看文件 @
13bbb7b0
...
...
@@ -41,14 +41,20 @@ const char PlayerBase::kRtspPwdIsMD5[] = "rtsp_pwd_md5";
PlayerBase
::
Ptr
PlayerBase
::
createPlayer
(
const
char
*
strUrl
)
{
static
auto
releasePlayer
=
[](
PlayerBase
*
ptr
){
onceToken
token
(
nullptr
,[
&
](){
delete
ptr
;
});
ptr
->
teardown
();
};
string
prefix
=
FindField
(
strUrl
,
NULL
,
"://"
);
if
(
strcasecmp
(
"rtsp"
,
prefix
.
data
())
==
0
)
{
return
PlayerBase
::
Ptr
(
new
RtspPlayerImp
());
return
PlayerBase
::
Ptr
(
new
RtspPlayerImp
()
,
releasePlayer
);
}
if
(
strcasecmp
(
"rtmp"
,
prefix
.
data
())
==
0
)
{
return
PlayerBase
::
Ptr
(
new
RtmpPlayerImp
());
return
PlayerBase
::
Ptr
(
new
RtmpPlayerImp
()
,
releasePlayer
);
}
return
PlayerBase
::
Ptr
(
new
RtspPlayerImp
());
return
PlayerBase
::
Ptr
(
new
RtspPlayerImp
()
,
releasePlayer
);
}
///////////////////////////Demuxer//////////////////////////////
...
...
This diff is collapsed.
Click to expand it.
src/Rtmp/RtmpPlayer.cpp
查看文件 @
13bbb7b0
...
...
@@ -46,7 +46,6 @@ RtmpPlayer::RtmpPlayer() {
}
RtmpPlayer
::~
RtmpPlayer
()
{
teardown
();
DebugL
<<
endl
;
}
void
RtmpPlayer
::
teardown
()
{
...
...
This diff is collapsed.
Click to expand it.
src/Rtmp/RtmpPlayerImp.h
查看文件 @
13bbb7b0
...
...
@@ -45,7 +45,6 @@ public:
RtmpPlayerImp
(){};
virtual
~
RtmpPlayerImp
(){
DebugL
<<
endl
;
teardown
();
};
float
getProgress
()
const
override
{
if
(
getDuration
()
>
0
){
...
...
This diff is collapsed.
Click to expand it.
src/Rtsp/RtspPlayer.cpp
查看文件 @
13bbb7b0
...
...
@@ -55,7 +55,6 @@ RtspPlayer::RtspPlayer(void){
_pktPool
.
setSize
(
64
);
}
RtspPlayer
::~
RtspPlayer
(
void
)
{
RtspPlayer
::
teardown
();
DebugL
<<
endl
;
}
void
RtspPlayer
::
teardown
(){
...
...
This diff is collapsed.
Click to expand it.
src/Rtsp/RtspPlayerImp.h
查看文件 @
13bbb7b0
...
...
@@ -47,7 +47,6 @@ public:
RtspPlayerImp
(){};
virtual
~
RtspPlayerImp
(){
DebugL
<<
endl
;
teardown
();
};
float
getProgress
()
const
override
{
if
(
getDuration
()
>
0
){
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论