vrxtx/rtsp: allow compressed stream passthough

If the input is already compressed, try to pass it further. Initialize
the compression just if receiving uncompressed data.

This is implemented in the same way as it already is in vrxtx/sdp.

refers to GH-433

Author: MartinPulec

src/main.cpp

@@ -1072,16 +1072,10 @@ static int adjust_params(struct ug_options *opt) {
         }
 
         // default values for different RXTX protocols
-        if (strcasecmp(opt->video_protocol, "rtsp") == 0 || strcasecmp(opt->video_protocol, "sdp") == 0) {
-                if (opt->requested_compression == nullptr) {
-                        if (strcasecmp(opt->video_protocol, "rtsp") == 0) {
-                                opt->requested_compression = "lavc:enc=libx264:safe";
-                        } else {
-                                opt->requested_compression = "none"; // will be set later by h264_sdp_video_rxtx::send_frame()
-                        }
-                }
-        } else {
-                if (opt->requested_compression == nullptr) {
+        if (opt->requested_compression == nullptr) {
+                if (strcasecmp(opt->video_protocol, "rtsp") == 0 || strcasecmp(opt->video_protocol, "sdp") == 0) {
+                        opt->requested_compression = "none"; // will be set later by video_rxtx::send_frame()
+                } else {
                         opt->requested_compression = DEFAULT_VIDEO_COMPRESSION;
                 }
         }

src/messaging.cpp

@@ -37,6 +37,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #include "config_unix.h"
@@ -55,6 +56,7 @@
 #include "module.h"
 #include "utils/list.h"
 #include "utils/lock_guard.h"
+#include "utils/macros.h"        // for snprintf_ch
 
 #define MAX_MESSAGES 100
 #define MAX_MESSAGES_FOR_NOT_EXISTING_RECV 10
@@ -402,3 +404,21 @@ struct message *check_message(struct module *mod)
         }
 }
 
+/**
+ * send compress change
+ * @param mod         any module that can reach the root module
+ * @param compression compression to be used
+ */
+void
+send_compess_change(struct module *mod, const char *compression)
+{
+        auto *msg = (struct msg_change_compress_data *) new_message(
+            sizeof(struct msg_change_compress_data));
+        msg->what = CHANGE_COMPRESS;
+        snprintf_ch(msg->config_string, "%s", compression);
+
+        const char *path = "sender.compress";
+        auto       *resp =
+            send_message(get_root_module(mod), path, (struct message *) msg);
+        free_response(resp);
+}

src/messaging.h

@@ -180,6 +180,8 @@ struct message *check_message(struct module *);
 
 void free_message_for_child(void *m, struct response *r);
 
+void send_compess_change(struct module *mod, const char *compression);
+
 #ifdef __cplusplus
 }
 #endif

src/video_rxtx/h264_rtp.cpp

@@ -50,6 +50,7 @@
 #include "debug.h"
 #include "host.h"
 #include "lib_common.h"
+#include "messaging.h"
 #include "rtp/rtp.h"
 #include "rtsp/rtsp_utils.h"  // for rtsp_types_t
 #include "transmit.h"
@@ -61,6 +62,7 @@
 #include "video_rxtx.hpp"
 #include "video_rxtx/h264_rtp.hpp"
 
+constexpr char DEFAULT_RTSP_COMPRESSION[] = "lavc:enc=libx264:safe";
 #define MOD_NAME "[vrxtx/h264_rtp] "
 
 using std::shared_ptr;
@@ -109,6 +111,16 @@ h264_rtp_video_rxtx::configure_rtsp_server_video()
 void
 h264_rtp_video_rxtx::send_frame(shared_ptr<video_frame> tx_frame) noexcept
 {
+        // requestt compress reconfiguration if receivng raw data
+        if (!is_codec_opaque(tx_frame->color_spec)) {
+                if (!m_sent_compress_change) {
+                        send_compess_change(m_common.parent,
+                                            DEFAULT_RTSP_COMPRESSION);
+                        m_sent_compress_change = true;
+                }
+                return;
+        }
+
         if (m_rtsp_server == nullptr) {
                 rtsp_params.video_codec = tx_frame->color_spec;
                 configure_rtsp_server_video();
@@ -117,6 +129,11 @@ h264_rtp_video_rxtx::send_frame(shared_ptr<video_frame> tx_frame) noexcept
                 return;
         }
 
+        if (tx_frame->color_spec != rtsp_params.video_codec) {
+                MSG(ERROR, "Video codec reconfiguration is not supported!\n");
+                return;
+        }
+
         tx_send_std(m_tx, tx_frame.get(), m_network_device);
 
         if ((m_rxtx_mode & MODE_RECEIVER) == 0) { // send RTCP (receiver thread would otherwise do this

src/video_rxtx/h264_rtp.hpp

@@ -72,6 +72,8 @@ class h264_rtp_video_rxtx : public rtp_video_rxtx {
         rtsp_serv_t                  *m_rtsp_server    = nullptr;
         void (*tx_send_std)(struct tx *tx_session, struct video_frame *frame,
                             struct rtp *rtp_session) = nullptr;
+
+        bool m_sent_compress_change = false;
 };
 
 #endif // VIDEO_RXTX_H264_RTP_H_

src/video_rxtx/h264_sdp.cpp

@@ -122,15 +122,7 @@ h264_sdp_video_rxtx::send_frame(shared_ptr<video_frame> tx_frame) noexcept
 		if (m_sent_compress_change) {
 			return;
 		}
-		auto msg = (struct msg_change_compress_data *)
-			new_message(sizeof(struct msg_change_compress_data));
-		msg->what = CHANGE_COMPRESS;
-		strncpy(msg->config_string, DEFAULT_SDP_COMPRESSION, sizeof(msg->config_string) - 1);
-
-		const char *path = "sender.compress";
-                auto *resp = send_message(get_root_module(m_common.parent), path,
-                                         (struct message *) msg);
-		free_response(resp);
+		send_compess_change(m_common.parent, DEFAULT_SDP_COMPRESSION);
 		m_sent_compress_change = true;
 		return;
         }