Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-15 20:45:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

删除多余ts split代码

Browse Source
This commit is contained in:
xiongziliang
2022-02-13 21:36:04 +08:00
parent 83c1f29253
commit 2e9d77e8e1
7 changed files with 11 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Http/HlsPlayer.cpp
View File

@@ -16,7 +16,6 @@ using namespace toolkit;
namespace mediakit {
HlsPlayer::HlsPlayer(const EventPoller::Ptr &poller) {
_segment.setOnSegment([this](const char *data, size_t len) { onPacket(data, len); });
setPoller(poller ? poller : EventPollerPool::Instance().getPoller());
}
@@ -68,7 +67,7 @@ void HlsPlayer::fetchSegment() {
}
weak_ptr<HlsPlayer> weak_self = dynamic_pointer_cast<HlsPlayer>(shared_from_this());
if (!_http_ts_player) {
_http_ts_player = std::make_shared<HttpTSPlayer>(getPoller(), false);
_http_ts_player = std::make_shared<HttpTSPlayer>(getPoller());
_http_ts_player->setOnCreateSocket([weak_self](const EventPoller::Ptr &poller) {
auto strong_self = weak_self.lock();
if (strong_self) {
@@ -84,7 +83,7 @@ void HlsPlayer::fetchSegment() {
return;
}
//收到ts包
strong_self->onPacket_l(data, len);
strong_self->onPacket(data, len);
});
}
@@ -238,16 +237,6 @@ void HlsPlayer::playDelay() {
}, getPoller()));
}
void HlsPlayer::onPacket_l(const char *data, size_t len) {
try {
_segment.input(data, len);
} catch (...) {
//ts解析失败，清空缓存数据
_segment.reset();
throw;
}
}
//////////////////////////////////////////////////////////////////////////
void HlsDemuxer::start(const EventPoller::Ptr &poller, TrackListener *listener) {