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
83387737
Commit
83387737
authored
Feb 11, 2022
by
ziyue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hls/http-ts播放器新增性能测试模式
parent
91c0a563
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
29 行增加
和
14 行删除
+29
-14
src/Http/HlsPlayer.cpp
+16
-10
src/Http/TsPlayer.cpp
+5
-1
src/Http/TsPlayer.h
+2
-1
src/Http/TsplayerImp.cpp
+6
-2
没有找到文件。
src/Http/HlsPlayer.cpp
查看文件 @
83387737
...
...
@@ -76,15 +76,17 @@ void HlsPlayer::fetchSegment() {
}
return
Socket
::
createSocket
(
poller
,
true
);
});
_http_ts_player
->
setOnPacket
([
weak_self
](
const
char
*
data
,
size_t
len
)
{
auto
strong_self
=
weak_self
.
lock
();
if
(
!
strong_self
)
{
return
;
}
//收到ts包
strong_self
->
onPacket_l
(
data
,
len
);
});
auto
benchmark_mode
=
(
*
this
)[
Client
::
kBenchmarkMode
].
as
<
int
>
();
if
(
!
benchmark_mode
)
{
_http_ts_player
->
setOnPacket
([
weak_self
](
const
char
*
data
,
size_t
len
)
{
auto
strong_self
=
weak_self
.
lock
();
if
(
!
strong_self
)
{
return
;
}
//收到ts包
strong_self
->
onPacket_l
(
data
,
len
);
});
}
if
(
!
(
*
this
)[
Client
::
kNetAdapter
].
empty
())
{
_http_ts_player
->
setNetAdapter
((
*
this
)[
Client
::
kNetAdapter
]);
...
...
@@ -349,7 +351,8 @@ void HlsPlayerImp::addTrackCompleted() {
}
void
HlsPlayerImp
::
onPlayResult
(
const
SockException
&
ex
)
{
if
(
ex
)
{
auto
benchmark_mode
=
(
*
this
)[
Client
::
kBenchmarkMode
].
as
<
int
>
();
if
(
ex
||
benchmark_mode
)
{
PlayerImp
<
HlsPlayer
,
PlayerBase
>::
onPlayResult
(
ex
);
}
else
{
auto
demuxer
=
std
::
make_shared
<
HlsDemuxer
>
();
...
...
@@ -364,6 +367,9 @@ void HlsPlayerImp::onShutdown(const SockException &ex) {
}
vector
<
Track
::
Ptr
>
HlsPlayerImp
::
getTracks
(
bool
ready
)
const
{
if
(
!
_demuxer
)
{
return
vector
<
Track
::
Ptr
>
();
}
return
static_pointer_cast
<
HlsDemuxer
>
(
_demuxer
)
->
getTracks
(
ready
);
}
...
...
src/Http/TsPlayer.cpp
查看文件 @
83387737
...
...
@@ -20,6 +20,7 @@ TsPlayer::TsPlayer(const EventPoller::Ptr &poller) : HttpTSPlayer(poller, true)
void
TsPlayer
::
play
(
const
string
&
url
)
{
TraceL
<<
"play http-ts: "
<<
url
;
_play_result
=
false
;
_benchmark_mode
=
(
*
this
)[
Client
::
kBenchmarkMode
].
as
<
int
>
();
setHeaderTimeout
((
*
this
)[
Client
::
kTimeoutMS
].
as
<
int
>
());
setBodyTimeout
((
*
this
)[
Client
::
kMediaTimeoutMS
].
as
<
int
>
());
setMethod
(
"GET"
);
...
...
@@ -45,7 +46,9 @@ void TsPlayer::onResponseBody(const char *buf, size_t size) {
_play_result
=
true
;
onPlayResult
(
SockException
(
Err_success
,
"play http-ts success"
));
}
HttpTSPlayer
::
onResponseBody
(
buf
,
size
);
if
(
!
_benchmark_mode
)
{
HttpTSPlayer
::
onResponseBody
(
buf
,
size
);
}
}
}
//
namespace
mediakit
\ No newline at end of file
src/Http/TsPlayer.h
查看文件 @
83387737
...
...
@@ -16,7 +16,7 @@
namespace
mediakit
{
class
TsPlayer
:
public
HttpTSPlayer
,
public
PlayerBase
{
class
TsPlayer
:
public
HttpTSPlayer
,
public
PlayerBase
{
public
:
TsPlayer
(
const
toolkit
::
EventPoller
::
Ptr
&
poller
);
~
TsPlayer
()
override
=
default
;
...
...
@@ -37,6 +37,7 @@ protected:
private
:
bool
_play_result
=
true
;
bool
_benchmark_mode
=
false
;
};
}
// namespace mediakit
...
...
src/Http/TsplayerImp.cpp
查看文件 @
83387737
...
...
@@ -33,7 +33,8 @@ void TsPlayerImp::addTrackCompleted() {
}
void
TsPlayerImp
::
onPlayResult
(
const
SockException
&
ex
)
{
if
(
ex
)
{
auto
benchmark_mode
=
(
*
this
)[
Client
::
kBenchmarkMode
].
as
<
int
>
();
if
(
ex
||
benchmark_mode
)
{
PlayerImp
<
TsPlayer
,
PlayerBase
>::
onPlayResult
(
ex
);
}
else
{
auto
demuxer
=
std
::
make_shared
<
HlsDemuxer
>
();
...
...
@@ -47,7 +48,10 @@ void TsPlayerImp::onShutdown(const SockException &ex) {
_demuxer
=
nullptr
;
}
vector
<
Track
::
Ptr
>
TsPlayerImp
::
getTracks
(
bool
ready
)
const
{
vector
<
Track
::
Ptr
>
TsPlayerImp
::
getTracks
(
bool
ready
)
const
{
if
(
!
_demuxer
)
{
return
vector
<
Track
::
Ptr
>
();
}
return
static_pointer_cast
<
HlsDemuxer
>
(
_demuxer
)
->
getTracks
(
ready
);
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论