初步添加HlsMediaSource

src/Common/MediaSource.cpp

@@ -39,9 +39,7 @@ recursive_mutex MediaSource::g_mtxMediaSrc;
 MediaSource::SchemaVhostAppStreamMap MediaSource::g_mapMediaSrc;
 
 MediaSource::MediaSource(const string &strSchema, const string &strVhost, const string &strApp, const string &strId) :
-        _strSchema(strSchema),
+        _strSchema(strSchema), _strApp(strApp), _strId(strId) {
-        _strApp(strApp),
-        _strId(strId) {
     if (strVhost.empty()) {
         _strVhost = DEFAULT_VHOST;
     } else {
@@ -146,12 +144,7 @@ void MediaSource::for_each_media(const function<void(const MediaSource::Ptr &src
 }
 
 template<typename MAP, typename FUNC>
-static bool searchMedia(MAP &map,
+static bool searchMedia(MAP &map, const string &schema, const string &vhost, const string &app, const string &id, FUNC &&func) {
-                        const string &schema,
-                        const string &vhost,
-                        const string &app,
-                        const string &id,
-                        FUNC &&func) {
     auto it0 = map.find(schema);
     if (it0 == map.end()) {
         //未找到协议
@@ -188,16 +181,9 @@ static void eraseIfEmpty(MAP &map, IT0 it0, IT1 it1, IT2 it2) {
     }
 };
 
-void findAsync_l(const MediaInfo &info,
+void findAsync_l(const MediaInfo &info, const std::shared_ptr<TcpSession> &session, bool retry,
-                            const std::shared_ptr<TcpSession> &session,
+                 const function<void(const MediaSource::Ptr &src)> &cb){
-                            bool retry,
+    auto src = MediaSource::find(info._schema, info._vhost, info._app, info._streamid, true);
-                            const function<void(const MediaSource::Ptr &src)> &cb){
-
-    auto src = MediaSource::find(info._schema,
-                                 info._vhost,
-                                 info._app,
-                                 info._streamid,
-                                 true);
     if(src || !retry){
         cb(src);
         return;
@@ -263,12 +249,7 @@ void MediaSource::findAsync(const MediaInfo &info, const std::shared_ptr<TcpSess
     return findAsync_l(info, session, true, cb);
 }
 
-MediaSource::Ptr MediaSource::find(
+MediaSource::Ptr MediaSource::find(const string &schema, const string &vhost_tmp, const string &app, const string &id, bool bMake) {
-        const string &schema,
-        const string &vhost_tmp,
-        const string &app,
-        const string &id,
-        bool bMake) {
     string vhost = vhost_tmp;
     if(vhost.empty()){
         vhost = DEFAULT_VHOST;

src/Common/MediaSource.h

@@ -132,7 +132,7 @@ public:
     // 观看者个数，包括(hls/rtsp/rtmp)
     virtual int totalReaderCount();
     // 获取流当前时间戳
-    virtual uint32_t getTimeStamp(TrackType trackType) = 0;
+    virtual uint32_t getTimeStamp(TrackType trackType) { return 0; };
 
     // 拖动进度条
     bool seekTo(uint32_t ui32Stamp);

src/Common/MultiMediaSourceMuxer.h

@@ -30,7 +30,7 @@
 #include "Rtsp/RtspMediaSourceMuxer.h"
 #include "Rtmp/RtmpMediaSourceMuxer.h"
 #include "Record/Recorder.h"
-#include "Record/HlsManager.h"
+#include "Record/HlsMediaSource.h"
 
 class MultiMediaSourceMuxer : public MediaSink , public std::enable_shared_from_this<MultiMediaSourceMuxer>{
 public:
@@ -66,7 +66,8 @@ public:
         }
 
         _get_hls_player = [vhost,strApp,strId](){
-            return HlsManager::Instance().hlsPlayerCount(vhost,strApp,strId);
+            auto src = MediaSource::find(HLS_SCHEMA,vhost,strApp,strId);
+            return src ? src->readerCount() : 0;
         };
     }
     virtual ~MultiMediaSourceMuxer(){}

src/Common/config.h

@@ -62,6 +62,7 @@ bool loadIniConfig(const char *ini_path = nullptr);
 #define HTTP_SCHEMA "http"
 #define RTSP_SCHEMA "rtsp"
 #define RTMP_SCHEMA "rtmp"
+#define HLS_SCHEMA "hls"
 #define DEFAULT_VHOST "__defaultVhost__"
 
 ////////////广播名称///////////

src/Http/HttpFileManager.cpp

@@ -32,7 +32,7 @@
 #include "HttpFileManager.h"
 #include "Util/File.h"
 #include "HttpSession.h"
-#include "Record/HlsManager.h"
+#include "Record/HlsMediaSource.h"
 
 namespace mediakit {
 

src/Record/HlsMakerImp.cpp

@@ -95,6 +95,9 @@ void HlsMakerImp::onWriteHls(const char *data, int len) {
     if(hls){
         fwrite(data,len,1,hls.get());
         hls.reset();
+        if(_media_src){
+            _media_src->registHls();
+        }
     } else{
         WarnL << "create hls file falied," << _path_hls << " " <<  get_uv_errmsg();
     }
@@ -115,4 +118,8 @@ std::shared_ptr<FILE> HlsMakerImp::makeFile(const string &file,bool setbuf) {
     return ret;
 }
 
+void HlsMakerImp::setMediaInfo(const string &vhost, const string &app, const string &stream_id) {
+    _media_src = std::make_shared<HlsMediaSource>(vhost, app, stream_id);
+}
+
 }//namespace mediakit

src/Record/HlsMakerImp.h

@@ -31,6 +31,7 @@
 #include <string>
 #include <stdlib.h>
 #include "HlsMaker.h"
+#include "HlsMediaSource.h"
 using namespace std;
 
 namespace mediakit {
@@ -43,6 +44,14 @@ public:
                 float seg_duration = 5,
                 uint32_t seg_number = 3);
     virtual ~HlsMakerImp();
+
+    /**
+     * 设置媒体信息
+     * @param vhost 虚拟主机
+     * @param app 应用名
+     * @param stream_id 流id
+     */
+    void setMediaInfo(const string &vhost, const string &app, const string &stream_id);
 protected:
     string onOpenSegment(int index) override ;
     void onDelSegment(int index) override;
@@ -51,6 +60,7 @@ protected:
 private:
     std::shared_ptr<FILE> makeFile(const string &file,bool setbuf = false);
 private:
+    HlsMediaSource::Ptr _media_src;
     map<int /*index*/,string/*file_path*/> _segment_file_paths;
     std::shared_ptr<FILE> _file;
     std::shared_ptr<char> _file_buf;

src/Record/HlsManager.cpp

@@ -1,101 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com>
- *
- * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include "HlsManager.h"
-#include "Util/util.h"
-using namespace toolkit;
-
-namespace mediakit{
-
-HlsCookieData::HlsCookieData(const MediaInfo &info) {
-    _info = info;
-    _manager = HlsManager::Instance().shared_from_this();
-    _manager->onAddHlsPlayer(_info);
-}
-
-HlsCookieData::~HlsCookieData() {
-    _manager->onAddHlsPlayer(_info);
-}
-
-void HlsCookieData::addByteUsage(uint64_t bytes) {
-    _bytes += bytes;
-}
-
-////////////////////////////////////////////////////////
-HlsManager::HlsManager() {}
-HlsManager::~HlsManager() {}
-INSTANCE_IMP(HlsManager);
-
-void HlsManager::onAddHlsPlayer(const MediaInfo &info) {
-    lock_guard<decltype(_mtx)> lck(_mtx);
-    ++_player_counter[info._vhost][info._app][info._streamid]._count;
-}
-
-void HlsManager::onDelHlsPlayer(const MediaInfo &info) {
-    lock_guard<decltype(_mtx)> lck(_mtx);
-    auto it0 = _player_counter.find(info._vhost);
-    if(it0 == _player_counter.end()){
-        return;
-    }
-    auto it1 = it0->second.find(info._app);
-    if(it1 == it0->second.end()){
-        return;
-    }
-    auto it2 = it1->second.find(info._streamid);
-    if(it2 == it1->second.end()){
-        return;
-    }
-    if(--(it2->second._count) == 0){
-        it1->second.erase(it2);
-        if(it1->second.empty()){
-            it0->second.erase(it1);
-            if(it0->second.empty()){
-                _player_counter.erase(it0);
-            }
-        }
-    }
-}
-
-int HlsManager::hlsPlayerCount(const string &vhost, const string &app, const string &stream) {
-    lock_guard<decltype(_mtx)> lck(_mtx);
-    auto it0 = _player_counter.find(vhost);
-    if(it0 == _player_counter.end()){
-        return 0;
-    }
-    auto it1 = it0->second.find(app);
-    if(it1 == it0->second.end()){
-        return 0;
-    }
-    auto it2 = it1->second.find(stream);
-    if(it2 == it1->second.end()){
-        return 0;
-    }
-    return it2->second._count;
-}
-
-
-}//namespace mediakit
-

src/Record/HlsMediaSource.cpp

@@ -0,0 +1,52 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com>
+ *
+ * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "HlsMediaSource.h"
+
+namespace mediakit{
+
+HlsCookieData::HlsCookieData(const MediaInfo &info) {
+    _info = info;
+    auto src = dynamic_pointer_cast<HlsMediaSource>(MediaSource::find(HLS_SCHEMA,_info._vhost,_info._app,_info._streamid));
+    if(src){
+        src->modifyCount(true);
+    }
+}
+
+HlsCookieData::~HlsCookieData() {
+    auto src = dynamic_pointer_cast<HlsMediaSource>(MediaSource::find(HLS_SCHEMA,_info._vhost,_info._app,_info._streamid));
+    if(src){
+        src->modifyCount(false);
+    }
+}
+
+void HlsCookieData::addByteUsage(uint64_t bytes) {
+    _bytes += bytes;
+}
+
+
+}//namespace mediakit
+

src/Record/HlsMediaSource.h

@@ -1,4 +1,4 @@
-/*
+/*
  * MIT License
  *
  * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com>
@@ -23,20 +23,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#ifndef ZLMEDIAKIT_HLSMEDIASOURCE_H
+#define ZLMEDIAKIT_HLSMEDIASOURCE_H
 
-
+#include <atomic>
-#ifndef ZLMEDIAKIT_HLSMANAGER_H
-#define ZLMEDIAKIT_HLSMANAGER_H
-
-#include <memory>
-#include <string>
-#include <mutex>
 #include "Common/MediaSource.h"
-using namespace std;
-
 namespace mediakit{
 
-class HlsManager;
 class HlsCookieData{
 public:
     HlsCookieData(const MediaInfo &info);
@@ -45,41 +38,59 @@ public:
 private:
     uint64_t _bytes = 0;
     MediaInfo _info;
-    std::shared_ptr<HlsManager> _manager;
 };
 
-
+class HlsMediaSource : public MediaSource {
-class HlsManager : public std::enable_shared_from_this<HlsManager>{
 public:
     friend class HlsCookieData;
-    ~HlsManager();
+    typedef std::shared_ptr<HlsMediaSource> Ptr;
-    static HlsManager& Instance();
+    HlsMediaSource(const string &vhost,
+                   const string &app,
+                   const string &stream_id) :
+            MediaSource(HLS_SCHEMA, vhost, app, stream_id){
+        _readerCount = 0;
+    }
+
+    virtual ~HlsMediaSource() = default;
 
     /**
-     * 获取hls播放器个数
+	 * 获取播放器个数
-     * @param vhost 虚拟主机
+	 * @return
-     * @param app 应用名
+	 */
-     * @param stream 流id
+    int readerCount() override {
-     * @return 播放器个数
+        return _readerCount.load();
+    }
+
+    /**
+     * 注册hls
      */
-    int hlsPlayerCount(const string &vhost,const string &app,const string &stream);
+    void registHls(){
-private:
+        if(!_registed){
-    void onAddHlsPlayer(const MediaInfo &info);
+            regist();
-    void onDelHlsPlayer(const MediaInfo &info);
+            _registed = true;
-    HlsManager();
+        }
-private:
+    }
-    class HlsPlayerCounter{
-    private:
-        friend class HlsManager;
-        int _count = 0;
-    };
-private:
-    recursive_mutex _mtx;
-    unordered_map<string/*vhost*/,unordered_map<string/*app*/,
-            unordered_map<string/*stream*/,HlsPlayerCounter> > > _player_counter;
 
+private:
+    /**
+     * 修改观看者个数
+     * @param add 添加海思删除
+     */
+    void modifyCount(bool add) {
+        if (add) {
+            ++_readerCount;
+            return;
+        }
 
+        if (--_readerCount == 0 && totalReaderCount() == 0) {
+            onNoneReader();
+        }
+    }
+private:
+    atomic_int _readerCount;
+    bool _registed = false;
 };
 
+
 }//namespace mediakit
-#endif //ZLMEDIAKIT_HLSMANAGER_H
+#endif //ZLMEDIAKIT_HLSMEDIASOURCE_H

src/Record/HlsRecorder.h

@@ -43,6 +43,9 @@ public:
     ~HlsRecorder(){
         delete _hls;
     }
+    void setMediaInfo(const string &vhost, const string &app, const string &stream_id){
+        _hls->setMediaInfo(vhost,app,stream_id);
+    }
 protected:
     void onTs(const void *packet, int bytes,uint32_t timestamp,int flags) override {
         _hls->inputData((char *)packet,bytes,timestamp);

src/Record/Recorder.cpp

@@ -54,7 +54,9 @@ MediaSinkInterface *createHlsRecorder(const string &strVhost_tmp, const string &
         m3u8FilePath = strApp + "/" + strId + "/hls.m3u8";
     }
     m3u8FilePath = File::absolutePath(m3u8FilePath, hlsPath);
-    return new HlsRecorder(m3u8FilePath, params);
+    auto ret = new HlsRecorder(m3u8FilePath, params);
+    ret->setMediaInfo(strVhost,strApp,strId);
+    return ret;
 #else
     return nullptr;
 #endif //defined(ENABLE_HLS)