forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-05-26 15:26:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Maxim Devaev
2023-10-12 04:19:23 +03:00
parent 55e432a529
commit 05e5db09e4
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ustreamer/encoders/cpu/encoder.c
View File

@@ -26,7 +26,6 @@
#include "encoder.h" #include "encoder.h"
#include <stdint.h>
typedef struct { 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_width = src->width;
jpeg.image_height = src->height; jpeg.image_height = src->height;
jpeg.input_components = 3; 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_defaults(&jpeg);
jpeg_set_quality(&jpeg, quality, TRUE); 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; uint8_t *ptr = line_buf;
for (unsigned x = 0; x < frame->width; ++x) { 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 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 u = data[1];
const uint8_t v = data[3]; 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[2] = v;
ptr += 3; ptr += 3;
data += is_odd_pixel? 4: 0; data += (is_odd_pixel ? 4: 0);
} }
data += padding; data += padding;
@@ -153,9 +152,9 @@ static void _jpeg_write_scanlines_uyvy(struct jpeg_compress_struct *jpeg, const
uint8_t *ptr = line_buf; uint8_t *ptr = line_buf;
for (unsigned x = 0; x < frame->width; ++x) { 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 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 u = data[0];
const uint8_t v = data[2]; 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[2] = v;
ptr += 3; ptr += 3;
data += is_odd_pixel? 4: 0; data += (is_odd_pixel ? 4 : 0);
} }
data += padding; data += padding;