From 606f8873b322c9f3e18c0c5cbe4ecd612555ebc0 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Fri, 17 Apr 2020 10:42:04 +0800
Subject: [PATCH] Refactor code

---
 trunk/src/app/srs_app_rtc_conn.cpp | 60 +++++++++++++++---------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp
index 5b802684a..239909c59 100644
--- a/trunk/src/app/srs_app_rtc_conn.cpp
+++ b/trunk/src/app/srs_app_rtc_conn.cpp
@@ -951,39 +951,41 @@ srs_error_t SrsRtcSenderThread::send_packets_gso(SrsRtcPackets& packets)
 
         SrsRtpPacket2* next_packet = NULL;
         int nn_next_packet = 0;
-        if (i < nn_packets - 1) {
-            next_packet = (i < nn_packets - 1)? packets.at(i + 1):NULL;
-            nn_next_packet = next_packet? next_packet->nb_bytes() : 0;
-        }
-
-        // Padding the packet to next or GSO size.
-        if (max_padding > 0 && next_packet) {
-            if (!using_gso) {
-                // Padding to the next packet to merge with it.
-                if (nn_next_packet > nn_packet) {
-                    padding = nn_next_packet - nn_packet;
-                }
-            } else {
-                // Padding to GSO size for next one to merge with us.
-                if (nn_next_packet < gso_size) {
-                    padding = gso_size - nn_packet;
-                }
+        if (max_padding > 0) {
+            if (i < nn_packets - 1) {
+                next_packet = (i < nn_packets - 1)? packets.at(i + 1):NULL;
+                nn_next_packet = next_packet? next_packet->nb_bytes() : 0;
             }
 
-            // Reset padding if exceed max.
-            if (padding > max_padding) {
-                padding = 0;
-            }
+            // Padding the packet to next or GSO size.
+            if (next_packet) {
+                if (!using_gso) {
+                    // Padding to the next packet to merge with it.
+                    if (nn_next_packet > nn_packet) {
+                        padding = nn_next_packet - nn_packet;
+                    }
+                } else {
+                    // Padding to GSO size for next one to merge with us.
+                    if (nn_next_packet < gso_size) {
+                        padding = gso_size - nn_packet;
+                    }
+                }
 
-            if (padding > 0) {
+                // Reset padding if exceed max.
+                if (padding > max_padding) {
+                    padding = 0;
+                }
+
+                if (padding > 0) {
 #if defined(SRS_DEBUG)
-                srs_trace("#%d, Padding %d bytes %d=>%d, packets %d, max_padding %d", packets.debug_id,
-                    padding, nn_packet, nn_packet + padding, nn_packets, max_padding);
+                    srs_trace("#%d, Padding %d bytes %d=>%d, packets %d, max_padding %d", packets.debug_id,
+                        padding, nn_packet, nn_packet + padding, nn_packets, max_padding);
 #endif
-                packet->set_padding(padding);
-                nn_packet += padding;
-                packets.nn_paddings++;
-                packets.nn_padding_bytes += padding;
+                    packet->set_padding(padding);
+                    nn_packet += padding;
+                    packets.nn_paddings++;
+                    packets.nn_padding_bytes += padding;
+                }
             }
         }
 
@@ -1970,7 +1972,7 @@ srs_error_t SrsUdpMuxSender::cycle()
         }
 
         // Increase total messages.
-        nn_msgs += pos;
+        nn_msgs += pos + gso_iovs;
         nn_msgs_max = srs_max(pos, nn_msgs_max);
         nn_gso_msgs_max = srs_max(gso_pos, nn_gso_msgs_max);
         nn_gso_iovs_max = srs_max(gso_iovs, nn_gso_iovs_max);