Bump version: 0.81 → 1.0

.bumpversion.cfg

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

pkg/arch/PKGBUILD

@@ -3,14 +3,14 @@
 
 
 pkgname=ustreamer
-pkgver=0.80
+pkgver=1.0
 pkgrel=1
 pkgdesc="Lightweight and fast MJPG-HTTP streamer"
 url="https://github.com/pi-kvm/ustreamer"
 license=(GPL)
 arch=(i686 x86_64 armv6h armv7h)
 depends=(libjpeg libevent libutil-linux)
-# optional: raspberrypi-firmware for OMX JPEG encoder
+# optional: raspberrypi-firmware for OMX encoder
 # optional: wiringpi for GPIO support
 makedepends=(gcc make)
 source=(${pkgname}::"git+https://github.com/pi-kvm/ustreamer#commit=v${pkgver}")

pkg/openwrt/Makefile

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

src/config.h

@@ -23,5 +23,5 @@
 #pragma once
 
 #ifndef VERSION
-#	define VERSION "0.80"
+#	define VERSION "1.0"
 #endif

src/device.h

@@ -28,11 +28,13 @@
 #include <linux/videodev2.h>
 
 
-#define VIDEO_MIN_WIDTH		320
-#define VIDEO_MAX_WIDTH		1920
+#define VIDEO_MIN_WIDTH		160
+#define VIDEO_MAX_WIDTH		10240
 
-#define VIDEO_MIN_HEIGHT	180
-#define VIDEO_MAX_HEIGHT	1200
+#define VIDEO_MIN_HEIGHT	120
+#define VIDEO_MAX_HEIGHT	4320
+
+#define VIDEO_MAX_FPS		120
 
 #define STANDARD_UNKNOWN	V4L2_STD_UNKNOWN
 #define STANDARDS_STR		"PAL, NTSC, SECAM"

src/encoder.c

