This commit is contained in:
Devaev Maxim
2021-03-30 03:21:04 +03:00
parent 04d1d3d5a6
commit c1d7bd1595
5 changed files with 8 additions and 4 deletions

View File

@@ -36,7 +36,7 @@ commands = cppcheck \
--inline-suppr \ --inline-suppr \
--library=python \ --library=python \
-DCHAR_BIT=8 \ -DCHAR_BIT=8 \
python python/ustreamer.c
[testenv:flake8] [testenv:flake8]
whitelist_externals = bash whitelist_externals = bash

View File

@@ -73,6 +73,10 @@ typedef struct {
_dest->encode_end_ts = _src->encode_end_ts; \ _dest->encode_end_ts = _src->encode_end_ts; \
} }
inline void frame_copy_meta(const frame_s *src, frame_s *dest) {
FRAME_COPY_META(src, dest);
}
#define FRAME_COMPARE_META_USED_NOTS(_a, _b) ( \ #define FRAME_COMPARE_META_USED_NOTS(_a, _b) ( \
_a->used == _b->used \ _a->used == _b->used \
&& _a->width == _b->width \ && _a->width == _b->width \

View File

@@ -57,7 +57,7 @@ int unjpeg(const frame_s *src, frame_s *dest, bool decode) {
jpeg_start_decompress(&jpeg); jpeg_start_decompress(&jpeg);
FRAME_COPY_META(src, dest); frame_copy_meta(src, dest);
dest->format = V4L2_PIX_FMT_RGB24; dest->format = V4L2_PIX_FMT_RGB24;
dest->width = jpeg.output_width; dest->width = jpeg.output_width;
dest->height = jpeg.output_height; dest->height = jpeg.output_height;

View File

@@ -244,7 +244,7 @@ static bool _worker_run_job(worker_s *wr) {
assert(ER(type) != ENCODER_TYPE_UNKNOWN); assert(ER(type) != ENCODER_TYPE_UNKNOWN);
assert(src->used > 0); assert(src->used > 0);
FRAME_COPY_META(src, dest); frame_copy_meta(src, dest);
dest->format = V4L2_PIX_FMT_JPEG; dest->format = V4L2_PIX_FMT_JPEG;
dest->stride = 0; dest->stride = 0;
dest->encode_begin_ts = get_now_monotonic(); dest->encode_begin_ts = get_now_monotonic();

View File

@@ -267,7 +267,7 @@ int h264_encoder_compress(h264_encoder_s *enc, const frame_s *src, int src_vcsm_
assert(enc->format == src->format); assert(enc->format == src->format);
assert(enc->stride == src->stride); assert(enc->stride == src->stride);
FRAME_COPY_META(src, dest); frame_copy_meta(src, dest);
dest->encode_begin_ts = get_now_monotonic(); dest->encode_begin_ts = get_now_monotonic();
dest->format = V4L2_PIX_FMT_H264; dest->format = V4L2_PIX_FMT_H264;
dest->stride = 0; dest->stride = 0;