aunix/ZLMediaKit
1
0
Fork 0
mirror of https://gitee.com/xia-chu/ZLMediaKit.git synced 2026-05-16 23:07:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

提高某些国标流注册速度

Browse Source
This commit is contained in:
xia-chu 2025-04-21 11:07:38 +08:00
parent 1e14d296f5
commit f11467c2a8
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Rtp/Decoder.cpp
View File

@ -125,8 +125,14 @@ void DecoderImp::onDecode(int stream, int codecid, int flags, int64_t pts, int64
auto frame = Factory::getFrameFromPtr(codec, (char *)data, bytes, dts, pts); auto frame = Factory::getFrameFromPtr(codec, (char *)data, bytes, dts, pts);
if (getTrackType(codec) != TrackVideo) { if (getTrackType(codec) != TrackVideo) {
onFrame(stream, frame); onFrame(stream, frame);
if (_last_is_keyframe && _video_merge) {
// 上次是关键帧，收到音频后，说明帧收齐了
_video_merge->flush();
}
return; return;
} }
_last_is_keyframe = frame->keyFrame();
_video_merge = &ref.second;
ref.second.inputFrame(frame, [this, stream, codec](uint64_t dts, uint64_t pts, const Buffer::Ptr &buffer, bool) { ref.second.inputFrame(frame, [this, stream, codec](uint64_t dts, uint64_t pts, const Buffer::Ptr &buffer, bool) {
onFrame(stream, Factory::getFrameFromBuffer(codec, buffer, dts, pts)); onFrame(stream, Factory::getFrameFromBuffer(codec, buffer, dts, pts));
}); });

3
src/Rtp/Decoder.h
View File

@ -59,13 +59,14 @@ private:
private: private:
bool _finished = false; bool _finished = false;
bool _have_video = false; bool _have_video = false;
bool _last_is_keyframe = false;
Decoder::Ptr _decoder; Decoder::Ptr _decoder;
MediaSinkInterface *_sink; MediaSinkInterface *_sink;
class FrameMergerImp : public FrameMerger { class FrameMergerImp : public FrameMerger {
public: public:
FrameMergerImp() : FrameMerger(FrameMerger::none) {} FrameMergerImp() : FrameMerger(FrameMerger::none) {}
}; };
FrameMergerImp *_video_merge = nullptr;
std::unordered_map<int, std::pair<Track::Ptr, FrameMergerImp> > _tracks; std::unordered_map<int, std::pair<Track::Ptr, FrameMergerImp> > _tracks;
}; };