Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-12 19:24:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace the tuple (vhost/app/stream) with MediaTuple. (#2560)

Browse Source
This commit is contained in:
johzzy
2023-06-17 10:28:01 +08:00
committed by GitHub
parent c0a7a4ab70
commit 03770ff409
11 changed files with 37 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/test_pusher.cpp
View File

@@ -88,8 +88,9 @@ int domain(const string &playUrl, const string &pushUrl) {
NoticeCenter::Instance().addListener(nullptr, Broadcast::kBroadcastMediaChanged,
[pushUrl,poller](BroadcastMediaChangedArgs) {
//媒体源"app/stream"已经注册，这时方可新建一个RtmpPusher对象并绑定该媒体源
if(bRegist && pushUrl.find(sender.getSchema()) == 0){
createPusher(poller,sender.getSchema(),sender.getVhost(),sender.getApp(), sender.getId(), pushUrl);
if (bRegist && pushUrl.find(sender.getSchema()) == 0) {
auto tuple = sender.getMediaTuple();
createPusher(poller, sender.getSchema(), tuple.vhost, tuple.app, tuple.stream, pushUrl);
}
});

5
tests/test_server.cpp
View File

@@ -155,9 +155,10 @@ void initEventListener() {
//监听rtsp、rtmp源注册或注销事件；此处用于测试rtmp保存为flv录像，保存在http根目录下
NoticeCenter::Instance().addListener(nullptr, Broadcast::kBroadcastMediaChanged, [](BroadcastMediaChangedArgs) {
if (sender.getSchema() == RTMP_SCHEMA && sender.getApp() == "live") {
auto tuple = sender.getMediaTuple();
if (sender.getSchema() == RTMP_SCHEMA && tuple.app == "live") {
lock_guard<mutex> lck(s_mtxFlvRecorder);
auto key = sender.shortUrl();
auto key = tuple.shortUrl();
if (bRegist) {
DebugL << "开始录制RTMP：" << sender.getUrl();
GET_CONFIG(string, http_root, Http::kRootPath);