Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-13 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

合并 https://gitee.com/kingyuanyuan/ZLMediaKit

Browse Source
This commit is contained in:
ziyue
2020-12-27 18:41:53 +08:00
parent 2941068724 62130f77e6
commit fd15fe70b2
10 changed files with 55 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/source/mk_events_objects.cpp
View File

@@ -214,7 +214,7 @@ API_EXPORT int API_CALL mk_media_source_seek_to(const mk_media_source ctx,uint32
API_EXPORT void API_CALL mk_media_source_start_send_rtp(const mk_media_source ctx, const char *dst_url, uint16_t dst_port, const char *ssrc, int is_udp, on_mk_media_source_send_rtp_result cb, void *user_data){
assert(ctx && dst_url && ssrc);
MediaSource *src = (MediaSource *)ctx;
src->startSendRtp(dst_url, dst_port, ssrc, is_udp, [cb, user_data](const SockException &ex){
src->startSendRtp(dst_url, dst_port, ssrc, is_udp, 0, [cb, user_data](const SockException &ex){
if (cb) {
cb(user_data, ex.getErrCode(), ex.what());
}
@@ -224,7 +224,7 @@ API_EXPORT void API_CALL mk_media_source_start_send_rtp(const mk_media_source ct
API_EXPORT int API_CALL mk_media_source_stop_send_rtp(const mk_media_source ctx){
assert(ctx);
MediaSource *src = (MediaSource *) ctx;
return src->stopSendRtp();
return src->stopSendRtp("");
}
API_EXPORT void API_CALL mk_media_source_find(const char *schema,

4
api/source/mk_media.cpp
View File

@@ -193,7 +193,7 @@ API_EXPORT void API_CALL mk_media_start_send_rtp(mk_media ctx, const char *dst_u
assert(ctx && dst_url && ssrc);
MediaHelper::Ptr* obj = (MediaHelper::Ptr*) ctx;
//sender参数无用
(*obj)->getChannel()->startSendRtp(*(MediaSource *) 1, dst_url, dst_port, ssrc, is_udp, [cb, user_data](const SockException &ex){
(*obj)->getChannel()->startSendRtp(*(MediaSource *) 1, dst_url, dst_port, ssrc, is_udp, 0, [cb, user_data](const SockException &ex){
if (cb) {
cb(user_data, ex.getErrCode(), ex.what());
}
@@ -204,5 +204,5 @@ API_EXPORT int API_CALL mk_media_stop_send_rtp(mk_media ctx){
assert(ctx);
MediaHelper::Ptr *obj = (MediaHelper::Ptr *) ctx;
//sender参数无用
return (*obj)->getChannel()->stopSendRtp(*(MediaSource *) 1);
return (*obj)->getChannel()->stopSendRtp(*(MediaSource *) 1, "");
}

2
api/source/mk_thread.cpp
View File

@@ -77,7 +77,7 @@ public:
_task->cancel();
}
void start(int ms ,EventPoller &poller){
void start(uint64_t ms ,EventPoller &poller){
weak_ptr<TimerForC> weak_self = shared_from_this();
_task = poller.doDelayTask(ms, [weak_self]() {
auto strong_self = weak_self.lock();