Skip to content

Commit

Permalink
Add comments
Browse files Browse the repository at this point in the history
  • Loading branch information
KangLin committed Aug 10, 2023
1 parent 273a0c7 commit 722a268
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ mac 和 ios我没有设备,请有设备的同学自行编译测试。

### [下载安装包](https://github.com/KangLin/FaceRecognizer/releases/latest)

**注意**: 本项目安装包中暂时未打包模型文件,请到相关依赖项目中下载模型文件到一个目录中,然后在程序 菜单->选项->设置模型路径 中指定此目录。

+ [最后版本](https://github.com/KangLin/FaceRecognizer/releases/latest)
+ 当前版本:
- windows
Expand Down Expand Up @@ -128,9 +130,6 @@ mac 和 ios我没有设备,请有设备的同学自行编译测试。
# 如要你是在老的 linux 发行版本上,你需要用下列命令替换:
# sudo dpkg -i facerecognizer_0.0.4_amd64.deb
# sudo apt-get install -f # 安装依赖

**注意**: 本项目安装包中暂时未打包模型文件,请到相关依赖项目中下载模型文件到一个目录中,然后在程序 菜单->选项->设置模型路径 中指定此目录。

## 捐赠
本软件如果对你有用,或者你喜欢它。欢迎以任何形式的捐赠(包括参与到项目代码贡献、意见反馈、以及[捐赠资金](#捐赠资金)等)支持作者。谢谢!
Expand Down
7 changes: 5 additions & 2 deletions Src/ImageTool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,15 @@ QImage CImageTool::ConverFormatToRGB888(const QVideoFrame &frame)
{
QImage image = m_pConverFormat->onConverFormatToRGB888(frame);
if(!image.isNull()) return image;
qCritical(logImageTool) << m_pConverFormat->getName()
<< "m_pConverFormat->onConverFormatToRGB888 fail";
}

#ifdef HAVE_LIBYUV
return LibyuvConverFormatToRGB888(frame);
#endif
if(QVideoFrame::Format_YUV420P != frame.pixelFormat())
if(!(QVideoFrame::Format_YUV420P == frame.pixelFormat()
|| QVideoFrame::Format_Jpeg == frame.pixelFormat()))
{
qWarning(logImageTool) << "Please use one of opencv, ffmpeg, libyuv";
}
Expand Down Expand Up @@ -319,7 +322,7 @@ int CImageTool::FindPlugins(QDir dir, QStringList filters)
}
QStringList files = dir.entryList(filters, QDir::Files | QDir::CaseSensitive);
foreach (fileName, files) {
qInfo(logImageTool) << "file name:" << fileName;
qDebug(logImageTool) << "file name:" << fileName;
QString szPlugins = dir.absoluteFilePath(fileName);
QPluginLoader loader(szPlugins);
QObject *plugin = loader.instance();
Expand Down
7 changes: 5 additions & 2 deletions Src/Plugins/FFmpge/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@ if(NOT USE_FFMPEG)
return()
endif()

find_package(FFMPEG)
find_package(FFMPEG CONFIG)
if(NOT FFMPEG_FOUND)
return()
find_package(FFMPEG)
if(NOT FFMPEG_FOUND)
return()
endif()
endif()

message(STATUS "FFMPGE:${FFMPEG_FOUND}")
Expand Down
2 changes: 1 addition & 1 deletion Src/Plugins/FFmpge/ConverFormatFFmpeg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ void Log(void*, int, const char* fmt, va_list vl)

CConverFormatFFmpeg::CConverFormatFFmpeg(QObject *parent) : CConverFormat(parent)
{
qDebug(logFFMPGE) << "FFmpeg version:" << av_version_info()
qInfo(logFFMPGE) << "FFmpeg version:" << av_version_info()
<< "libavutil version:"
<< av_version_info()
<< "libswscale Version:"
Expand Down

0 comments on commit 722a268

Please sign in to comment.