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

Allow playback of h265 encoded Reolink video (#138667)

Browse Source
This commit is contained in:
starkillerOG 2025-02-18 11:17:13 +01:00 committed by GitHub
parent 800cdee409
commit f5e1fa6a21
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
homeassistant/components/reolink/media_source.py
View File

@ -222,7 +222,7 @@ class ReolinkVODMediaSource(MediaSource):
if main_enc == "h265": if main_enc == "h265":
_LOGGER.debug( _LOGGER.debug(
"Reolink camera %s uses h265 encoding for main stream," "Reolink camera %s uses h265 encoding for main stream,"
"playback only possible using sub stream", "playback at high resolution may not work in all browsers/apps",
host.api.camera_name(channel), host.api.camera_name(channel),
) )
@ -236,34 +236,29 @@ class ReolinkVODMediaSource(MediaSource):
can_play=False, can_play=False,
can_expand=True, can_expand=True,
), ),
BrowseMediaSource(
domain=DOMAIN,
identifier=f"RES|{config_entry_id}|{channel}|main",
media_class=MediaClass.CHANNEL,
media_content_type=MediaType.PLAYLIST,
title="High resolution",
can_play=False,
can_expand=True,
),
] ]
if main_enc != "h265":
children.append(
BrowseMediaSource(
domain=DOMAIN,
identifier=f"RES|{config_entry_id}|{channel}|main",
media_class=MediaClass.CHANNEL,
media_content_type=MediaType.PLAYLIST,
title="High resolution",
can_play=False,
can_expand=True,
),
)
if host.api.supported(channel, "autotrack_stream"): if host.api.supported(channel, "autotrack_stream"):
children.append( children.extend(
BrowseMediaSource( [
domain=DOMAIN, BrowseMediaSource(
identifier=f"RES|{config_entry_id}|{channel}|autotrack_sub", domain=DOMAIN,
media_class=MediaClass.CHANNEL, identifier=f"RES|{config_entry_id}|{channel}|autotrack_sub",
media_content_type=MediaType.PLAYLIST, media_class=MediaClass.CHANNEL,
title="Autotrack low resolution", media_content_type=MediaType.PLAYLIST,
can_play=False, title="Autotrack low resolution",
can_expand=True, can_play=False,
), can_expand=True,
) ),
if main_enc != "h265":
children.append(
BrowseMediaSource( BrowseMediaSource(
domain=DOMAIN, domain=DOMAIN,
identifier=f"RES|{config_entry_id}|{channel}|autotrack_main", identifier=f"RES|{config_entry_id}|{channel}|autotrack_main",
@ -273,11 +268,7 @@ class ReolinkVODMediaSource(MediaSource):
can_play=False, can_play=False,
can_expand=True, can_expand=True,
), ),
) ]
if len(children) == 1:
return await self._async_generate_camera_days(
config_entry_id, channel, "sub"
) )
title = host.api.camera_name(channel) title = host.api.camera_name(channel)

17
tests/components/reolink/test_media_source.py
View File

@ -235,12 +235,12 @@ async def test_browsing(
reolink_connect.model = TEST_HOST_MODEL reolink_connect.model = TEST_HOST_MODEL
async def test_browsing_unsupported_encoding( async def test_browsing_h265_encoding(
hass: HomeAssistant, hass: HomeAssistant,
reolink_connect: MagicMock, reolink_connect: MagicMock,
config_entry: MockConfigEntry, config_entry: MockConfigEntry,
) -> None: ) -> None:
"""Test browsing a Reolink camera with unsupported stream encoding.""" """Test browsing a Reolink camera with h265 stream encoding."""
entry_id = config_entry.entry_id entry_id = config_entry.entry_id
with patch("homeassistant.components.reolink.PLATFORMS", [Platform.CAMERA]): with patch("homeassistant.components.reolink.PLATFORMS", [Platform.CAMERA]):
@ -249,7 +249,6 @@ async def test_browsing_unsupported_encoding(
browse_root_id = f"CAM|{entry_id}|{TEST_CHANNEL}" browse_root_id = f"CAM|{entry_id}|{TEST_CHANNEL}"
# browse resolution select/camera recording days when main encoding unsupported
mock_status = MagicMock() mock_status = MagicMock()
mock_status.year = TEST_YEAR mock_status.year = TEST_YEAR
mock_status.month = TEST_MONTH mock_status.month = TEST_MONTH
@ -261,6 +260,18 @@ async def test_browsing_unsupported_encoding(
browse = await async_browse_media(hass, f"{URI_SCHEME}{DOMAIN}/{browse_root_id}") browse = await async_browse_media(hass, f"{URI_SCHEME}{DOMAIN}/{browse_root_id}")
browse_resolution_id = f"RESs|{entry_id}|{TEST_CHANNEL}"
browse_res_sub_id = f"RES|{entry_id}|{TEST_CHANNEL}|sub"
browse_res_main_id = f"RES|{entry_id}|{TEST_CHANNEL}|main"
assert browse.domain == DOMAIN
assert browse.title == f"{TEST_NVR_NAME}"
assert browse.identifier == browse_resolution_id
assert browse.children[0].identifier == browse_res_sub_id
assert browse.children[1].identifier == browse_res_main_id
browse = await async_browse_media(hass, f"{URI_SCHEME}{DOMAIN}/{browse_res_sub_id}")
browse_days_id = f"DAYS|{entry_id}|{TEST_CHANNEL}|sub" browse_days_id = f"DAYS|{entry_id}|{TEST_CHANNEL}|sub"
browse_day_0_id = ( browse_day_0_id = (
f"DAY|{entry_id}|{TEST_CHANNEL}|sub|{TEST_YEAR}|{TEST_MONTH}|{TEST_DAY}" f"DAY|{entry_id}|{TEST_CHANNEL}|sub|{TEST_YEAR}|{TEST_MONTH}|{TEST_DAY}"