merge upstream

This commit is contained in:
monktan
2020-10-25 17:48:37 +08:00
45 changed files with 743 additions and 404 deletions

View File

@@ -34,7 +34,7 @@ public:
}
void setListener(const std::weak_ptr<MediaSourceEvent> &listener) {
_listener = listener;
setDelegate(listener);
_hls->getMediaSource()->setListener(shared_from_this());
//先注册媒体流,后续可以按需生成
_hls->getMediaSource()->registHls(false);