rtsp server: support for sending H.265

Author: MartinPulec

src/transmit.cpp

@@ -1177,6 +1177,74 @@ void tx_send_h264(struct tx *tx, struct video_frame *frame,
         }
 }
 
+void tx_send_h265(struct tx *tx, struct video_frame *frame,
+		struct rtp *rtp_session) {
+        assert(frame->tile_count == 1);
+        assert(!frame->fragment);
+        const uint32_t ts   = get_std_video_local_mediatime();
+        struct tile   *tile = &frame->tiles[0];
+
+        const char pt = PT_DynRTP_Type96;
+        // assume IPv6 (we don't know a priori)
+        unsigned maxPacketSize = tx->mtu - get_tx_hdr_len(true);
+
+        const unsigned char       *endptr = nullptr;
+        const unsigned char       *nal    = (uint8_t *) tile->data;
+        const unsigned char *const end    = nal + tile->data_len;
+
+        while ((nal = rtpenc_get_next_nal(nal, end - nal, &endptr))) {
+                unsigned int nalsize = endptr - nal;
+
+                if (nalsize <= maxPacketSize) { // single NALU packet
+                        char *payload = const_cast<char *>(
+                            reinterpret_cast<const char *>(nal));
+                        if (rtp_send_data_hdr(rtp_session, ts, pt, 1 /* m */, 0,
+                                              nullptr, (char *) nullptr, 0,
+                                              payload, (int) nalsize, nullptr,
+                                              0, 0) < 0) {
+                                error_msg("There was a problem sending the RTP "
+                                          "packet\n");
+                        }
+                } else { // fragment
+                        uint8_t hdr[3];
+                        hdr[0] = (nal[0] & 0x81) | NAL_RTP_HEVC_FU << 1;
+                        hdr[1] = nal[1];
+                        hdr[2] =
+                            1 << 7 | (nal[0] >> 1 & 0x3F); // s=1,e=1+FU type
+                        nal += 2;
+                        nalsize -= 2;
+                        while (nalsize > 0) {
+                                unsigned size = nalsize;
+                                int      m    = 0;
+                                if (nalsize <= maxPacketSize) { // last packet
+                                        m = 1;
+                                        hdr[2] &= 0x40; // set end bit
+                                } else {
+                                        size = maxPacketSize;
+                                }
+                                char *payload = const_cast<char *>(
+                                    reinterpret_cast<const char *>(nal));
+                                if (rtp_send_data_hdr(
+                                        rtp_session, ts, pt, m, 0, nullptr,
+                                        (char *) hdr, sizeof hdr,
+                                        (char *) payload, (int) size, nullptr,
+                                        0, 0) < 0) {
+                                        error_msg("There was a problem sending "
+                                                  "the RTP "
+                                                  "packet\n");
+                                }
+                                hdr[2] &= 0x7F; // clear start bit
+                                nal += size;
+                                nalsize -= size;
+                        }
+                }
+        }
+
+        if (endptr != end) {
+                error_msg("No NAL found!\n");
+        }
+}
+
 void tx_send_jpeg(struct tx *tx, struct video_frame *frame,
                struct rtp *rtp_session) {
         uint32_t ts = 0;

src/transmit.h

@@ -80,6 +80,7 @@ void             format_video_header(struct video_frame *frame, int tile_idx, in
                 uint32_t *hdr);
 
 void tx_send_h264(struct tx *tx_session, struct video_frame *frame, struct rtp *rtp_session);
+void tx_send_h265(struct tx *tx_session, struct video_frame *frame, struct rtp *rtp_session);
 void tx_send_jpeg(struct tx *tx_session, struct video_frame *frame, struct rtp *rtp_session);
 
 /**

src/utils/sdp.c

@@ -312,8 +312,9 @@ get_video_rtp_pt_rtpmap(codec_t codec, char rtpmapLine[STR_LEN])
             rtpmap_codec = "JPEG";
             break;
     case H264:
+    case H265:
             pt           = PT_DynRTP_Type96;
-            rtpmap_codec = "H264";
+            rtpmap_codec = codec == H264 ? "H264" : "H265";
             break;
     default:
             return -2;

src/video_rxtx/h264_rtp.cpp

@@ -87,13 +87,19 @@ void
 h264_rtp_video_rxtx::configure_rtsp_server_video()
 {
         assert((rtsp_params.avType & rtsp_type_video) != 0);
-        if (rtsp_params.video_codec == H264) {
+        switch (rtsp_params.video_codec) {
+        case H264:
                 tx_send_std = tx_send_h264;
-        } else if (rtsp_params.video_codec == JPEG) {
+                break;
+        case H265:
+                tx_send_std = tx_send_h265;
+                break;
+        case JPEG:
                 tx_send_std = tx_send_jpeg;
-        } else {
+                break;
+        default:
                 MSG(ERROR,
-                    "codecs other than H.264 and JPEG currently not "
+                    "codecs other than H.264/H.265 and JPEG currently not "
                     "supported, got %s\n",
                     get_codec_name(rtsp_params.video_codec));
                 return;