Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-14 03:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

HLS: hls播放解决播放下一个切片导致数据丢失的bug： #1294

Browse Source
This commit is contained in:
ziyue
2021-12-24 13:29:16 +08:00
parent 0bf75529a2
commit c25ff6400f
4 changed files with 119 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/Http/HttpTSPlayer.h
View File

@@ -14,33 +14,46 @@
#include "Http/HttpDownloader.h"
#include "Player/MediaPlayer.h"
#include "Rtp/TSDecoder.h"
using namespace toolkit;
namespace mediakit {
//http-ts播发器，未实现ts解复用
class HttpTSPlayer : public HttpClientImp{
class HttpTSPlayer : public HttpClientImp {
public:
typedef function<void(const SockException &)> onShutdown;
typedef std::shared_ptr<HttpTSPlayer> Ptr;
using Ptr = std::shared_ptr<HttpTSPlayer>;
using onComplete = std::function<void(const SockException &)>;
HttpTSPlayer(const EventPoller::Ptr &poller = nullptr, bool split_ts = true);
~HttpTSPlayer() override ;
~HttpTSPlayer() override = default;
//设置异常断开回调
void setOnDisconnect(const onShutdown &cb);
//设置接收ts包回调
void setOnPacket(const TSSegment::onSegment &cb);
/**
* 设置下载完毕或异常断开回调
*/
void setOnComplete(onComplete cb);
/**
* 设置接收ts包回调
*/
void setOnPacket(TSSegment::onSegment cb);
protected:
///HttpClient override///
ssize_t onResponseHeader(const string &status,const HttpHeader &headers) override;
void onResponseBody(const char *buf,size_t size,size_t recvedSize,size_t totalSize) override;
ssize_t onResponseHeader(const string &status, const HttpHeader &header) override;
void onResponseBody(const char *buf, size_t size, size_t recved_size, size_t total_size) override;
void onResponseCompleted() override;
void onDisconnect(const SockException &ex) override ;
void onDisconnect(const SockException &ex) override;
//收到ts包
protected:
/**
* 收到ts数据
*/
virtual void onPacket(const char *data, size_t len);
private:
void emitOnComplete(const SockException &ex);
private:
//是否为mpegts负载
bool _is_ts_content = false;
@@ -50,7 +63,7 @@ private:
bool _split_ts;
string _status;
TSSegment _segment;
onShutdown _on_disconnect;
onComplete _on_complete;
TSSegment::onSegment _on_segment;
};