Bump version: 0.21 → 0.22

.bumpversion.cfg

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

PKGBUILD

@@ -3,13 +3,13 @@
 
 
 pkgname=ustreamer
-pkgver=0.20
+pkgver=0.22
 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)
+depends=(libjpeg libevent libutil-linux)
 # optional: raspberrypi-firmware for OMX JPEG compressor
 makedepends=(gcc make)
 source=("$url/archive/v$pkgver.tar.gz")

README.md

@@ -31,7 +31,7 @@
 
 -----
 # Сборка
-Для сборки вам понадобятся ```make```, ```gcc```, ```libevent``` с поддержкой ```pthreads``` и ```libjpeg8```/```libjpeg-turbo```.
+Для сборки вам понадобятся ```make```, ```gcc```, ```libevent``` с поддержкой ```pthreads```, ```libjpeg8```/```libjpeg-turbo``` и ```libuuid```.
 
 На Raspberry Pi програма автоматически собирается с поддержкой OpenMAX IL, если обнаружит нужные хедеры в ```/opt/vc/include```.
 

src/config.h

@@ -21,4 +21,4 @@
 
 #pragma once
 
-#define VERSION "0.20"
+#define VERSION "0.22"

src/http.c

@@ -174,15 +174,15 @@ static void _http_callback_ping(struct evhttp_request *request, void *v_server)
 
 	assert((buf = evbuffer_new()));
 	assert(evbuffer_add_printf(buf,
-		"{\"stream\": {\"resolution\":"
+		"{\"source\": {\"resolution\": {\"width\": %u, \"height\": %u},"
-		" {\"width\": %u, \"height\": %u},"
+		" \"online\": %s, \"quality\": %u, \"captured_fps\": %u},"
-		" \"captured_fps\": %u, \"queued_fps\": %u,"
+		" \"stream\": {\"queued_fps\": %u,  \"clients\": %u, \"clients_stat\": {",
-		" \"online\": %s, \"clients\": %u, \"clients_stat\": {",
 		(server->fake_width ? server->fake_width : server->run->exposed->width),
 		(server->fake_height ? server->fake_height : server->run->exposed->height),
+		(server->run->exposed->online ? "true" : "false"),
+		server->run->stream->encoder->quality,
 		server->run->exposed->captured_fps,
 		server->run->exposed->queued_fps,
-		(server->run->exposed->online ? "true" : "false"),
 		server->run->stream_clients_count
 	));
 	for (struct stream_client_t * client = server->run->stream_clients; client != NULL; client = client->next) {