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

Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev

Browse Source
This commit is contained in:
xiongziliang
2021-05-22 10:25:05 +08:00
parent 08d4edddb0 975c11b74c
commit 9f223bc7a2
9 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/WebApi.cpp
View File

@@ -281,7 +281,7 @@ static inline string getProxyKey(const string &vhost,const string &app,const str
Value makeMediaSourceJson(MediaSource &media){
Value item;
item["schema"] = media.getSchema();
item["vhost"] = media.getVhost();
item[VHOST_KEY] = media.getVhost();
item["app"] = media.getApp();
item["stream"] = media.getId();
item["createStamp"] = (Json::UInt64) media.getCreateStamp();
@@ -292,6 +292,8 @@ Value makeMediaSourceJson(MediaSource &media){
item["originType"] = (int) media.getOriginType();
item["originTypeStr"] = getOriginTypeString(media.getOriginType());
item["originUrl"] = media.getOriginUrl();
item["isRecordingMP4"] = media.isRecording(Recorder::type_mp4);
item["isRecordingHLS"] = media.isRecording(Recorder::type_hls);
auto originSock = media.getOriginSock();
if (originSock) {
item["originSock"]["local_ip"] = originSock->get_local_ip();