From 4f332c3d4f47f3e1eb73ef738eb3fadb40e1909a Mon Sep 17 00:00:00 2001 From: "KKEM\\Administrator" Date: Fri, 24 Nov 2023 21:17:29 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=E7=AD=89=E5=BE=85=E6=AF=8F=E4=B8=AA?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=B5=81=E6=8B=BF=E5=88=B01s=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=86=8D=E5=BC=80=E5=A7=8B=E7=BC=96=E7=A0=81?= =?UTF-8?q?=EF=BC=88=E5=BE=85=E5=AE=9E=E7=8E=B0=20=E5=BD=93=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E8=A7=86=E9=A2=91=E6=B5=81=E8=B7=9F=E8=A6=81=E8=BE=93?= =?UTF-8?q?=E5=87=BA=E8=A7=86=E9=A2=91=E5=B8=A7=E7=8E=87=E4=B8=8D=E4=B8=80?= =?UTF-8?q?=E8=87=B4=E6=97=B6=EF=BC=8C=E8=BF=9B=E8=A1=8C=E8=A1=A5=E5=B8=A7?= =?UTF-8?q?=E6=88=96=E4=B8=A2=E5=B8=A7=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_video_stack.cpp | 72 ++++++++++++++++++++++++-------------- tests/test_video_stack.h | 18 +++++++--- 2 files changed, 59 insertions(+), 31 deletions(-) diff --git a/tests/test_video_stack.cpp b/tests/test_video_stack.cpp index 850d5524..23ddf9b1 100644 --- a/tests/test_video_stack.cpp +++ b/tests/test_video_stack.cpp @@ -113,9 +113,7 @@ void VideoStack::parseParam(const std::string ¶m) { } } -void VideoStack::copyToBuf(const FFmpegFrame::Ptr &frame, const Param &p) { - - auto &buf = _buffer; +void VideoStack::copyToBuf(const std::shared_ptr &buf, const FFmpegFrame::Ptr &frame, const Param &p) { auto sws = std::make_shared(AV_PIX_FMT_YUV420P, p.width, p.height); @@ -203,7 +201,14 @@ void StackPlayer::init(const std::string &url) { void StackPlayer::addStackPtr(VideoStack* that) { //std::unique_lock wlock(_mx); - _stacks.push_back(that); + if (!that) { + return; + } + auto it = _stacks.find(that->_stack_id); + if (it != _stacks.end()) { + return; + } + _stacks[that->_stack_id] = that; } void StackPlayer::delStackPtr(VideoStack *that) { @@ -214,8 +219,8 @@ void StackPlayer::delStackPtr(VideoStack *that) { void StackPlayer::onFrame(const FFmpegFrame::Ptr &frame) { //std::shared_lock rlock(_mx); - for (auto &that : _stacks) { - + for (auto &vsp : _stacks) { + auto &that = vsp.second; if (!that) { continue; } @@ -227,12 +232,20 @@ void StackPlayer::onFrame(const FFmpegFrame::Ptr &frame) { } // TODO: 待实现帧缓存和帧同步 - if (std::chrono::steady_clock::now() - p.lastInputTime > std::chrono::milliseconds(20)) { - - that->copyToBuf(frame, p); - - p.lastInputTime = std::chrono::steady_clock::now(); + p.cache.push_back(frame); + if (that->isReady.test(p.order)) { + continue; } + if (p.cache.size() >= MAX_FRAME_SIZE) { + auto start = std::chrono::high_resolution_clock::now(); // 记录迭代开始时间 + for (int i = 0; i < MAX_FRAME_SIZE; i++) { + auto &front = p.cache.front(); + that->copyToBuf(that->_buffers[i], front, p); + p.cache.pop_front(); + that->isReady.set(p.order); + } + } + } } } @@ -252,18 +265,23 @@ void VideoStack::init() { // dev->initAudio(); //TODO:音频 _dev->addTrackCompleted(); - _buffer.reset(av_frame_alloc(), [](AVFrame *frame_) { av_frame_free(&frame_); }); + for (int i = 0; i < MAX_FRAME_SIZE; i++) { - _buffer->width = _width; - _buffer->height = _height; - _buffer->format = _pixfmt; + std::shared_ptr frame(av_frame_alloc(), [](AVFrame *frame_) { av_frame_free(&frame_); }); - av_frame_get_buffer(_buffer.get(), 32); + frame->width = _width; + frame->height = _height; + frame->format = _pixfmt; + + av_frame_get_buffer(frame.get(), 32); + _buffers.push_back(frame); + } // setBackground(0, 0, 0); _isExit = false; + int i = 0; for (auto &v : _params) { for (auto &p : v) { if (p.stream_id.empty()) { @@ -277,6 +295,9 @@ void VideoStack::init() { p.tmp->format = _pixfmt; av_frame_get_buffer(p.tmp.get(), 32);*/ + p.order = i++; + + flag.set(p.order); auto it = playerMap.find(p.stream_id); if (it == playerMap.end()) { @@ -302,16 +323,15 @@ void VideoStack::start() { int64_t pts = 0, index = 0; auto interval = milliseconds(40); // 设置间隔时间为40毫秒 while (!_isExit) { - auto start = high_resolution_clock::now(); - - _dev->inputYUV((char **)_buffer->data, _buffer->linesize, pts); - pts += 40; - index++; - - auto end = high_resolution_clock::now(); - auto duration = duration_cast(end - start); - if (duration < interval) { - std::this_thread::sleep_for(interval - duration); // 如果迭代花费时间小于间隔时间，等待剩余时间 + if (isReady == flag) { + for (auto &buf : _buffers) { + _dev->inputYUV((char **)buf->data, buf->linesize, pts); + pts += 40; + index++; + } + isReady = 0; + } else { + std::this_thread::sleep_for(std::chrono::milliseconds(5)); } } }).detach(); diff --git a/tests/test_video_stack.h b/tests/test_video_stack.h index 1d4de14d..af229459 100644 --- a/tests/test_video_stack.h +++ b/tests/test_video_stack.h @@ -14,13 +14,15 @@ #include "Common/Device.h" #include "api/include/mk_transcode.h" #include "json/json.h" +#include #include static std::string testJson - = R"({"msg":"set_combine_source","gapv":0.002,"gaph":0.001,"width":1920,"urls":[["rtsp://47.243.129.22:1554/live/test","rtsp://47.243.129.22:1554/live/test","rtsp://47.243.129.22:1554/live/test","rtsp://47.243.129.22:1554/live/test"],["rtsp://47.243.129.22:1554/live/test","rtsp://47.243.129.22:1554/live/test","rtsp://47.243.129.22:1554/live/test","rtsp://47.243.129.22:1554/live/test"],["rtsp://47.243.129.22:1554/live/test","rtsp://47.243.129.22:1554/live/test","rtsp://47.243.129.22:1554/live/test","rtsp://47.243.129.22:1554/live/test"],["rtsp://47.243.129.22:1554/live/test","rtsp://47.243.129.22:1554/live/test","rtsp://47.243.129.22:1554/live/test","rtsp://47.243.129.22:1554/live/test"]],"id":"89","rows":4,"cols":4,"height":1080,"span":[[[0,0],[1,1]],[[2,3],[3,3]]]})"; + = R"({"msg":"set_combine_source","gapv":0.002,"gaph":0.001,"width":1920,"urls":[["rtsp://kkem.me:1554/live/test","rtsp://kkem.me:1554/live/test","rtsp://kkem.me:1554/live/test","rtsp://kkem.me:1554/live/test"],["rtsp://kkem.me:1554/live/test","rtsp://kkem.me:1554/live/test","rtsp://kkem.me:1554/live/test","rtsp://kkem.me:1554/live/test"],["rtsp://kkem.me:1554/live/test","rtsp://kkem.me:1554/live/test","rtsp://kkem.me:1554/live/test","rtsp://kkem.me:1554/live/test"],["rtsp://kkem.me:1554/live/test","rtsp://kkem.me:1554/live/test","rtsp://kkem.me:1554/live/test","rtsp://kkem.me:1554/live/test"]],"id":"89","rows":4,"cols":4,"height":1080,"span":[[[0,0],[1,1]],[[2,3],[3,3]]]})"; +static constexpr int MAX_FRAME_SIZE = 24; class VideoStack : public std::enable_shared_from_this { public: @@ -32,8 +34,10 @@ public: std::string stream_id; // RuntimeParam - std::chrono::steady_clock::time_point lastInputTime; + //std::chrono::steady_clock::time_point lastInputTime; //std::shared_ptr tmp; // 临时存储缩放后的frame + int order; + std::list cache; }; VideoStack() = default; @@ -48,7 +52,7 @@ public: void start(); - void copyToBuf(const mediakit::FFmpegFrame::Ptr &frame, const Param &p); + void copyToBuf(const std::shared_ptr &buf, const mediakit::FFmpegFrame::Ptr &frame, const Param &p); public: std::string _stack_id; @@ -65,7 +69,10 @@ public: mediakit::DevChannel::Ptr _dev; - std::shared_ptr _buffer; + std::vector> _buffers; + + std::bitset<1024> isReady; + std::bitset<1024> flag; }; @@ -85,7 +92,8 @@ private: std::string _url; //std::shared_timed_mutex _mx; - std::vector _stacks; // 需要给哪些Stack对象推送帧数据 + //std::vector _stacks; // 需要给哪些Stack对象推送帧数据 + std::unordered_map _stacks; mediakit::MediaPlayer::Ptr _player; };