aligned input

src/libs/common/frame.c

@@ -79,6 +79,7 @@ void frame_copy_meta(const frame_s *src, frame_s *dest) {
 	COPY(width);
 	COPY(height);
 	COPY(format);
+	COPY(stride);
 	COPY(online);
 	COPY(grab_ts);
 	COPY(encode_begin_ts);
@@ -88,14 +89,35 @@ void frame_copy_meta(const frame_s *src, frame_s *dest) {
 #undef COPY
 
 bool frame_compare(const frame_s *a, const frame_s *b) {
+#	define CMP(_field) (a->_field == b->_field)
 	return (
 		a->allocated && b->allocated
-		&& a->used == b->used
-		&& a->width == b->width
-		&& a->height == b->height
-		&& a->online == b->online
+		&& CMP(used)
+		&& CMP(width)
+		&& CMP(height)
+		&& CMP(format)
+		&& CMP(stride)
+		&& CMP(online)
 		&& !memcmp(a->data, b->data, b->used)
 	);
+#	undef CMP
+}
+
+unsigned frame_get_padding(const frame_s *frame) {
+	unsigned bytes_per_pixel = 0;
+	switch (frame->format) {
+		case V4L2_PIX_FMT_YUYV:
+		case V4L2_PIX_FMT_UYVY:
+		case V4L2_PIX_FMT_RGB565: bytes_per_pixel = 2; break;
+		case V4L2_PIX_FMT_RGB24: bytes_per_pixel = 3; break;
+		case V4L2_PIX_FMT_MJPEG:
+		case V4L2_PIX_FMT_JPEG: bytes_per_pixel = 0; break;
+		default: assert(0 && "Unknown pixelformat");
+	}
+	if (bytes_per_pixel > 0 && frame->stride > frame->width) {
+		return (frame->stride - frame->width * bytes_per_pixel);
+	}
+	return 0;
 }
 
 const char *fourcc_to_string(unsigned format, char *buf, size_t size) {

src/libs/common/frame.h

@@ -29,20 +29,28 @@
 #include <string.h>
 #include <assert.h>
 
+#include <linux/videodev2.h>
+
 #include "tools.h"
 #include "logging.h"
 
 
 typedef struct {
-	const char	*name;
+	const char *name;
 
-	uint8_t		*data;
-	size_t		used;
-	size_t		allocated;
-	unsigned	width;
-	unsigned	height;
-	unsigned	format;
-	bool		online;
+	uint8_t	*data;
+	size_t	used;
+	size_t	allocated;
+
+	unsigned width;
+	unsigned height;
+	unsigned format;
+	unsigned stride;
+	// Stride is a bytesperline in V4L2
+	// https://www.kernel.org/doc/html/v4.14/media/uapi/v4l/pixfmt-v4l2.html
+	// https://medium.com/@oleg.shipitko/what-does-stride-mean-in-image-processing-bba158a72bcd
+
+	bool online;
 
 	long double	grab_ts;
 	long double	encode_begin_ts;
@@ -63,4 +71,6 @@ void frame_copy(const frame_s *src, frame_s *dest);
 void frame_copy_meta(const frame_s *src, frame_s *dest);
 bool frame_compare(const frame_s *a, const frame_s *b);
 
+unsigned frame_get_padding(const frame_s *frame);
+
 const char *fourcc_to_string(unsigned format, char *buf, size_t size);

src/libs/common/unjpeg.c

@@ -39,12 +39,7 @@ int unjpeg(const frame_s *src, frame_s *dest, bool decode) {
 	struct jpeg_decompress_struct jpeg;
 	jpeg_create_decompress(&jpeg);
 
-	frame_copy_meta(src, dest);
-	dest->format = V4L2_PIX_FMT_RGB24;
-	dest->used = 0;
-
 	// https://stackoverflow.com/questions/19857766/error-handling-in-libjpeg
-
 	_jpeg_error_manager_s jpeg_error;
 	jpeg.err = jpeg_std_error((struct jpeg_error_mgr *)&jpeg_error);
 	jpeg_error.mgr.error_exit = _jpeg_error_handler;
@@ -60,24 +55,26 @@ int unjpeg(const frame_s *src, frame_s *dest, bool decode) {
 
 	jpeg_start_decompress(&jpeg);
 
+	frame_copy_meta(src, dest);
+	dest->format = V4L2_PIX_FMT_RGB24;
+	dest->width = jpeg.output_width;
+	dest->height = jpeg.output_height;
+	dest->stride = jpeg.output_width * jpeg.output_components; // Row stride
+	dest->used = 0;
+
 	if (decode) {
-		const unsigned row_stride = jpeg.output_width * jpeg.output_components;
-
 		JSAMPARRAY scanlines;
-		scanlines = (*jpeg.mem->alloc_sarray)((j_common_ptr) &jpeg, JPOOL_IMAGE, row_stride, 1);
+		scanlines = (*jpeg.mem->alloc_sarray)((j_common_ptr) &jpeg, JPOOL_IMAGE, dest->stride, 1);
 
-		frame_realloc_data(dest, ((src->width * src->height) << 1) * 2);
+		frame_realloc_data(dest, ((dest->width * dest->height) << 1) * 2);
 		while (jpeg.output_scanline < jpeg.output_height) {
 			jpeg_read_scanlines(&jpeg, scanlines, 1);
-			frame_append_data(dest, scanlines[0], row_stride);
+			frame_append_data(dest, scanlines[0], dest->stride);
 		}
 
 		jpeg_finish_decompress(&jpeg);
 	}
 
-	dest->width = jpeg.output_width;
-	dest->height = jpeg.output_height;
-
 	done:
 		jpeg_destroy_decompress(&jpeg);
 		return retval;

src/libs/memsink/memsink.c

@@ -153,6 +153,7 @@ int memsink_server_put(memsink_s *sink, const frame_s *frame) {
 		COPY(width);
 		COPY(height);
 		COPY(format);
+		COPY(stride);
 		COPY(online);
 		COPY(grab_ts);
 		COPY(encode_begin_ts);
@@ -203,6 +204,7 @@ int memsink_client_get(memsink_s *sink, frame_s *frame) { // cppcheck-suppress u
 	COPY(width);
 	COPY(height);
 	COPY(format);
+	COPY(stride);
 	COPY(online);
 	COPY(grab_ts);
 	COPY(encode_begin_ts);

src/libs/memsink/memsink.h

@@ -51,6 +51,7 @@ typedef struct {
 	unsigned	width;
 	unsigned	height;
 	unsigned	format;
+	unsigned	stride;
 	bool		online;
 	long double	grab_ts;
 	long double	encode_begin_ts;