Bump version: 1.23 → 1.24

Issue #32: Create Dockerfiles

.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 1.22
+current_version = 1.24
 parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?)?
 serialize = 
 	{major}.{minor}

.dockerignore

@@ -0,0 +1,6 @@
+# Ignore everything
+*
+
+# Allow source code
+!Makefile
+!src/**

README.md

@@ -69,6 +69,8 @@ $ ./ustreamer \
     --drop-same-frames=30 # Save the traffic
 ```
 
+Please note that to use `--drop-same-frames` for different browsers you need to use some specific URL `/stream` parameters (see URL `/` for details).
+
 You can always view the full list of options with ```ustreamer --help```.
 
 -----

README.ru.md

@@ -69,6 +69,8 @@ $ ./ustreamer \
     --drop-same-frames=30 # Экономим трафик
 ```
 
+Обратите внимание что для использования `--drop-same-frames` для разных браузеров нужно использовать ряд специальных параметров в `/stream` (за деталями обратитесь к урлу `/`).
+
 За полным списком опций обращайтесь ко встроенной справке: ```ustreamer --help```.
 
 -----

pkg/arch/PKGBUILD

@@ -3,12 +3,12 @@
 
 
 pkgname=ustreamer
-pkgver=1.22
+pkgver=1.24
 pkgrel=1
 pkgdesc="Lightweight and fast MJPG-HTTP streamer"
 url="https://github.com/pikvm/ustreamer"
 license=(GPL)
-arch=(i686 x86_64 armv6h armv7h)
+arch=(i686 x86_64 armv6h armv7h aarch64)
 depends=(libjpeg libevent libutil-linux libbsd)
 # optional: raspberrypi-firmware for OMX encoder
 # optional: wiringpi for GPIO support

pkg/docker/Dockerfile.arm.cross

@@ -0,0 +1,41 @@
+FROM balenalib/raspberrypi3-debian:build as build
+
+RUN ["cross-build-start"]
+
+RUN apt-get update \
+	&& apt-get install -y --no-install-recommends \
+		gcc \
+		libjpeg8-dev \
+		libbsd-dev \
+		libraspberrypi-dev \
+		wiringpi \
+	&& rm -rf /var/lib/apt/lists/*
+
+WORKDIR /build/ustreamer/
+COPY . .
+RUN make -j5 WITH_OMX=1 WITH_GPIO=1
+RUN ["cross-build-end"]
+
+FROM balenalib/raspberrypi3-debian:run as RUN
+
+RUN ["cross-build-start"]
+
+RUN apt-get update \
+	&& apt-get install -y --no-install-recommends \
+		libevent-2.1 \
+		libevent-pthreads-2.1-6 \
+		libjpeg8 \
+		uuid \
+		libbsd0 \
+		wiringpi \
+	&& rm -rf /var/lib/apt/lists/*
+
+RUN ["cross-build-end"]
+
+WORKDIR /ustreamer
+COPY --from=build /build/ustreamer/ustreamer .
+
+EXPOSE 8080
+ENTRYPOINT ["./ustreamer", "--host=::"]
+
+# vim: syntax=dockerfile

pkg/docker/Dockerfile.arm.native

@@ -0,0 +1,34 @@
+FROM balenalib/raspberrypi3-debian:build as build
+
+RUN apt-get update \
+	&& apt-get install -y --no-install-recommends \
+		gcc \
+		libjpeg8-dev \
+		libbsd-dev \
+		libraspberrypi-dev \
+		wiringpi \
+	&& rm -rf /var/lib/apt/lists/*
+
+WORKDIR /build/ustreamer/
+COPY . .
+RUN make -j5 WITH_OMX=1 WITH_GPIO=1
+
+FROM balenalib/raspberrypi3-debian:run as RUN
+
+RUN apt-get update \
+	&& apt-get install -y --no-install-recommends \
+		libevent-2.1 \
+		libevent-pthreads-2.1-6 \
+		libjpeg8 \
+		uuid \
+		libbsd0 \
+		wiringpi \
+	&& rm -rf /var/lib/apt/lists/*
+
+WORKDIR /ustreamer
+COPY --from=build /build/ustreamer/ustreamer .
+
+EXPOSE 8080
+ENTRYPOINT ["./ustreamer", "--host=::"]
+
+# vim: syntax=dockerfile

pkg/docker/Dockerfile.x64.native

@@ -0,0 +1,38 @@
+FROM debian:buster-slim as build
+
+RUN apt-get update \
+	&& apt-get install -y \
+		ca-certificates \
+		make \
+		gcc \
+		git \
+		libevent-dev \
+		libjpeg62-turbo-dev \
+		uuid-dev \
+		libbsd-dev \
+	&& rm -rf /var/lib/apt/lists/*
+
+WORKDIR /build/ustreamer/
+COPY . .
+RUN make -j5
+
+FROM debian:buster-slim as run
+
+RUN apt-get update \
+	&& apt-get install -y \
+		ca-certificates \
+		libevent-2.1 \
+		libevent-pthreads-2.1-6 \
+		libjpeg62-turbo \
+		uuid \
+		libbsd0 \
+	&& rm -rf /var/lib/apt/lists/*
+
+WORKDIR /ustreamer
+COPY --from=build /build/ustreamer/ustreamer .
+
+#ENV LD_LIBRARY_PATH=/opt/vc/lib
+EXPOSE 8080
+ENTRYPOINT ["./ustreamer", "--host=0.0.0.0"]
+
+# vim: syntax=dockerfile

pkg/openwrt/Makefile

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

src/config.h

@@ -23,5 +23,5 @@
 #pragma once
 
 #ifndef VERSION
-#	define VERSION "1.22"
+#	define VERSION "1.24"
 #endif

src/device.c

@@ -501,6 +501,8 @@ static int _device_open_format(struct device_t *dev) {
 static void _device_open_hw_fps(struct device_t *dev) {
 	struct v4l2_streamparm setfps;
 
+	dev->run->hw_fps = 0;
+
 	MEMSET_ZERO(setfps);
 	setfps.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
@@ -531,10 +533,21 @@ static void _device_open_hw_fps(struct device_t *dev) {
 		return;
 	}
 
-	if (dev->desired_fps != SETFPS_TPF(denominator)) {
+	if (SETFPS_TPF(numerator) != 1) {
-		LOG_INFO("Using HW FPS: %u -> %u (coerced)", dev->desired_fps, SETFPS_TPF(denominator));
+		LOG_ERROR("Invalid HW FPS numerator: %u != 1", SETFPS_TPF(numerator));
+		return;
+	}
+
+	if (SETFPS_TPF(denominator) == 0) { // Не знаю, бывает ли так, но пускай на всякий случай
+		LOG_ERROR("Invalid HW FPS denominator: 0");
+		return;
+	}
+
+	dev->run->hw_fps = SETFPS_TPF(denominator);
+	if (dev->desired_fps != dev->run->hw_fps) {
+		LOG_INFO("Using HW FPS: %u -> %u (coerced)", dev->desired_fps, dev->run->hw_fps);
 	} else {
-		LOG_INFO("Using HW FPS: %u", dev->desired_fps);
+		LOG_INFO("Using HW FPS: %u", dev->run->hw_fps);
 	}
 
 #	undef SETFPS_TPF

src/device.h

@@ -60,6 +60,7 @@ struct device_runtime_t {
 	unsigned			width;
 	unsigned			height;
 	unsigned			format;
+	unsigned			hw_fps;
 	size_t				raw_size;
 	unsigned			n_buffers;
 	unsigned			n_workers;

src/options.c

@@ -680,5 +680,5 @@ static void _help(struct device_t *dev, struct encoder_t *encoder, struct http_s
 	printf("═════════════\n");
 	printf("    -h|--help  ─────── Print this text and exit.\n\n");
 	printf("    -v|--version  ──── Print version and exit.\n\n");
-	printf("    --features  ────── Print list of supporeted features.\n\n");
+	printf("    --features  ────── Print list of supported features.\n\n");
 }

src/stream.c

@@ -350,11 +350,14 @@ static void _stream_expose_picture(struct stream_t *stream, unsigned buf_index,
 static struct _workers_pool_t *_workers_pool_init(struct stream_t *stream) {
 	struct _workers_pool_t *pool;
 
-	LOG_INFO("Creating pool with %u workers ...", stream->dev->run->n_workers);
+#	define DEV(_next) stream->dev->_next
+#	define RUN(_next) stream->dev->run->_next
+
+	LOG_INFO("Creating pool with %u workers ...", RUN(n_workers));
 
 	A_CALLOC(pool, 1);
 
-	pool->n_workers = stream->dev->run->n_workers;
+	pool->n_workers = RUN(n_workers);
 	A_CALLOC(pool->workers, pool->n_workers);
 
 	A_MUTEX_INIT(&pool->free_workers_mutex);
@@ -362,10 +365,13 @@ static struct _workers_pool_t *_workers_pool_init(struct stream_t *stream) {
 
 	atomic_init(&pool->workers_stop, false);
 
-	if (stream->dev->desired_fps > 0) {
+	if (DEV(desired_fps) > 0 && (DEV(desired_fps) < RUN(hw_fps) || RUN(hw_fps) == 0)) {
-		pool->desired_frames_interval = (long double)1 / stream->dev->desired_fps;
+		pool->desired_frames_interval = (long double)1 / DEV(desired_fps);
 	}
 
+#	undef RUN
+#	undef DEV
+
 	for (unsigned number = 0; number < pool->n_workers; ++number) {
 #		define WORKER(_next) pool->workers[number]._next
 
@@ -557,6 +563,7 @@ static long double _workers_pool_get_fluency_delay(struct _workers_pool_t *pool,
 
 	if (pool->desired_frames_interval > 0 && min_delay > 0 && pool->desired_frames_interval > min_delay) {
 		// Искусственное время задержки на основе желаемого FPS, если включен --desired-fps
+		// и аппаратный fps не попадает точно в желаемое значение
 		return pool->desired_frames_interval;
 	}
 	return min_delay;

src/threading.h

@@ -102,7 +102,23 @@ INLINE void thread_get_name(char *name) { // Always required for logging
 #	endif
 	if (retval < 0) {
 #endif
-		assert(snprintf(name, MAX_THREAD_NAME, "tid=%d", (pid_t)syscall(SYS_gettid)) > 0);
+
+#if defined(__linux__)
+		pid_t tid = syscall(SYS_gettid);
+#elif defined(__FreeBSD__)
+		pid_t tid = syscall(SYS_thr_self);
+#elif defined(__OpenBSD__)
+		pid_t tid = syscall(SYS_getthrid);
+#elif defined(__NetBSD__)
+		pid_t tid = syscall(SYS__lwp_self);
+#elif defined(__DragonFly__)
+		pid_t tid = syscall(SYS_lwp_gettid);
+#else
+		pid_t tid = 0; // Makes cppcheck happy
+#	warning gettid() not implemented
+#endif
+		assert(snprintf(name, MAX_THREAD_NAME, "tid=%d", tid) > 0);
+
 #ifdef WITH_PTHREAD_NP
 	}
 #endif