projects
/
python_utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More cleanup, yey!
[python_utils.git]
/
camera_utils.py
diff --git
a/camera_utils.py
b/camera_utils.py
index f5d295b6ed7477815fe502eed82eaea8a2c4831c..c789ed61e19d304391c9d10393bcb22094b0b7d7 100644
(file)
--- a/
camera_utils.py
+++ b/
camera_utils.py
@@
-50,7
+50,7
@@
def sanity_check_image(hsv: np.ndarray) -> SanityCheckImageMetadata:
weird_orange_count += 1
elif is_near(pixel[0], 0) and is_near(pixel[1], 0):
hs_zero_count += 1
weird_orange_count += 1
elif is_near(pixel[0], 0) and is_near(pixel[1], 0):
hs_zero_count += 1
- logger.debug(
f"hszero#={hs_zero_count}, weird_orange={weird_orange_count}"
)
+ logger.debug(
"hszero#=%d, weird_orange=%d", hs_zero_count, weird_orange_count
)
return SanityCheckImageMetadata(
hs_zero_count > (num_pixels * 0.75),
weird_orange_count > (num_pixels * 0.75),
return SanityCheckImageMetadata(
hs_zero_count > (num_pixels * 0.75),
weird_orange_count > (num_pixels * 0.75),
@@
-67,23
+67,26
@@
def fetch_camera_image_from_video_server(
url = (
f"http://10.0.0.226:8080/Umtxxf1uKMBniFblqeQ9KRbb6DDzN4/jpeg/GKlT2FfiSQ/{camera_name}/s.jpg"
)
url = (
f"http://10.0.0.226:8080/Umtxxf1uKMBniFblqeQ9KRbb6DDzN4/jpeg/GKlT2FfiSQ/{camera_name}/s.jpg"
)
- logger.debug(
f'Fetching image from {url}'
)
+ logger.debug(
'Fetching image from %s', url
)
try:
response = requests.get(url, stream=False, timeout=10.0)
if response.ok:
raw = response.content
try:
response = requests.get(url, stream=False, timeout=10.0)
if response.ok:
raw = response.content
- logger.debug(
f'Read {len(response.content)} byte image from HTTP server'
)
+ logger.debug(
'Read %d byte image from HTTP server', len(response.content)
)
tmp = np.frombuffer(raw, dtype="uint8")
logger.debug(
tmp = np.frombuffer(raw, dtype="uint8")
logger.debug(
- f'Translated raw content into {tmp.shape} {type(tmp)} with element type {type(tmp[0])}.'
+ 'Translated raw content into %s %s with element type %s',
+ tmp.shape, type(tmp), type(tmp[0]),
)
jpg = cv2.imdecode(tmp, cv2.IMREAD_COLOR)
logger.debug(
)
jpg = cv2.imdecode(tmp, cv2.IMREAD_COLOR)
logger.debug(
- f'Decoded into {jpg.shape} jpeg {type(jpg)} with element type {type(jpg[0][0])}'
+ 'Decoded into %s jpeg %s with element type %s',
+ jpg.shape, type(jpg), type(jpg[0][0])
)
hsv = cv2.cvtColor(jpg, cv2.COLOR_BGR2HSV)
logger.debug(
)
hsv = cv2.cvtColor(jpg, cv2.COLOR_BGR2HSV)
logger.debug(
- f'Converted JPG into HSV {hsv.shape} HSV {type(hsv)} with element type {type(hsv[0][0])}'
+ 'Converted JPG into %s HSV HSV %s with element type %s',
+ hsv.shape, type(hsv), type(hsv[0][0])
)
(_, is_bad_image) = sanity_check_image(hsv)
if not is_bad_image:
)
(_, is_bad_image) = sanity_check_image(hsv)
if not is_bad_image:
@@
-125,7
+128,7
@@
def fetch_camera_image_from_rtsp_stream(camera_name: str, *, width: int = 256) -
"""Fetch the raw webcam image straight from the webcam's RTSP stream."""
hostname = camera_name_to_hostname(camera_name)
stream = f"rtsp://camera:IaLaIok@{hostname}:554/live"
"""Fetch the raw webcam image straight from the webcam's RTSP stream."""
hostname = camera_name_to_hostname(camera_name)
stream = f"rtsp://camera:IaLaIok@{hostname}:554/live"
- logger.debug(
f'Fetching image from RTSP stream {stream}'
)
+ logger.debug(
'Fetching image from RTSP stream %s', stream
)
try:
cmd = [
"/usr/bin/timeout",
try:
cmd = [
"/usr/bin/timeout",