amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 10:40:05 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

C API和WebHook未找到流回调添加直接关闭机制 (#1948)

Browse Source
This commit is contained in:
huangxiuqi 2022-09-09 10:55:35 +08:00 committed by GitHub
parent 7f86299c80
commit 258a4dd166
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/include/mk_events.h
View File

@ -53,8 +53,10 @@ typedef struct {
* 未找到流后会广播该事件，请在监听该事件后去拉流或其他方式产生流，这样就能按需拉流了 * 未找到流后会广播该事件，请在监听该事件后去拉流或其他方式产生流，这样就能按需拉流了
* @param url_info 播放url相关信息 * @param url_info 播放url相关信息
* @param sender 播放客户端相关信息 * @param sender 播放客户端相关信息
* @return 1 直接关闭
* 0 等待流注册
*/ */
void (API_CALL *on_mk_media_not_found)(const mk_media_info url_info, int (API_CALL *on_mk_media_not_found)(const mk_media_info url_info,
const mk_sock_info sender); const mk_sock_info sender);
/** /**
@ -152,7 +154,7 @@ typedef struct {
size_t total_seconds, size_t total_seconds,
int is_player, int is_player,
const mk_sock_info sender); const mk_sock_info sender);
/** /**
* 日志输出广播 * 日志输出广播
@ -178,4 +180,3 @@ API_EXPORT void API_CALL mk_events_listen(const mk_events *events);
} }
#endif #endif
#endif //MK_EVENTS_H #endif //MK_EVENTS_H

6
api/source/mk_events.cpp
View File

@ -141,8 +141,10 @@ API_EXPORT void API_CALL mk_events_listen(const mk_events *events){
NoticeCenter::Instance().addListener(&s_tag,Broadcast::kBroadcastNotFoundStream,[](BroadcastNotFoundStreamArgs){ NoticeCenter::Instance().addListener(&s_tag,Broadcast::kBroadcastNotFoundStream,[](BroadcastNotFoundStreamArgs){
if (s_events.on_mk_media_not_found) { if (s_events.on_mk_media_not_found) {
s_events.on_mk_media_not_found((mk_media_info) &args, if (s_events.on_mk_media_not_found((mk_media_info) &args,
(mk_sock_info) &sender); (mk_sock_info) &sender)) {
closePlayer();
}
} }
}); });

5
api/tests/server.c
View File

@ -88,8 +88,10 @@ void API_CALL on_mk_media_play(const mk_media_info url_info,
* 未找到流后会广播该事件，请在监听该事件后去拉流或其他方式产生流，这样就能按需拉流了 * 未找到流后会广播该事件，请在监听该事件后去拉流或其他方式产生流，这样就能按需拉流了
* @param url_info 播放url相关信息 * @param url_info 播放url相关信息
* @param sender 播放客户端相关信息 * @param sender 播放客户端相关信息
* @return 1 直接关闭
* 0 等待流注册
*/ */
void API_CALL on_mk_media_not_found(const mk_media_info url_info, int API_CALL on_mk_media_not_found(const mk_media_info url_info,
const mk_sock_info sender) { const mk_sock_info sender) {
char ip[64]; char ip[64];
log_printf(LOG_LEV, log_printf(LOG_LEV,
@ -104,6 +106,7 @@ void API_CALL on_mk_media_not_found(const mk_media_info url_info,
mk_media_info_get_app(url_info), mk_media_info_get_app(url_info),
mk_media_info_get_stream(url_info), mk_media_info_get_stream(url_info),
mk_media_info_get_params(url_info)); mk_media_info_get_params(url_info));
return 0;
} }
/** /**

11
server/WebHook.cpp
View File

@ -505,8 +505,17 @@ void installWebHook(){
body["ip"] = sender.get_peer_ip(); body["ip"] = sender.get_peer_ip();
body["port"] = sender.get_peer_port(); body["port"] = sender.get_peer_port();
body["id"] = sender.getIdentifier(); body["id"] = sender.getIdentifier();
// Hook回复立即关闭流
auto res_cb = [closePlayer](const Value &res, const string &err) {
bool flag = res["close"].asBool();
if (flag) {
closePlayer();
}
};
//执行hook //执行hook
do_http_hook(hook_stream_not_found, body, nullptr); do_http_hook(hook_stream_not_found, body, res_cb);
}); });
static auto getRecordInfo = [](const RecordInfo &info) { static auto getRecordInfo = [](const RecordInfo &info) {