external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Refactor code

Browse source
This commit is contained in:
winlin 2020-04-17 10:42:04 +08:00
parent acc471b0a9
commit 606f8873b3
1 changed files with 31 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

60
trunk/src/app/srs_app_rtc_conn.cpp
View file

@ -951,39 +951,41 @@ srs_error_t SrsRtcSenderThread::send_packets_gso(SrsRtcPackets& packets)
SrsRtpPacket2* next_packet = NULL; SrsRtpPacket2* next_packet = NULL;
int nn_next_packet = 0; int nn_next_packet = 0;
if (i < nn_packets - 1) { if (max_padding > 0) {
next_packet = (i < nn_packets - 1)? packets.at(i + 1):NULL; if (i < nn_packets - 1) {
nn_next_packet = next_packet? next_packet->nb_bytes() : 0; 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;
}
} }
// Reset padding if exceed max. // Padding the packet to next or GSO size.
if (padding > max_padding) { if (next_packet) {
padding = 0; 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) #if defined(SRS_DEBUG)
srs_trace("#%d, Padding %d bytes %d=>%d, packets %d, max_padding %d", packets.debug_id, 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); padding, nn_packet, nn_packet + padding, nn_packets, max_padding);
#endif #endif
packet->set_padding(padding); packet->set_padding(padding);
nn_packet += padding; nn_packet += padding;
packets.nn_paddings++; packets.nn_paddings++;
packets.nn_padding_bytes += padding; packets.nn_padding_bytes += padding;
}
} }
} }
@ -1970,7 +1972,7 @@ srs_error_t SrsUdpMuxSender::cycle()
} }
// Increase total messages. // Increase total messages.
nn_msgs += pos; nn_msgs += pos + gso_iovs;
nn_msgs_max = srs_max(pos, nn_msgs_max); nn_msgs_max = srs_max(pos, nn_msgs_max);
nn_gso_msgs_max = srs_max(gso_pos, nn_gso_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); nn_gso_iovs_max = srs_max(gso_iovs, nn_gso_iovs_max);