From 5479820748f2ded4c4421ab0dc0a5ac810231275 Mon Sep 17 00:00:00 2001
From: xiongguangjie <xiong_panda@163.com>
Date: Thu, 16 Jun 2022 09:59:09 +0800
Subject: [PATCH] const payload type variable start's letter is lower case
---
src/Common/config.cpp | 28 ++++++++++++++--------------
src/Common/config.h | 14 +++++++-------
src/Rtp/GB28181Process.cpp | 14 +++++++-------
3 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/Common/config.cpp b/src/Common/config.cpp
index 032b0bc..ae1593b 100644
--- a/src/Common/config.cpp
+++ b/src/Common/config.cpp
@@ -278,25 +278,25 @@ namespace RtpProxy {
const string kDumpDir = RTP_PROXY_FIELD "dumpDir";
const string kTimeoutSec = RTP_PROXY_FIELD "timeoutSec";
const string kPortRange = RTP_PROXY_FIELD "port_range";
-const string KH264PT = RTP_PROXY_FIELD "h264_pt";
-const string KH265PT = RTP_PROXY_FIELD "h265_pt";
-const string KPSPT = RTP_PROXY_FIELD "ps_pt";
-const string KTSPT = RTP_PROXY_FIELD "ts_pt";
-const string KOpusPT = RTP_PROXY_FIELD "opus_pt";
-const string KG711UPT = RTP_PROXY_FIELD "g711u_pt";
-const string KG711APT = RTP_PROXY_FIELD "g711a_pt";
+const string kH264PT = RTP_PROXY_FIELD "h264_pt";
+const string kH265PT = RTP_PROXY_FIELD "h265_pt";
+const string kPSPT = RTP_PROXY_FIELD "ps_pt";
+const string kTSPT = RTP_PROXY_FIELD "ts_pt";
+const string kOpusPT = RTP_PROXY_FIELD "opus_pt";
+const string kG711UPT = RTP_PROXY_FIELD "g711u_pt";
+const string kG711APT = RTP_PROXY_FIELD "g711a_pt";
static onceToken token([]() {
mINI::Instance()[kDumpDir] = "";
mINI::Instance()[kTimeoutSec] = 15;
mINI::Instance()[kPortRange] = "30000-35000";
- mINI::Instance()[KH264PT] = 98;
- mINI::Instance()[KH265PT] = 99;
- mINI::Instance()[KPSPT] = 96;
- mINI::Instance()[KTSPT] = 33;
- mINI::Instance()[KOpusPT] = 100;
- mINI::Instance()[KG711UPT] = 0;
- mINI::Instance()[KG711APT] = 8;
+ mINI::Instance()[kH264PT] = 98;
+ mINI::Instance()[kH265PT] = 99;
+ mINI::Instance()[kPSPT] = 96;
+ mINI::Instance()[kTSPT] = 33;
+ mINI::Instance()[kOpusPT] = 100;
+ mINI::Instance()[kG711UPT] = 0;
+ mINI::Instance()[kG711APT] = 8;
});
} // namespace RtpProxy
diff --git a/src/Common/config.h b/src/Common/config.h
index 990cdf2..ad87247 100644
--- a/src/Common/config.h
+++ b/src/Common/config.h
@@ -325,19 +325,19 @@ extern const std::string kTimeoutSec;
// 该范围同时限制rtsp服务器udp端口范围
extern const std::string kPortRange;
// rtp server h264的pt
-extern const std::string KH264PT;
+extern const std::string kH264PT;
// rtp server h265的pt
-extern const std::string KH265PT;
+extern const std::string kH265PT;
// rtp server ps 的pt
-extern const std::string KPSPT;
+extern const std::string kPSPT;
// rtp server ts 的pt
-extern const std::string KTSPT;
+extern const std::string kTSPT;
// rtp server opus 的pt
-extern const std::string KOpusPT;
+extern const std::string kOpusPT;
// rtp server g711u 的pt
-extern const std::string KG711UPT;
+extern const std::string kG711UPT;
// rtp server g711a 的pt
-extern const std::string KG711APT;
+extern const std::string kG711APT;
} // namespace RtpProxy
/**
diff --git a/src/Rtp/GB28181Process.cpp b/src/Rtp/GB28181Process.cpp
index 42735af..229fa03 100644
--- a/src/Rtp/GB28181Process.cpp
+++ b/src/Rtp/GB28181Process.cpp
@@ -66,13 +66,13 @@ void GB28181Process::onRtpSorted(RtpPacket::Ptr rtp) {
}
bool GB28181Process::inputRtp(bool, const char *data, size_t data_len) {
- GET_CONFIG(uint32_t, h264_pt, RtpProxy::KH264PT);
- GET_CONFIG(uint32_t, h265_pt, RtpProxy::KH265PT);
- GET_CONFIG(uint32_t, ps_pt, RtpProxy::KPSPT);
- GET_CONFIG(uint32_t, ts_pt, RtpProxy::KTSPT);
- GET_CONFIG(uint32_t, opus_pt, RtpProxy::KOpusPT);
- GET_CONFIG(uint32_t, g711u_pt, RtpProxy::KG711UPT);
- GET_CONFIG(uint32_t, g711a_pt, RtpProxy::KG711APT);
+ GET_CONFIG(uint32_t, h264_pt, RtpProxy::kH264PT);
+ GET_CONFIG(uint32_t, h265_pt, RtpProxy::kH265PT);
+ GET_CONFIG(uint32_t, ps_pt, RtpProxy::kPSPT);
+ GET_CONFIG(uint32_t, ts_pt, RtpProxy::kTSPT);
+ GET_CONFIG(uint32_t, opus_pt, RtpProxy::kOpusPT);
+ GET_CONFIG(uint32_t, g711u_pt, RtpProxy::kG711UPT);
+ GET_CONFIG(uint32_t, g711a_pt, RtpProxy::kG711APT);
RtpHeader *header = (RtpHeader *)data;
auto pt = header->pt;
--
libgit2 0.26.0