Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2025-01-21 00:06:44 +01:00
Code Issues Projects Releases Wiki Activity

fix ffmpeg config for env vars

Browse Source
This commit is contained in:
Blake Blackshear 2021-11-08 18:20:47 -06:00
parent 5a9e82c4b0
commit b29b311e92
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frigate/app.py
View File

@ -71,6 +71,9 @@ class FrigateApp:
self.config = user_config.runtime_config self.config = user_config.runtime_config
for camera_name in self.config.cameras.keys(): for camera_name in self.config.cameras.keys():
# generage the ffmpeg commands
self.config.cameras[camera_name].create_ffmpeg_cmds()
# create camera_metrics # create camera_metrics
self.camera_metrics[camera_name] = { self.camera_metrics[camera_name] = {
"camera_fps": mp.Value("d", 0.0), "camera_fps": mp.Value("d", 0.0),

8
frigate/config.py
View File

@ -12,7 +12,7 @@ import yaml
from pydantic import BaseModel, Extra, Field, validator from pydantic import BaseModel, Extra, Field, validator
from pydantic.fields import PrivateAttr from pydantic.fields import PrivateAttr
from frigate.const import BASE_DIR, CACHE_DIR, RECORD_DIR from frigate.const import BASE_DIR, CACHE_DIR
from frigate.edgetpu import load_labels from frigate.edgetpu import load_labels
from frigate.util import create_mask, deep_merge from frigate.util import create_mask, deep_merge
@ -506,8 +506,6 @@ class CameraConfig(FrigateBaseModel):
super().__init__(**config) super().__init__(**config)
self._ffmpeg_cmds = self._create_ffmpeg_cmds()
@property @property
def frame_shape(self) -> Tuple[int, int]: def frame_shape(self) -> Tuple[int, int]:
return self.detect.height, self.detect.width return self.detect.height, self.detect.width
@ -520,7 +518,7 @@ class CameraConfig(FrigateBaseModel):
def ffmpeg_cmds(self) -> List[Dict[str, List[str]]]: def ffmpeg_cmds(self) -> List[Dict[str, List[str]]]:
return self._ffmpeg_cmds return self._ffmpeg_cmds
def _create_ffmpeg_cmds(self) -> List[Dict[str, List[str]]]: def create_ffmpeg_cmds(self) -> List[Dict[str, List[str]]]:
ffmpeg_cmds = [] ffmpeg_cmds = []
for ffmpeg_input in self.ffmpeg.inputs: for ffmpeg_input in self.ffmpeg.inputs:
ffmpeg_cmd = self._get_ffmpeg_cmd(ffmpeg_input) ffmpeg_cmd = self._get_ffmpeg_cmd(ffmpeg_input)
@ -528,7 +526,7 @@ class CameraConfig(FrigateBaseModel):
continue continue
ffmpeg_cmds.append({"roles": ffmpeg_input.roles, "cmd": ffmpeg_cmd}) ffmpeg_cmds.append({"roles": ffmpeg_input.roles, "cmd": ffmpeg_cmd})
return ffmpeg_cmds self._ffmpeg_cmds = ffmpeg_cmds
def _get_ffmpeg_cmd(self, ffmpeg_input: CameraInput): def _get_ffmpeg_cmd(self, ffmpeg_input: CameraInput):
ffmpeg_output_args = [] ffmpeg_output_args = []