jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 03:07:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ffmpeg default extra options (#22682)

Browse Source
This commit is contained in:
Pascal Vizeli 2019-04-03 13:46:41 +02:00 committed by GitHub
parent 58a89640bb
commit 7066fb0d10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
homeassistant/components/amcrest/__init__.py
View File

@ -26,6 +26,7 @@ DEFAULT_NAME = 'Amcrest Camera'
DEFAULT_PORT = 80 DEFAULT_PORT = 80
DEFAULT_RESOLUTION = 'high' DEFAULT_RESOLUTION = 'high'
DEFAULT_STREAM_SOURCE = 'snapshot' DEFAULT_STREAM_SOURCE = 'snapshot'
DEFAULT_ARGUMENTS = '-pred 1'
TIMEOUT = 10 TIMEOUT = 10
DATA_AMCREST = 'amcrest' DATA_AMCREST = 'amcrest'
@ -77,7 +78,8 @@ CONFIG_SCHEMA = vol.Schema({
vol.All(vol.In(RESOLUTION_LIST)), vol.All(vol.In(RESOLUTION_LIST)),
vol.Optional(CONF_STREAM_SOURCE, default=DEFAULT_STREAM_SOURCE): vol.Optional(CONF_STREAM_SOURCE, default=DEFAULT_STREAM_SOURCE):
vol.All(vol.In(STREAM_SOURCE_LIST)), vol.All(vol.In(STREAM_SOURCE_LIST)),
vol.Optional(CONF_FFMPEG_ARGUMENTS): cv.string, vol.Optional(CONF_FFMPEG_ARGUMENTS, default=DEFAULT_ARGUMENTS):
cv.string,
vol.Optional(CONF_SCAN_INTERVAL, default=SCAN_INTERVAL): vol.Optional(CONF_SCAN_INTERVAL, default=SCAN_INTERVAL):
cv.time_period, cv.time_period,
vol.Optional(CONF_SENSORS): vol.Optional(CONF_SENSORS):

7
homeassistant/components/arlo/camera.py
View File

@ -13,6 +13,8 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
from . import DATA_ARLO, DEFAULT_BRAND, SIGNAL_UPDATE_ARLO from . import DATA_ARLO, DEFAULT_BRAND, SIGNAL_UPDATE_ARLO
DEPENDENCIES = ['arlo', 'ffmpeg']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
ARLO_MODE_ARMED = 'armed' ARLO_MODE_ARMED = 'armed'
@ -28,8 +30,7 @@ ATTR_UNSEEN_VIDEOS = 'unseen_videos'
ATTR_LAST_REFRESH = 'last_refresh' ATTR_LAST_REFRESH = 'last_refresh'
CONF_FFMPEG_ARGUMENTS = 'ffmpeg_arguments' CONF_FFMPEG_ARGUMENTS = 'ffmpeg_arguments'
DEFAULT_ARGUMENTS = '-pred 1'
DEPENDENCIES = ['arlo', 'ffmpeg']
POWERSAVE_MODE_MAPPING = { POWERSAVE_MODE_MAPPING = {
1: 'best_battery_life', 1: 'best_battery_life',
@ -38,7 +39,7 @@ POWERSAVE_MODE_MAPPING = {
} }
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Optional(CONF_FFMPEG_ARGUMENTS): cv.string, vol.Optional(CONF_FFMPEG_ARGUMENTS, default=DEFAULT_ARGUMENTS): cv.string,
}) })

7
homeassistant/components/canary/camera.py
View File

@ -18,16 +18,17 @@ from homeassistant.util import Throttle
from . import DATA_CANARY, DEFAULT_TIMEOUT from . import DATA_CANARY, DEFAULT_TIMEOUT
CONF_FFMPEG_ARGUMENTS = 'ffmpeg_arguments'
DEPENDENCIES = ['canary', 'ffmpeg'] DEPENDENCIES = ['canary', 'ffmpeg']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
CONF_FFMPEG_ARGUMENTS = 'ffmpeg_arguments'
DEFAULT_ARGUMENTS = '-pred 1'
MIN_TIME_BETWEEN_SESSION_RENEW = timedelta(seconds=90) MIN_TIME_BETWEEN_SESSION_RENEW = timedelta(seconds=90)
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Optional(CONF_FFMPEG_ARGUMENTS): cv.string, vol.Optional(CONF_FFMPEG_ARGUMENTS, default=DEFAULT_ARGUMENTS): cv.string,
}) })

