Adapt RTSP library to provide TCP transport with interleaved RTP

packets, correct behavior of the CSS class used to hide popup checkboxes

Author: wberube

res/index.html

@@ -93,7 +93,7 @@
 		.right { float: right; }
 		.inline { display: inline-block; }
 		.nope { display: none; }
-		.hide { position: absolute; top: -3px; left: -3px; width: 1px; height: 1px; }
+		.hide { position: absolute; width: 1px; height: 1px; padding: 0; margin: -1px; overflow: hidden; clip: rect(0, 0, 0, 0); clip-path: inset(50%); white-space: nowrap; border: 0; }
 		.pill { border-radius: 9999px; }
 		.rounded { border-radius: 4px; }
 		.scrollx { overflow-x: auto; padding-bottom: .5em; }

src/main.c

@@ -96,6 +96,7 @@ int main(int argc, char *argv[]) {
         record_start();
 
     while (keepRunning) {
+        if (app_config.rtsp_enable) rtsp_tick(rtspHandle);
         watchdog_reset();
         sleep(1);
     }

src/media.c

@@ -97,9 +97,7 @@ int save_video_stream(char index, hal_vidstream *stream) {
                 send_h26x_to_client(index, stream);
             }
             if (app_config.rtsp_enable)
-                for (int i = 0; i < stream->count; i++)
-                    rtp_send_h26x(rtspHandle, stream->pack[i].data + stream->pack[i].offset, 
-                        stream->pack[i].length - stream->pack[i].offset, isH265);
+                rtp_send_h26x(rtspHandle, stream, isH265);
 
             if (app_config.stream_enable) {
                 for (int i = 0; i < stream->count; i++) {

src/rtsp/rtcp.h

@@ -7,6 +7,7 @@
 #include "rfc.h"
 #include "rtsp.h"
 #include "common.h"
+
 /******************************************************************************
  *              DECLARATIONS
  ******************************************************************************/
@@ -20,8 +21,7 @@ static inline int __rtcp_send_sr(struct connection_item_t *con, int track_id);
 static inline int __rtcp_send_sr(struct connection_item_t *con, int track_id)
 {
     struct timeval tv;
-    unsigned int ts_h; 
-    unsigned int ts_l; 
+    unsigned int ts_h, ts_l;
     int send_bytes;
     struct sockaddr_in to_addr;
     transport_t *t;
@@ -36,21 +36,55 @@ static inline int __rtcp_send_sr(struct connection_item_t *con, int track_id)
     ts_h = (unsigned int)tv.tv_sec + 2208988800U;
     ts_l = (((double)tv.tv_usec) / 1e6) * 4294967296.0;
 
-    rtcp_t rtcp = { common: {version: 2, length: htons(6), p:0, count: 0, pt:RTCP_SR},
+    rtcp_t rtcp = { common: {version: 2, length: htons(8), p:0, count: 0, pt:RTCP_SR},
         r: { sr: { ssrc: htonl(con->ssrc),
             ntp_sec: htonl(ts_h),
             ntp_frac: htonl(ts_l),
             rtp_ts: htonl(t->rtp_timestamp),
             psent: htonl(t->rtcp_packet_cnt),
             osent: htonl(t->rtcp_octet)}}};
 
-    to_addr = con->addr;
-    to_addr.sin_port = t->client_port_rtcp;
+    if (t->is_tcp) {
+        unsigned char head[4];
+        head[0] = '$';
+        head[1] = t->channel_rtcp;
+        head[2] = 0;
+        head[3] = 36;
+
+        pthread_mutex_lock(&con->write_mutex);
+        int sent_h = 0;
+        while (sent_h < 4) {
+            int r = send(con->client_fd, head + sent_h, 4 - sent_h, 0);
+            if (r > 0) sent_h += r;
+            else if (r < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) usleep(1000);
+            else { sent_h = -1; break; }
+        }
+        if (sent_h == 4) {
+            int sent_b = 0;
+            while (sent_b < 36) {
+                int r = send(con->client_fd, (char*)&(rtcp) + sent_b, 36 - sent_b, 0);
+                if (r > 0) sent_b += r;
+                else if (r < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) usleep(1000);
+                else { sent_b = -1; break; }
+            }
+            send_bytes = sent_b;
+        } else {
+            send_bytes = -1;
+        }
+        pthread_mutex_unlock(&con->write_mutex);
+
+        ASSERT(send_bytes == 36, ({
+            ERR("send (interleaved):%d:%s\n", send_bytes, strerror(errno));
+            return FAILURE;}));
+    } else {
+        to_addr = con->addr;
+        to_addr.sin_port = htons(t->client_port_rtcp);
 
-    ASSERT((send_bytes = send(t->server_rtcp_fd,
-        &(rtcp),36,0)) == 36, ({
-                ERR("send:%d:%s¥n",send_bytes,strerror(errno));
-                return FAILURE;}));
+        ASSERT((send_bytes = send(t->server_rtcp_fd,
+            &(rtcp), 36, 0)) == 36, ({
+                    ERR("send:%d:%s\n", send_bytes, strerror(errno));
+                    return FAILURE;}));
+    }
 
     t->rtcp_packet_cnt = 0;
     t->rtcp_octet = 0;
@@ -59,4 +93,4 @@ static inline int __rtcp_send_sr(struct connection_item_t *con, int track_id)
     return SUCCESS;
 }
 
-#endif
+#endif

src/rtsp/rtp.c

@@ -32,6 +32,7 @@ static inline int __retrieve_sprop(rtsp_handle h, unsigned char *buf, size_t len
 struct __transfer_set_t {
     struct list_head_t list_head;
     rtsp_handle h;
+    int track_id;
 };
 
 /******************************************************************************
@@ -158,12 +159,11 @@ static inline int __rtp_send_eachconnection(struct list_t *e, void *v)
     struct transfer_item_t *trans;
     struct nal_rtp_t *rtp = v;
     int track_id = rtp->packet.header.pt == 96 ? 0 : 1;
-    char attempts = 0;
 
     list_upcast(trans,e); 
 
     MUST(con = trans->con, return FAILURE);
-    if (!con->trans[track_id].server_port_rtp) return SUCCESS;
+    if (!con->trans[track_id].server_port_rtp && !con->trans[track_id].is_tcp) return SUCCESS;
 
     rtp->packet.header.seq = htons(con->trans[track_id].rtp_seq);
     if (rtp->packet.header.m)
@@ -172,21 +172,58 @@ static inline int __rtp_send_eachconnection(struct list_t *e, void *v)
     rtp->packet.header.ssrc = htonl(con->ssrc);
     con->trans[track_id].rtp_seq += 1;
 
-    do  {
-        send_bytes = send(con->trans[track_id].server_rtp_fd,
-            &(rtp->packet),rtp->rtpsize,0);
+    if (con->trans[track_id].is_tcp) {
+        unsigned char head[4];
+        head[0] = '$';
+        head[1] = con->trans[track_id].channel_rtp;
+        head[2] = (rtp->rtpsize >> 8) & 0xFF;
+        head[3] = rtp->rtpsize & 0xFF;
+
+        pthread_mutex_lock(&con->write_mutex);
+        int sent_h = 0;
+        while (sent_h < 4) {
+            int r = send(con->client_fd, head + sent_h, 4 - sent_h, 0);
+            if (r > 0) sent_h += r;
+            else if (r < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) usleep(1000);
+            else { sent_h = -1; break; }
+        }
+        if (sent_h == 4) {
+            int sent_b = 0;
+            while (sent_b < rtp->rtpsize) {
+                int r = send(con->client_fd, (char*)&(rtp->packet) + sent_b, rtp->rtpsize - sent_b, 0);
+                if (r > 0) sent_b += r;
+                else if (r < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) usleep(1000);
+                else { sent_b = -1; break; }
+            }
+            send_bytes = sent_b;
+        } else {
+            send_bytes = -1;
+        }
+        pthread_mutex_unlock(&con->write_mutex);
 
         if (send_bytes == rtp->rtpsize) {
             con->trans[track_id].rtcp_packet_cnt += 1;
             con->trans[track_id].rtcp_octet += rtp->rtpsize;
             return SUCCESS;
-        } else if(con->con_state != __CON_S_PLAYING) {
-            DBG("connection state changed before send\n");
-            return SUCCESS;
-        } else
-            usleep(5000);
-    } while (++attempts < 10 && 
-        send_bytes == -1 && (errno == EAGAIN || errno == EWOULDBLOCK));
+        }
+    } else {
+        char attempts = 0;
+        do  {
+            send_bytes = send(con->trans[track_id].server_rtp_fd,
+                &(rtp->packet),rtp->rtpsize,0);
+
+            if (send_bytes == rtp->rtpsize) {
+                con->trans[track_id].rtcp_packet_cnt += 1;
+                con->trans[track_id].rtcp_octet += rtp->rtpsize;
+                return SUCCESS;
+            } else if(con->con_state != __CON_S_PLAYING) {
+                DBG("connection state changed before send\n");
+                return SUCCESS;
+            } else
+                usleep(5000);
+        } while (++attempts < 10 && 
+            send_bytes == -1 && (errno == EAGAIN || errno == EWOULDBLOCK));
+    }
 
     ERR("send:%d:%s\n", send_bytes, strerror(errno));
     return FAILURE;
@@ -214,7 +251,7 @@ static inline int __rtp_setup_transfer(struct list_t *e, void *v)
     if (con->con_state == __CON_S_PLAYING) {
 
         ASSERT(bufpool_get_free(trans_set->h->transfer_pool, &trans) == SUCCESS, ({
-            ERR("transfer object resouce starvation detected. possibly connection limits are wrongfully setup\n");
+            ERR("transfer object resource starvation detected. possibly connection limits are wrongfully setup\n");
             goto error;}));
 
         MUST(bufpool_attach(con->pool, con) == SUCCESS,
@@ -227,8 +264,8 @@ static inline int __rtp_setup_transfer(struct list_t *e, void *v)
 
         timestamp_offset = trans_set->h->stat.ts_offset;
 
-        con->trans[con->track_id].rtp_timestamp = 
-            ((unsigned int)con->trans[con->track_id].rtp_timestamp + timestamp_offset);
+        con->trans[trans_set->track_id].rtp_timestamp = 
+            ((unsigned int)con->trans[trans_set->track_id].rtp_timestamp + timestamp_offset);
     }
 
     ret = SUCCESS;
@@ -278,8 +315,8 @@ static inline int __retrieve_sprop(rtsp_handle h, unsigned char *buf, size_t len
         single_len = 0;
 
         while (__split_nal(buf, &nalptr, &single_len, len) == SUCCESS) {
-            if ((!(h->isH265) && nalptr[0] & 0x1F == H264_NAL_TYPE_SPS) ||
-                (h->isH265 && nalptr[0] >> 1 & 0x3F == H265_NAL_TYPE_SPS)) {
+            if ((!(h->isH265) && (nalptr[0] & 0x1F) == H264_NAL_TYPE_SPS) ||
+                (h->isH265 && (nalptr[0] >> 1 & 0x3F) == H265_NAL_TYPE_SPS)) {
                 ASSERT(base64 = mime_base64_create((char *)&(nalptr[0]), single_len), return FAILURE);
                 ASSERT(base16 = mime_base16_create((char *)&(nalptr[1]), 3), return FAILURE);
 
@@ -314,8 +351,8 @@ static inline int __retrieve_sprop(rtsp_handle h, unsigned char *buf, size_t len
         nalptr = buf;
         single_len = 0;
         while (__split_nal(buf, &nalptr, &single_len, len) == SUCCESS) {
-            if ((!(h->isH265) && nalptr[0] & 0x1F == H264_NAL_TYPE_PPS) ||
-                (h->isH265 && nalptr[0] >> 1 & 0x3F == H265_NAL_TYPE_PPS)) {
+            if ((!(h->isH265) && (nalptr[0] & 0x1F) == H264_NAL_TYPE_PPS) ||
+                (h->isH265 && (nalptr[0] >> 1 & 0x3F) == H265_NAL_TYPE_PPS)) {
                 ASSERT(single_len >= 4, return FAILURE);
                 ASSERT(base64 = mime_base64_create((char *)&(nalptr[0]), single_len), return FAILURE);
 
@@ -369,10 +406,8 @@ void rtp_disable_audio(rtsp_handle h)
     h->audioPt = 255;
 }
 
-int rtp_send_h26x(rtsp_handle h, unsigned char *buf, size_t len, char isH265)
+int rtp_send_h26x(rtsp_handle h, hal_vidstream *stream, char isH265)
 {
-    unsigned char *nalptr = buf;
-    size_t single_len = 0;
     int ret = FAILURE;
     int track_id = 0;
     struct __transfer_set_t trans = {};
@@ -389,16 +424,24 @@ int rtp_send_h26x(rtsp_handle h, unsigned char *buf, size_t len, char isH265)
 
     h->isH265 = isH265;
 
-    ASSERT(__retrieve_sprop(h, buf, len) == SUCCESS, goto error);
+    for (int i = 0; i < stream->count; i++) {
+        ASSERT(__retrieve_sprop(h, stream->pack[i].data + stream->pack[i].offset, 
+            stream->pack[i].length - stream->pack[i].offset) == SUCCESS, goto error);
+    }
 
     trans.h = h;
+    trans.track_id = track_id;
 
-    /* setup transmission objecl t*/
-    ASSERT(list_map_inline(&h->con_list, (__rtp_setup_transfer), &trans) == SUCCESS, goto error);
+    /* setup transmission object */
+    rtsp_lock(h);
+    ASSERT(list_map_inline(&h->con_list, (__rtp_setup_transfer), &trans) == SUCCESS, ({rtsp_unlock(h); goto error;}));
+    rtsp_unlock(h);
 
     if (trans.list_head.list) {
-        while (__split_nal(buf, &nalptr, &single_len, len) == SUCCESS) {
-            ASSERT(__transfer_nal_h26x(&(trans.list_head), nalptr, single_len, h->isH265) == SUCCESS, goto error);
+        for (int i = 0; i < stream->count; i++) {
+            ASSERT(__transfer_nal_h26x(&(trans.list_head), 
+                stream->pack[i].data + stream->pack[i].offset, 
+                stream->pack[i].length - stream->pack[i].offset, h->isH265) == SUCCESS, goto error);
         }
         ASSERT(list_map_inline(&(trans.list_head), (__rtcp_poll), &track_id) == SUCCESS, goto error);
     } 
@@ -430,9 +473,12 @@ int rtp_send_mp3(rtsp_handle h, unsigned char *buf, size_t len)
     h->audioPt = 14;
 
     trans.h = h;
+    trans.track_id = track_id;
 
-    /* setup transmission objecl t*/
-    ASSERT(list_map_inline(&h->con_list, (__rtp_setup_transfer), &trans) == SUCCESS, goto error);
+    /* setup transmission object */
+    rtsp_lock(h);
+    ASSERT(list_map_inline(&h->con_list, (__rtp_setup_transfer), &trans) == SUCCESS, ({rtsp_unlock(h); goto error;}));
+    rtsp_unlock(h);
 
     if (trans.list_head.list) {
         ASSERT(__transfer_nal_mpga(&(trans.list_head), buf, len) == SUCCESS, goto error);
@@ -445,4 +491,4 @@ int rtp_send_mp3(rtsp_handle h, unsigned char *buf, size_t len)
     list_destroy(&(trans.list_head));
 
     return ret;
-}
+}