From 0377796c031275a8186108c015fa8e418c6e05fb Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Sat, 8 May 2021 19:33:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dclang=E4=B8=8B=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91=E8=AD=A6=E5=91=8A=E5=92=8C=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Rtcp/Rtcp.cpp          | 7 +++----
 src/Rtcp/Rtcp.h            | 2 +-
 src/Rtcp/RtcpFCI.cpp       | 2 +-
 webrtc/RtpExt.cpp          | 6 +++---
 webrtc/WebRtcTransport.cpp | 2 +-
 webrtc/WebRtcTransport.h   | 2 +-
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/Rtcp/Rtcp.cpp b/src/Rtcp/Rtcp.cpp
index 16e9c9fa..4b7dbd25 100644
--- a/src/Rtcp/Rtcp.cpp
+++ b/src/Rtcp/Rtcp.cpp
@@ -236,7 +236,6 @@ public:
     }
 
 private:
-    std::size_t _size;
     std::shared_ptr<RtcpHeader> _rtcp;
 };
 
@@ -604,7 +603,7 @@ std::shared_ptr<RtcpBye> RtcpBye::create(const std::vector<uint32_t> &ssrcs, con
     setupHeader(ptr, RtcpType::RTCP_BYE, ssrcs.size(), bytes);
     setupPadding(ptr, bytes - real_size);
 
-    auto *ssrc_ptr = &(((RtcpBye *) ptr)->ssrc);
+    auto ssrc_ptr = ((RtcpBye *) ptr)->ssrc;
     for (auto ssrc : ssrcs) {
         *ssrc_ptr = htonl(ssrc);
         ++ssrc_ptr;
@@ -623,7 +622,7 @@ std::shared_ptr<RtcpBye> RtcpBye::create(const std::vector<uint32_t> &ssrcs, con
 
 vector<uint32_t *> RtcpBye::getSSRC()  {
     vector<uint32_t *> ret;
-    uint32_t *ssrc_ptr = &ssrc;
+    auto ssrc_ptr = ssrc;
     for (size_t i = 0; i < report_count; ++i) {
         ret.emplace_back(ssrc_ptr);
         ssrc_ptr += 1;
@@ -652,7 +651,7 @@ string RtcpBye::dumpString() const {
 void RtcpBye::net2Host(size_t size) {
     static const size_t kMinSize = sizeof(RtcpHeader);
     CHECK_MIN_SIZE(size, kMinSize);
-    uint32_t *ssrc_ptr = &ssrc;
+    auto ssrc_ptr = ssrc;
     size_t offset = kMinSize;
     size_t i = 0;
     for (; i < report_count && offset + sizeof(ssrc) <= size; ++i) {
diff --git a/src/Rtcp/Rtcp.h b/src/Rtcp/Rtcp.h
index 836699d2..c4055f71 100644
--- a/src/Rtcp/Rtcp.h
+++ b/src/Rtcp/Rtcp.h
@@ -622,7 +622,7 @@ class RtcpBye : public RtcpHeader {
 public:
     friend class RtcpHeader;
     /* 变长，根据count决定有多少个ssrc */
-    uint32_t ssrc;
+    uint32_t ssrc[1];
 
     /** 中间可能有若干个 ssrc **/
 
diff --git a/src/Rtcp/RtcpFCI.cpp b/src/Rtcp/RtcpFCI.cpp
index d0f4fb62..6acb4d3a 100644
--- a/src/Rtcp/RtcpFCI.cpp
+++ b/src/Rtcp/RtcpFCI.cpp
@@ -149,7 +149,7 @@ string FCI_REMB::dumpString() const {
     for (auto &ssrc : ((FCI_REMB *) this)->getSSRC()) {
         printer << ssrc << " ";
     }
-    return printer;
+    return std::move(printer);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/webrtc/RtpExt.cpp b/webrtc/RtpExt.cpp
index a0f47bf1..5ea0192d 100644
--- a/webrtc/RtpExt.cpp
+++ b/webrtc/RtpExt.cpp
@@ -130,7 +130,7 @@ static bool isOneByteExt<RtpExtOneByte>(){
 }
 
 template<typename Type>
-static void appendExt(map<uint8_t, RtpExt> &ret, uint8_t *ptr, const uint8_t *end) {
+void appendExt(map<uint8_t, RtpExt> &ret, uint8_t *ptr, const uint8_t *end) {
     while (ptr < end) {
         auto ext = reinterpret_cast<Type *>(ptr);
         if (ext->getId() == (uint8_t) RtpExtType::padding) {
@@ -191,7 +191,7 @@ map<uint8_t/*id*/, RtpExt/*data*/> RtpExt::getExtValue(const RtpHeader *header)
     XX(encrypt,                     "urn:ietf:params:rtp-hdrext:encrypt")
 
 #define XX(type, url) {RtpExtType::type , url},
-static unordered_map<RtpExtType/*id*/, string/*ext*/> s_type_to_url = {RTP_EXT_MAP(XX)};
+static map<RtpExtType/*id*/, string/*ext*/> s_type_to_url = {RTP_EXT_MAP(XX)};
 #undef XX
 
 
@@ -353,7 +353,7 @@ uint32_t RtpExt::getAbsSendTime() const {
 uint16_t RtpExt::getTransportCCSeq() const {
     CHECK(_type == RtpExtType::transport_cc && size() >= 2);
     uint16_t ret;
-    ret |= (*this)[0] << 8;
+    ret = (*this)[0] << 8;
     ret |= (*this)[1];
     return ret;
 }
diff --git a/webrtc/WebRtcTransport.cpp b/webrtc/WebRtcTransport.cpp
index f2e232d8..38fecd1f 100644
--- a/webrtc/WebRtcTransport.cpp
+++ b/webrtc/WebRtcTransport.cpp
@@ -667,7 +667,7 @@ static void changeRtpExtId(const RtpPacket::Ptr &rtp, const Type &map) {
     auto header = rtp->getHeader();
     auto ext_map = RtpExt::getExtValue(header);
     for (auto &pr : ext_map) {
-        auto it = map.find((Type::key_type) pr.first);
+        auto it = map.find((typename Type::key_type) (pr.first));
         if (it == map.end()) {
             WarnL << "未处理的rtp ext, 类型不识别:" << (int) pr.first;
             pr.second.clearExt();
diff --git a/webrtc/WebRtcTransport.h b/webrtc/WebRtcTransport.h
index 84394534..84fdbde5 100644
--- a/webrtc/WebRtcTransport.h
+++ b/webrtc/WebRtcTransport.h
@@ -226,7 +226,7 @@ private:
     //根据推流端rtcp的ssrc获取相关信息
     unordered_map<uint32_t, RtpPayloadInfo*> _rtp_info_ssrc;
     //发送rtp时需要修改rtp ext id
-    unordered_map<RtpExtType, uint8_t> _rtp_ext_type_to_id;
+    map<RtpExtType, uint8_t> _rtp_ext_type_to_id;
     //接收rtp时需要修改rtp ext id
     unordered_map<uint8_t, RtpExtType> _rtp_ext_id_to_type;
 };