amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 19:00:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

通过getMediaList接口可返回Track时间戳增量信息

Browse Source
This commit is contained in:
xia-chu 2023-10-28 11:09:31 +08:00 committed by 夏楚
parent c1b82961cf
commit d8d7fe9144
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/WebApi.cpp
View File

@ -370,6 +370,7 @@ Value makeMediaSourceJson(MediaSource &media){
obj["loss"] = loss; obj["loss"] = loss;
} }
obj["frames"] = track->getFrames(); obj["frames"] = track->getFrames();
obj["duration"] = track->getDuration();
switch(codec_type){ switch(codec_type){
case TrackAudio : { case TrackAudio : {
auto audio_track = dynamic_pointer_cast<AudioTrack>(track); auto audio_track = dynamic_pointer_cast<AudioTrack>(track);

9
src/Extension/Frame.h
View File

@ -16,6 +16,7 @@
#include <functional> #include <functional>
#include "Util/List.h" #include "Util/List.h"
#include "Util/TimeTicker.h" #include "Util/TimeTicker.h"
#include "Common/Stamp.h"
#include "Network/Buffer.h" #include "Network/Buffer.h"
namespace mediakit { namespace mediakit {
@ -361,11 +362,18 @@ public:
return _gop_interval_ms; return _gop_interval_ms;
} }
int64_t getDuration() const {
std::lock_guard<std::recursive_mutex> lck(_mtx);
return _stamp.getRelativeStamp();
}
private: private:
void doStatistics(const Frame::Ptr &frame) { void doStatistics(const Frame::Ptr &frame) {
if (!frame->configFrame() && !frame->dropAble()) { if (!frame->configFrame() && !frame->dropAble()) {
// 忽略配置帧与可丢弃的帧 // 忽略配置帧与可丢弃的帧
++_frames; ++_frames;
int64_t out;
_stamp.revise(frame->dts(), frame->pts(), out, out);
if (frame->keyFrame() && frame->getTrackType() == TrackVideo) { if (frame->keyFrame() && frame->getTrackType() == TrackVideo) {
// 遇视频关键帧时统计 // 遇视频关键帧时统计
++_video_key_frames; ++_video_key_frames;
@ -384,6 +392,7 @@ private:
uint64_t _last_frames = 0; uint64_t _last_frames = 0;
uint64_t _frames = 0; uint64_t _frames = 0;
uint64_t _video_key_frames = 0; uint64_t _video_key_frames = 0;
Stamp _stamp;
mutable std::recursive_mutex _mtx; mutable std::recursive_mutex _mtx;
std::map<void *, FrameWriterInterface::Ptr> _delegates; std::map<void *, FrameWriterInterface::Ptr> _delegates;
}; };