Bump version: 5.11 → 5.12

.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 5.9
+current_version = 5.12
 parse = (?P<major>\d+)\.(?P<minor>\d+)
 serialize = 
 	{major}.{minor}

man/ustreamer-dump.1

@@ -1,6 +1,6 @@
 .\" Manpage for ustreamer-dump.
 .\" Open an issue or pull request to https://github.com/pikvm/ustreamer to correct errors or typos
-.TH USTREAMER-DUMP 1 "version 5.9" "January 2021"
+.TH USTREAMER-DUMP 1 "version 5.12" "January 2021"
 
 .SH NAME
 ustreamer-dump \- Dump uStreamer's memory sink to file

man/ustreamer.1

@@ -1,6 +1,6 @@
 .\" Manpage for ustreamer.
 .\" Open an issue or pull request to https://github.com/pikvm/ustreamer to correct errors or typos
-.TH USTREAMER 1 "version 5.9" "November 2020"
+.TH USTREAMER 1 "version 5.12" "November 2020"
 
 .SH NAME
 ustreamer \- stream MJPEG video from any V4L2 device to the network

pkg/arch/PKGBUILD

@@ -3,7 +3,7 @@
 
 
 pkgname=ustreamer
-pkgver=5.9
+pkgver=5.12
 pkgrel=1
 pkgdesc="Lightweight and fast MJPEG-HTTP streamer"
 url="https://github.com/pikvm/ustreamer"

pkg/openwrt/Makefile

@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ustreamer
-PKG_VERSION:=5.9
+PKG_VERSION:=5.12
 PKG_RELEASE:=1
 PKG_MAINTAINER:=Maxim Devaev <mdevaev@gmail.com>
 

python/setup.py

@@ -19,7 +19,7 @@ def _find_sources(suffix: str) -> List[str]:
 if __name__ == "__main__":
     setup(
         name="ustreamer",
-        version="5.9",
+        version="5.12",
         description="uStreamer tools",
         author="Maxim Devaev",
         author_email="mdevaev@gmail.com",

src/libs/config.h

@@ -23,7 +23,7 @@
 #pragma once
 
 #define VERSION_MAJOR 5
-#define VERSION_MINOR 9
+#define VERSION_MINOR 12
 
 #define MAKE_VERSION2(_major, _minor) #_major "." #_minor
 #define MAKE_VERSION1(_major, _minor) MAKE_VERSION2(_major, _minor)

src/ustreamer/encoder.c

@@ -224,8 +224,9 @@ static bool _worker_run_job(worker_s *wr) {
 	} else if (ER(type) == ENCODER_TYPE_NOOP) {
 		LOG_VERBOSE("Compressing JPEG using NOOP (do nothing): worker=%s, buffer=%u",
 			wr->name, job->hw->buf.index);
+		frame_encoding_begin(src, dest, V4L2_PIX_FMT_JPEG);
 		usleep(5000); // Просто чтобы работала логика desired_fps
-		dest->encode_end_ts = get_now_monotonic();
+		dest->encode_end_ts = get_now_monotonic(); // frame_encoding_end()
 	}
 
 	LOG_VERBOSE("Compressed new JPEG: size=%zu, time=%0.3Lf, worker=%s, buffer=%u",

src/ustreamer/m2m.c

@@ -27,7 +27,7 @@ static m2m_encoder_s *_m2m_encoder_init(
 	const char *name, const char *path, unsigned output_format,
 	unsigned fps, bool allow_dma, m2m_option_s *options);
 
-static int _m2m_encoder_prepare(m2m_encoder_s *enc, const frame_s *frame);
+static void _m2m_encoder_prepare(m2m_encoder_s *enc, const frame_s *frame);
 
 static int _m2m_encoder_init_buffers(
 	m2m_encoder_s *enc, const char *name, enum v4l2_buf_type type,
@@ -117,9 +117,10 @@ int m2m_encoder_compress(m2m_encoder_s *enc, const frame_s *src, frame_s *dest,
 		|| RUN(stride) != src->stride
 		|| RUN(dma) != (enc->allow_dma && src->dma_fd >= 0)
 	) {
-		if (_m2m_encoder_prepare(enc, src) < 0) {
+		_m2m_encoder_prepare(enc, src);
-			return -1;
+	}
-		}
+	if (!RUN(ready)) { // Already prepared but failed
+		return -1;
 	}
 
 	force_key = (enc->output_format == V4L2_PIX_FMT_H264 && (force_key || RUN(last_online) != src->online));
@@ -179,7 +180,7 @@ static m2m_encoder_s *_m2m_encoder_init(
 		} \
 	}
 
-static int _m2m_encoder_prepare(m2m_encoder_s *enc, const frame_s *frame) {
+static void _m2m_encoder_prepare(m2m_encoder_s *enc, const frame_s *frame) {
 	bool dma = (enc->allow_dma && frame->dma_fd >= 0);
 
 	E_LOG_INFO("Configuring encoder: DMA=%d ...", dma);
@@ -273,12 +274,11 @@ static int _m2m_encoder_prepare(m2m_encoder_s *enc, const frame_s *frame) {
 
 	RUN(ready) = true;
 	E_LOG_DEBUG("Encoder state: *** READY ***");
-	return 0;
+	return;
 
 	error:
 		_m2m_encoder_cleanup(enc);
 		E_LOG_ERROR("Encoder destroyed due an error (prepare)");
-		return -1;
 }
 
 static int _m2m_encoder_init_buffers(