video_rxtx/omt: Use unique_ptrs

Author: mpiatka

src/video_rxtx/omt.cpp

@@ -45,18 +45,22 @@
 #include "video_codec.h"
 #include "video_display.h"
 #include "video_frame.h"
+#include "utils/misc.h"
 
 #define MOD_NAME "[OMT] "
 
 namespace{
+using omt_receive_uniq = std::unique_ptr<omt_receive_t, deleter_from_fcn<omt_receive_destroy>>;
+using omt_send_uniq = std::unique_ptr<omt_send_t, deleter_from_fcn<omt_send_destroy>>;
+
 void omt_log_callback(const char *msg){
         log_msg(LOG_LEVEL_INFO, MOD_NAME "OMTLOG: %s\n", msg);
 }
 
 struct omt_rxtx_state{
         module *parent = nullptr;
-        omt_receive_t *omt_recv_handle = nullptr;
-        omt_send_t *omt_send_handle = nullptr;
+        omt_receive_uniq omt_recv_handle;
+        omt_send_uniq omt_send_handle;
 
         OMTMediaFrame send_video_frame{};
 
@@ -80,36 +84,36 @@ void set_omt_sender_info(omt_rxtx_state *s){
         productName.copy(info.ProductName, OMT_MAX_STRING_LENGTH, 0);
         manufacturer.copy(info.Manufacturer, OMT_MAX_STRING_LENGTH, 0);
         version.copy(info.Version, OMT_MAX_STRING_LENGTH, 0);
-        omt_send_setsenderinformation(s->omt_send_handle, &info);
+        omt_send_setsenderinformation(s->omt_send_handle.get(), &info);
 }
 
 void init_recv(const vrxtx_params *params, omt_rxtx_state *s){
         s->display_device = params->display_device;
         log_msg(LOG_LEVEL_INFO, MOD_NAME "Create omt receive with address %s\n", params->receiver);
-        s->omt_recv_handle = omt_receive_create(params->receiver, static_cast<OMTFrameType>(OMTFrameType_Audio | OMTFrameType_Video),
-                OMTPreferredVideoFormat_UYVY, OMTReceiveFlags_None);
+        s->omt_recv_handle.reset(omt_receive_create(params->receiver, static_cast<OMTFrameType>(OMTFrameType_Audio | OMTFrameType_Video),
+                OMTPreferredVideoFormat_UYVY, OMTReceiveFlags_None));
 }
 
 void init_send(omt_rxtx_state *s){
-        s->omt_send_handle = omt_send_create("UltraGrid", OMTQuality_Default);
+        s->omt_send_handle.reset(omt_send_create("UltraGrid", OMTQuality_Default));
         set_omt_sender_info(s);
         s->send_video_frame.Type = OMTFrameType_Video;
         s->send_video_frame.Timestamp = -1;
 }
 
 void *omt_rxtx_create(const vrxtx_params *params, const common_opts *common){
-        auto s = new omt_rxtx_state();
+        auto s = std::make_unique<omt_rxtx_state>();
         s->parent = common->parent;
 
         omt_setloggingcallback(omt_log_callback);
 
         if(params->rxtx_mode & MODE_RECEIVER)
-            init_recv(params, s);
+            init_recv(params, s.get());
 
         if(params->rxtx_mode & MODE_SENDER)
-            init_send(s);
+            init_send(s.get());
 
-        return s;
+        return s.release();
 }
 
 void omt_rxtx_done(void *state){
@@ -145,7 +149,7 @@ void omt_rxtx_send_frame(void *state, std::shared_ptr<video_frame> f){
         s->send_video_frame.Data = f->tiles[0].data;
         s->send_video_frame.DataLength = f->tiles[0].data_len;
 
-        int ret = omt_send(s->omt_send_handle, &s->send_video_frame);
+        int ret = omt_send(s->omt_send_handle.get(), &s->send_video_frame);
 
         log_msg(LOG_LEVEL_INFO, MOD_NAME "Send returned %d\n", ret);
 }
@@ -166,7 +170,7 @@ void *omt_rxtx_recv_worker(void *state){
                                       omt_should_exit_callback, state);
 
         while(!s->should_exit){
-                auto omt_frame = omt_receive(s->omt_recv_handle, OMTFrameType_Video, 1000);
+                auto omt_frame = omt_receive(s->omt_recv_handle.get(), OMTFrameType_Video, 1000);
                 if(!omt_frame){
                         log_msg(LOG_LEVEL_INFO, MOD_NAME "Receive failed\n");
                         continue;