From ea1fa03f139102aac8c4b9190fbb53874f735c1e Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Thu, 7 Oct 2021 13:07:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dtwcc=20fci=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Rtcp/RtcpFCI.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Rtcp/RtcpFCI.cpp b/src/Rtcp/RtcpFCI.cpp
index e03b1043..a5143e6a 100644
--- a/src/Rtcp/RtcpFCI.cpp
+++ b/src/Rtcp/RtcpFCI.cpp
@@ -291,7 +291,7 @@ public:
 } PACKED;
 
 StatusVecChunk::StatusVecChunk(bool symbol_bit, const vector<SymbolStatus> &status) {
-    CHECK((1 + symbol_bit) * status.size() <= 14);
+    CHECK( status.size() << symbol_bit <= 14);
     uint16_t value = 0;
     type = 1;
     symbol = symbol_bit;
@@ -501,14 +501,14 @@ string FCI_TWCC::create(uint32_t ref_time, uint8_t fb_pkt_count, TwccPacketStatu
             auto symbol = status.begin()->second.first;
             int16_t count = 0;
             for (auto &pr : status) {
-                if (++count == (0xFFFF >> 3)) {
-                    //RunLengthChunk 13个bit表明rtp个数，最多可以表述0xFFFF >> 3个rtp状态
-                    break;
-                }
                 if (pr.second.first != symbol) {
                     //状态发送变更了，本chunk结束
                     break;
                 }
+                if (++count >= (0xFFFF >> 3)) {
+                    //RunLengthChunk 13个bit表明rtp个数，最多可以表述0xFFFF >> 3个rtp状态
+                    break;
+                }
             }
             if (count >= 7) {
                 //连续状态相同个数大于6个时，使用RunLengthChunk模式比较节省带宽
@@ -523,7 +523,6 @@ string FCI_TWCC::create(uint32_t ref_time, uint8_t fb_pkt_count, TwccPacketStatu
             //StatusVecChunk模式
             //symbol_list中元素是1个bit
             auto symbol = 0;
-            int count = 0;
             vector<SymbolStatus> vec;
             for (auto &pr : status) {
                 vec.push_back(pr.second.first);
@@ -531,15 +530,17 @@ string FCI_TWCC::create(uint32_t ref_time, uint8_t fb_pkt_count, TwccPacketStatu
                     //symbol_list中元素是2个bit
                     symbol = 1;
                 }
-                if ((1 + symbol) * (++count) == 14) {
+
+                if (vec.size() << symbol >= 14) {
                     //symbol为0时，最多存放14个rtp的状态
                     //symbol为1时，最多存放7个rtp的状态
                     break;
                 }
             }
+            vec.resize(MIN(vec.size(), 14 >> symbol));
             StatusVecChunk chunk(symbol, vec);
             fci.append((char *)&chunk, StatusVecChunk::kSize);
-            appendDeltaString(delta_str, status, count);
+            appendDeltaString(delta_str, status, vec.size());
         }
     }