Merge 90bd28249e into 87277ac91a

src/Common/MediaSink.cpp

@@ -114,12 +114,14 @@ void MediaSink::checkTrackIfReady() {
         }
     }
 
-    // 等待音频超时时间
+    // 等待音频超时时间  [AUTO-TRANSLATED:5ec16b26]
+    // Wait for audio timeout time
     GET_CONFIG(uint32_t, kWaitAudioTrackDataMS, General::kWaitAudioTrackDataMS);
     if (_max_track_size > 1) {
         for (auto it = _track_map.begin(); it != _track_map.end();) {
             if (it->second.first->getTrackType() == TrackAudio && _ticker.elapsedTime() > kWaitAudioTrackDataMS && !it->second.second) {
-                // 音频超时且完全没收到音频数据，忽略音频
+                // 音频超时且完全没收到音频数据，忽略音频  [AUTO-TRANSLATED:0d0fbb13]
+                // Audio timeout and did not receive any audio data, ignore audio
                 auto index = it->second.first->getIndex();
                 WarnL << "Audio track index " << index << " codec " << it->second.first->getCodecName() << " receive no data for long "
                       << _ticker.elapsedTime() << "ms. Ignore it!";

srt/Packet.cpp

@@ -292,8 +292,8 @@ bool HandshakePacket::loadFromData(uint8_t *buf, size_t len) {
     syn_cookie = loadUint32(ptr);
     ptr += 4;
 
-    memcpy(peer_ip_addr, ptr, sizeof(peer_ip_addr) * sizeof(peer_ip_addr[0]));
-    ptr += sizeof(peer_ip_addr) * sizeof(peer_ip_addr[0]);
+    memcpy(peer_ip_addr, ptr, sizeof(peer_ip_addr));
+    ptr += sizeof(peer_ip_addr);
 
     if (encryption_field != NO_ENCRYPTION) {
         ErrorL << "not support encryption " << encryption_field;
@@ -400,8 +400,8 @@ bool HandshakePacket::storeToData() {
     storeUint32(ptr, syn_cookie);
     ptr += 4;
 
-    memcpy(ptr, peer_ip_addr, sizeof(peer_ip_addr) * sizeof(peer_ip_addr[0]));
-    ptr += sizeof(peer_ip_addr) * sizeof(peer_ip_addr[0]);
+    memcpy(ptr, peer_ip_addr, sizeof(peer_ip_addr));
+    ptr += sizeof(peer_ip_addr);
 
     if (encryption_field != NO_ENCRYPTION) {
         ErrorL << "not support encryption " << encryption_field;
@@ -433,7 +433,7 @@ uint32_t HandshakePacket::getSynCookie(uint8_t *buf, size_t len) {
 }
 
 void HandshakePacket::assignPeerIP(struct sockaddr_storage *addr) {
-    memset(peer_ip_addr, 0, sizeof(peer_ip_addr) * sizeof(peer_ip_addr[0]));
+    memset(peer_ip_addr, 0, sizeof(peer_ip_addr));
     if (addr->ss_family == AF_INET) {
         struct sockaddr_in *ipv4 = (struct sockaddr_in *)addr;
         // 抓包 奇怪好像是小头端？？？  [AUTO-TRANSLATED:40eb164c]
@@ -446,7 +446,7 @@ void HandshakePacket::assignPeerIP(struct sockaddr_storage *addr) {
             storeUint32LE(peer_ip_addr, addr4.s_addr);
         } else {
             const sockaddr_in6 *ipv6 = (struct sockaddr_in6 *)addr;
-            memcpy(peer_ip_addr, ipv6->sin6_addr.s6_addr, sizeof(peer_ip_addr) * sizeof(peer_ip_addr[0]));
+            memcpy(peer_ip_addr, ipv6->sin6_addr.s6_addr, sizeof(peer_ip_addr));
         }
     }
 }

srt/SrtTransport.cpp

@@ -206,7 +206,7 @@ void SrtTransport::handleHandshakeInduction(HandshakePacket &pkt, struct sockadd
     res->srt_socket_id = _peer_socket_id;
     res->syn_cookie = HandshakePacket::generateSynCookie(addr, _start_timestamp);
     _sync_cookie = res->syn_cookie;
-    memcpy(res->peer_ip_addr, pkt.peer_ip_addr, sizeof(pkt.peer_ip_addr) * sizeof(pkt.peer_ip_addr[0]));
+    memcpy(res->peer_ip_addr, pkt.peer_ip_addr, sizeof(pkt.peer_ip_addr));
     _handleshake_res = res;
     res->storeToData();