forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-03-11 18:13:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Devaev Maxim
2019-03-01 10:41:44 +03:00
parent e2922aa820
commit 383075d323
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/jpeg/encoder.c
View File

@@ -50,8 +50,8 @@ struct _mjpg_destination_mgr {
static void _jpeg_set_dest_picture(j_compress_ptr jpeg, unsigned char *picture, unsigned long *written); static void _jpeg_set_dest_picture(j_compress_ptr jpeg, unsigned char *picture, unsigned long *written);
static void _jpeg_write_scanlines_yuyv(struct jpeg_compress_struct *jpeg, static void _jpeg_write_scanlines_yuyv(struct jpeg_compress_struct *jpeg,
unsigned char *line_buffer, const unsigned char *data, unsigned char *line_buffer, const unsigned char *data,
const unsigned width, const unsigned height); const unsigned width, const unsigned height);
static void _jpeg_write_scanlines_uyvy(struct jpeg_compress_struct *jpeg, static void _jpeg_write_scanlines_uyvy(struct jpeg_compress_struct *jpeg,
unsigned char *line_buffer, const unsigned char *data, unsigned char *line_buffer, const unsigned char *data,
@@ -93,6 +93,7 @@ void jpeg_encoder_compress_buffer(struct device_t *dev, const unsigned index, co
# define WRITE_SCANLINES(_func) \ # define WRITE_SCANLINES(_func) \
_func(&jpeg, line_buffer, dev->run->hw_buffers[index].start, dev->run->width, dev->run->height) _func(&jpeg, line_buffer, dev->run->hw_buffers[index].start, dev->run->width, dev->run->height)
switch (dev->run->format) { switch (dev->run->format) {
// https://www.fourcc.org/yuv.php // https://www.fourcc.org/yuv.php
case V4L2_PIX_FMT_YUYV: WRITE_SCANLINES(_jpeg_write_scanlines_yuyv); break; case V4L2_PIX_FMT_YUYV: WRITE_SCANLINES(_jpeg_write_scanlines_yuyv); break;
@@ -100,6 +101,7 @@ void jpeg_encoder_compress_buffer(struct device_t *dev, const unsigned index, co
case V4L2_PIX_FMT_RGB565: WRITE_SCANLINES(_jpeg_write_scanlines_rgb565); break; case V4L2_PIX_FMT_RGB565: WRITE_SCANLINES(_jpeg_write_scanlines_rgb565); break;
default: assert(0 && "Unsupported input format for JPEG compressor"); default: assert(0 && "Unsupported input format for JPEG compressor");
} }
# undef WRITE_SCANLINES # undef WRITE_SCANLINES
// TODO: process jpeg errors: // TODO: process jpeg errors:
@@ -128,6 +130,8 @@ static void _jpeg_set_dest_picture(j_compress_ptr jpeg, unsigned char *picture,
dest->written = written; dest->written = written;
} }
#define NORM_COMPONENT(_x) (((_x) > 255) ? 255 : (((_x) < 0) ? 0 : (_x)))
static void _jpeg_write_scanlines_yuyv(struct jpeg_compress_struct *jpeg, static void _jpeg_write_scanlines_yuyv(struct jpeg_compress_struct *jpeg,
unsigned char *line_buffer, const unsigned char *data, unsigned char *line_buffer, const unsigned char *data,
const unsigned width, const unsigned height) { const unsigned width, const unsigned height) {
@@ -147,9 +151,9 @@ static void _jpeg_write_scanlines_yuyv(struct jpeg_compress_struct *jpeg,
int g = (y - (88 * u) - (183 * v)) >> 8; int g = (y - (88 * u) - (183 * v)) >> 8;
int b = (y + (454 * u)) >> 8; int b = (y + (454 * u)) >> 8;
*(ptr++) = (r > 255) ? 255 : ((r < 0) ? 0 : r); *(ptr++) = NORM_COMPONENT(r);
*(ptr++) = (g > 255) ? 255 : ((g < 0) ? 0 : g); *(ptr++) = NORM_COMPONENT(g);
*(ptr++) = (b > 255) ? 255 : ((b < 0) ? 0 : b); *(ptr++) = NORM_COMPONENT(b);
if (z++) { if (z++) {
z = 0; z = 0;
@@ -181,9 +185,9 @@ static void _jpeg_write_scanlines_uyvy(struct jpeg_compress_struct *jpeg,
int g = (y - (88 * u) - (183 * v)) >> 8; int g = (y - (88 * u) - (183 * v)) >> 8;
int b = (y + (454 * u)) >> 8; int b = (y + (454 * u)) >> 8;
*(ptr++) = (r > 255) ? 255 : ((r < 0) ? 0 : r); *(ptr++) = NORM_COMPONENT(r);
*(ptr++) = (g > 255) ? 255 : ((g < 0) ? 0 : g); *(ptr++) = NORM_COMPONENT(g);
*(ptr++) = (b > 255) ? 255 : ((b < 0) ? 0 : b); *(ptr++) = NORM_COMPONENT(b);
if (z++) { if (z++) {
z = 0; z = 0;
@@ -196,6 +200,8 @@ static void _jpeg_write_scanlines_uyvy(struct jpeg_compress_struct *jpeg,
} }
} }
#undef NORM_COMPONENT
static void _jpeg_write_scanlines_rgb565(struct jpeg_compress_struct *jpeg, static void _jpeg_write_scanlines_rgb565(struct jpeg_compress_struct *jpeg,
unsigned char *line_buffer, const unsigned char *data, unsigned char *line_buffer, const unsigned char *data,
const unsigned width, const unsigned height) { const unsigned width, const unsigned height) {