python/mk_plugin.py

@@ -85,17 +85,17 @@ def on_flow_report(args: dict, totalBytes: int, totalDuration: int, isPlayer: bo
     # 返回True代表此事件被python拦截
     return True
 
-def on_media_changed(is_register: bool, sender: mk_loader.MediaSource) -> bool:
+def on_media_changed(is_register: bool, sender) -> bool:
     mk_logger.log_info(f"is_register: {is_register}, sender: {sender.getUrl()}")
     # 该事件在c++中也处理下
     return False
 
-def on_player_proxy_failed(url: str, media_tuple: mk_loader.MediaTuple , ex: mk_loader.SockException) -> bool:
+def on_player_proxy_failed(url, media_tuple, ex) -> bool:
     mk_logger.log_info(f"on_player_proxy_failed: {url}, {media_tuple.shortUrl()}, {ex.what()}")
     # 该事件在c++中也处理下
     return False
 
-def on_get_rtsp_realm(args: dict, invoker, sender: dict) -> bool:
+def on_get_rtsp_realm(args: dict, invoker, sender) -> bool:
     mk_logger.log_info(f"on_get_rtsp_realm, args: {args}, sender: {sender}")
     mk_loader.rtsp_get_realm_invoker_do(invoker, "zlmediakit")
     # 返回True代表此事件被python拦截
@@ -123,46 +123,5 @@ def on_record_ts(info: dict) -> bool:
     # 返回True代表此事件被python拦截
     return True
 
-def on_stream_none_reader(sender: mk_loader.MediaSource) -> bool:
-    mk_logger.log_info(f"on_stream_none_reader: {sender.getUrl()}")
-    # 无人观看自动关闭
-    sender.close(False)
-    # 返回True代表此事件被python拦截
-    return True
-
-def on_send_rtp_stopped(sender: mk_loader.MultiMediaSourceMuxer, ssrc: str, ex: mk_loader.SockException) -> bool:
-    mk_logger.log_info(f"on_send_rtp_stopped, ssrc: {ssrc}, ex: {ex.what()}, url: {sender.getMediaTuple().getUrl()}")
-    # 返回True代表此事件被python拦截
-    return True
-
-def on_http_access(parser: mk_loader.Parser, path: str, is_dir: bool, invoker, sender: dict) -> bool:
-    mk_logger.log_info(f"on_http_access, path: {path}, is_dir: {is_dir}, sender: {sender}, http header: {parser.getHeader()}")
-    # 允许访问该文件/目录1小时, cookie有效期内，访问该目录下的文件或路径不再触发该事件
-    mk_loader.http_access_invoker_do(invoker, "", path, 60 * 60)
-    # 返回True代表此事件被python拦截
-    return True
-
-def on_rtp_server_timeout(local_port: int, tuple: mk_loader.MediaTuple, tcp_mode: int, re_use_port: bool, ssrc: int) -> bool:
-    mk_logger.log_info(f"on_rtp_server_timeout, local_port: {local_port}, tuple: {tuple.shortUrl()}, tcp_mode: {tcp_mode}, re_use_port: {re_use_port}, ssrc: {ssrc}")
-    # 返回True代表此事件被python拦截
-    return True
-
 def on_reload_config():
-    mk_logger.log_info(f"on_reload_config")
-
-class PyMultiMediaSourceMuxer:
-    def __init__(self, sender: mk_loader.MultiMediaSourceMuxer):
-        mk_logger.log_info(f"PyMultiMediaSourceMuxer: {sender.getMediaTuple().shortUrl()}")
-    def destroy(self):
-        mk_logger.log_info(f"~PyMultiMediaSourceMuxer")
-
-    def addTrack(self, track: mk_loader.Track):
-        mk_logger.log_info(f"addTrack: {track.getCodecName()}")
-        return True
-    def addTrackCompleted(self):
-        mk_logger.log_info(f"addTrackCompleted")
-    def inputFrame(self, frame: mk_loader.Frame):
-        mk_logger.log_info(f"inputFrame: {frame.getCodecName()} {frame.dts()}")
-        return True
-def on_create_muxer(sender: mk_loader.MultiMediaSourceMuxer):
-    return PyMultiMediaSourceMuxer(sender)
+    mk_logger.log_info(f"on_reload_config")

server/WebHook.cpp

@@ -695,12 +695,6 @@ void installWebHook() {
             return;
         }
 
-#if defined(ENABLE_PYTHON)
-        if (PythonInvoker::Instance().on_stream_none_reader(sender)) {
-            return;
-        }
-#endif
-
         GET_CONFIG(string, hook_stream_none_reader, Hook::kOnStreamNoneReader);
         if (!hook_enable || hook_stream_none_reader.empty()) {
             return;
@@ -728,11 +722,6 @@ void installWebHook() {
     });
 
     NoticeCenter::Instance().addListener(&web_hook_tag, Broadcast::kBroadcastSendRtpStopped, [](BroadcastSendRtpStoppedArgs) {
-#if defined(ENABLE_PYTHON)
-        if (PythonInvoker::Instance().on_send_rtp_stopped(sender, ssrc, ex)) {
-            return;
-        }
-#endif
         GET_CONFIG(string, hook_send_rtp_stopped, Hook::kOnSendRtpStopped);
         if (!hook_enable || hook_send_rtp_stopped.empty()) {
             return;
@@ -782,11 +771,6 @@ void installWebHook() {
     // 追踪用户的目的是为了缓存上次鉴权结果，减少鉴权次数，提高性能  [AUTO-TRANSLATED:22827145]
     // The purpose of tracking users is to cache the last authentication result, reduce the number of authentication times, and improve performance
     NoticeCenter::Instance().addListener(&web_hook_tag, Broadcast::kBroadcastHttpAccess, [](BroadcastHttpAccessArgs) {
-#if defined(ENABLE_PYTHON)
-        if (PythonInvoker::Instance().on_http_access(parser, path, is_dir, invoker, sender)) {
-            return;
-        }
-#endif
         GET_CONFIG(string, hook_http_access, Hook::kOnHttpAccess);
         if (!hook_enable || hook_http_access.empty()) {
             // 未开启http文件访问鉴权，那么允许访问，但是每次访问都要鉴权；  [AUTO-TRANSLATED:deb3a0ae]
@@ -831,11 +815,6 @@ void installWebHook() {
     });
 
     NoticeCenter::Instance().addListener(&web_hook_tag, Broadcast::kBroadcastRtpServerTimeout, [](BroadcastRtpServerTimeoutArgs) {
-#if defined(ENABLE_PYTHON)
-        if (PythonInvoker::Instance().on_rtp_server_timeout(local_port, tuple, tcp_mode, re_use_port, ssrc)) {
-            return;
-        }
-#endif
         GET_CONFIG(string, rtp_server_timeout, Hook::kOnRtpServerTimeout);
         if (!hook_enable || rtp_server_timeout.empty()) {
             return;

server/main.cpp

@@ -63,7 +63,7 @@ const string kSSLPort = HTTP_FIELD"sslport";
 onceToken token1([](){
     mINI::Instance()[kPort] = 80;
     mINI::Instance()[kSSLPort] = 443;
-});
+},nullptr);
 }//namespace Http
 
 // //////////SHELL配置///////////  [AUTO-TRANSLATED:f023ec45]
@@ -73,7 +73,7 @@ namespace Shell {
 const string kPort = SHELL_FIELD"port";
 onceToken token1([](){
     mINI::Instance()[kPort] = 9000;
-});
+},nullptr);
 } //namespace Shell
 
 // //////////RTSP服务器配置///////////  [AUTO-TRANSLATED:950e1981]
@@ -85,7 +85,7 @@ const string kSSLPort = RTSP_FIELD"sslport";
 onceToken token1([](){
     mINI::Instance()[kPort] = 554;
     mINI::Instance()[kSSLPort] = 332;
-});
+},nullptr);
 
 } //namespace Rtsp
 
@@ -98,7 +98,7 @@ const string kSSLPort = RTMP_FIELD"sslport";
 onceToken token1([](){
     mINI::Instance()[kPort] = 1935;
     mINI::Instance()[kSSLPort] = 19350;
-});
+},nullptr);
 } //namespace RTMP
 
 // //////////Rtp代理相关配置///////////  [AUTO-TRANSLATED:7b285587]
