From 4258bbe9278e592e51242fd5ce6bb215d9154832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=81=93=E7=94=AB?= Date: Wed, 29 May 2024 09:59:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=85C=20API=E6=8B=89?= =?UTF-8?q?=E6=B5=81=E4=BB=A3=E7=90=86=E7=BC=BA=E5=B0=91retry=5Fcount?= =?UTF-8?q?=E9=87=8D=E8=AF=95=E6=AC=A1=E6=95=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/include/mk_proxyplayer.h | 6 ++---- api/source/mk_proxyplayer.cpp | 12 ++---------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/api/include/mk_proxyplayer.h b/api/include/mk_proxyplayer.h index c3cbed01..4a00702d 100644 --- a/api/include/mk_proxyplayer.h +++ b/api/include/mk_proxyplayer.h @@ -44,8 +44,7 @@ API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create(const char *vhost, co * @param retry_count 重试次数，当<0无限次重试 * @return 对象指针 */ -API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create1( - const char *vhost, const char *app, const char *stream, int hls_enabled, int mp4_enabled, int retry_count); +API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create1(const char *vhost, const char *app, const char *stream, int hls_enabled, int mp4_enabled, int retry_count); /** * 创建一个代理播放器 @@ -67,8 +66,7 @@ API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create2(const char *vhost, c * @param retry_count 重试次数，当<0无限次重试 * @return 对象指针 */ -API_EXPORT mk_proxy_player API_CALL -mk_proxy_player_create3(const char *vhost, const char *app, const char *stream, mk_ini option, int retry_count); +API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create3(const char *vhost, const char *app, const char *stream, mk_ini option, int retry_count); /** diff --git a/api/source/mk_proxyplayer.cpp b/api/source/mk_proxyplayer.cpp index 29a39167..634f5f3b 100644 --- a/api/source/mk_proxyplayer.cpp +++ b/api/source/mk_proxyplayer.cpp @@ -16,12 +16,7 @@ using namespace toolkit; using namespace mediakit; API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create(const char *vhost, const char *app, const char *stream, int hls_enabled, int mp4_enabled) { - assert(vhost && app && stream); - ProtocolOption option; - option.enable_hls = hls_enabled; - option.enable_mp4 = mp4_enabled; - PlayerProxy::Ptr *obj(new PlayerProxy::Ptr(new PlayerProxy(vhost, app, stream, option))); - return (mk_proxy_player) obj; + mk_proxy_player_create1(vhost, app, stream, hls_enabled, mp4_enabled,-1); } API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create1(const char *vhost, const char *app, const char *stream, int hls_enabled, int mp4_enabled, int retry_count) { @@ -34,10 +29,7 @@ API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create1(const char *vhost, c } API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create2(const char *vhost, const char *app, const char *stream, mk_ini ini) { - assert(vhost && app && stream); - ProtocolOption option(*((mINI *)ini)); - PlayerProxy::Ptr *obj(new PlayerProxy::Ptr(new PlayerProxy(vhost, app, stream, option))); - return (mk_proxy_player)obj; + mk_proxy_player_create3(vhost, app, stream, ini, -1); }