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

Merge pull request #41909 from home-assistant/rc

Browse Source
This commit is contained in:
Paulus Schoutsen 2020-10-15 23:41:17 +02:00 committed by GitHub
commit 3bcf2f9fd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
homeassistant/components/onvif/manifest.json
View File

@ -2,7 +2,11 @@
"domain": "onvif", "domain": "onvif",
"name": "ONVIF", "name": "ONVIF",
"documentation": "https://www.home-assistant.io/integrations/onvif", "documentation": "https://www.home-assistant.io/integrations/onvif",
"requirements": ["onvif-zeep-async==0.5.0", "WSDiscovery==2.0.0"], "requirements": [
"onvif-zeep-async==0.6.0",
"WSDiscovery==2.0.0",
"zeep[async]==3.4.0"
],
"dependencies": ["ffmpeg"], "dependencies": ["ffmpeg"],
"codeowners": ["@hunterjm"], "codeowners": ["@hunterjm"],
"config_flow": true "config_flow": true

3
homeassistant/components/stream/fmp4utils.py
View File

@ -70,7 +70,8 @@ def get_codec_string(segment: io.BytesIO) -> str:
): ):
profile = stsd_box[111:112].hex() profile = stsd_box[111:112].hex()
compatibility = stsd_box[112:113].hex() compatibility = stsd_box[112:113].hex()
level = stsd_box[113:114].hex() # Cap level at 4.1 for compatibility with some Google Cast devices
level = hex(min(stsd_box[113], 41))[2:]
codec += "." + profile + compatibility + level codec += "." + profile + compatibility + level
# Handle H265 # Handle H265

5
homeassistant/components/stream/hls.py
View File

@ -32,10 +32,11 @@ class HlsMasterPlaylistView(StreamView):
def render(track): def render(track):
"""Render M3U8 file.""" """Render M3U8 file."""
# Need to calculate max bandwidth as input_container.bit_rate doesn't seem to work # Need to calculate max bandwidth as input_container.bit_rate doesn't seem to work
# Calculate file size / duration and use a multiplier to account for variation # Calculate file size / duration and use a small multiplier to account for variation
# hls spec already allows for 25% variation
segment = track.get_segment(track.segments[-1]) segment = track.get_segment(track.segments[-1])
bandwidth = round( bandwidth = round(
segment.segment.seek(0, io.SEEK_END) * 8 / segment.duration * 3 segment.segment.seek(0, io.SEEK_END) * 8 / segment.duration * 1.2
) )
codecs = get_codec_string(segment.segment) codecs = get_codec_string(segment.segment)
lines = [ lines = [

2
homeassistant/const.py
View File

@ -1,7 +1,7 @@
"""Constants used by Home Assistant components.""" """Constants used by Home Assistant components."""
MAJOR_VERSION = 0 MAJOR_VERSION = 0
MINOR_VERSION = 116 MINOR_VERSION = 116
PATCH_VERSION = "3" PATCH_VERSION = "4"
__short_version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}" __short_version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}"
__version__ = f"{__short_version__}.{PATCH_VERSION}" __version__ = f"{__short_version__}.{PATCH_VERSION}"
REQUIRED_PYTHON_VER = (3, 7, 1) REQUIRED_PYTHON_VER = (3, 7, 1)

5
requirements_all.txt
View File

@ -1022,7 +1022,7 @@ omnilogic==0.4.0
onkyo-eiscp==1.2.7 onkyo-eiscp==1.2.7
# homeassistant.components.onvif # homeassistant.components.onvif
onvif-zeep-async==0.5.0 onvif-zeep-async==0.6.0
# homeassistant.components.opengarage # homeassistant.components.opengarage
open-garage==0.1.4 open-garage==0.1.4
@ -2303,6 +2303,9 @@ yeelightsunflower==0.0.10
# homeassistant.components.media_extractor # homeassistant.components.media_extractor
youtube_dl==2020.09.20 youtube_dl==2020.09.20
# homeassistant.components.onvif
zeep[async]==3.4.0
# homeassistant.components.zengge # homeassistant.components.zengge
zengge==0.2 zengge==0.2

5
requirements_test_all.txt
View File

@ -490,7 +490,7 @@ oauth2client==4.0.0
omnilogic==0.4.0 omnilogic==0.4.0
# homeassistant.components.onvif # homeassistant.components.onvif
onvif-zeep-async==0.5.0 onvif-zeep-async==0.6.0
# homeassistant.components.openerz # homeassistant.components.openerz
openerz-api==0.1.0 openerz-api==0.1.0
@ -1066,6 +1066,9 @@ xmltodict==0.12.0
# homeassistant.components.yeelight # homeassistant.components.yeelight
yeelight==0.5.4 yeelight==0.5.4
# homeassistant.components.onvif
zeep[async]==3.4.0
# homeassistant.components.zeroconf # homeassistant.components.zeroconf
zeroconf==0.28.5 zeroconf==0.28.5