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
6a044f07
Commit
6a044f07
authored
Dec 22, 2021
by
ziyue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
HLS: 修复http客户端连接复用导致hls播放异常的bug: #1294
parent
f27893ff
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
32 行增加
和
13 行删除
+32
-13
src/Http/HlsPlayer.cpp
+9
-0
src/Http/HlsPlayer.h
+1
-0
src/Http/HttpClient.cpp
+16
-10
src/Http/HttpClient.h
+6
-3
没有找到文件。
src/Http/HlsPlayer.cpp
查看文件 @
6a044f07
...
...
@@ -28,11 +28,15 @@ void HlsPlayer::play_l(){
teardown_l
(
SockException
(
Err_shutdown
,
"所有hls url都尝试播放失败!"
));
return
;
}
if
(
alive
()
&&
_waiting_response
)
{
return
;
}
float
playTimeOutSec
=
(
*
this
)[
Client
::
kTimeoutMS
].
as
<
int
>
()
/
1000.0
f
;
setMethod
(
"GET"
);
if
(
!
(
*
this
)[
kNetAdapter
].
empty
())
{
setNetAdapter
((
*
this
)[
kNetAdapter
]);
}
_waiting_response
=
true
;
sendRequest
(
_m3u8_list
.
back
(),
playTimeOutSec
);
}
...
...
@@ -173,6 +177,7 @@ void HlsPlayer::onResponseBody(const char *buf, size_t size, size_t recvedSize,
}
void
HlsPlayer
::
onResponseCompleted
()
{
_waiting_response
=
false
;
if
(
HlsParser
::
parse
(
getUrl
(),
_m3u8
))
{
playDelay
();
if
(
_first
)
{
...
...
@@ -208,6 +213,7 @@ float HlsPlayer::delaySecond() {
}
void
HlsPlayer
::
onDisconnect
(
const
SockException
&
ex
)
{
_waiting_response
=
false
;
if
(
_first
)
{
//第一次失败,则播放失败
_first
=
false
;
...
...
@@ -219,6 +225,8 @@ void HlsPlayer::onDisconnect(const SockException &ex) {
if
(
ex
.
getErrCode
()
==
Err_shutdown
)
{
if
(
_m3u8_list
.
size
()
<=
1
)
{
//全部url都播放失败
_timer
=
nullptr
;
_timer_ts
=
nullptr
;
onShutdown
(
ex
);
}
else
{
_m3u8_list
.
pop_back
();
...
...
@@ -399,6 +407,7 @@ void HlsPlayerImp::onPlayResult(const SockException &ex) {
}
void
HlsPlayerImp
::
onShutdown
(
const
SockException
&
ex
)
{
WarnL
<<
ex
.
what
();
PlayerImp
<
HlsPlayer
,
PlayerBase
>::
onShutdown
(
ex
);
_demuxer
=
nullptr
;
}
...
...
src/Http/HlsPlayer.h
查看文件 @
6a044f07
...
...
@@ -112,6 +112,7 @@ private:
private
:
bool
_is_m3u8
=
false
;
bool
_first
=
true
;
bool
_waiting_response
=
false
;
int64_t
_last_sequence
=
-
1
;
string
_m3u8
;
Timer
::
Ptr
_timer
;
...
...
src/Http/HttpClient.cpp
查看文件 @
6a044f07
...
...
@@ -80,20 +80,27 @@ void HttpClient::sendRequest(const string &strUrl, float fTimeOutSec) {
startConnect
(
host
,
port
,
fTimeOutSec
);
}
else
{
SockException
ex
;
onConnect
(
ex
);
onConnect
_l
(
ex
);
}
}
void
HttpClient
::
clear
()
{
_url
.
clear
();
_header
.
clear
();
_body
.
reset
();
_method
.
clear
();
_path
.
clear
();
_parser
.
Clear
();
_recvedBodySize
=
0
;
_totalBodySize
=
0
;
_aliveTicker
.
resetTime
();
_chunkedSplitter
.
reset
();
_fTimeOutSec
=
0
;
clearResponse
();
}
void
HttpClient
::
clearResponse
()
{
_recvedBodySize
=
0
;
_totalBodySize
=
0
;
_parser
.
Clear
();
_chunkedSplitter
=
nullptr
;
HttpRequestSplitter
::
reset
();
}
...
...
@@ -131,16 +138,17 @@ const string &HttpClient::getUrl() const {
}
void
HttpClient
::
onConnect
(
const
SockException
&
ex
)
{
onConnect_l
(
ex
);
}
void
HttpClient
::
onConnect_l
(
const
SockException
&
ex
)
{
_aliveTicker
.
resetTime
();
if
(
ex
)
{
onDisconnect
(
ex
);
return
;
}
_totalBodySize
=
0
;
_recvedBodySize
=
0
;
HttpRequestSplitter
::
reset
();
_chunkedSplitter
.
reset
();
clearResponse
();
_StrPrinter
printer
;
printer
<<
_method
+
" "
<<
_path
+
" HTTP/1.1
\r\n
"
;
...
...
@@ -280,8 +288,6 @@ void HttpClient::onManager() {
}
void
HttpClient
::
onResponseCompleted_l
()
{
_totalBodySize
=
0
;
_recvedBodySize
=
0
;
onResponseCompleted
();
}
...
...
src/Http/HttpClient.h
查看文件 @
6a044f07
...
...
@@ -165,7 +165,9 @@ protected:
private
:
void
onResponseCompleted_l
();
void
onConnect_l
(
const
SockException
&
ex
);
void
checkCookie
(
HttpHeader
&
headers
);
void
clearResponse
();
protected
:
bool
_isHttps
;
...
...
@@ -176,13 +178,14 @@ private:
HttpBody
::
Ptr
_body
;
string
_method
;
string
_path
;
string
_lastHost
;
Ticker
_aliveTicker
;
float
_fTimeOutSec
=
0
;
//recv
size_t
_recvedBodySize
;
ssize_t
_totalBodySize
;
Parser
_parser
;
string
_lastHost
;
Ticker
_aliveTicker
;
float
_fTimeOutSec
=
0
;
std
::
shared_ptr
<
HttpChunkedSplitter
>
_chunkedSplitter
;
};
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论