Allow improve_contrast to be toggled via mqtt #3011

hawkeye217 · 2022-03-24T18:48:00Z

I love the improve_contrast setting on some of my cameras at night, but didn't want to enable the setting during the day. This PR enables toggling it via mqtt in the same way that detection is toggled: frigate/<camera name>/improve_contrast/set

NickM-27

Overall looks good to me and in line with what is implemented. You will also need to update the mqtt docs to include this in returns as well as showing the new topic that can be set.

hawkeye217 · 2022-03-24T19:06:22Z

Overall looks good to me and in line with what is implemented. You will also need to update the mqtt docs to include this in returns as well as showing the new topic that can be set.

Thanks! Let me know if I missed anything else.

hawkeye217 · 2022-03-25T04:25:26Z

Sorry, user error. Didn't mean to close.

blakeblackshear · 2022-04-15T11:56:07Z

frigate/video.py

@@ -377,6 +378,7 @@ def receiveSignal(signalNumber, frame):
 objects_to_track,
 object_filters,
 detection_enabled,
+ improve_contrast_enabled,


Rather than passing this to process_frames, can it be passed to the motion_detector instantiation above so you don't have to pass it around on every call?

Good idea, that's actually cleaner.

Because the motion detection is run in a subprocess and motion_detector is instantiated once, I'll just create a variable in the class that has an initial value based on the config entry. Then the call to detect doesn't have to be as messy.

blakeblackshear · 2022-04-16T12:21:46Z

frigate/video.py

