From 0a71e06d4abd4f0b27e348b3ceb4a5658a021569 Mon Sep 17 00:00:00 2001 From: xiongguangjie Date: Wed, 19 Oct 2022 14:55:39 +0800 Subject: [PATCH] united some code style --- src/Common/MediaSource.h | 2 +- src/Common/config.cpp | 8 ++++---- src/Common/config.h | 4 ++-- src/Extension/H264Rtp.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Common/MediaSource.h b/src/Common/MediaSource.h index 9266a936..fe61d685 100644 --- a/src/Common/MediaSource.h +++ b/src/Common/MediaSource.h @@ -399,7 +399,7 @@ private: GET_CONFIG(int, mergeWriteMS, General::kMergeWriteMS); - GET_CONFIG(int, rtspLowLatency, Rtsp::KLowLatency); + GET_CONFIG(int, rtspLowLatency, Rtsp::kLowLatency); if(std::is_same::value && rtspLowLatency){ return true; } diff --git a/src/Common/config.cpp b/src/Common/config.cpp index 926dd9cc..9f5976e2 100644 --- a/src/Common/config.cpp +++ b/src/Common/config.cpp @@ -173,7 +173,7 @@ const string kAuthBasic = RTSP_FIELD "authBasic"; const string kHandshakeSecond = RTSP_FIELD "handshakeSecond"; const string kKeepAliveSecond = RTSP_FIELD "keepAliveSecond"; const string kDirectProxy = RTSP_FIELD "directProxy"; -const string KLowLatency = RTSP_FIELD"lowLatency"; +const string kLowLatency = RTSP_FIELD"lowLatency"; static onceToken token([]() { // 默认Md5方式认证 @@ -181,7 +181,7 @@ static onceToken token([]() { mINI::Instance()[kHandshakeSecond] = 15; mINI::Instance()[kKeepAliveSecond] = 15; mINI::Instance()[kDirectProxy] = 1; - mINI::Instance()[KLowLatency] = 0; + mINI::Instance()[kLowLatency] = 0; }); } // namespace Rtsp @@ -208,13 +208,13 @@ const string kAudioMtuSize = RTP_FIELD "audioMtuSize"; // rtp包最大长度限制,单位是KB const string kRtpMaxSize = RTP_FIELD "rtpMaxSize"; -const string KLowLatency = RTP_FIELD "lowLatency"; +const string kLowLatency = RTP_FIELD "lowLatency"; static onceToken token([]() { mINI::Instance()[kVideoMtuSize] = 1400; mINI::Instance()[kAudioMtuSize] = 600; mINI::Instance()[kRtpMaxSize] = 10; - mINI::Instance()[KLowLatency] = 0; + mINI::Instance()[kLowLatency] = 0; }); } // namespace Rtp diff --git a/src/Common/config.h b/src/Common/config.h index 7b64e02e..312878b6 100644 --- a/src/Common/config.h +++ b/src/Common/config.h @@ -253,7 +253,7 @@ extern const std::string kKeepAliveSecond; extern const std::string kDirectProxy; // rtsp 转发是否使用低延迟模式,当开启时,不会缓存rtp包,来提高并发,可以降低一帧的延迟 -extern const std::string KLowLatency; +extern const std::string kLowLatency; } // namespace Rtsp ////////////RTMP服务器配置/////////// @@ -275,7 +275,7 @@ extern const std::string kAudioMtuSize; // rtp包最大长度限制, 单位KB extern const std::string kRtpMaxSize; // rtp 打包时,低延迟开关,默认关闭(为0),h264存在一帧多个slice(NAL)的情况,在这种情况下,如果开启可能会导致画面花屏 -extern const std::string KLowLatency; +extern const std::string kLowLatency; } // namespace Rtp ////////////组播配置/////////// diff --git a/src/Extension/H264Rtp.cpp b/src/Extension/H264Rtp.cpp index f5187658..1130102f 100644 --- a/src/Extension/H264Rtp.cpp +++ b/src/Extension/H264Rtp.cpp @@ -283,7 +283,7 @@ bool H264RtpEncoder::inputFrame(const Frame::Ptr &frame) { default: break; } - GET_CONFIG(int,lowLatency,Rtp::KLowLatency); + GET_CONFIG(int,lowLatency,Rtp::kLowLatency); if (lowLatency) { // 低延迟模式 if (_last_frame) { flush();