amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 10:40:05 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

hls/ts 播放器不做content-length严格限制

Browse Source
This commit is contained in:
ziyue 2022-01-21 16:10:27 +08:00
parent bf191aa902
commit 5007578202
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdpart/ZLToolKit

@ -1 +1 @@
Subproject commit c41a8e61e43292080462517027554d0015e26fbe Subproject commit 74cd97f7e9712848b8df1ecf47760fb6d97b74ee

6
src/Http/HlsPlayer.cpp
View File

@ -167,9 +167,9 @@ void HlsPlayer::onResponseHeader(const string &status, const HttpClient::HttpHea
//失败 //失败
throw invalid_argument("bad http status code:" + status); throw invalid_argument("bad http status code:" + status);
} }
auto content_type = const_cast<HttpClient::HttpHeader &>(headers)["Content-Type"]; auto content_type = strToLower(const_cast<HttpClient::HttpHeader &>(headers)["Content-Type"]);
if (content_type.find("application/vnd.apple.mpegurl") != 0) { if (content_type.find("application/vnd.apple.mpegurl") != 0 && content_type.find("application/x-mpegurl") != 0) {
throw invalid_argument("content type not m3u8: " + content_type); WarnL << "may not a hls video: " << content_type << ", url: " << getUrl();
} }
_m3u8.clear(); _m3u8.clear();
} }

4
src/Http/HttpTSPlayer.cpp
View File

@ -24,9 +24,9 @@ void HttpTSPlayer::onResponseHeader(const string &status, const HttpClient::Http
throw invalid_argument("bad http status code:" + status); throw invalid_argument("bad http status code:" + status);
} }
auto content_type = const_cast<HttpClient::HttpHeader &>(header)["Content-Type"]; auto content_type = strToLower(const_cast<HttpClient::HttpHeader &>(header)["Content-Type"]);
if (content_type.find("video/mp2t") != 0 && content_type.find("video/mpeg") != 0) { if (content_type.find("video/mp2t") != 0 && content_type.find("video/mpeg") != 0) {
throw invalid_argument("content type not mpeg-ts: " + content_type); WarnL << "may not a mpeg-ts video: " << content_type << ", url: " << getUrl();
} }
} }