@@ -108,13 +108,13 @@ void encoder_prepare(struct encoder_t *encoder, struct device_t *dev) {
 	bool cpu_forced = false;
 
 	if ((dev->run->format == V4L2_PIX_FMT_MJPEG || dev->run->format == V4L2_PIX_FMT_JPEG) && type != ENCODER_TYPE_HW) {
-		LOG_INFO("Switching to HW JPEG encoder because the input format is (M)JPEG");
+		LOG_INFO("Switching to HW encoder because the input format is (M)JPEG");
 		type = ENCODER_TYPE_HW;
 	}
 
 	if (type == ENCODER_TYPE_HW) {
 		if (dev->run->format != V4L2_PIX_FMT_MJPEG && dev->run->format != V4L2_PIX_FMT_JPEG) {
-			LOG_INFO("Switching to CPU JPEG encoder because the input format is not (M)JPEG");
+			LOG_INFO("Switching to CPU encoder because the input format is not (M)JPEG");
 			goto use_cpu;
 		}
 
@@ -131,16 +131,16 @@ void encoder_prepare(struct encoder_t *encoder, struct device_t *dev) {
 				encoder->glitched_resolutions[index][0] == dev->run->width
 				&& encoder->glitched_resolutions[index][1] == dev->run->height
 			) {
-				LOG_INFO("Switching to CPU JPEG encoder the resolution %ux%u marked as glitchy for OMX",
+				LOG_INFO("Switching to CPU encoder the resolution %ux%u marked as glitchy for OMX",
 					dev->run->width, dev->run->height);
 				goto use_cpu;
 			}
 		}
 
-		LOG_DEBUG("Preparing OMX JPEG encoder ...");
+		LOG_DEBUG("Preparing OMX encoder ...");
 
 		if (dev->run->n_workers > OMX_MAX_ENCODERS) {
-			LOG_INFO("OMX JPEG encoder sets limit for worker threads: %u", OMX_MAX_ENCODERS);
+			LOG_INFO("OMX encoder sets limit for worker threads: %u", OMX_MAX_ENCODERS);
 			dev->run->n_workers = OMX_MAX_ENCODERS;
 		}
 
@@ -151,14 +151,14 @@ void encoder_prepare(struct encoder_t *encoder, struct device_t *dev) {
 		// Начинаем с нуля и доинициализируем на следующих заходах при необходимости
 		for (; encoder->run->n_omxs < dev->run->n_workers; ++encoder->run->n_omxs) {
 			if ((encoder->run->omxs[encoder->run->n_omxs] = omx_encoder_init()) == NULL) {
-				LOG_ERROR("Can't initialize OMX JPEG encoder, falling back to CPU");
+				LOG_ERROR("Can't initialize OMX encoder, falling back to CPU");
 				goto force_cpu;
 			}
 		}
 
 		for (unsigned index = 0; index < encoder->run->n_omxs; ++index) {
 			if (omx_encoder_prepare(encoder->run->omxs[index], dev, quality) < 0) {
-				LOG_ERROR("Can't prepare OMX JPEG encoder, falling back to CPU");
+				LOG_ERROR("Can't prepare OMX encoder, falling back to CPU");
 				goto force_cpu;
 			}
 		}

src/encoders/cpu/encoder.c

@@ -100,7 +100,7 @@ void cpu_encoder_compress_buffer(struct device_t *dev, unsigned index, unsigned
 		WRITE_SCANLINES(V4L2_PIX_FMT_UYVY, _jpeg_write_scanlines_uyvy);
 		WRITE_SCANLINES(V4L2_PIX_FMT_RGB565, _jpeg_write_scanlines_rgb565);
 		WRITE_SCANLINES(V4L2_PIX_FMT_RGB24, _jpeg_write_scanlines_rgb24);
-		default: assert(0 && "Unsupported input format for CPU JPEG encoder");
+		default: assert(0 && "Unsupported input format for CPU encoder");
 	}
 
 #	undef WRITE_SCANLINES

src/encoders/hw/encoder.c

@@ -51,12 +51,12 @@ int hw_encoder_prepare(struct device_t *dev, unsigned quality) {
 	MEMSET_ZERO(comp);
 
 	if (xioctl(dev->run->fd, VIDIOC_G_JPEGCOMP, &comp) < 0) {
-		LOG_ERROR("Can't query HW JPEG encoder params and set quality (unsupported)");
+		LOG_ERROR("Can't query HW encoder params and set quality (unsupported)");
 		return -1;
 	}
 	comp.quality = quality;
 	if (xioctl(dev->run->fd, VIDIOC_S_JPEGCOMP, &comp) < 0) {
-		LOG_ERROR("Can't set HW JPEG encoder quality (unsopported)");
+		LOG_ERROR("Can't set HW encoder quality (unsupported)");
 		return -1;
 	}
 	return 0;
@@ -64,7 +64,7 @@ int hw_encoder_prepare(struct device_t *dev, unsigned quality) {
 
 void hw_encoder_compress_buffer(struct device_t *dev, unsigned index) {
 	if (dev->run->format != V4L2_PIX_FMT_MJPEG && dev->run->format != V4L2_PIX_FMT_JPEG) {
-		assert(0 && "Unsupported input format for HW JPEG encoder");
+		assert(0 && "Unsupported input format for HW encoder");
 	}
 
 #	define PICTURE(_next)	dev->run->pictures[index]._next

src/encoders/omx/encoder.c

@@ -99,7 +99,7 @@ struct omx_encoder_t *omx_encoder_init(void) {
 	}
 	_i_omx += 1;
 
-	LOG_INFO("Initializing OMX JPEG encoder ...");
+	LOG_INFO("Initializing OMX encoder ...");
 
 	if (vcos_semaphore_create(&omx->handler_lock, "handler_lock", 0) != VCOS_SUCCESS) {
 		LOG_ERROR("Can't create VCOS semaphore");
@@ -125,7 +125,7 @@ struct omx_encoder_t *omx_encoder_init(void) {
 void omx_encoder_destroy(struct omx_encoder_t *omx) {
 	OMX_ERRORTYPE error;
 
-	LOG_INFO("Destroying OMX JPEG encoder ...");
+	LOG_INFO("Destroying OMX encoder ...");
 
 	component_set_state(&omx->encoder, OMX_StateIdle);
 	_omx_encoder_clear_ports(omx);
@@ -329,7 +329,7 @@ static int _omx_setup_input(struct omx_encoder_t *omx, struct device_t *dev) {
 		// FIXME: RGB24 не работает нормально, нижняя половина экрана зеленая.
 		// FIXME: Китайский EasyCap тоже не работает, мусор на экране.
 		// Вероятно обе проблемы вызваны некорректной реализацией OMX на пае.
-		default: assert(0 && "Unsupported input format for OMX JPEG encoder");
+		default: assert(0 && "Unsupported input format for OMX encoder");
 	}
 
 #	undef MAP_FORMAT

src/main.c

@@ -381,7 +381,7 @@ static int _parse_options(int argc, char *argv[], struct device_t *dev, struct e
 			case 'm':	OPT_PARSE("pixel format", dev->format, device_parse_format, FORMAT_UNKNOWN);
 #			pragma GCC diagnostic pop
 			case 'a':	OPT_PARSE("TV standard", dev->standard, device_parse_standard, STANDARD_UNKNOWN);
-			case 'f':	OPT_NUMBER("--desired-fps", dev->desired_fps, 0, 30, 0);
+			case 'f':	OPT_NUMBER("--desired-fps", dev->desired_fps, 0, VIDEO_MAX_FPS, 0);
 			case 'z':	OPT_NUMBER("--min-frame-size", dev->min_frame_size, 0, 8192, 0);
 			case 'n':	OPT_SET(dev->persistent, true);
 			case 't':	OPT_SET(dev->dv_timings, true);
@@ -418,7 +418,7 @@ static int _parse_options(int argc, char *argv[], struct device_t *dev, struct e
 			case 3001:	OPT_SET(server->passwd, optarg);
 			case 3002:	OPT_SET(server->static_path, optarg);
 			case 'k':	OPT_SET(server->blank_path, optarg);
-			case 'e':	OPT_NUMBER("--drop-same-frames", server->drop_same_frames, 0, 30, 0);
+			case 'e':	OPT_NUMBER("--drop-same-frames", server->drop_same_frames, 0, VIDEO_MAX_FPS, 0);
 			case 'l':	OPT_SET(server->slowdown, true);
 			case 'R':	OPT_RESOLUTION("--fake-resolution", server->fake_width, server->fake_height, false);
 			case 3003:	OPT_RESOLUTION_OBSOLETE("--fake-width", "--fake-resolution", server->fake_width, 0, UINT_MAX);