From 683d5fb029d5759ab48bb5f3d839758f6d07f140 Mon Sep 17 00:00:00 2001 From: lidaofu Date: Fri, 18 Oct 2024 15:38:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20C=20Api=E5=A2=9E=E5=8A=A0loadMP4File?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/include/mk_recorder.h | 9 ++------- api/source/mk_recorder.cpp | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/api/include/mk_recorder.h b/api/include/mk_recorder.h index a16e801e..e70213e8 100644 --- a/api/include/mk_recorder.h +++ b/api/include/mk_recorder.h @@ -125,9 +125,6 @@ API_EXPORT int API_CALL mk_recorder_start(int type, const char *vhost, const cha */ API_EXPORT int API_CALL mk_recorder_stop(int type, const char *vhost, const char *app, const char *stream); - -#if ENABLE_MP4 - /** * 加载mp4列表 * @param vhost 虚拟主机 @@ -137,10 +134,8 @@ API_EXPORT int API_CALL mk_recorder_stop(int type, const char *vhost, const char * @param file_repeat 循环解复用 * @param ini 配置 */ -API_EXPORT void API_CALL mk_player_load_mp4_file(const char *vhost, const char *app, const char *stream, const char *file_path, int file_repeat); -API_EXPORT void API_CALL mk_player_load_mp4_file2(const char *vhost, const char *app, const char *stream, const char *file_path, int file_repeat, mk_ini ini); - -#endif +API_EXPORT void API_CALL mk_load_mp4_file(const char *vhost, const char *app, const char *stream, const char *file_path, int file_repeat); +API_EXPORT void API_CALL mk_load_mp4_file2(const char *vhost, const char *app, const char *stream, const char *file_path, int file_repeat, mk_ini ini); #ifdef __cplusplus } diff --git a/api/source/mk_recorder.cpp b/api/source/mk_recorder.cpp index be6c1c1d..bda3df97 100644 --- a/api/source/mk_recorder.cpp +++ b/api/source/mk_recorder.cpp @@ -87,7 +87,7 @@ API_EXPORT int API_CALL mk_recorder_stop(int type, const char *vhost, const char #if ENABLE_MP4 -API_EXPORT void API_CALL mk_player_load_mp4_file(const char *vhost, const char *app, const char *stream, const char *file_path, int file_repeat) { +API_EXPORT void API_CALL mk_load_mp4_file(const char *vhost, const char *app, const char *stream, const char *file_path, int file_repeat) { assert(vhost && app && stream && file_path); ProtocolOption option; // mp4支持多track [AUTO-TRANSLATED:b9688762] @@ -110,7 +110,7 @@ API_EXPORT void API_CALL mk_player_load_mp4_file(const char *vhost, const char * reader->startReadMP4(0, true, file_repeat); } -API_EXPORT void API_CALL mk_player_load_mp4_file2(const char *vhost, const char *app, const char *stream, const char *file_path, int file_repeat, mk_ini ini) { +API_EXPORT void API_CALL mk_load_mp4_file2(const char *vhost, const char *app, const char *stream, const char *file_path, int file_repeat, mk_ini ini) { assert(vhost && app && stream && file_path); ProtocolOption option(*((mINI *)ini)); // mp4支持多track [AUTO-TRANSLATED:b9688762]