administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-03 01:35:22 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Nick Mowen 2022-10-24 07:05:40 -06:00
parent ae13b7dbcc
commit 04373c4fc6
6 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frigate/config.py
View File

@ -590,12 +590,17 @@ class CameraConfig(FrigateBaseModel):
# add roles to the input if there is only one # add roles to the input if there is only one
if len(config["ffmpeg"]["inputs"]) == 1: if len(config["ffmpeg"]["inputs"]) == 1:
has_rtmp = "rtmp" in config["ffmpeg"]["inputs"][0]["roles"]
config["ffmpeg"]["inputs"][0]["roles"] = [ config["ffmpeg"]["inputs"][0]["roles"] = [
"record", "record",
"detect", "detect",
"restream", "restream",
] ]
if has_rtmp:
config["ffmpeg"]["inputs"][0]["roles"].append("rtmp")
super().__init__(**config) super().__init__(**config)
@property @property

22
frigate/test/test_config.py
View File

@ -1181,7 +1181,7 @@ class TestConfig(unittest.TestCase):
"inputs": [ "inputs": [
{ {
"path": "rtsp://10.0.0.1:554/video", "path": "rtsp://10.0.0.1:554/video",
"roles": ["detect"], "roles": ["detect", "rtmp"],
}, },
] ]
}, },
@ -1225,11 +1225,11 @@ class TestConfig(unittest.TestCase):
runtime_config = frigate_config.runtime_config runtime_config = frigate_config.runtime_config
assert not runtime_config.cameras["back"].rtmp.enabled assert not runtime_config.cameras["back"].rtmp.enabled
def test_global_live(self): def test_global_jsmpeg(self):
config = { config = {
"mqtt": {"host": "mqtt"}, "mqtt": {"host": "mqtt"},
"live": {"quality": 4}, "restream": {"jsmpeg": {"quality": 4}},
"cameras": { "cameras": {
"back": { "back": {
"ffmpeg": { "ffmpeg": {
@ -1247,7 +1247,7 @@ class TestConfig(unittest.TestCase):
assert config == frigate_config.dict(exclude_unset=True) assert config == frigate_config.dict(exclude_unset=True)
runtime_config = frigate_config.runtime_config runtime_config = frigate_config.runtime_config
assert runtime_config.cameras["back"].live.quality == 4 assert runtime_config.cameras["back"].restream.jsmpeg.quality == 4
def test_default_live(self): def test_default_live(self):
@ -1270,13 +1270,13 @@ class TestConfig(unittest.TestCase):
assert config == frigate_config.dict(exclude_unset=True) assert config == frigate_config.dict(exclude_unset=True)
runtime_config = frigate_config.runtime_config runtime_config = frigate_config.runtime_config
assert runtime_config.cameras["back"].live.quality == 8 assert runtime_config.cameras["back"].restream.jsmpeg.quality == 8
def test_global_live_merge(self): def test_global_live_merge(self):
config = { config = {
"mqtt": {"host": "mqtt"}, "mqtt": {"host": "mqtt"},
"live": {"quality": 4, "height": 480}, "restream": {"jsmpeg": {"quality": 4, "height": 480}},
"cameras": { "cameras": {
"back": { "back": {
"ffmpeg": { "ffmpeg": {
@ -1287,8 +1287,10 @@ class TestConfig(unittest.TestCase):
}, },
] ]
}, },
"live": { "restream": {
"quality": 7, "jsmpeg": {
"quality": 7,
}
}, },
} }
}, },
@ -1297,8 +1299,8 @@ class TestConfig(unittest.TestCase):
assert config == frigate_config.dict(exclude_unset=True) assert config == frigate_config.dict(exclude_unset=True)
runtime_config = frigate_config.runtime_config runtime_config = frigate_config.runtime_config
assert runtime_config.cameras["back"].live.quality == 7 assert runtime_config.cameras["back"].restream.jsmpeg.quality == 7
assert runtime_config.cameras["back"].live.height == 480 assert runtime_config.cameras["back"].restream.jsmpeg.height == 480
def test_global_timestamp_style(self): def test_global_timestamp_style(self):

BIN
test.db-journal Normal file
View File

Binary file not shown.

4
web/config/handlers.js
View File

@ -19,7 +19,7 @@ export const handlers = [
record: { enabled: true }, record: { enabled: true },
detect: { width: 1280, height: 720 }, detect: { width: 1280, height: 720 },
snapshots: {}, snapshots: {},
live: { height: 720 }, restream: { enabled: true, jsmpeg: { height: 720 } },
ui: { dashboard: true, order: 0 }, ui: { dashboard: true, order: 0 },
}, },
side: { side: {
@ -28,7 +28,7 @@ export const handlers = [
record: { enabled: false }, record: { enabled: false },
detect: { width: 1280, height: 720 }, detect: { width: 1280, height: 720 },
snapshots: {}, snapshots: {},
live: { height: 720 }, restream: { enabled: true, jsmpeg: { height: 720 } },
ui: { dashboard: true, order: 1 }, ui: { dashboard: true, order: 1 },
}, },
}, },

4
web/src/routes/Camera.jsx
View File

@ -29,7 +29,7 @@ export default function Camera({ camera }) {
? Math.round(cameraConfig.restream.jsmpeg.height * (cameraConfig.detect.width / cameraConfig.detect.height)) ? Math.round(cameraConfig.restream.jsmpeg.height * (cameraConfig.detect.width / cameraConfig.detect.height))
: 0; : 0;
const [viewSource, setViewSource] = usePersistence(`${camera}-source`, 'jsmpeg'); const [viewSource, setViewSource] = usePersistence(`${camera}-source`, 'jsmpeg');
const sourceValues = cameraConfig.restream.enabled ? ['jsmpeg', 'mp4', 'webrtc'] : ['jsmpeg']; const sourceValues = (cameraConfig && cameraConfig.restream.enabled) ? ['jsmpeg', 'mp4', 'webrtc'] : ['jsmpeg'];
const [options, setOptions] = usePersistence(`${camera}-feed`, emptyObject); const [options, setOptions] = usePersistence(`${camera}-feed`, emptyObject);
const handleSetOption = useCallback( const handleSetOption = useCallback(
@ -100,7 +100,7 @@ export default function Camera({ camera }) {
if (viewSource == 'mp4') { if (viewSource == 'mp4') {
player = ( player = (
<Fragment> <Fragment>
<div className="max-w-7xl"> <div className="max-w-5xl">
<VideoPlayer <VideoPlayer
live={true} live={true}
options={{ options={{

8
web/src/routes/__tests__/Camera.test.jsx
View File

@ -47,6 +47,11 @@ describe('Camera Route', () => {
test('updates camera feed options to persistence', async () => { test('updates camera feed options to persistence', async () => {
mockUsePersistence mockUsePersistence
.mockReturnValueOnce([{}, mockSetOptions])
.mockReturnValueOnce([{}, mockSetOptions])
.mockReturnValueOnce([{}, mockSetOptions])
.mockReturnValueOnce([{}, mockSetOptions])
.mockReturnValueOnce([{}, mockSetOptions])
.mockReturnValueOnce([{}, mockSetOptions]) .mockReturnValueOnce([{}, mockSetOptions])
.mockReturnValueOnce([{}, mockSetOptions]) .mockReturnValueOnce([{}, mockSetOptions])
.mockReturnValueOnce([{}, mockSetOptions]) .mockReturnValueOnce([{}, mockSetOptions])
@ -63,9 +68,8 @@ describe('Camera Route', () => {
fireEvent.change(screen.queryByTestId('timestamp-input'), { target: { checked: true } }); fireEvent.change(screen.queryByTestId('timestamp-input'), { target: { checked: true } });
fireEvent.click(screen.queryByText('Hide Options')); fireEvent.click(screen.queryByText('Hide Options'));
expect(mockUsePersistence).toHaveBeenCalledTimes(5); expect(mockUsePersistence).toHaveBeenCalledTimes(10);
expect(mockSetOptions).toHaveBeenCalledTimes(2); expect(mockSetOptions).toHaveBeenCalledTimes(2);
expect(mockSetOptions).toHaveBeenCalledWith({ bbox: true, timestamp: true });
expect(screen.queryByTestId('mock-image')).toHaveTextContent('bbox=1&timestamp=1'); expect(screen.queryByTestId('mock-image')).toHaveTextContent('bbox=1&timestamp=1');
}); });
}); });