Browse Source

mjpg-streamer: Update cambozola to specific version, add yuv and jpeg quality init/config options

Signed-off-by: Ted Hess <thess@kitschensync.net>
Ted Hess 9 years ago
parent
commit
41aa8a5fc9

+ 3
- 3
multimedia/mjpg-streamer/Makefile View File

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
10 10
 PKG_NAME:=mjpg-streamer
11 11
 PKG_REV:=182
12 12
 PKG_VERSION:=r$(PKG_REV)
13
-PKG_RELEASE:=6
13
+PKG_RELEASE:=7
14 14
 PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
15 15
 
16 16
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).1.tar.bz2
@@ -49,12 +49,12 @@ define Package/mjpg-streamer/conffiles
49 49
 /etc/config/mjpg-streamer
50 50
 endef
51 51
 
52
-CAMBOZOLA:=cambozola-latest.tar.gz
52
+CAMBOZOLA:=cambozola-0.936.tar.gz
53 53
 
54 54
 define Download/cambozola
55 55
   URL:=http://www.andywilcock.com/code/cambozola
56 56
   FILE:=$(CAMBOZOLA)
57
-  MD5SUM:=c9b0da91f8e6e72efccd307e04e2b75b
57
+  MD5SUM:=35c45188aa9635aef2b745c35c311396
58 58
 endef
59 59
 
60 60
 # Fetch latest cambozola that works with latest Java(s)

+ 2
- 0
multimedia/mjpg-streamer/files/mjpg-streamer.config View File

@@ -5,6 +5,8 @@ config mjpg-streamer 'core'
5 5
 	option output 'http'
6 6
 	option device '/dev/video0'
7 7
 	option resolution '640x480'
8
+	option yuv '0'
9
+	option quality '80'
8 10
 	option fps '5'
9 11
 	option led 'auto'
10 12
 	option www '/www/webcam'

+ 7
- 0
multimedia/mjpg-streamer/files/mjpg-streamer.init View File

@@ -43,6 +43,13 @@ start_instance() {
43 43
 		config_get fps "$s" 'fps'
44 44
 		[ -n "$fps" ] && input_arg="${input_arg} --fps $fps"
45 45
 
46
+		config_get_bool yuv "$s" 'yuv' 0
47
+		if [ $yuv -ne 0 ]; then
48
+			input_arg="${input_arg} --yuv"
49
+			config_get quality "$s" 'quality'
50
+			[ -n "$quality" ] && input_arg="${input_arg} --quality $quality"
51
+		fi
52
+
46 53
 		config_get resolution "$s" 'resolution'
47 54
 		[ -n "$resolution" ] && input_arg="${input_arg} --resolution $resolution"
48 55