4
homeassistant/components/ffmpeg/camera.py
View File

@ -20,11 +20,13 @@ from . import CONF_EXTRA_ARGUMENTS, CONF_INPUT, DATA_FFMPEG
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
DEPENDENCIES = ['ffmpeg'] DEPENDENCIES = ['ffmpeg']
DEFAULT_NAME = 'FFmpeg' DEFAULT_NAME = 'FFmpeg'
DEFAULT_ARGUMENTS = "-pred 1"
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Required(CONF_INPUT): cv.string, vol.Required(CONF_INPUT): cv.string,
vol.Optional(CONF_EXTRA_ARGUMENTS): cv.string, vol.Optional(CONF_EXTRA_ARGUMENTS, default=DEFAULT_ARGUMENTS): cv.string,
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
}) })

2
homeassistant/components/onvif/camera.py
View File

@ -33,7 +33,7 @@ DEFAULT_NAME = 'ONVIF Camera'
DEFAULT_PORT = 5000 DEFAULT_PORT = 5000
DEFAULT_USERNAME = 'admin' DEFAULT_USERNAME = 'admin'
DEFAULT_PASSWORD = '888888' DEFAULT_PASSWORD = '888888'
DEFAULT_ARGUMENTS = '-q:v 2' DEFAULT_ARGUMENTS = '-pred 1'
DEFAULT_PROFILE = 0 DEFAULT_PROFILE = 0
CONF_PROFILE = "profile" CONF_PROFILE = "profile"

3
homeassistant/components/xiaomi/camera.py
View File

@ -23,6 +23,7 @@ DEFAULT_BRAND = 'Xiaomi Home Camera'
DEFAULT_PATH = '/media/mmcblk0p1/record' DEFAULT_PATH = '/media/mmcblk0p1/record'
DEFAULT_PORT = 21 DEFAULT_PORT = 21
DEFAULT_USERNAME = 'root' DEFAULT_USERNAME = 'root'
DEFAULT_ARGUMENTS = '-pred 1'
CONF_FFMPEG_ARGUMENTS = 'ffmpeg_arguments' CONF_FFMPEG_ARGUMENTS = 'ffmpeg_arguments'
CONF_MODEL = 'model' CONF_MODEL = 'model'
@ -39,7 +40,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Optional(CONF_PATH, default=DEFAULT_PATH): cv.string, vol.Optional(CONF_PATH, default=DEFAULT_PATH): cv.string,
vol.Optional(CONF_USERNAME, default=DEFAULT_USERNAME): cv.string, vol.Optional(CONF_USERNAME, default=DEFAULT_USERNAME): cv.string,
vol.Required(CONF_PASSWORD): cv.string, vol.Required(CONF_PASSWORD): cv.string,
vol.Optional(CONF_FFMPEG_ARGUMENTS): cv.string vol.Optional(CONF_FFMPEG_ARGUMENTS, default=DEFAULT_ARGUMENTS): cv.string
}) })

3
homeassistant/components/yi/camera.py
View File

@ -26,6 +26,7 @@ DEFAULT_PASSWORD = ''
DEFAULT_PATH = '/tmp/sd/record' DEFAULT_PATH = '/tmp/sd/record'
DEFAULT_PORT = 21 DEFAULT_PORT = 21
DEFAULT_USERNAME = 'root' DEFAULT_USERNAME = 'root'
DEFAULT_ARGUMENTS = '-pred 1'
CONF_FFMPEG_ARGUMENTS = 'ffmpeg_arguments' CONF_FFMPEG_ARGUMENTS = 'ffmpeg_arguments'
@ -36,7 +37,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Optional(CONF_PATH, default=DEFAULT_PATH): cv.string, vol.Optional(CONF_PATH, default=DEFAULT_PATH): cv.string,
vol.Optional(CONF_USERNAME, default=DEFAULT_USERNAME): cv.string, vol.Optional(CONF_USERNAME, default=DEFAULT_USERNAME): cv.string,
vol.Required(CONF_PASSWORD): cv.string, vol.Required(CONF_PASSWORD): cv.string,
vol.Optional(CONF_FFMPEG_ARGUMENTS): cv.string vol.Optional(CONF_FFMPEG_ARGUMENTS, default=DEFAULT_ARGUMENTS): cv.string
}) })