Fix typo

Author: KangLin

App/RabbitImApp.pro.bak

@@ -44,7 +44,7 @@ isEmpty(RabbitCommon_DIR): RabbitCommon_DIR=$$PWD/../../RabbitCommon
     message("Don't find RabbitCommon, in environment variable RabbitCommon_DIR:$$RabbitCommon_DIR")
     message("1. Please download RabbitCommon source code from https://github.com/KangLin/RabbitCommon ag:")
     message("   git clone https://github.com/KangLin/RabbitCommon.git")
-    error  ("2. Then set environment variable RabbitCommon_DIR to download dirctory")
+    error  ("2. Then set environment variable RabbitCommon_DIR to download directory")
 }
 
 SOURCES += main.cpp

CMakeLists.txt

@@ -121,7 +121,7 @@ else()
     message("1. Please download RabbitCommon source code from https://github.com/KangLin/RabbitCommon")
     message("   ag:")
     message("       git clone https://github.com/KangLin/RabbitCommon.git")
-    message("2. Then set cmake value or environment variable RabbitCommon_DIR to download root dirctory.")
+    message("2. Then set cmake value or environment variable RabbitCommon_DIR to download root directory.")
     message("   ag:")
     message(FATAL_ERROR "       cmake -DRabbitCommon_DIR= ")
 endif()
@@ -160,7 +160,7 @@ CONFIGURE_FILE(
     "${RabbitCommon_DIR}/cmake/cmake_uninstall.cmake.in"
     "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake"
     IMMEDIATE @ONLY)
-# Create unistall target
+# Create uninstall target
 ADD_CUSTOM_TARGET(uninstall
     "${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake"
     DEPENDS uninstall-runtime)

Install/Install.nsi

@@ -82,7 +82,7 @@ Function InstallVC
    ClearErrors
    ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{FF66E9F6-83E7-3A3E-AF14-8DE9A809A6A4}" "Version"
 
-   ; check regist
+   ; check register
    IfErrors 0 VSRedistInstalled
    Exec "$INSTDIR\bin\vcredist_x86.exe /q /norestart"
    StrCpy $R0 "-1"
@@ -98,7 +98,7 @@ Function _InstallVC
    ClearErrors
    ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{FF66E9F6-83E7-3A3E-AF14-8DE9A809A6A4}" "Version"
 
-   ; check regist
+   ; check register
    IfErrors 0 VSRedistInstalled
    Exec "$INSTDIR\bin\vc_redist.x86.exe /q /norestart"
    StrCpy $R0 "-1"
@@ -114,7 +114,7 @@ Function InstallVC64
     ClearErrors
     ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{FF66E9F6-83E7-3A3E-AF14-8DE9A809A6A4}" "Version"
 
-    ; check regist
+    ; check register
     IfErrors 0 VSRedistInstalled
     Exec "$INSTDIR\bin\vcredist_x64.exe /q /norestart"
     StrCpy $R0 "-1"
@@ -130,7 +130,7 @@ Function _InstallVC64
     ClearErrors
     ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{FF66E9F6-83E7-3A3E-AF14-8DE9A809A6A4}" "Version"
 
-    ; check regist
+    ; check register
     IfErrors 0 VSRedistInstalled
     Exec "$INSTDIR\bin\vc_redist.x64.exe /q /norestart"
     StrCpy $R0 "-1"

Install/install.sh

@@ -14,7 +14,7 @@ case "$1" in
 
     install|*)
         echo "install ..."
-        # Install destop
+        # Install desktop
         if [ -f /usr/share/applications/RabbitIm.desktop ]; then
             rm /usr/share/applications/RabbitIm.desktop
         fi

Plugin/ConverFormat/OpenCV/ConverFormatOpenCV.h

@@ -10,7 +10,7 @@ if(FFMPEG_FOUND)
 else()
     return()
 endif()
-message("== FFMPGE: ${FFMPEG_FOUND}; Versoin: ${FFMPEG_VERSION}")
+message("== FFMPGE: ${FFMPEG_FOUND}; Version: ${FFMPEG_VERSION}")
 
 project(FFMpeg)
 
@@ -20,7 +20,7 @@ if(NOT ANDROID)
     set(PLUGIN_INSTALL_DIR plugins/${PLUGIN_RELATIVE_DIR})
 endif()
 ADD_PLUGIN_TARGET(
-    SOURCE_FILES ConverFormatFFmpeg.cpp ConverFormatFFmpeg.h
+    SOURCE_FILES ConvertFormatFFmpeg.cpp ConvertFormatFFmpeg.h
     INCLUDE_DIRS $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/Src>
         $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/Plugin>
     PRIVATE_LIBS RabbitIm ${FFMPEG_LIBRARIES}

Plugin/ConverFormat/CMakeLists.txt Plugin/ConvertFormat/CMakeLists.txtPlugin/ConverFormat/CMakeLists.txt renamed to Plugin/ConvertFormat/CMakeLists.txt

@@ -1,5 +1,5 @@
 #include <QLoggingCategory>
-#include "ConverFormatFFmpeg.h"
+#include "ConvertFormatFFmpeg.h"
 
 static Q_LOGGING_CATEGORY(log, "Conver.FFmpeg")
 
@@ -28,19 +28,19 @@ void Log(void*, int level, const char* fmt, va_list vl)
     }
 }
 
