CMake: fix BUILD_PERFORMANCE

KangLin · Aug 15, 2023 · a31fa0e · a31fa0e
1 parent 19dded4
commit a31fa0e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Src/CMakeLists.txt b/Src/CMakeLists.txt
@@ -49,6 +49,7 @@ set(SOURCE_FILES
     database/Database.cpp
     database/DataRegister.cpp
     database/TableRegister.cpp
+    Performance.cpp
     )
 
 set(INSTALLHEADER_FILES
@@ -97,7 +98,7 @@ ADD_TARGET(NAME ${PROJECT_NAME}
     PRIVATE_DEFINITIONS
         FaceRecognizer_VERSION="${FaceRecognizer_VERSION}"
         FaceRecognizer_REVISION="${FaceRecognizer_REVISION}"
-    DEFINITIONS RABBITCOMMON ${LIBS_DEFINES}
+    DEFINITIONS RABBITCOMMON ${LIBS_DEFINES} BUILD_PERFORMANCE
     SOURCE_FILES ${SOURCE_FILES} ${HEADER_FILES} ${RCC_FILES}
     INSTALL_HEADER_FILES "${INSTALLHEADER_FILES}"
     OPTIONS ${FACERECOGNIZER_OPTIONS}

diff --git a/Src/Performance.h b/Src/Performance.h
@@ -10,7 +10,7 @@
     #define RETURN(value)    
 #else
     #define PERFORMANCE(name) \
-        CPerformance object##name (#name);
+        CPerformance object##name(#name);
     #define PERFORMANCE_START(name) object##name.StartTime();
     #define PERFORMANCE_ADD_TIME(name, message) \
         object##name.AddTime(__FILE__, __LINE__, __FUNCTION__, message);

diff --git a/Src/Plugins/FFmpge/ConverFormatFFmpeg.cpp b/Src/Plugins/FFmpge/ConverFormatFFmpeg.cpp
@@ -27,6 +27,7 @@ int CConverFormatFFmpeg::SetFFmpegLog()
     return 0;
 }
 
+// See: https://blog.csdn.net/u014260892/article/details/51883723
 AVPixelFormat CConverFormatFFmpeg::QVideoFrameFormatToFFMpegPixFormat(
         const QVideoFrame::PixelFormat format)
 {
@@ -77,7 +78,8 @@ QImage CConverFormatFFmpeg::onConverFormatToRGB888(const QVideoFrame &frame)
                      QImage::Format_RGB888);
 #if LIBAVUTIL_VERSION_MAJOR >= 55
         nRet = av_image_fill_arrays(outPic->data, outPic->linesize,
-                                    img.bits(), AV_PIX_FMT_RGB24, img.width(), img.height(), 1);
+                                    img.bits(), AV_PIX_FMT_RGB24,
+                                    img.width(), img.height(), 1);
 #else
         nRet = avpicture_fill((AVPicture *)outPic, videoFrame.bits(),
                               QVideoFrameFormatToFFMpegPixFormat(videoFrame.pixelFormat()),