rtp_rxtx_common: hide member "used"

Author: MartinPulec

src/video_rxtx/h264_rtp.cpp

@@ -128,7 +128,7 @@ h264_rtp_video_rxtx::configure_rtsp_server_video()
 void
 h264_rtp_video_rxtx::send_frame(shared_ptr<video_frame> tx_frame) noexcept
 {
-        rtp_process_sender_messages(m_rtp_common);
+        rtp_rxtx_sender_do_housekeeping(m_rtp_common);
         // requestt compress reconfiguration if receivng raw data
         if (!is_codec_opaque(tx_frame->color_spec)) {
                 if (!m_sent_compress_change) {

src/video_rxtx/h264_sdp.cpp

@@ -61,6 +61,7 @@
 #include "utils/sdp.h"
 #include "video_codec.h"         // for is_codec_opaque
 #include "video_rxtx.h"
+#include "video_rxtx/rtp.hpp"
 
 #define DEFAULT_SDP_COMPRESSION "lavc:codec=MJPG:safe"
 #define MOD_NAME "[vrxtx/sdp] "
@@ -127,7 +128,7 @@ void h264_sdp_video_rxtx::sdp_add_video(codec_t codec)
 void
 h264_sdp_video_rxtx::send_frame(shared_ptr<video_frame> tx_frame) noexcept
 {
-        rtp_process_sender_messages(m_rtp_common);
+        rtp_rxtx_sender_do_housekeeping(m_rtp_common);
         if (!is_codec_opaque(tx_frame->color_spec)) {
 		if (m_sent_compress_change) {
 			return;

src/video_rxtx/rtp.cpp

@@ -87,6 +87,8 @@ struct rtp_rxtx_common_priv_state {
         /// message and also the send/receive handling is not entirely
         /// symetric).
         struct module m_rtp_sender_mod;
+
+        bool used;
 };
 
 static struct rtp *initialize_network(const char *addr, int recv_port,
@@ -166,7 +168,7 @@ rtp_process_sender_message(struct rtp_rxtx_common *s, struct msg_sender *msg)
 
                         // Exit only if we failed because of command line
                         // params, not control port msg
-                        if (s->used) {
+                        if (s->priv->used) {
                                 exit_uv(rc);
                         }
 
@@ -210,8 +212,10 @@ rtp_process_sender_message(struct rtp_rxtx_common *s, struct msg_sender *msg)
         return new_response(RESPONSE_OK, nullptr);
 }
 
-void rtp_process_sender_messages(struct rtp_rxtx_common *s)
+void rtp_rxtx_sender_do_housekeeping(struct rtp_rxtx_common *s)
 {
+        s->priv->used = true;
+
         struct message *msg_external = nullptr;
         while ((msg_external = check_message(&s->priv->m_rtp_sender_mod)) !=
                nullptr) {
@@ -266,7 +270,7 @@ struct rtp_rxtx_common *rtp_rxtx_common_init(const struct vrxtx_params *params,
         // The idea of doing that is to display help on '-f ldgm:help' even if UG would exit
         // immediately. The encoder is actually created by a message.
         // Also for `-x sdp:help` the message will get discarded and the warning that message quie
-        rtp_process_sender_messages(s);
+        rtp_rxtx_sender_do_housekeeping(s);
 
         return s;
 }

src/video_rxtx/rtp.hpp

@@ -59,15 +59,14 @@ struct rtp_rxtx_common {
         struct pdb     *participants;
         struct fec     *fec_state;
         int             rxtx_mode;
-        bool            used; ///< at least one frame was sent
         struct rtp_rxtx_common_priv_state *priv;
 };
 
 struct rtp_rxtx_common *rtp_rxtx_common_init(const struct vrxtx_params *params,
                        const struct common_opts  *common);
 void                    rtp_rxtx_common_done(struct rtp_rxtx_common *state);
 
-void rtp_process_sender_messages(struct rtp_rxtx_common *s);
+void rtp_rxtx_sender_do_housekeeping(struct rtp_rxtx_common *s);
 void rtp_rxtx_set_pbuf_delay(struct rtp_rxtx_common *s, double delay);
 
 

src/video_rxtx/ultragrid_rtp.cpp

@@ -127,8 +127,7 @@ void *ultragrid_rtp_video_rxtx::receiver_thread(void *arg) {
 void
 ultragrid_rtp_video_rxtx::send_frame(shared_ptr<video_frame> tx_frame) noexcept
 {
-        rtp_process_sender_messages(m_rtp_common);
-        m_rtp_common->used = true;
+        rtp_rxtx_sender_do_housekeeping(m_rtp_common);
         if (m_rtp_common->fec_state != nullptr) {
                 tx_frame = m_rtp_common->fec_state->encode(tx_frame);
         }