-CConverFormatFFmpeg::CConverFormatFFmpeg(QObject *parent) : CPluginConverFormat(parent)
+CConvertFormatFFmpeg::CConvertFormatFFmpeg(QObject *parent) : CPluginConverFormat(parent)
 {
     SetFFmpegLog();
 }
 
-int CConverFormatFFmpeg::SetFFmpegLog()
+int CConvertFormatFFmpeg::SetFFmpegLog()
 {
     //在程序初始化时设置ffmpeg日志的回调函数
     av_log_set_callback(Log);
     return 0;
 }
 
-AVPixelFormat CConverFormatFFmpeg::QVideoFrameFormatToFFMpegPixFormat(
+AVPixelFormat CConvertFormatFFmpeg::QVideoFrameFormatToFFMpegPixFormat(
         const QVideoFrame::PixelFormat format)
 {
     switch (format) {
@@ -65,7 +65,7 @@ AVPixelFormat CConverFormatFFmpeg::QVideoFrameFormatToFFMpegPixFormat(
     }
 }
 
-AVPixelFormat CConverFormatFFmpeg::QImageFormatToFFMpegPixFormat(const QImage::Format format)
+AVPixelFormat CConvertFormatFFmpeg::QImageFormatToFFMpegPixFormat(const QImage::Format format)
 {
     if(QImage::Format_RGB32 == format)
         return AV_PIX_FMT_RGB32;
@@ -74,7 +74,7 @@ AVPixelFormat CConverFormatFFmpeg::QImageFormatToFFMpegPixFormat(const QImage::F
 
 //如果转换成功，则调用者使用完 pOutFrame 后，需要调用 avpicture_free(pOutFrame) 释放内存
 //成功返回0，不成功返回非0
-int CConverFormatFFmpeg::ConvertFormat(/*[in]*/ const AVPicture &inFrame,
+int CConvertFormatFFmpeg::ConvertFormat(/*[in]*/ const AVPicture &inFrame,
                          /*[in]*/  int nInWidth,
                          /*[in]*/  int nInHeight,
                          /*[in]*/  AVPixelFormat inPixelFormat,
@@ -137,7 +137,7 @@ int CConverFormatFFmpeg::ConvertFormat(/*[in]*/ const AVPicture &inFrame,
     return nRet;
 }
 
-QImage CConverFormatFFmpeg::onConverFormatToRGB888(const QVideoFrame &frame)
+QImage CConvertFormatFFmpeg::onConverFormatToRGB888(const QVideoFrame &frame)
 {
     int nRet = 0;
     AVPicture inPic, outPic;

Plugin/ConverFormat/FFmpeg/CMakeLists.txt …ugin/ConvertFormat/FFmpeg/CMakeLists.txtPlugin/ConverFormat/FFmpeg/CMakeLists.txt renamed to Plugin/ConvertFormat/FFmpeg/CMakeLists.txt Plugin/ConverFormat/FFmpeg/CMakeLists.txt renamed to Plugin/ConvertFormat/FFmpeg/CMakeLists.txt

@@ -1,7 +1,6 @@
-#ifndef CCONVERFORMATFFMPEG_H
-#define CCONVERFORMATFFMPEG_H
 
-#include "PluginConverFormat.h"
+#pragma once
+#include "PluginConvertFormat.h"
 
 extern "C" {
 #include "libavformat/avformat.h"
@@ -10,11 +9,11 @@ extern "C" {
 #undef PixelFormat
 }
 
-class CConverFormatFFmpeg : public CPluginConverFormat
+class CConvertFormatFFmpeg : public CPluginConverFormat
 {
     Q_OBJECT
 public:
-    explicit CConverFormatFFmpeg(QObject *parent = nullptr);
+    explicit CConvertFormatFFmpeg(QObject *parent = nullptr);
     virtual QImage onConverFormatToRGB888(const QVideoFrame &frame);
 
     Q_INTERFACES(CPluginConverFormat)
@@ -35,7 +34,7 @@ class CConverFormatFFmpeg : public CPluginConverFormat
             const QVideoFrame::PixelFormat format);
     static AVPixelFormat QImageFormatToFFMpegPixFormat(
             const QImage::Format format);
-    static QImage FFMpegConverFormatToRGB888(const QVideoFrame &frame);
+    static QImage FFMpegConvertFormatToRGB888(const QVideoFrame &frame);
 
 private:
     /**
@@ -60,5 +59,3 @@ class CConverFormatFFmpeg : public CPluginConverFormat
                              /*[in]*/  int nOutHeight,               /** 转换后的帧的高度 */
                              /*[in]*/  AVPixelFormat outPixelFormat);/** 转换后的帧的格式 */
 };
-
-#endif // CCONVERFORMATFFMPEG_H