Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2024-12-19 19:06:16 +01:00
Code Issues Projects Releases Wiki Activity

maintain aspect ratio for birdseye

Browse Source
This commit is contained in:
Blake Blackshear 2021-06-23 07:36:47 -05:00
parent 0ff037997f
commit fa61e9da29
3 changed files with 87 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frigate/output.py
View File

@ -193,8 +193,6 @@ class BirdsEyeFrameManager:
]
)
logger.debug(f"Active cameras: {active_cameras}")
# if there are no active cameras
if len(active_cameras) == 0:
# if the layout is already cleared
@ -209,7 +207,6 @@ class BirdsEyeFrameManager:
# calculate layout dimensions
layout_dim = math.ceil(math.sqrt(len(active_cameras)))
logger.debug(f"New calculated layout dimensions: {layout_dim}")
# reset the layout if it needs to be different
if layout_dim != self.layout_dim:

45
frigate/test/test_copy_yuv_to_position.py
View File

@ -1,7 +1,7 @@
import cv2
import numpy as np
from unittest import TestCase, main
from frigate.util import copy_yuv_to_position
from frigate.util import get_yuv_crop, copy_yuv_to_position
class TestCopyYuvToPosition(TestCase):
@ -11,14 +11,53 @@ class TestCopyYuvToPosition(TestCase):
self.source_yuv_frame = cv2.cvtColor(
self.source_frame_bgr, cv2.COLOR_BGR2YUV_I420
)
y, u1, u2, v1, v2 = get_yuv_crop(
self.source_yuv_frame.shape,
(
0,
0,
self.source_frame_bgr.shape[1],
self.source_frame_bgr.shape[0],
),
)
self.source_channel_dims = {
"y": y,
"u1": u1,
"u2": u2,
"v1": v1,
"v2": v2,
}
self.dest_frame_bgr = np.zeros((400, 800, 3), np.uint8)
self.dest_frame_bgr[:] = (112, 202, 50)
self.dest_frame_bgr[100:300, 200:600] = (255, 0, 0)
self.dest_yuv_frame = cv2.cvtColor(self.dest_frame_bgr, cv2.COLOR_BGR2YUV_I420)
def test_copy_yuv_to_position(self):
copy_yuv_to_position(1, self.dest_yuv_frame, 3)
def test_clear_position(self):
copy_yuv_to_position(self.dest_yuv_frame, (100, 100), (100, 100))
# cv2.imwrite(f"source_frame_yuv.jpg", self.source_yuv_frame)
# cv2.imwrite(f"dest_frame_yuv.jpg", self.dest_yuv_frame)
def test_copy_position(self):
copy_yuv_to_position(
self.dest_yuv_frame,
(100, 100),
(100, 200),
self.source_yuv_frame,
self.source_channel_dims,
)
# cv2.imwrite(f"source_frame_yuv.jpg", self.source_yuv_frame)
# cv2.imwrite(f"dest_frame_yuv.jpg", self.dest_yuv_frame)
def test_copy_position_full_screen(self):
copy_yuv_to_position(
self.dest_yuv_frame,
(0, 0),
(400, 800),
self.source_yuv_frame,
self.source_channel_dims,
)
# cv2.imwrite(f"source_frame_yuv.jpg", self.source_yuv_frame)
# cv2.imwrite(f"dest_frame_yuv.jpg", self.dest_yuv_frame)

55
frigate/util.py
View File