@@ -108,16 +108,16 @@ namespace RtpProxy {
 const string kPort = RTP_PROXY_FIELD"port";
 onceToken token1([](){
     mINI::Instance()[kPort] = 10000;
-});
+},nullptr);
 } //namespace RtpProxy
 
 namespace Python {
 #define Python_FIELD "python."
 const string kPlugin = Python_FIELD"plugin";
 onceToken token1([](){
-    mINI::Instance()[kPlugin] = "";
-});
-} //namespace Python
+    mINI::Instance()[kPlugin] = "mk_plugin";
+},nullptr);
+} //namespace RtpProxy
 
 }  // namespace mediakit
 

server/pyinvoker.cpp

@@ -128,8 +128,7 @@ void handle_http_request(const py::object &check_route, const py::object &submit
         auto args = getAllArgs(parser);
         auto allArgs = ArgsMap(parser, args);
         GET_CONFIG(std::string, api_secret, API::kSecret);
-        // TODO python http api暂不开启secret鉴权
-        // CHECK_SECRET(); // 检测secret
+        CHECK_SECRET(); // 检测secret
     } catch (std::exception &ex) {
         Json::Value val;
         val["code"] = API::Exception;
@@ -167,53 +166,6 @@ void handle_http_request(const py::object &check_route, const py::object &submit
     submit_coro(scope, py::bytes(parser.content()), send);
 }
 
-class MuxerDelegatePython : public MediaSinkInterface {
-public:
-    MuxerDelegatePython(py::object object) {
-        _py_muxer = std::move(object);
-        _input_frame = _py_muxer.attr("inputFrame");
-        _add_track = _py_muxer.attr("addTrack");
-        _add_track_completed = _py_muxer.attr("addTrackCompleted");
-    }
-
-    ~MuxerDelegatePython() override {
-        py::gil_scoped_acquire guard;
-        try {
-            auto destroy = _py_muxer.attr("destroy");
-            destroy();
-            destroy = py::function();
-        } catch (std::exception &ex) {
-            ErrorL << "destroy python muxer failed: " << ex.what();
-        }
-        _input_frame = py::function();
-        _add_track = py::function();
-        _add_track_completed = py::function();
-        _py_muxer = py::function();
-    }
-
-    bool addTrack(const Track::Ptr &track) override {
-        py::gil_scoped_acquire guard;
-        return _add_track ? _add_track(track).cast<bool>() : false;
-    }
-
-    void addTrackCompleted() override {
-        py::gil_scoped_acquire guard;
-        if (_add_track_completed) {
-            _add_track_completed();
-        }
-    }
-
-    bool inputFrame(const Frame::Ptr &frame) override {
-        py::gil_scoped_acquire guard;
-        return _input_frame ? _input_frame(frame).cast<bool>() : false;
-    }
-
-private:
-    py::object _py_muxer;
-    py::function _input_frame;
-    py::function _add_track;
-    py::function _add_track_completed;
-};
 
 PYBIND11_EMBEDDED_MODULE(mk_loader, m) {
     m.def("log", [](int lev, const char *file, int line, const char *func, const char *content) {
@@ -284,13 +236,6 @@ PYBIND11_EMBEDDED_MODULE(mk_loader, m) {
         invoker();
     });
 
-    m.def("http_access_invoker_do", [](const py::capsule &cap, const std::string &errMsg,const std::string &accessPath, int cookieLifeSecond) {
-        // 执行c++代码时释放gil锁
-        py::gil_scoped_release release;
-        auto &invoker = to_native<HttpSession::HttpAccessPathInvoker>(cap);
-        invoker(errMsg, accessPath, cookieLifeSecond);
-    });
-
     m.def("set_fastapi", [](const py::object &check_route, const py::object &submit_coro) {
         static void *fastapi_tag = nullptr;
         NoticeCenter::Instance().delListener(&fastapi_tag, Broadcast::kBroadcastHttpRequest);
@@ -329,8 +274,7 @@ PYBIND11_EMBEDDED_MODULE(mk_loader, m) {
         .def("setupRecord", &MediaSource::setupRecord)
         .def("isRecording", &MediaSource::isRecording)
         .def("stopSendRtp", &MediaSource::stopSendRtp)
-        .def("getLossRate", &MediaSource::getLossRate)
-        .def("getMuxer", &MediaSource::getMuxer);
+        .def("getLossRate", &MediaSource::getLossRate);
 
     py::class_<MediaTuple, std::shared_ptr<MediaTuple>>(m, "MediaTuple")
         .def_readwrite("vhost", &MediaTuple::vhost)
@@ -340,110 +284,6 @@ PYBIND11_EMBEDDED_MODULE(mk_loader, m) {
         .def("shortUrl", &MediaTuple::shortUrl);
 
     py::class_<SockException, std::shared_ptr<SockException>>(m, "SockException").def("what", &SockException::what).def("code", &SockException::getErrCode);
-
-    py::class_<Parser, std::shared_ptr<Parser>>(m, "Parser")
-        .def("method", &Parser::method)
-        .def("url", &Parser::url)
-        .def("status", &Parser::status)
-        .def("fullUrl", &Parser::fullUrl)
-        .def("protocol", &Parser::protocol)
-        .def("statusStr", &Parser::statusStr)
-        .def("content", &Parser::content)
-        .def("params", &Parser::params)
-        .def("getHeader", [](Parser *thiz) {
-            py::dict ret;
-            for (auto &pr : thiz->getHeader()) {
-                ret[pr.first.data()] = pr.second;
-            }
-            return ret;
-        });
-
-    py::enum_<Recorder::type>(m, "RecordType")
-        .value("hls", Recorder::type_hls)
-        .value("mp4", Recorder::type_mp4)
-        .value("hls_fmp4", Recorder::type_hls_fmp4)
-        .value("fmp4", Recorder::type_fmp4)
-        .value("ts", Recorder::type_ts)
-        .export_values();
-
-#define OPT(key) .def_readwrite(#key, &ProtocolOption::key)
-    py::class_<ProtocolOption, std::shared_ptr<ProtocolOption>>(m, "ProtocolOption") OPT_VALUE(OPT);
-#undef OPT
-
-    py::class_<MultiMediaSourceMuxer, std::shared_ptr<MultiMediaSourceMuxer>>(m, "MultiMediaSourceMuxer")
-        .def("totalReaderCount", static_cast<int (MultiMediaSourceMuxer::*)() const>(&MultiMediaSourceMuxer::totalReaderCount))
-        .def("isEnabled", &MultiMediaSourceMuxer::isEnabled)
-        .def("setupRecord", &MultiMediaSourceMuxer::setupRecord)
-        .def("startRecord", &MultiMediaSourceMuxer::startRecord)
-        .def("isRecording", &MultiMediaSourceMuxer::isRecording)
-        .def("startSendRtp", &MultiMediaSourceMuxer::startSendRtp)
-        .def("stopSendRtp", &MultiMediaSourceMuxer::stopSendRtp)
-        .def("getOption", &MultiMediaSourceMuxer::getOption)
-        .def("getMediaTuple", &MultiMediaSourceMuxer::getMediaTuple);
-
-    py::class_<Track, Track::Ptr>(m, "Track")
-        .def("getCodecId", &Track::getCodecId)
-        .def("getCodecName", &Track::getCodecName)
-        .def("getTrackType", &Track::getTrackType)
-        .def("getTrackTypeStr", &Track::getTrackTypeStr)
-        .def("setIndex", &Track::setIndex)
-        .def("getIndex", &Track::getIndex)
-        .def("getVideoKeyFrames", &Track::getVideoKeyFrames)
-        .def("getFrames", &Track::getFrames)
-        .def("getVideoGopSize", &Track::getVideoGopSize)
-        .def("getVideoGopInterval", &Track::getVideoGopInterval)
-        .def("getDuration", &Track::getDuration)
-        .def("ready", &Track::ready)
-        .def("update", &Track::update)
-        .def("getSdp", &Track::getSdp)
-        .def("getExtraData", &Track::getExtraData)
-        .def("setExtraData", &Track::setExtraData)
-        .def("getBitRate", &Track::getBitRate)
-        .def("setBitRate", &Track::setBitRate)
-        .def("getVideoHeight",[](Track *thiz) {
-            auto ptr = dynamic_cast<VideoTrack *>(thiz);
-            return ptr ? ptr->getVideoHeight() : 0;
-        })
-        .def("getVideoWidth", [](Track *thiz) {
-            auto ptr = dynamic_cast<VideoTrack *>(thiz);
-            return ptr ? ptr->getVideoWidth() : 0;
-        })
-        .def("getVideoFps", [](Track *thiz) {
-            auto ptr = dynamic_cast<VideoTrack *>(thiz);
-            return ptr ? ptr->getVideoFps() : 0;
-        })
-        .def("getAudioSampleRate",[](Track *thiz) {
-            auto ptr = dynamic_cast<AudioTrack *>(thiz);
-            return ptr ? ptr->getAudioSampleRate() : 0;
-        })
-        .def("getAudioSampleBit", [](Track *thiz) {
-            auto ptr = dynamic_cast<AudioTrack *>(thiz);
-            return ptr ? ptr->getAudioSampleBit() : 0;
-        })
-        .def("getAudioChannel", [](Track *thiz) {
-            auto ptr = dynamic_cast<AudioTrack *>(thiz);
-            return ptr ? ptr->getAudioChannel() : 0;
-        });
-
-    py::class_<Frame, Frame::Ptr>(m, "Frame")
-        .def("data", &Frame::data)
-        .def("size", &Frame::size)
-        .def("toString", &Frame::toString)
-        .def("getCapacity", &Frame::getCapacity)
-        .def("getCodecId", &Frame::getCodecId)
-        .def("getCodecName", &Frame::getCodecName)
-        .def("getTrackType", &Frame::getTrackType)
-        .def("getTrackTypeStr", &Frame::getTrackTypeStr)
-        .def("setIndex", &Frame::setIndex)
-        .def("getIndex", &Frame::getIndex)
-        .def("dts", &Frame::dts)
-        .def("pts", &Frame::pts)
-        .def("prefixSize", &Frame::prefixSize)
-        .def("keyFrame", &Frame::keyFrame)
-        .def("configFrame", &Frame::configFrame)
-        .def("cacheAble", &Frame::cacheAble)
-        .def("dropAble", &Frame::dropAble)
-        .def("decodeAble", &Frame::decodeAble);
 }
 
 namespace mediakit {
@@ -500,16 +340,6 @@ PythonInvoker::PythonInvoker() {
             _on_reload_config();
         }
     });
-
-    NoticeCenter::Instance().addListener(this, Broadcast::kBroadcastCreateMuxer, [this](BroadcastCreateMuxerArgs) {
-        py::gil_scoped_acquire guard;
-        if (_on_create_muxer) {
-            auto py_muxer = _on_create_muxer(sender);
-            if (py_muxer && !py_muxer.is_none()) {
-                delegate = std::make_shared<MuxerDelegatePython>(std::move(py_muxer));
-            }
-        }
-    });
 }
 
 PythonInvoker::~PythonInvoker() {
@@ -531,11 +361,6 @@ PythonInvoker::~PythonInvoker() {
         _on_stream_not_found = py::function();
         _on_record_mp4 = py::function();
         _on_record_ts = py::function();
-        _on_stream_none_reader = py::function();
-        _on_send_rtp_stopped = py::function();
-        _on_http_access = py::function();
-        _on_rtp_server_timeout = py::function();
-        _on_create_muxer = py::function();
         _module = py::module();
     }
     delete _rel;
@@ -563,11 +388,6 @@ void PythonInvoker::load(const std::string &module_name) {
         GET_FUNC(_module, on_stream_not_found);
         GET_FUNC(_module, on_record_mp4);
         GET_FUNC(_module, on_record_ts);
-        GET_FUNC(_module, on_stream_none_reader);
-        GET_FUNC(_module, on_send_rtp_stopped);
-        GET_FUNC(_module, on_http_access);
-        GET_FUNC(_module, on_rtp_server_timeout);
-        GET_FUNC(_module, on_create_muxer);
 
         if (hasattr(_module, "on_start")) {
             py::object on_start = _module.attr("on_start");
@@ -660,38 +480,6 @@ bool PythonInvoker::on_record_ts(BroadcastRecordTsArgs) const {
     return _on_record_ts(to_python(info)).cast<bool>();
 }
 
-bool PythonInvoker::on_stream_none_reader(BroadcastStreamNoneReaderArgs) const {
-    py::gil_scoped_acquire gil; // 确保在 Python 调用期间持有 GIL
-    if (!_on_stream_none_reader) {
-        return false;
-    }
-    return _on_stream_none_reader(to_python_ref(sender)).cast<bool>();
-}
-
-bool PythonInvoker::on_send_rtp_stopped(BroadcastSendRtpStoppedArgs) const {
-    py::gil_scoped_acquire gil; // 确保在 Python 调用期间持有 GIL
-    if (!_on_send_rtp_stopped) {
-        return false;
-    }
-    return _on_send_rtp_stopped(to_python_ref(sender), ssrc, to_python_ref(ex)).cast<bool>();
-}
-
-bool PythonInvoker::on_http_access(BroadcastHttpAccessArgs) const {
-    py::gil_scoped_acquire gil; // 确保在 Python 调用期间持有 GIL
-    if (!_on_http_access) {
-        return false;
-    }
-    return _on_http_access(to_python_ref(parser), path, is_dir, to_python(invoker), to_python(sender)).cast<bool>();
-}
-
-bool PythonInvoker::on_rtp_server_timeout(BroadcastRtpServerTimeoutArgs) const {
-    py::gil_scoped_acquire gil; // 确保在 Python 调用期间持有 GIL
-    if (!_on_rtp_server_timeout) {
-        return false;
-    }
-    return _on_rtp_server_timeout(local_port, to_python_ref(tuple), tcp_mode, re_use_port, ssrc).cast<bool>();
-}
-
 } // namespace mediakit
 
 #endif

server/pyinvoker.h

@@ -13,7 +13,6 @@
 #include "Common/MediaSource.h"
 #include "Player/PlayerProxy.h"
 #include "Rtsp/RtspSession.h"
-#include "Http/HttpSession.h"
 
 namespace py = pybind11;
 
@@ -37,10 +36,6 @@ public:
     bool on_stream_not_found(BroadcastNotFoundStreamArgs) const;
     bool on_record_mp4(BroadcastRecordMP4Args) const;
     bool on_record_ts(BroadcastRecordTsArgs) const;
-    bool on_stream_none_reader(BroadcastStreamNoneReaderArgs) const;
-    bool on_send_rtp_stopped(BroadcastSendRtpStoppedArgs) const;
-    bool on_http_access(BroadcastHttpAccessArgs) const;
-    bool on_rtp_server_timeout(BroadcastRtpServerTimeoutArgs) const;
 
 private:
     PythonInvoker();
@@ -75,16 +70,6 @@ private:
     py::function _on_record_mp4;
     // 生成hls ts/fmp4切片文件回调
     py::function _on_record_ts;
-    // 流无人观看事件
-    py::function _on_stream_none_reader;
-    // rtp转发失败事件
-    py::function _on_send_rtp_stopped;
-    // http访问鉴权事件
-    py::function _on_http_access;
-    // rtp服务收流超时事件
-    py::function _on_rtp_server_timeout;
-    // 创建Python muxer对象
-    py::function _on_create_muxer;
 
 
 };

src/Common/MultiMediaSourceMuxer.cpp

@@ -243,8 +243,6 @@ MultiMediaSourceMuxer::MultiMediaSourceMuxer(const MediaTuple& tuple, float dur_
     // Audio related settings
     enableAudio(option.enable_audio);
     enableMuteAudio(option.add_mute_audio);
-
-    NOTICE_EMIT(BroadcastCreateMuxerArgs, Broadcast::kBroadcastCreateMuxer, _delegate, *this);
 }
 
 void MultiMediaSourceMuxer::setMediaListener(const std::weak_ptr<MediaSourceEvent> &listener) {
@@ -707,9 +705,6 @@ bool MultiMediaSourceMuxer::onTrackReady(const Track::Ptr &track) {
     if (_mp4) {
         ret = _mp4->addTrack(track) ? true : ret;
     }
-    if (_delegate) {
-        _delegate->addTrack(track);
-    }
     return ret;
 }
 
@@ -769,9 +764,6 @@ void MultiMediaSourceMuxer::onAllTrackReady() {
             pr.second.syncTo(*first);
         }
     }
-    if (_delegate) {
-        _delegate->addTrackCompleted();
-    }
     InfoL << "stream: " << shortUrl() << " , codec info: " << getTrackInfoStr(this);
 }
 
@@ -855,9 +847,6 @@ bool MultiMediaSourceMuxer::onTrackFrame_l(const Frame::Ptr &frame_in) {
     if (_fmp4) {
         ret = _fmp4->inputFrame(frame) ? true : ret;
     }
-    if (_delegate) {
-        _delegate->inputFrame(frame);
-    }
     if (_ring) {
         // 此场景由于直接转发，可能存在切换线程引起的数据被缓存在管道，所以需要CacheAbleFrame  [AUTO-TRANSLATED:528afbb7]
         // In this scenario, due to direct forwarding, there may be data cached in the pipeline due to thread switching, so CacheAbleFrame is needed

src/Common/MultiMediaSourceMuxer.h

@@ -29,7 +29,6 @@ class MultiMediaSourceMuxer : public MediaSourceEventInterceptor, public MediaSi
 public:
     using Ptr = std::shared_ptr<MultiMediaSourceMuxer>;
     using RingType = toolkit::RingBuffer<Frame::Ptr>;
-    using onCreateMuxer = std::function<MediaSinkInterface::Ptr()>;
 
     class Listener {
     public:
@@ -250,8 +249,6 @@ private:
     toolkit::EventPoller::Ptr _poller;
     RingType::Ptr _ring;
 
-    MediaSinkInterface::Ptr _delegate;
-
     // 对象个数统计  [AUTO-TRANSLATED:3b43e8c2]
     // Object count statistics
     toolkit::ObjectStatistic<MultiMediaSourceMuxer> _statistic;

src/Common/config.cpp

@@ -82,7 +82,6 @@ const string kBroadcastRtcSctpSend = "kBroadcastRtcSctpSend";
 const string kBroadcastRtcSctpReceived = "kBroadcastRtcSctpReceived";
 const string kBroadcastPlayerCountChanged = "kBroadcastPlayerCountChanged";
 const string kBroadcastPlayerProxyFailed = "kBroadcastPlayerProxyFailed";
-const string kBroadcastCreateMuxer = "kBroadcastCreateMuxer";
 
 } // namespace Broadcast
 

src/Common/config.h

@@ -126,7 +126,7 @@ extern const std::string kBroadcastStreamNoneReader;
 // rtp推流被动停止时触发  [AUTO-TRANSLATED:43881965]
 // Triggered when rtp push stream is passively stopped.
 extern const std::string kBroadcastSendRtpStopped;
-#define BroadcastSendRtpStoppedArgs MultiMediaSourceMuxer &sender, const std::string &ssrc, const toolkit::SockException &ex
+#define BroadcastSendRtpStoppedArgs MultiMediaSourceMuxer &sender, const std::string &ssrc, const SockException &ex
 
 // 更新配置文件事件广播,执行loadIniConfig函数加载配置文件成功后会触发该广播  [AUTO-TRANSLATED:ad4e167d]
 // Update configuration file event broadcast. This broadcast will be triggered after the loadIniConfig function loads the configuration file successfully.
@@ -164,9 +164,6 @@ extern const std::string kBroadcastPlayerCountChanged;
 extern const std::string kBroadcastPlayerProxyFailed;
 #define BroadcastPlayerProxyFailedArgs const PlayerProxy& sender, const toolkit::SockException &ex
 
-extern const std::string kBroadcastCreateMuxer;
-#define BroadcastCreateMuxerArgs MediaSinkInterface::Ptr &delegate, const MultiMediaSourceMuxer &sender
-
 #define ReloadConfigTag ((void *)(0xFF))
 #define RELOAD_KEY(arg, key)                                                                                           \
     do {                                                                                                               \