Merge 6119ac9c53 into 6b2fcf7943

src/Record/MP4Muxer.cpp

@@ -247,7 +247,8 @@ bool MP4MuxerMemory::inputFrame(const Frame::Ptr &frame) {
         _key_frame = false;
     }
 
-    if (frame->keyFrame()) {
+    // only audio all frame is key frame
+    if (frame->keyFrame() || !haveVideo()) {
         _key_frame = true;
     }
     if (frame->getTrackType() == TrackVideo || !haveVideo()) {

src/Rtp/GB28181Process.cpp

@@ -105,6 +105,16 @@ bool GB28181Process::inputRtp(bool, const char *data, size_t data_len) {
                 _rtp_decoder[pt] = Factory::getRtpDecoderByCodecId(track->getCodecId());
                 break;
             }
+            case Rtsp::PT_L16_Mono: {
+                //L16
+                ref = std::make_shared<RtpReceiverImp>(16000, [this](RtpPacket::Ptr rtp) { onRtpSorted(std::move(rtp)); });
+                auto track = Factory::getTrackByCodecId(CodecL16, 16000, 1, 16);
+                CHECK(track);
+                track->setIndex(pt);
+                _interface->addTrack(track);
+                _rtp_decoder[pt] = Factory::getRtpDecoderByCodecId(track->getCodecId());
+                break;
+            }
             default: {
                 if (pt == opus_pt) {
                     // opus负载  [AUTO-TRANSLATED:defa6a8d]

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]));
+    memcpy(peer_ip_addr, ptr, sizeof(peer_ip_addr));
-    ptr += sizeof(peer_ip_addr) * sizeof(peer_ip_addr[0]);
+    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]));
+    memcpy(ptr, peer_ip_addr, sizeof(peer_ip_addr));
-    ptr += sizeof(peer_ip_addr) * sizeof(peer_ip_addr[0]);
+    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();