From bc7671cfb3ac0362c201a2a9bf7cbec84266f93f Mon Sep 17 00:00:00 2001 From: Leon <8544842+leon14631@user.noreply.gitee.com> Date: Mon, 8 Aug 2022 09:58:17 +0000 Subject: [PATCH 1/6] update server/WebApi.cpp. --- server/WebApi.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/WebApi.cpp b/server/WebApi.cpp index 14c6a61c..0c6e5451 100755 --- a/server/WebApi.cpp +++ b/server/WebApi.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved. * * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit). @@ -357,6 +357,7 @@ Value makeMediaSourceJson(MediaSource &media){ } case TrackVideo : { auto video_track = dynamic_pointer_cast(track); + video_track->flush(); obj["width"] = video_track->getVideoWidth(); obj["height"] = video_track->getVideoHeight(); obj["fps"] = round(video_track->getVideoFps()); -- Gitee From 052f1aa3888e2bbd6e503662a750db3617776b35 Mon Sep 17 00:00:00 2001 From: Leon <8544842+leon14631@user.noreply.gitee.com> Date: Mon, 8 Aug 2022 09:59:56 +0000 Subject: [PATCH 2/6] update src/Extension/Track.h. --- src/Extension/Track.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Extension/Track.h b/src/Extension/Track.h index 0bada492..d09c989a 100644 --- a/src/Extension/Track.h +++ b/src/Extension/Track.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved. * * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit). @@ -92,6 +92,12 @@ public: * 返回视频fps */ virtual float getVideoFps() const {return 0;}; + + /** + * 刷新宽高帧率 + */ + + virtual void flush() {return;}; }; /** -- Gitee From e1cb1e5501168c61e0157e508487368e48849355 Mon Sep 17 00:00:00 2001 From: Leon <8544842+leon14631@user.noreply.gitee.com> Date: Mon, 8 Aug 2022 10:01:31 +0000 Subject: [PATCH 3/6] update src/Extension/H264.h. --- src/Extension/H264.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Extension/H264.h b/src/Extension/H264.h index 4f7a3e90..3a202b54 100644 --- a/src/Extension/H264.h +++ b/src/Extension/H264.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved. * * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit). @@ -128,6 +128,7 @@ public: int getVideoHeight() const override; int getVideoWidth() const override; float getVideoFps() const override; + void flush() override; bool inputFrame(const Frame::Ptr &frame) override; private: -- Gitee From ed51e2f75c4cf3f999ae4fe292d3653ef2d3fa52 Mon Sep 17 00:00:00 2001 From: Leon <8544842+leon14631@user.noreply.gitee.com> Date: Mon, 8 Aug 2022 10:02:13 +0000 Subject: [PATCH 4/6] update src/Extension/H265.h. --- src/Extension/H265.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Extension/H265.h b/src/Extension/H265.h index 59913c81..a1b24375 100644 --- a/src/Extension/H265.h +++ b/src/Extension/H265.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved. * * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit). @@ -150,6 +150,7 @@ public: int getVideoWidth() const override; int getVideoHeight() const override; float getVideoFps() const override; + void flush() override; bool inputFrame(const Frame::Ptr &frame) override; private: -- Gitee From b8019739d1ba3e0a399ead02678d12bc6f87b72e Mon Sep 17 00:00:00 2001 From: Leon <8544842+leon14631@user.noreply.gitee.com> Date: Mon, 8 Aug 2022 10:05:31 +0000 Subject: [PATCH 5/6] update src/Extension/H264.cpp. --- src/Extension/H264.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Extension/H264.cpp b/src/Extension/H264.cpp index 3426f5cc..4587f0be 100644 --- a/src/Extension/H264.cpp +++ b/src/Extension/H264.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved. * * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit). @@ -142,6 +142,17 @@ float H264Track::getVideoFps() const { return _fps; } +void H264Track::flush() const { + int w = 0; + int h = 0; + float fps = 0.0; + if(getAVCInfo(_sps, w, h, fps)){ + _width = w; + _height = h; + _fps = fps; + } +} + bool H264Track::ready() { return !_sps.empty() && !_pps.empty(); } -- Gitee From 1e6005d609366c39ef702d3d3fbf7c8bb3052c70 Mon Sep 17 00:00:00 2001 From: Leon <8544842+leon14631@user.noreply.gitee.com> Date: Mon, 8 Aug 2022 10:08:15 +0000 Subject: [PATCH 6/6] update src/Extension/H265.cpp. --- src/Extension/H265.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Extension/H265.cpp b/src/Extension/H265.cpp index 8877371d..6c610c96 100644 --- a/src/Extension/H265.cpp +++ b/src/Extension/H265.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved. * * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit). @@ -88,6 +88,17 @@ float H265Track::getVideoFps() const { return _fps; } +void H265Track::flush() { + int w = 0; + int h = 0; + float fps = 0.0; + if(getHEVCInfo(_vps,_sps, w, h, fps)){ + _width = w; + _height = h; + _fps = fps; + } +} + bool H265Track::ready() { return !_vps.empty() && !_sps.empty() && !_pps.empty(); } -- Gitee