diff --git a/api/include/mk_events_objects.h b/api/include/mk_events_objects.h index feb86d62..5d1127a3 100644 --- a/api/include/mk_events_objects.h +++ b/api/include/mk_events_objects.h @@ -122,7 +122,7 @@ API_EXPORT int API_CALL mk_media_source_broadcast_msg(const mk_media_source ctx, API_EXPORT const char* API_CALL mk_media_source_get_origin_url(const mk_media_source ctx); // MediaSource::getOriginType() API_EXPORT int API_CALL mk_media_source_get_origin_type(const mk_media_source ctx); -// MediaSource::getOriginTypeStr() +// MediaSource::getOriginTypeStr(), 使用后请用mk_free释放返回值 API_EXPORT const char *API_CALL mk_media_source_get_origin_type_str(const mk_media_source ctx); // MediaSource::getCreateStamp() API_EXPORT uint64_t API_CALL mk_media_source_get_create_stamp(const mk_media_source ctx); diff --git a/api/include/mk_track.h b/api/include/mk_track.h index ee91a1e1..63d34b0f 100644 --- a/api/include/mk_track.h +++ b/api/include/mk_track.h @@ -74,7 +74,7 @@ API_EXPORT const char* API_CALL mk_track_codec_name(mk_track track); API_EXPORT int API_CALL mk_track_bit_rate(mk_track track); /** - * 获取轨道是否准备好 + * 获取轨道是否已就绪,1: 已就绪,0:未就绪 */ API_EXPORT int API_CALL mk_track_ready(mk_track track); @@ -84,7 +84,7 @@ API_EXPORT int API_CALL mk_track_ready(mk_track track); API_EXPORT uint64_t API_CALL mk_track_frames(mk_track track); /** - * 获取时间 + * 获取时间,单位毫秒 */ API_EXPORT uint64_t API_CALL mk_track_duration(mk_track track); diff --git a/api/source/mk_events_objects.cpp b/api/source/mk_events_objects.cpp index c978fe0a..097e4201 100644 --- a/api/source/mk_events_objects.cpp +++ b/api/source/mk_events_objects.cpp @@ -222,8 +222,7 @@ API_EXPORT float API_CALL mk_media_source_get_track_loss(const mk_media_source c assert(ctx); MediaSource *src = (MediaSource *)ctx; // rtp推流只有一个统计器,但是可能有多个track,如果短时间多次获取间隔丢包率,第二次会获取为-1 - float loss = src->getLossRate((*((Track::Ptr *)track))->getTrackType()); - return loss; + return src->getLossRate((*((Track::Ptr *)track))->getTrackType()); } API_EXPORT int API_CALL mk_media_source_broadcast_msg(const mk_media_source ctx, const char *msg, size_t len) { diff --git a/api/source/mk_track.cpp b/api/source/mk_track.cpp index 7f751b49..dbd94eb4 100644 --- a/api/source/mk_track.cpp +++ b/api/source/mk_track.cpp @@ -206,13 +206,7 @@ API_EXPORT int API_CALL mk_track_video_gop_interval_ms(mk_track track) { assert(track); auto video = dynamic_pointer_cast((*((Track::Ptr *)track))); if (video) { - int gop_size = video->getVideoGopSize(); - int gop_interval_ms = video->getVideoGopInterval(); - float fps = video->getVideoFps(); - if (fps <= 1 && gop_interval_ms) { - fps = gop_size * 1000.0 / gop_interval_ms; - } - return gop_interval_ms; + return video->getVideoGopInterval(); } WarnL << "not video track"; return 0;