From 05e5db09e4d95f5eccdddddcb96660e000f64ef2 Mon Sep 17 00:00:00 2001 From: Maxim Devaev Date: Thu, 12 Oct 2023 04:19:23 +0300 Subject: [PATCH] fix --- src/ustreamer/encoders/cpu/encoder.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/ustreamer/encoders/cpu/encoder.c b/src/ustreamer/encoders/cpu/encoder.c index 3164dde..d3075be 100644 --- a/src/ustreamer/encoders/cpu/encoder.c +++ b/src/ustreamer/encoders/cpu/encoder.c @@ -26,7 +26,6 @@ #include "encoder.h" -#include typedef struct { @@ -65,7 +64,7 @@ void us_cpu_encoder_compress(const us_frame_s *src, us_frame_s *dest, unsigned q jpeg.image_width = src->width; jpeg.image_height = src->height; jpeg.input_components = 3; - jpeg.in_color_space = (src->format == V4L2_PIX_FMT_YUYV || src->format == V4L2_PIX_FMT_UYVY)? JCS_YCbCr: JCS_RGB; + jpeg.in_color_space = ((src->format == V4L2_PIX_FMT_YUYV || src->format == V4L2_PIX_FMT_UYVY) ? JCS_YCbCr : JCS_RGB); jpeg_set_defaults(&jpeg); jpeg_set_quality(&jpeg, quality, TRUE); @@ -120,9 +119,9 @@ static void _jpeg_write_scanlines_yuyv(struct jpeg_compress_struct *jpeg, const uint8_t *ptr = line_buf; for (unsigned x = 0; x < frame->width; ++x) { - // see also: https://www.kernel.org/doc/html/v4.8/media/uapi/v4l/pixfmt-yuyv.html + // See also: https://www.kernel.org/doc/html/v4.8/media/uapi/v4l/pixfmt-yuyv.html const bool is_odd_pixel = x & 1; - const uint8_t y = data[is_odd_pixel ? 2: 0]; + const uint8_t y = data[is_odd_pixel ? 2 : 0]; const uint8_t u = data[1]; const uint8_t v = data[3]; @@ -131,7 +130,7 @@ static void _jpeg_write_scanlines_yuyv(struct jpeg_compress_struct *jpeg, const ptr[2] = v; ptr += 3; - data += is_odd_pixel? 4: 0; + data += (is_odd_pixel ? 4: 0); } data += padding; @@ -153,9 +152,9 @@ static void _jpeg_write_scanlines_uyvy(struct jpeg_compress_struct *jpeg, const uint8_t *ptr = line_buf; for (unsigned x = 0; x < frame->width; ++x) { - // see also: https://www.kernel.org/doc/html/v4.8/media/uapi/v4l/pixfmt-uyvy.html + // See also: https://www.kernel.org/doc/html/v4.8/media/uapi/v4l/pixfmt-uyvy.html const bool is_odd_pixel = x & 1; - const uint8_t y = data[is_odd_pixel ? 3: 1]; + const uint8_t y = data[is_odd_pixel ? 3 : 1]; const uint8_t u = data[0]; const uint8_t v = data[2]; @@ -164,7 +163,7 @@ static void _jpeg_write_scanlines_uyvy(struct jpeg_compress_struct *jpeg, const ptr[2] = v; ptr += 3; - data += is_odd_pixel? 4: 0; + data += (is_odd_pixel ? 4 : 0); } data += padding;