THENG
/
ZLMediaKit
mirror of https://gitcode.com/gh_mirrors/zlme/ZLMediaKit.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: 补充C API拉流代理缺少retry_count重试次数配置 修改函数名称

This commit is contained in:
李道甫 2024-05-29 10:45:46 +08:00
parent b5c0f73849
commit 84209bec26
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/include/mk_common.h
View File

@ -51,6 +51,9 @@ extern "C" {
//输出日志到回调函数(mk_events::on_mk_log) //输出日志到回调函数(mk_events::on_mk_log)
#define LOG_CALLBACK (1 << 2) #define LOG_CALLBACK (1 << 2)
//向下兼容
#define mk_env_init1 mk_env_init2
//回调user_data回调函数 //回调user_data回调函数
typedef void(API_CALL *on_user_data_free)(void *user_data); typedef void(API_CALL *on_user_data_free)(void *user_data);
@ -104,7 +107,7 @@ API_EXPORT void API_CALL mk_stop_all_server();
* @param ssl ssl证书内容或路径，可以为NULL * @param ssl ssl证书内容或路径，可以为NULL
* @param ssl_pwd 证书密码，可以为NULL * @param ssl_pwd 证书密码，可以为NULL
*/ */
API_EXPORT void API_CALL mk_env_init1(int thread_num, API_EXPORT void API_CALL mk_env_init2(int thread_num,
int log_level, int log_level,
int log_mask, int log_mask,
const char *log_file_path, const char *log_file_path,

4
api/include/mk_proxyplayer.h
View File

@ -44,7 +44,7 @@ API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create(const char *vhost, co
* @param retry_count 重试次数，当<0无限次重试 * @param retry_count 重试次数，当<0无限次重试
* @return 对象指针 * @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_create3(const char *vhost, const char *app, const char *stream, int hls_enabled, int mp4_enabled, int retry_count);
/** /**
* 创建一个代理播放器 * 创建一个代理播放器
@ -66,7 +66,7 @@ API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create2(const char *vhost, c
* @param retry_count 重试次数，当<0无限次重试 * @param retry_count 重试次数，当<0无限次重试
* @return 对象指针 * @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_create4(const char *vhost, const char *app, const char *stream, mk_ini option, int retry_count);
/** /**

2
api/source/mk_common.cpp
View File

@ -83,7 +83,7 @@ API_EXPORT void API_CALL mk_stop_all_server(){
stopAllTcpServer(); stopAllTcpServer();
} }
API_EXPORT void API_CALL mk_env_init1(int thread_num, API_EXPORT void API_CALL mk_env_init2(int thread_num,
int log_level, int log_level,
int log_mask, int log_mask,
const char *log_file_path, const char *log_file_path,

8
api/source/mk_proxyplayer.cpp
View File

@ -16,10 +16,10 @@ using namespace toolkit;
using namespace mediakit; 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) { 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) {
return mk_proxy_player_create1(vhost, app, stream, hls_enabled, mp4_enabled,-1); return mk_proxy_player_create3(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) { API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create3(const char *vhost, const char *app, const char *stream, int hls_enabled, int mp4_enabled, int retry_count) {
assert(vhost && app && stream); assert(vhost && app && stream);
ProtocolOption option; ProtocolOption option;
option.enable_hls = hls_enabled; option.enable_hls = hls_enabled;
@ -29,11 +29,11 @@ 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) { API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create2(const char *vhost, const char *app, const char *stream, mk_ini ini) {
return mk_proxy_player_create3(vhost, app, stream, ini, -1); return mk_proxy_player_create4(vhost, app, stream, ini, -1);
} }
API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create3(const char *vhost, const char *app, const char *stream, mk_ini ini, int retry_count) { API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create4(const char *vhost, const char *app, const char *stream, mk_ini ini, int retry_count) {
assert(vhost && app && stream); assert(vhost && app && stream);
ProtocolOption option(*((mINI *)ini)); ProtocolOption option(*((mINI *)ini));
PlayerProxy::Ptr *obj(new PlayerProxy::Ptr(new PlayerProxy(vhost, app, stream, option, retry_count))); PlayerProxy::Ptr *obj(new PlayerProxy::Ptr(new PlayerProxy(vhost, app, stream, option, retry_count)));