@ -343,51 +343,86 @@ def copy_yuv_to_position(
# clear v2
destination_frame[v2[1] : v2[3], v2[0] : v2[2]] = 128
else:
# calculate the resized frame, maintaining the aspect ratio
source_aspect_ratio = source_frame.shape[1] / (source_frame.shape[0] // 3 * 2)
dest_aspect_ratio = destination_shape[1] / destination_shape[0]
if source_aspect_ratio <= dest_aspect_ratio:
y_resize_height = int(destination_shape[0] // 4 * 4)
y_resize_width = int((y_resize_height * source_aspect_ratio) // 4 * 4)
else:
y_resize_width = int(destination_shape[1] // 4 * 4)
y_resize_height = int((y_resize_width / source_aspect_ratio) // 4 * 4)
uv_resize_width = int(y_resize_width // 2)
uv_resize_height = int(y_resize_height // 4)
y_y_offset = int((destination_shape[0] - y_resize_height) / 4 // 4 * 4)
y_x_offset = int((destination_shape[1] - y_resize_width) / 2 // 4 * 4)
uv_y_offset = y_y_offset // 4
uv_x_offset = y_x_offset // 2
interpolation = cv2.INTER_LINEAR
# resize/copy y channel
destination_frame[y[1] : y[3], y[0] : y[2]] = cv2.resize(
destination_frame[
y[1] + y_y_offset : y[1] + y_y_offset + y_resize_height,
y[0] + y_x_offset : y[0] + y_x_offset + y_resize_width,
] = cv2.resize(
source_frame[
source_channel_dim["y"][1] : source_channel_dim["y"][3],
source_channel_dim["y"][0] : source_channel_dim["y"][2],
],
dsize=(y[2] - y[0], y[3] - y[1]),
dsize=(y_resize_width, y_resize_height),
interpolation=interpolation,
)
# resize/copy u1
destination_frame[u1[1] : u1[3], u1[0] : u1[2]] = cv2.resize(
destination_frame[
u1[1] + uv_y_offset : u1[1] + uv_y_offset + uv_resize_height,
u1[0] + uv_x_offset : u1[0] + uv_x_offset + uv_resize_width,
] = cv2.resize(
source_frame[
source_channel_dim["u1"][1] : source_channel_dim["u1"][3],
source_channel_dim["u1"][0] : source_channel_dim["u1"][2],
],
dsize=(u1[2] - u1[0], u1[3] - u1[1]),
dsize=(uv_resize_width, uv_resize_height),
interpolation=interpolation,
)
# resize/copy u2
destination_frame[u2[1] : u2[3], u2[0] : u2[2]] = cv2.resize(
destination_frame[
u2[1] + uv_y_offset : u2[1] + uv_y_offset + uv_resize_height,
u2[0] + uv_x_offset : u2[0] + uv_x_offset + uv_resize_width,
] = cv2.resize(
source_frame[
source_channel_dim["u2"][1] : source_channel_dim["u2"][3],
source_channel_dim["u2"][0] : source_channel_dim["u2"][2],
],
dsize=(u2[2] - u2[0], u2[3] - u2[1]),
dsize=(uv_resize_width, uv_resize_height),
interpolation=interpolation,
)
# resize/copy v1
destination_frame[v1[1] : v1[3], v1[0] : v1[2]] = cv2.resize(
destination_frame[
v1[1] + uv_y_offset : v1[1] + uv_y_offset + uv_resize_height,
v1[0] + uv_x_offset : v1[0] + uv_x_offset + uv_resize_width,
] = cv2.resize(
source_frame[
source_channel_dim["v1"][1] : source_channel_dim["v1"][3],
source_channel_dim["v1"][0] : source_channel_dim["v1"][2],
],
dsize=(v1[2] - v1[0], v1[3] - v1[1]),
dsize=(uv_resize_width, uv_resize_height),
interpolation=interpolation,
)
# resize/copy v2
destination_frame[v2[1] : v2[3], v2[0] : v2[2]] = cv2.resize(
destination_frame[
v2[1] + uv_y_offset : v2[1] + uv_y_offset + uv_resize_height,
v2[0] + uv_x_offset : v2[0] + uv_x_offset + uv_resize_width,
] = cv2.resize(
source_frame[
source_channel_dim["v2"][1] : source_channel_dim["v2"][3],
source_channel_dim["v2"][0] : source_channel_dim["v2"][2],
],
dsize=(v2[2] - v2[0], v2[3] - v2[1]),
dsize=(uv_resize_width, uv_resize_height),
interpolation=interpolation,
)