ultragrid_rtp get_ssrc simplified

Author: MartinPulec

src/hd-rum-translator/hd-rum-recompress.cpp

@@ -53,7 +53,6 @@
 #include "debug.h"
 #include "host.h"
 #include "utils/misc.h"
-#include "rtp/rtp.h"
 #include "tv.h"
 #include "video_compress.h"
 
@@ -149,13 +148,10 @@ static void recompress_port_write(recompress_output_port& port, shared_ptr<video
         double seconds = chrono::duration_cast<chrono::duration<double>>(now - port.t0).count();
         if(seconds > 5) {
                 double fps = port.frames / seconds;
-                auto  *urxtx = static_cast<ultragrid_rtp_video_rxtx *>(
-                    port.video_rxtx->m_impl_state);
-                assert(urxtx != nullptr);
                 log_msg(LOG_LEVEL_INFO, "[0x%08" PRIx32 "->%s:%d:0x%08" PRIx32 "] %d frames in %g seconds = %g FPS\n",
                                 frame->ssrc,
                                 port.host.c_str(), port.tx_port,
-                                urxtx->get_ssrc(),
+                                ultragrid_rtp_get_ssrc(port.video_rxtx->m_impl_state),
                                 port.frames, seconds, fps);
                 port.t0 = now;
                 port.frames = 0;
@@ -263,10 +259,8 @@ uint32_t recompress_get_port_ssrc(struct state_recompress *s, int idx){
         auto [compress_cfg, i] = s->index_to_port[idx];
 
         std::lock_guard<std::mutex> work_lock(s->workers[compress_cfg].ports_mut);
-        auto *urxtx = static_cast<ultragrid_rtp_video_rxtx *>(
-                   s->workers[compress_cfg].ports[i].video_rxtx->m_impl_state);
-        assert(urxtx != nullptr);
-        return urxtx->get_ssrc();
+        return ultragrid_rtp_get_ssrc(
+            s->workers[compress_cfg].ports[i].video_rxtx->m_impl_state);
 }
 
 void recompress_port_set_active(struct state_recompress *s,

src/video_rxtx/ultragrid_rtp.cpp

@@ -418,9 +418,13 @@ void *ultragrid_rtp_video_rxtx::receiver_loop()
         return 0;
 }
 
-uint32_t ultragrid_rtp_video_rxtx::get_ssrc()
+uint32_t
+ultragrid_rtp_get_ssrc(void *state)
 {
-        return rtp_my_ssrc(m_network_device);
+        auto *s = static_cast<ultragrid_rtp_video_rxtx *>(state);
+        assert(s != nullptr);
+        assert(s->magic == MAGIC);
+        return rtp_my_ssrc(s->m_network_device);
 }
 
 static void *

src/video_rxtx/ultragrid_rtp.hpp

@@ -67,7 +67,6 @@ class ultragrid_rtp_video_rxtx : public rtp_video_rxtx {
         virtual void send_frame(std::shared_ptr<video_frame>) noexcept;
         void join();
         static void *receiver_thread(void *arg);
-        uint32_t get_ssrc();
 
         // transcoder functions
         friend ssize_t hd_rum_decompress_write(void *state, void *buf, size_t count);
@@ -110,7 +109,11 @@ class ultragrid_rtp_video_rxtx : public rtp_video_rxtx {
 
         bool m_should_exit = false;
         static void should_exit(void *state);
+
+        friend uint32_t ultragrid_rtp_get_ssrc(void *state);
 };
 
+uint32_t ultragrid_rtp_get_ssrc(void *state);
+
 #endif // VIDEO_RXTX_ULTRAGRID_RTP_H_