evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure camera scaling always produces an image of at least the requested width and height (#55033)

Browse source
This commit is contained in:
J. Nick Koston 2021-08-24 03:44:12 -05:00 • committed by GitHub
parent ccaf0d5c75
commit dc851b9dd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 74 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

46
tests/components/camera/test_img_util.py
View file

@ -1,11 +1,13 @@
"""Test img_util module."""
from unittest.mock import patch
import pytest
from turbojpeg import TurboJPEG
from homeassistant.components.camera import Image
from homeassistant.components.camera.img_util import (
TurboJPEGSingleton,
find_supported_scaling_factor,
scale_jpeg_camera_image,
)
@ -59,6 +61,15 @@ def test_scale_jpeg_camera_image():
assert jpeg_bytes == EMPTY_8_6_JPEG
turbo_jpeg = mock_turbo_jpeg(
first_width=640, first_height=480, second_width=640, second_height=480
)
with patch("turbojpeg.TurboJPEG", return_value=turbo_jpeg):
TurboJPEGSingleton()
jpeg_bytes = scale_jpeg_camera_image(camera_image, 320, 480)
assert jpeg_bytes == EMPTY_16_12_JPEG
def test_turbojpeg_load_failure():
"""Handle libjpegturbo not being installed."""
@ -70,3 +81,38 @@ def test_turbojpeg_load_failure():
_clear_turbojpeg_singleton()
TurboJPEGSingleton()
assert TurboJPEGSingleton.instance() is not None
SCALE_TEST_EXPECTED = [
(5782, 3946, 640, 480, (1, 8)), # Maximum scale
(1600, 1200, 640, 480, (1, 2)), # Equal scale for width and height
(1600, 1200, 1400, 1050, (7, 8)), # Equal scale for width and height
(1600, 1200, 1200, 900, (3, 4)), # Equal scale for width and height
(1600, 1200, 1000, 750, (5, 8)), # Equal scale for width and height
(1600, 1200, 600, 450, (3, 8)), # Equal scale for width and height
(1600, 1200, 400, 300, (1, 4)), # Equal scale for width and height
(1600, 1200, 401, 300, (3, 8)), # Width is just a little to big, next size up
(640, 480, 330, 200, (5, 8)), # Preserve width clarity
(640, 480, 300, 260, (5, 8)), # Preserve height clarity
(640, 480, 1200, 480, None), # Request larger width - no scaling
(640, 480, 640, 480, None), # Request same - no scaling
(640, 480, 640, 270, None), # Request smaller height - no scaling
(640, 480, 320, 480, None), # Request smaller width - no scaling
]
@pytest.mark.parametrize(
"image_width, image_height, input_width, input_height, scaling_factor",
SCALE_TEST_EXPECTED,
)
def test_find_supported_scaling_factor(
image_width, image_height, input_width, input_height, scaling_factor
):
"""Test we always get an image of at least the size we ask if its big enough."""
assert (
find_supported_scaling_factor(
image_width, image_height, input_width, input_height
)
== scaling_factor
)