Browse Source

Merge pull request #1222 from thess/mjpg-streamer-update

mjpg-streamer: Update cambozola to specific version, add yuv and jpeg qu...
lilik-openwrt-22.03
Ted Hess 10 years ago
parent
commit
d0a1f51ca8
3 changed files with 12 additions and 3 deletions
  1. +3
    -3
      multimedia/mjpg-streamer/Makefile
  2. +2
    -0
      multimedia/mjpg-streamer/files/mjpg-streamer.config
  3. +7
    -0
      multimedia/mjpg-streamer/files/mjpg-streamer.init

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

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mjpg-streamer
PKG_REV:=182
PKG_VERSION:=r$(PKG_REV)
PKG_RELEASE:=6
PKG_RELEASE:=7
PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).1.tar.bz2
@ -49,12 +49,12 @@ define Package/mjpg-streamer/conffiles
/etc/config/mjpg-streamer
endef
CAMBOZOLA:=cambozola-latest.tar.gz
CAMBOZOLA:=cambozola-0.936.tar.gz
define Download/cambozola
URL:=http://www.andywilcock.com/code/cambozola
FILE:=$(CAMBOZOLA)
MD5SUM:=c9b0da91f8e6e72efccd307e04e2b75b
MD5SUM:=35c45188aa9635aef2b745c35c311396
endef
# 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'
option output 'http'
option device '/dev/video0'
option resolution '640x480'
option yuv '0'
option quality '80'
option fps '5'
option led 'auto'
option www '/www/webcam'


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

@ -43,6 +43,13 @@ start_instance() {
config_get fps "$s" 'fps'
[ -n "$fps" ] && input_arg="${input_arg} --fps $fps"
config_get_bool yuv "$s" 'yuv' 0
if [ $yuv -ne 0 ]; then
input_arg="${input_arg} --yuv"
config_get quality "$s" 'quality'
[ -n "$quality" ] && input_arg="${input_arg} --quality $quality"
fi
config_get resolution "$s" 'resolution'
[ -n "$resolution" ] && input_arg="${input_arg} --resolution $resolution"


Loading…
Cancel
Save