From 3d38b77c5e3d2e7e24f5cb5df844846a2f0d6666 Mon Sep 17 00:00:00 2001 From: Sebastian Reimers Date: Tue, 24 Dec 2024 15:38:04 +0100 Subject: [PATCH] fix linter and mem check --- rem/vidconv/vconv.c | 23 ++++++++++------------- test/vidconv.c | 7 +++++-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/rem/vidconv/vconv.c b/rem/vidconv/vconv.c index fcdfdc8dc..3b8c7f28f 100644 --- a/rem/vidconv/vconv.c +++ b/rem/vidconv/vconv.c @@ -180,12 +180,11 @@ static inline void _yuv2rgb(uint8_t *rgb, uint8_t y, uint8_t u, uint8_t v) } -typedef void (line_h)(unsigned xsoffs, unsigned xdoffs, unsigned width, double rw, - unsigned yd, unsigned ys, unsigned ys2, - uint8_t *dd0, uint8_t *dd1, uint8_t *dd2, - unsigned lsd, - const uint8_t *sd0, const uint8_t *sd1, - const uint8_t *sd2, unsigned lss); +typedef void(line_h)(unsigned xsoffs, unsigned xdoffs, unsigned width, + double rw, unsigned yd, unsigned ys, unsigned ys2, + uint8_t *dd0, uint8_t *dd1, uint8_t *dd2, unsigned lsd, + const uint8_t *sd0, const uint8_t *sd1, + const uint8_t *sd2, unsigned lss); static void yuv420p_to_yuv420p(unsigned xsoffs, unsigned xdoffs, @@ -595,13 +594,11 @@ static void yuv444p_to_rgb32(unsigned xsoffs, unsigned xdoffs, unsigned width, } -static void nv12_to_rgb32(unsigned xsoffs, unsigned xdoffs, unsigned width, double rw, - unsigned yd, unsigned ys, unsigned ys2, - uint8_t *dd0, uint8_t *dd1, uint8_t *dd2, - unsigned lsd, - const uint8_t *ds0, const uint8_t *ds1, - const uint8_t *ds2, unsigned lss - ) +static void nv12_to_rgb32(unsigned xsoffs, unsigned xdoffs, unsigned width, + double rw, unsigned yd, unsigned ys, unsigned ys2, + uint8_t *dd0, uint8_t *dd1, uint8_t *dd2, + unsigned lsd, const uint8_t *ds0, const uint8_t *ds1, + const uint8_t *ds2, unsigned lss) { unsigned x, xd, xs, xs2; unsigned id, is; diff --git a/test/vidconv.c b/test/vidconv.c index 011b11b20..c9bd5c0c7 100644 --- a/test/vidconv.c +++ b/test/vidconv.c @@ -370,6 +370,8 @@ int test_vidconv_pixel_formats(void) static int test_vidconv_center(void) { int err; + struct vidframe *dst = NULL; + struct vidframe *src = NULL; static struct test { struct vidrect r; @@ -401,8 +403,6 @@ static int test_vidconv_center(void) for (size_t i = 0; i < RE_ARRAY_SIZE(testv); i++) { struct test *test = &testv[i]; - struct vidframe *dst = NULL; - struct vidframe *src = NULL; err = vidframe_alloc(&src, VID_FMT_YUV420P, &test->src_sz); err |= vidframe_alloc(&dst, VID_FMT_YUV420P, &test->dst_sz); @@ -415,6 +415,9 @@ static int test_vidconv_center(void) } out: + src = mem_deref(src); + dst = mem_deref(dst); + return err; }