diff --git a/src/log/log.cpp b/src/log/log.cpp deleted file mode 100644 index 7f73254..0000000 --- a/src/log/log.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "log.h" - -int LogDummy() -{ - return 0; -} \ No newline at end of file diff --git a/src/log/log.h b/src/log/log.h index 12cc03d..6031589 100644 --- a/src/log/log.h +++ b/src/log/log.h @@ -18,20 +18,7 @@ using namespace std::chrono; #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO -// SPDLOG_TRACE(...) -// SPDLOG_DEBUG(...) -// SPDLOG_INFO(...) -// SPDLOG_WARN(...) -// SPDLOG_ERROR(...) -// SPDLOG_CRITICAL(...) - -#ifdef SIGNAL_LOGGER -constexpr auto LOGGER_NAME = "siganl"; -#else -constexpr auto LOGGER_NAME = "rtc"; -#endif - -int LogDummy(); +constexpr auto LOGGER_NAME = "rt"; #define LOG_INFO(...) \ if (nullptr == spdlog::get(LOGGER_NAME)) { \ diff --git a/src/media/video/encode/openh264/openh264_encoder.cpp b/src/media/video/encode/openh264/openh264_encoder.cpp index 57859ea..8c30dd1 100644 --- a/src/media/video/encode/openh264/openh264_encoder.cpp +++ b/src/media/video/encode/openh264/openh264_encoder.cpp @@ -29,7 +29,7 @@ void nv12ToI420(unsigned char *Src_data, int src_width, int src_height, int src_stride_y = src_width; int src_stride_uv = src_width; - // dst: buffer address of Y channelĄ˘U channel and V channel + // dst: buffer address of Y channel、U channel and V channel unsigned char *Y_data_Dst = Dst_data; unsigned char *U_data_Dst = Dst_data + I420_Y_Size; unsigned char *V_data_Dst = Dst_data + I420_Y_Size + I420_U_Size; diff --git a/xmake.lua b/xmake.lua index f855431..c8eeca5 100644 --- a/xmake.lua +++ b/xmake.lua @@ -3,7 +3,8 @@ set_version("0.0.1") set_license("LGPL-3.0") add_rules("mode.release", "mode.debug") -set_languages("c++14") +set_languages("c++17") +set_encodings("utf-8") set_installdir("$(projectdir)/out") @@ -34,7 +35,7 @@ end target("log") set_kind("object") - add_files("src/log/log.cpp") + add_headerfiles("src/log/log.h") add_includedirs("src/log", {public = true}) target("common")