Skip to contentSkip to conversation

v4l2-tracer: unique_ptr conversions

PATCH In review Rosen Penev 2 participants 2 messages Nov 23, 2025 – Jan 13 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 v4l2-tracer: unique_ptr conversions

No need to manually free.

---
 utils/v4l2-tracer/retrace.cpp | 84 +++++++++++++----------------------
 1 file changed, 32 insertions(+), 52 deletions(-)
utils/v4l2-tracer/retrace.cpp +32 -52
index d65ecd3d..8419b2ce 100644
@@ -5,6 +5,8 @@
 
 #include "retrace.h"
 
+#include <memory>
+
 extern struct retrace_context ctx_retrace;
 
 void retrace_mmap(json_object *mmap_obj, bool is_mmap64)
@@ -226,9 +228,9 @@ struct v4l2_plane *retrace_v4l2_plane(json_object *plane_obj, __u32 memory)
 	return ptr;
 }
 
-struct v4l2_buffer *retrace_v4l2_buffer(json_object *ioctl_args)
+std::unique_ptr<v4l2_buffer> retrace_v4l2_buffer(json_object *ioctl_args)
 {
-	struct v4l2_buffer *buf = (struct v4l2_buffer *) calloc(1, sizeof(struct v4l2_buffer));
+	std::unique_ptr<v4l2_buffer> buf(new v4l2_buffer{});
 
 	json_object *buf_obj;
 	json_object_object_get_ex(ioctl_args, "v4l2_buffer", &buf_obj);
@@ -311,9 +313,9 @@ struct v4l2_buffer *retrace_v4l2_buffer(json_object *ioctl_args)
 
 void retrace_vidioc_querybuf(int fd_retrace, json_object *ioctl_args)
 {
-	struct v4l2_buffer *buf = retrace_v4l2_buffer(ioctl_args);
+	auto buf = retrace_v4l2_buffer(ioctl_args);
 
-	ioctl(fd_retrace, VIDIOC_QUERYBUF, buf);
+	ioctl(fd_retrace, VIDIOC_QUERYBUF, buf.get());
 
 	if (buf->memory == V4L2_MEMORY_MMAP) {
 		__u32 offset = 0;
@@ -342,15 +344,13 @@ void retrace_vidioc_querybuf(int fd_retrace, json_object *ioctl_args)
 		debug_line_info();
 		print_context();
 	}
-
-	free(buf);
 }
 
 void retrace_vidioc_qbuf(int fd_retrace, json_object *ioctl_args)
 {
-	struct v4l2_buffer *ptr = retrace_v4l2_buffer(ioctl_args);
+	auto ptr = retrace_v4l2_buffer(ioctl_args);
 
-	ioctl(fd_retrace, VIDIOC_QBUF, ptr);
+	ioctl(fd_retrace, VIDIOC_QBUF, ptr.get());
 
 	if (ptr->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ||
 	    ptr->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
@@ -367,13 +367,11 @@ void retrace_vidioc_qbuf(int fd_retrace, json_object *ioctl_args)
 		debug_line_info();
 		print_context();
 	}
-
-	free(ptr);
 }
 
 void retrace_vidioc_dqbuf(int fd_retrace, json_object *ioctl_args)
 {
-	struct v4l2_buffer *buf = retrace_v4l2_buffer(ioctl_args);
+	auto buf = retrace_v4l2_buffer(ioctl_args);
 
 	const int poll_timeout_ms = 5000;
 	struct pollfd *pfds = (struct pollfd *) calloc(1, sizeof(struct pollfd));
@@ -393,7 +391,7 @@ void retrace_vidioc_dqbuf(int fd_retrace, json_object *ioctl_args)
 		exit(EXIT_FAILURE);
 	}
 
-	ioctl(fd_retrace, VIDIOC_DQBUF, buf);
+	ioctl(fd_retrace, VIDIOC_DQBUF, buf.get());
 
 	if (is_verbose() || (errno != 0)) {
 		fprintf(stderr, "%s, index: %d, fd: %d, ",
@@ -407,15 +405,13 @@ void retrace_vidioc_dqbuf(int fd_retrace, json_object *ioctl_args)
 	if (buf->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ||
 	    buf->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
 			free(buf->m.planes);
-
-	free(buf);
 }
 
 void retrace_vidioc_prepare_buf(int fd_retrace, json_object *ioctl_args)
 {
-	struct v4l2_buffer *buf = retrace_v4l2_buffer(ioctl_args);
+	auto buf = retrace_v4l2_buffer(ioctl_args);
 
-	ioctl(fd_retrace, VIDIOC_PREPARE_BUF, buf);
+	ioctl(fd_retrace, VIDIOC_PREPARE_BUF, buf.get());
 
 	if (is_verbose() || (errno != 0)) {
 		fprintf(stderr, "%s, index: %d, fd: %d, ",
@@ -429,8 +425,6 @@ void retrace_vidioc_prepare_buf(int fd_retrace, json_object *ioctl_args)
 	if (buf->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ||
 	    buf->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
 			free(buf->m.planes);
-
-	free(buf);
 }
 
 void retrace_vidioc_create_bufs(int fd_retrace, json_object *ioctl_args)
@@ -541,9 +535,9 @@ void retrace_vidioc_s_fmt(int fd_retrace, json_object *ioctl_args)
 	free(ptr);
 }
 
-struct v4l2_streamparm *retrace_v4l2_streamparm(json_object *parent_obj, const std::string& key_name = "")
+std::unique_ptr<v4l2_streamparm> retrace_v4l2_streamparm(json_object *parent_obj, const std::string& key_name = "")
 {
-	struct v4l2_streamparm *ptr = (struct v4l2_streamparm *) calloc(1, sizeof(v4l2_streamparm));
+	std::unique_ptr<v4l2_streamparm> ptr(new v4l2_streamparm{});
 
 	json_object *v4l2_streamparm_obj;
 	json_object_object_get_ex(parent_obj, "v4l2_streamparm", &v4l2_streamparm_obj);
@@ -563,24 +557,20 @@ struct v4l2_streamparm *retrace_v4l2_streamparm(json_object *parent_obj, const s
 
 void retrace_vidioc_g_parm (int fd_retrace, json_object *ioctl_args)
 {
-	struct v4l2_streamparm *ptr = retrace_v4l2_streamparm(ioctl_args);
-	ioctl(fd_retrace, VIDIOC_G_PARM, ptr);
+	auto ptr = retrace_v4l2_streamparm(ioctl_args);
+	ioctl(fd_retrace, VIDIOC_G_PARM, ptr.get());
 
 	if (is_verbose() || (errno != 0))
 		perror("VIDIOC_G_PARM");
-
-	free(ptr);
 }
 
 void retrace_vidioc_s_parm (int fd_retrace, json_object *ioctl_args)
 {
-	struct v4l2_streamparm *ptr = retrace_v4l2_streamparm(ioctl_args);
-	ioctl(fd_retrace, VIDIOC_S_PARM, ptr);
+	auto ptr = retrace_v4l2_streamparm(ioctl_args);
+	ioctl(fd_retrace, VIDIOC_S_PARM, ptr.get());
 
 	if (is_verbose() || (errno != 0))
 		perror("VIDIOC_S_PARM");
-
-	free(ptr);
 }
 
 void retrace_vidioc_queryctrl(int fd_retrace, json_object *ioctl_args)
@@ -897,9 +887,9 @@ struct v4l2_ext_control *retrace_v4l2_ext_control(json_object *parent_obj, int c
 	return p;
 }
 
-struct v4l2_ext_controls *retrace_v4l2_ext_controls(json_object *parent_obj)
+std::unique_ptr<v4l2_ext_controls> retrace_v4l2_ext_controls(json_object *parent_obj)
 {
-	struct v4l2_ext_controls *ptr = (struct v4l2_ext_controls *) calloc(1, sizeof(v4l2_ext_controls));
+	std::unique_ptr<v4l2_ext_controls> ptr(new v4l2_ext_controls{});
 
 	json_object *v4l2_ext_controls_obj;
 	json_object_object_get_ex(parent_obj, "v4l2_ext_controls", &v4l2_ext_controls_obj);
@@ -948,10 +938,8 @@ struct v4l2_ext_controls *retrace_v4l2_ext_controls(json_object *parent_obj)
 
 void retrace_vidioc_try_ext_ctrls(int fd_retrace, json_object *ioctl_args)
 {
-	struct v4l2_ext_controls *ptr = retrace_v4l2_ext_controls(ioctl_args);
-	ioctl(fd_retrace, VIDIOC_TRY_EXT_CTRLS, ptr);
-
-	free(ptr);
+	auto ptr = retrace_v4l2_ext_controls(ioctl_args);
+	ioctl(fd_retrace, VIDIOC_TRY_EXT_CTRLS, ptr.get());
 
 	if (is_verbose() || (errno != 0))
 		perror("VIDIOC_TRY_EXT_CTRLS");
@@ -959,10 +947,8 @@ void retrace_vidioc_try_ext_ctrls(int fd_retrace, json_object *ioctl_args)
 
 void retrace_vidioc_g_ext_ctrls(int fd_retrace, json_object *ioctl_args)
 {
-	struct v4l2_ext_controls *ptr = retrace_v4l2_ext_controls(ioctl_args);
-	ioctl(fd_retrace, VIDIOC_G_EXT_CTRLS, ptr);
-
-	free(ptr);
+	auto ptr = retrace_v4l2_ext_controls(ioctl_args);
+	ioctl(fd_retrace, VIDIOC_G_EXT_CTRLS, ptr.get());
 
 	if (is_verbose() || (errno != 0))
 		perror("VIDIOC_G_EXT_CTRLS");
@@ -970,10 +956,8 @@ void retrace_vidioc_g_ext_ctrls(int fd_retrace, json_object *ioctl_args)
 
 void retrace_vidioc_s_ext_ctrls(int fd_retrace, json_object *ioctl_args)
 {
-	struct v4l2_ext_controls *ptr = retrace_v4l2_ext_controls(ioctl_args);
-	ioctl(fd_retrace, VIDIOC_S_EXT_CTRLS, ptr);
-
-	free(ptr);
+	auto ptr = retrace_v4l2_ext_controls(ioctl_args);
+	ioctl(fd_retrace, VIDIOC_S_EXT_CTRLS, ptr.get());
 
 	if (is_verbose() || (errno != 0)) {
 		perror("VIDIOC_S_EXT_CTRLS");
@@ -1056,9 +1040,9 @@ void retrace_vidioc_s_selection(int fd_retrace, json_object *ioctl_args)
 	free(ptr);
 }
 
-struct v4l2_decoder_cmd *retrace_v4l2_decoder_cmd(json_object *parent_obj)
+std::unique_ptr<v4l2_decoder_cmd> retrace_v4l2_decoder_cmd(json_object *parent_obj)
 {
-	struct v4l2_decoder_cmd *ptr = (struct v4l2_decoder_cmd *) calloc(1, sizeof(v4l2_decoder_cmd));
+	std::unique_ptr<v4l2_decoder_cmd> ptr(new v4l2_decoder_cmd{});
 
 	json_object *v4l2_decoder_cmd_obj;
 	json_object_object_get_ex(parent_obj, "v4l2_decoder_cmd", &v4l2_decoder_cmd_obj);
@@ -1121,14 +1105,12 @@ struct v4l2_decoder_cmd *retrace_v4l2_decoder_cmd(json_object *parent_obj)
 
 void retrace_vidioc_try_decoder_cmd(int fd_retrace, json_object *ioctl_args)
 {
-	struct v4l2_decoder_cmd *ptr = retrace_v4l2_decoder_cmd(ioctl_args);
+	auto ptr = retrace_v4l2_decoder_cmd(ioctl_args);
 
-	ioctl(fd_retrace, VIDIOC_TRY_DECODER_CMD, ptr);
+	ioctl(fd_retrace, VIDIOC_TRY_DECODER_CMD, ptr.get());
 
 	if (is_verbose() || (errno != 0))
 		perror("VIDIOC_TRY_DECODER_CMD");
-
-	free (ptr);
 }
 
 void retrace_vidioc_dqevent(int fd_retrace)
@@ -1188,14 +1170,12 @@ void retrace_vidioc_unsubscribe(int fd_retrace, json_object *ioctl_args)
 
 void retrace_vidioc_decoder_cmd(int fd_retrace, json_object *ioctl_args)
 {
-	struct v4l2_decoder_cmd *ptr = retrace_v4l2_decoder_cmd(ioctl_args);
+	auto ptr = retrace_v4l2_decoder_cmd(ioctl_args);
 
-	ioctl(fd_retrace, VIDIOC_DECODER_CMD, ptr);
+	ioctl(fd_retrace, VIDIOC_DECODER_CMD, ptr.get());
 
 	if (is_verbose() || (errno != 0))
 		perror("VIDIOC_DECODER_CMD");
-
-	free (ptr);
 }
 
 void retrace_vidioc_query_ext_ctrl(int fd_retrace, json_object *ioctl_args)
Signature · 1 line
2.52.0
#1 lore raw

Hi Rosen,

Thank you for this patch, but it fails to apply.

The problem is this change:

utils/v4l2-tracer/retrace.cpp void retrace_vidioc_s_fmt(int fd_retrace, json_object *ioctl_args) · line 538

Quoted 2 lines
utils/v4l2-tracer/retrace.cpp +1 -1
-struct v4l2_streamparm *retrace_v4l2_streamparm(json_object *parent_obj, const std::string& key_name = "")
+std::unique_ptr<v4l2_streamparm> retrace_v4l2_streamparm(json_object *parent_obj, const std::string& key_name = "")

Currently retrace_v4l2_streamparm doesn't have 'const' for key_name.

I suspect that there is a patch missing that needs to go in before this one.

Regards,

Hans

Quoted 251 lines · Rosen Penev

No need to manually free.

---
 utils/v4l2-tracer/retrace.cpp | 84 +++++++++++++----------------------
 1 file changed, 32 insertions(+), 52 deletions(-)
utils/v4l2-tracer/retrace.cpp +32 -52
index d65ecd3d..8419b2ce 100644
@@ -5,6 +5,8 @@
 
 #include "retrace.h"
 
+#include <memory>
+
 extern struct retrace_context ctx_retrace;
 
 void retrace_mmap(json_object *mmap_obj, bool is_mmap64)
@@ -226,9 +228,9 @@ struct v4l2_plane *retrace_v4l2_plane(json_object *plane_obj, __u32 memory)
 	return ptr;
 }
 
-struct v4l2_buffer *retrace_v4l2_buffer(json_object *ioctl_args)
+std::unique_ptr<v4l2_buffer> retrace_v4l2_buffer(json_object *ioctl_args)
 {
-	struct v4l2_buffer *buf = (struct v4l2_buffer *) calloc(1, sizeof(struct v4l2_buffer));
+	std::unique_ptr<v4l2_buffer> buf(new v4l2_buffer{});
 
 	json_object *buf_obj;
 	json_object_object_get_ex(ioctl_args, "v4l2_buffer", &buf_obj);
@@ -311,9 +313,9 @@ struct v4l2_buffer *retrace_v4l2_buffer(json_object *ioctl_args)
 
 void retrace_vidioc_querybuf(int fd_retrace, json_object *ioctl_args)
 {
-	struct v4l2_buffer *buf = retrace_v4l2_buffer(ioctl_args);
+	auto buf = retrace_v4l2_buffer(ioctl_args);
 
-	ioctl(fd_retrace, VIDIOC_QUERYBUF, buf);
+	ioctl(fd_retrace, VIDIOC_QUERYBUF, buf.get());
 
 	if (buf->memory == V4L2_MEMORY_MMAP) {
 		__u32 offset = 0;
@@ -342,15 +344,13 @@ void retrace_vidioc_querybuf(int fd_retrace, json_object *ioctl_args)
 		debug_line_info();
 		print_context();
 	}
-
-	free(buf);
 }
 
 void retrace_vidioc_qbuf(int fd_retrace, json_object *ioctl_args)
 {
-	struct v4l2_buffer *ptr = retrace_v4l2_buffer(ioctl_args);
+	auto ptr = retrace_v4l2_buffer(ioctl_args);
 
-	ioctl(fd_retrace, VIDIOC_QBUF, ptr);
+	ioctl(fd_retrace, VIDIOC_QBUF, ptr.get());
 
 	if (ptr->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ||
 	    ptr->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
@@ -367,13 +367,11 @@ void retrace_vidioc_qbuf(int fd_retrace, json_object *ioctl_args)
 		debug_line_info();
 		print_context();
 	}
-
-	free(ptr);
 }
 
 void retrace_vidioc_dqbuf(int fd_retrace, json_object *ioctl_args)
 {
-	struct v4l2_buffer *buf = retrace_v4l2_buffer(ioctl_args);
+	auto buf = retrace_v4l2_buffer(ioctl_args);
 
 	const int poll_timeout_ms = 5000;
 	struct pollfd *pfds = (struct pollfd *) calloc(1, sizeof(struct pollfd));
@@ -393,7 +391,7 @@ void retrace_vidioc_dqbuf(int fd_retrace, json_object *ioctl_args)
 		exit(EXIT_FAILURE);
 	}
 
-	ioctl(fd_retrace, VIDIOC_DQBUF, buf);
+	ioctl(fd_retrace, VIDIOC_DQBUF, buf.get());
 
 	if (is_verbose() || (errno != 0)) {
 		fprintf(stderr, "%s, index: %d, fd: %d, ",
@@ -407,15 +405,13 @@ void retrace_vidioc_dqbuf(int fd_retrace, json_object *ioctl_args)
 	if (buf->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ||
 	    buf->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
 			free(buf->m.planes);
-
-	free(buf);
 }
 
 void retrace_vidioc_prepare_buf(int fd_retrace, json_object *ioctl_args)
 {
-	struct v4l2_buffer *buf = retrace_v4l2_buffer(ioctl_args);
+	auto buf = retrace_v4l2_buffer(ioctl_args);
 
-	ioctl(fd_retrace, VIDIOC_PREPARE_BUF, buf);
+	ioctl(fd_retrace, VIDIOC_PREPARE_BUF, buf.get());
 
 	if (is_verbose() || (errno != 0)) {
 		fprintf(stderr, "%s, index: %d, fd: %d, ",
@@ -429,8 +425,6 @@ void retrace_vidioc_prepare_buf(int fd_retrace, json_object *ioctl_args)
 	if (buf->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ||
 	    buf->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
 			free(buf->m.planes);
-
-	free(buf);
 }
 
 void retrace_vidioc_create_bufs(int fd_retrace, json_object *ioctl_args)
@@ -541,9 +535,9 @@ void retrace_vidioc_s_fmt(int fd_retrace, json_object *ioctl_args)
 	free(ptr);
 }
 
-struct v4l2_streamparm *retrace_v4l2_streamparm(json_object *parent_obj, const std::string& key_name = "")
+std::unique_ptr<v4l2_streamparm> retrace_v4l2_streamparm(json_object *parent_obj, const std::string& key_name = "")
 {
-	struct v4l2_streamparm *ptr = (struct v4l2_streamparm *) calloc(1, sizeof(v4l2_streamparm));
+	std::unique_ptr<v4l2_streamparm> ptr(new v4l2_streamparm{});
 
 	json_object *v4l2_streamparm_obj;
 	json_object_object_get_ex(parent_obj, "v4l2_streamparm", &v4l2_streamparm_obj);
@@ -563,24 +557,20 @@ struct v4l2_streamparm *retrace_v4l2_streamparm(json_object *parent_obj, const s
 
 void retrace_vidioc_g_parm (int fd_retrace, json_object *ioctl_args)
 {
-	struct v4l2_streamparm *ptr = retrace_v4l2_streamparm(ioctl_args);
-	ioctl(fd_retrace, VIDIOC_G_PARM, ptr);
+	auto ptr = retrace_v4l2_streamparm(ioctl_args);
+	ioctl(fd_retrace, VIDIOC_G_PARM, ptr.get());
 
 	if (is_verbose() || (errno != 0))
 		perror("VIDIOC_G_PARM");
-
-	free(ptr);
 }
 
 void retrace_vidioc_s_parm (int fd_retrace, json_object *ioctl_args)
 {
-	struct v4l2_streamparm *ptr = retrace_v4l2_streamparm(ioctl_args);
-	ioctl(fd_retrace, VIDIOC_S_PARM, ptr);
+	auto ptr = retrace_v4l2_streamparm(ioctl_args);
+	ioctl(fd_retrace, VIDIOC_S_PARM, ptr.get());
 
 	if (is_verbose() || (errno != 0))
 		perror("VIDIOC_S_PARM");
-
-	free(ptr);
 }
 
 void retrace_vidioc_queryctrl(int fd_retrace, json_object *ioctl_args)
@@ -897,9 +887,9 @@ struct v4l2_ext_control *retrace_v4l2_ext_control(json_object *parent_obj, int c
 	return p;
 }
 
-struct v4l2_ext_controls *retrace_v4l2_ext_controls(json_object *parent_obj)
+std::unique_ptr<v4l2_ext_controls> retrace_v4l2_ext_controls(json_object *parent_obj)
 {
-	struct v4l2_ext_controls *ptr = (struct v4l2_ext_controls *) calloc(1, sizeof(v4l2_ext_controls));
+	std::unique_ptr<v4l2_ext_controls> ptr(new v4l2_ext_controls{});
 
 	json_object *v4l2_ext_controls_obj;
 	json_object_object_get_ex(parent_obj, "v4l2_ext_controls", &v4l2_ext_controls_obj);
@@ -948,10 +938,8 @@ struct v4l2_ext_controls *retrace_v4l2_ext_controls(json_object *parent_obj)
 
 void retrace_vidioc_try_ext_ctrls(int fd_retrace, json_object *ioctl_args)
 {
-	struct v4l2_ext_controls *ptr = retrace_v4l2_ext_controls(ioctl_args);
-	ioctl(fd_retrace, VIDIOC_TRY_EXT_CTRLS, ptr);
-
-	free(ptr);
+	auto ptr = retrace_v4l2_ext_controls(ioctl_args);
+	ioctl(fd_retrace, VIDIOC_TRY_EXT_CTRLS, ptr.get());
 
 	if (is_verbose() || (errno != 0))
 		perror("VIDIOC_TRY_EXT_CTRLS");
@@ -959,10 +947,8 @@ void retrace_vidioc_try_ext_ctrls(int fd_retrace, json_object *ioctl_args)
 
 void retrace_vidioc_g_ext_ctrls(int fd_retrace, json_object *ioctl_args)
 {
-	struct v4l2_ext_controls *ptr = retrace_v4l2_ext_controls(ioctl_args);
-	ioctl(fd_retrace, VIDIOC_G_EXT_CTRLS, ptr);
-
-	free(ptr);
+	auto ptr = retrace_v4l2_ext_controls(ioctl_args);
+	ioctl(fd_retrace, VIDIOC_G_EXT_CTRLS, ptr.get());
 
 	if (is_verbose() || (errno != 0))
 		perror("VIDIOC_G_EXT_CTRLS");
@@ -970,10 +956,8 @@ void retrace_vidioc_g_ext_ctrls(int fd_retrace, json_object *ioctl_args)
 
 void retrace_vidioc_s_ext_ctrls(int fd_retrace, json_object *ioctl_args)
 {
-	struct v4l2_ext_controls *ptr = retrace_v4l2_ext_controls(ioctl_args);
-	ioctl(fd_retrace, VIDIOC_S_EXT_CTRLS, ptr);
-
-	free(ptr);
+	auto ptr = retrace_v4l2_ext_controls(ioctl_args);
+	ioctl(fd_retrace, VIDIOC_S_EXT_CTRLS, ptr.get());
 
 	if (is_verbose() || (errno != 0)) {
 		perror("VIDIOC_S_EXT_CTRLS");
@@ -1056,9 +1040,9 @@ void retrace_vidioc_s_selection(int fd_retrace, json_object *ioctl_args)
 	free(ptr);
 }
 
-struct v4l2_decoder_cmd *retrace_v4l2_decoder_cmd(json_object *parent_obj)
+std::unique_ptr<v4l2_decoder_cmd> retrace_v4l2_decoder_cmd(json_object *parent_obj)
 {
-	struct v4l2_decoder_cmd *ptr = (struct v4l2_decoder_cmd *) calloc(1, sizeof(v4l2_decoder_cmd));
+	std::unique_ptr<v4l2_decoder_cmd> ptr(new v4l2_decoder_cmd{});
 
 	json_object *v4l2_decoder_cmd_obj;
 	json_object_object_get_ex(parent_obj, "v4l2_decoder_cmd", &v4l2_decoder_cmd_obj);
@@ -1121,14 +1105,12 @@ struct v4l2_decoder_cmd *retrace_v4l2_decoder_cmd(json_object *parent_obj)
 
 void retrace_vidioc_try_decoder_cmd(int fd_retrace, json_object *ioctl_args)
 {
-	struct v4l2_decoder_cmd *ptr = retrace_v4l2_decoder_cmd(ioctl_args);
+	auto ptr = retrace_v4l2_decoder_cmd(ioctl_args);
 
-	ioctl(fd_retrace, VIDIOC_TRY_DECODER_CMD, ptr);
+	ioctl(fd_retrace, VIDIOC_TRY_DECODER_CMD, ptr.get());
 
 	if (is_verbose() || (errno != 0))
 		perror("VIDIOC_TRY_DECODER_CMD");
-
-	free (ptr);
 }
 
 void retrace_vidioc_dqevent(int fd_retrace)
@@ -1188,14 +1170,12 @@ void retrace_vidioc_unsubscribe(int fd_retrace, json_object *ioctl_args)
 
 void retrace_vidioc_decoder_cmd(int fd_retrace, json_object *ioctl_args)
 {
-	struct v4l2_decoder_cmd *ptr = retrace_v4l2_decoder_cmd(ioctl_args);
+	auto ptr = retrace_v4l2_decoder_cmd(ioctl_args);
 
-	ioctl(fd_retrace, VIDIOC_DECODER_CMD, ptr);
+	ioctl(fd_retrace, VIDIOC_DECODER_CMD, ptr.get());
 
 	if (is_verbose() || (errno != 0))
 		perror("VIDIOC_DECODER_CMD");
-
-	free (ptr);
 }
 
 void retrace_vidioc_query_ext_ctrl(int fd_retrace, json_object *ioctl_args)