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

完善

This commit is contained in:
xiongziliang 2024-06-15 15:36:47 +08:00
parent 921f1c309d
commit e2bb3607f9
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/include/mk_events_objects.h
View File

@ -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); API_EXPORT const char* API_CALL mk_media_source_get_origin_url(const mk_media_source ctx);
// MediaSource::getOriginType() // MediaSource::getOriginType()
API_EXPORT int API_CALL mk_media_source_get_origin_type(const mk_media_source ctx); 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); API_EXPORT const char *API_CALL mk_media_source_get_origin_type_str(const mk_media_source ctx);
// MediaSource::getCreateStamp() // MediaSource::getCreateStamp()
API_EXPORT uint64_t API_CALL mk_media_source_get_create_stamp(const mk_media_source ctx); API_EXPORT uint64_t API_CALL mk_media_source_get_create_stamp(const mk_media_source ctx);

4
api/include/mk_track.h
View File

@ -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); 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); 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_frames(mk_track track);
/** /**
* 获取时间 * 获取时间，单位毫秒
*/ */
API_EXPORT uint64_t API_CALL mk_track_duration(mk_track track); API_EXPORT uint64_t API_CALL mk_track_duration(mk_track track);

3
api/source/mk_events_objects.cpp
View File

@ -222,8 +222,7 @@ API_EXPORT float API_CALL mk_media_source_get_track_loss(const mk_media_source c
assert(ctx); assert(ctx);
MediaSource *src = (MediaSource *)ctx; MediaSource *src = (MediaSource *)ctx;
// rtp推流只有一个统计器，但是可能有多个track，如果短时间多次获取间隔丢包率，第二次会获取为-1 // rtp推流只有一个统计器，但是可能有多个track，如果短时间多次获取间隔丢包率，第二次会获取为-1
float loss = src->getLossRate((*((Track::Ptr *)track))->getTrackType()); return src->getLossRate((*((Track::Ptr *)track))->getTrackType());
return loss;
} }
API_EXPORT int API_CALL mk_media_source_broadcast_msg(const mk_media_source ctx, const char *msg, size_t len) { API_EXPORT int API_CALL mk_media_source_broadcast_msg(const mk_media_source ctx, const char *msg, size_t len) {

8
api/source/mk_track.cpp
View File

@ -206,13 +206,7 @@ API_EXPORT int API_CALL mk_track_video_gop_interval_ms(mk_track track) {
assert(track); assert(track);
auto video = dynamic_pointer_cast<VideoTrack>((*((Track::Ptr *)track))); auto video = dynamic_pointer_cast<VideoTrack>((*((Track::Ptr *)track)));
if (video) { if (video) {
int gop_size = video->getVideoGopSize(); return video->getVideoGopInterval();
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;
} }
WarnL << "not video track"; WarnL << "not video track";
return 0; return 0;