@@ -491,6 +494,8 @@ def process_frames(
 logger.info(f"{camera_name}: frame {frame_time} is not in memory store.")
 continue

+ motion_detector.improve_contrast = improve_contrast_enabled.value


Can't you just pass improve_contrast_enabled to the constructor for the MotionDetector class? Then there is no need to set this on each loop.

I don't think I can because after the class is instantiated, the value can change (similar to the way detection_enabled does also in process_frames) after process creation. Right? Unless there's something I don't understand about Python classes, which could totally be the case.

Well I just tried it and I guess you're right. Apologies for my lack of Python knowledge. I'll get this changed shortly.

Alright, I think it's good now. Let me know how it looks. Thanks Blake!

blakeblackshear · 2022-04-16T13:21:54Z

frigate/video.py

@@ -458,6 +460,7 @@ def process_frames(
 objects_to_track: List[str],
 object_filters,
 detection_enabled: mp.Value,
+ improve_contrast_enabled: mp.Value,


I believe this parameter is now unused and can be removed.

blakeblackshear · 2022-04-16T13:25:08Z

frigate/video.py

@@ -377,6 +378,7 @@ def receiveSignal(signalNumber, frame):
 objects_to_track,
 object_filters,
 detection_enabled,
+ improve_contrast_enabled,


This also needs to be removed now. I think this should be last change.

Done. Thanks for your patience with me!

NickM-27 · 2022-04-16T13:41:52Z

Are we going to need to cherry-pick the improve_contrast commit or merge master back into release-0.11.0 for this to be mergeable?

hawkeye217 · 2022-04-16T18:08:32Z

Are we going to need to cherry-pick the improve_contrast commit or merge master back into release-0.11.0 for this to be mergeable?

There is only one conflict in motion.py because #2942 was only committed to master. The changes in this PR supersede that anyways.

NickM-27 · 2022-04-18T00:39:16Z

Are we going to need to cherry-pick the improve_contrast commit or merge master back into release-0.11.0 for this to be mergeable?

There is only one conflict in motion.py because #2942 was only committed to master. The changes in this PR supersede that anyways.

Just tried running and am seeing this:

'RuntimeMotionConfig' object has no attribute 'improve_contrast'
Traceback (most recent call last):
  File "/lab/frigate/frigate/app.py", line 326, in start
    self.init_config()
  File "/lab/frigate/frigate/app.py", line 96, in init_config
    "i", self.config.cameras[camera_name].motion.improve_contrast
AttributeError: 'RuntimeMotionConfig' object has no attribute 'improve_contrast'

because the code access config.motion.improve_contrast which doesn't exist

hawkeye217 · 2022-04-18T01:32:41Z

Are we going to need to cherry-pick the improve_contrast commit or merge master back into release-0.11.0 for this to be mergeable?

There is only one conflict in motion.py because #2942 was only committed to master. The changes in this PR supersede that anyways.

Just tried running and am seeing this:
'RuntimeMotionConfig' object has no attribute 'improve_contrast'
Traceback (most recent call last):
  File "/lab/frigate/frigate/app.py", line 326, in start
    self.init_config()
  File "/lab/frigate/frigate/app.py", line 96, in init_config
    "i", self.config.cameras[camera_name].motion.improve_contrast
AttributeError: 'RuntimeMotionConfig' object has no attribute 'improve_contrast'
because the code access config.motion.improve_contrast which doesn't exist

#2942 introduced improve_contrast in the config. That was not merged into 0.11.0 and probably should be - specifically the docs and config.py. The changes in this PR's motion.py supersede those in #2942.

hawkeye217 added 2 commits March 19, 2022 17:41

Toggle improve_contrast for cameras via MQTT

949b26f

Process parameter to mqtt toggle improve_contrast

6b40887

NickM-27 requested changes Mar 24, 2022

View reviewed changes

Update mqtt docs for improve_contrast topic

fb5c7cf

Spacing

8fd8eaa

NickM-27 approved these changes Mar 24, 2022

View reviewed changes

blakeblackshear added the pinned label Mar 24, 2022

hawkeye217 deleted the branch blakeblackshear:release-0.11.0 March 25, 2022 04:23

hawkeye217 closed this Mar 25, 2022

hawkeye217 deleted the release-0.11.0 branch March 25, 2022 04:23

hawkeye217 restored the release-0.11.0 branch March 25, 2022 04:24

hawkeye217 reopened this Mar 25, 2022

hawkeye217 mentioned this pull request Mar 25, 2022

Add an improve_contrast switch blakeblackshear/frigate-hass-integration#230

Merged

blakeblackshear reviewed Apr 15, 2022

View reviewed changes

Add class variable and update in process_frames

e072788

blakeblackshear reviewed Apr 16, 2022

View reviewed changes

hawkeye217 added 2 commits April 16, 2022 07:52

Pass to constructor

e485282

pass by reference mistake

d2a8908

blakeblackshear reviewed Apr 16, 2022

View reviewed changes

remove parameter

c5eb75f

blakeblackshear reviewed Apr 16, 2022

View reviewed changes

remove parameter

a020cb1

blakeblackshear merged commit 65e0ec7 into blakeblackshear:release-0.11.0 Apr 16, 2022

hawkeye217 deleted the release-0.11.0 branch April 16, 2022 18:04

hawkeye217 mentioned this pull request Apr 27, 2022

Adjust camera motion threshold and contour area with mqtt #3154

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow improve_contrast to be toggled via mqtt #3011

Allow improve_contrast to be toggled via mqtt #3011

hawkeye217 commented Mar 24, 2022 •

edited

Loading

NickM-27 left a comment •

edited

Loading

hawkeye217 commented Mar 24, 2022

hawkeye217 commented Mar 25, 2022

blakeblackshear Apr 15, 2022

hawkeye217 Apr 15, 2022

hawkeye217 Apr 15, 2022

blakeblackshear Apr 16, 2022

hawkeye217 Apr 16, 2022

hawkeye217 Apr 16, 2022

hawkeye217 Apr 16, 2022

blakeblackshear Apr 16, 2022

blakeblackshear Apr 16, 2022

hawkeye217 Apr 16, 2022

NickM-27 commented Apr 16, 2022

hawkeye217 commented Apr 16, 2022

NickM-27 commented Apr 18, 2022

hawkeye217 commented Apr 18, 2022

Allow improve_contrast to be toggled via mqtt #3011

Allow improve_contrast to be toggled via mqtt #3011

Conversation

hawkeye217 commented Mar 24, 2022 • edited Loading

NickM-27 left a comment • edited Loading

Choose a reason for hiding this comment

hawkeye217 commented Mar 24, 2022

hawkeye217 commented Mar 25, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NickM-27 commented Apr 16, 2022

hawkeye217 commented Apr 16, 2022

NickM-27 commented Apr 18, 2022

hawkeye217 commented Apr 18, 2022

hawkeye217 commented Mar 24, 2022 •

edited

Loading

NickM-27 left a comment •

edited

Loading