收集FFMPEG相关的对象计数

mtdxc · Jan 18, 2024 · 2e86a94 · 2e86a94
1 parent c3d1270
commit 2e86a94
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git a/server/FFmpegSource.cpp b/server/FFmpegSource.cpp
@@ -20,7 +20,7 @@
 using namespace std;
 using namespace toolkit;
 using namespace mediakit;
-
+StatisticImp(FFmpegSource);
 namespace FFmpeg {
 #define FFmpeg_FIELD "ffmpeg."
 const string kBin = FFmpeg_FIELD"bin";

diff --git a/server/FFmpegSource.h b/server/FFmpegSource.h
@@ -93,6 +93,7 @@ class FFmpegSource : public std::enable_shared_from_this<FFmpegSource> , public
     std::string _ffmpeg_cmd_key;
     std::function<void()> _onClose;
     toolkit::Ticker _replay_ticker;
+    toolkit::ObjectStatistic<FFmpegSource> _counter;
 };
 
 

diff --git a/server/WebApi.cpp b/server/WebApi.cpp
@@ -29,7 +29,7 @@
 #include "Network/TcpServer.h"
 #include "Network/UdpServer.h"
 #include "Thread/WorkThreadPool.h"
-
+#include "Codec/Transcode.h"
 #ifdef ENABLE_MYSQL
 #include "Util/SqlPool.h"
 #endif //ENABLE_MYSQL
@@ -480,6 +480,17 @@ void getStatisticJson(const function<void(Value &val)> &cb) {
 
     val["RtpPacket"] = (Json::UInt64)(ObjectStatistic<RtpPacket>::count());
     val["RtmpPacket"] = (Json::UInt64)(ObjectStatistic<RtmpPacket>::count());
+
+    val["FFmpegSource"] = (Json::UInt64)(ObjectStatistic<FFmpegSource>::count());
+#ifdef ENABLE_FFMPEG
+    val["FFmpegFrame"] = (Json::UInt64)(ObjectStatistic<FFmpegFrame>::count());
+    val["FFmpegSwr"] = (Json::UInt64)(ObjectStatistic<FFmpegSwr>::count());
+    val["FFmpegSws"] = (Json::UInt64)(ObjectStatistic<FFmpegSws>::count());
+    val["FFmpegAudioFifo"] = (Json::UInt64)(ObjectStatistic<FFmpegAudioFifo>::count());
+    val["FFmpegDecoder"] = (Json::UInt64)(ObjectStatistic<FFmpegDecoder>::count());
+    val["FFmpegEncoder"] = (Json::UInt64)(ObjectStatistic<FFmpegEncoder>::count());
+#endif // ENABLE_FFMPEG
+
 #ifdef ENABLE_MEM_DEBUG
     auto bytes = getTotalMemUsage();
     val["totalMemUsage"] = (Json::UInt64) bytes;

diff --git a/src/Codec/Transcode.cpp b/src/Codec/Transcode.cpp
@@ -24,6 +24,12 @@
 
 using namespace std;
 using namespace toolkit;
+StatisticImp(mediakit::FFmpegFrame);
+StatisticImp(mediakit::FFmpegSwr);
+StatisticImp(mediakit::FFmpegSws);
+StatisticImp(mediakit::FFmpegAudioFifo);
+StatisticImp(mediakit::FFmpegDecoder);
+StatisticImp(mediakit::FFmpegEncoder);
 
 namespace mediakit {
 // 配置项目

diff --git a/src/Codec/Transcode.h b/src/Codec/Transcode.h
@@ -12,7 +12,7 @@
 #define ZLMEDIAKIT_TRANSCODE_H
 
 #if defined(ENABLE_FFMPEG)
-
+#include "Util/util.h"
 #include "Util/TimeTicker.h"
 #include "Common/MediaSink.h"
 
@@ -45,6 +45,7 @@ class FFmpegFrame {
 private:
     char *_data = nullptr;
     std::shared_ptr<AVFrame> _frame;
+    toolkit::ObjectStatistic<FFmpegFrame> _counter;
 };
 
 class FFmpegSwr {
@@ -61,6 +62,7 @@ class FFmpegSwr {
     int _target_samplerate;
     AVSampleFormat _target_format;
     SwrContext *_ctx = nullptr;
+    toolkit::ObjectStatistic<FFmpegSwr> _statistic;
 };
 
 class FFmpegAudioFifo {
@@ -143,6 +145,7 @@ class FFmpegDecoder : public TaskManager, public CodecInfo {
     onDec _cb;
     std::shared_ptr<AVCodecContext> _context;
     FrameMerger _merger{FrameMerger::h264_prefix};
+    toolkit::ObjectStatistic<FFmpegDecoder> _counter;
 };
 
 class FFmpegSws {
@@ -165,6 +168,7 @@ class FFmpegSws {
     SwsContext *_ctx = nullptr;
     AVPixelFormat _src_format = AV_PIX_FMT_NONE;
     AVPixelFormat _target_format = AV_PIX_FMT_NONE;
+    toolkit::ObjectStatistic<FFmpegSws> _counter;
 };
 
 class FFmpegEncoder : public TaskManager, public CodecInfo {
@@ -196,6 +200,7 @@ class FFmpegEncoder : public TaskManager, public CodecInfo {
     std::unique_ptr<FFmpegSws> _sws;
     std::unique_ptr<FFmpegSwr> _swr;
     std::unique_ptr<FFmpegAudioFifo> _fifo;
+    toolkit::ObjectStatistic<FFmpegEncoder> _counter;
 };
 }//namespace mediakit
 #endif// ENABLE_FFMPEG