From e6a19c4eccfeac1f3f06433469379f0e75cbf017 Mon Sep 17 00:00:00 2001
From: xia-chu <771730766@qq.com>
Date: Sat, 8 Jul 2023 22:12:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dc=20api=E5=BD=95=E5=88=B6?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E7=BA=BF=E7=A8=8B=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/include/mk_recorder.h  |  4 ++--
 api/source/mk_recorder.cpp | 14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/api/include/mk_recorder.h b/api/include/mk_recorder.h
index c9053db5..a23e50f4 100644
--- a/api/include/mk_recorder.h
+++ b/api/include/mk_recorder.h
@@ -58,7 +58,7 @@ API_EXPORT int API_CALL mk_recorder_is_recording(int type, const char *vhost, co
 
 /**
  * 开始录制
- * @param type 0:hls,1:MP4
+ * @param type 0:hls-ts,1:MP4,2:hls-fmp4,3:http-fmp4,4:http-ts
  * @param vhost 虚拟主机
  * @param app 应用名
  * @param stream 流id
@@ -70,7 +70,7 @@ API_EXPORT int API_CALL mk_recorder_start(int type, const char *vhost, const cha
 
 /**
  * 停止录制
- * @param type 0:hls,1:MP4
+ * @param type 0:hls-ts,1:MP4,2:hls-fmp4,3:http-fmp4,4:http-ts
  * @param vhost 虚拟主机
  * @param app 应用名
  * @param stream 流id
diff --git a/api/source/mk_recorder.cpp b/api/source/mk_recorder.cpp
index e16a64c4..f99d7130 100644
--- a/api/source/mk_recorder.cpp
+++ b/api/source/mk_recorder.cpp
@@ -47,21 +47,25 @@ static inline bool isRecording(Recorder::type type, const string &vhost, const s
     return src->isRecording(type);
 }
 
-static inline  bool startRecord(Recorder::type type, const string &vhost, const string &app, const string &stream_id,const string &customized_path, size_t max_second){
+static inline bool startRecord(Recorder::type type, const string &vhost, const string &app, const string &stream_id, const string &customized_path, size_t max_second) {
     auto src = MediaSource::find(vhost, app, stream_id);
     if (!src) {
         WarnL << "未找到相关的MediaSource,startRecord失败:" << vhost << "/" << app << "/" << stream_id;
         return false;
     }
-    return src->setupRecord(type, true, customized_path, max_second);
+    bool ret;
+    src->getOwnerPoller()->sync([&]() { ret = src->setupRecord(type, true, customized_path, max_second); });
+    return ret;
 }
 
-static inline bool stopRecord(Recorder::type type, const string &vhost, const string &app, const string &stream_id){
+static inline bool stopRecord(Recorder::type type, const string &vhost, const string &app, const string &stream_id) {
     auto src = MediaSource::find(vhost, app, stream_id);
-    if(!src){
+    if (!src) {
         return false;
     }
-    return src->setupRecord(type, false, "", 0);
+    bool ret;
+    src->getOwnerPoller()->sync([&]() { ret = src->setupRecord(type, false, "", 0); });
+    return ret;
 }
 
 API_EXPORT int API_CALL mk_recorder_is_recording(int type, const char *vhost, const char *app, const char *stream){