Use api path to determine type (#12031)

* Use api path to determine type

* Use in both cases

* Fix extension parsing
This commit is contained in:
Nicolas Mowen
2024-06-17 14:53:35 -06:00
committed by GitHub
parent 5b60785cca
commit 4635e64b2e
4 changed files with 8 additions and 7 deletions

View File

@@ -105,6 +105,7 @@ def latest_frame(camera_name):
"regions": request.args.get("regions", type=int),
}
resize_quality = request.args.get("quality", default=70, type=int)
extension = os.path.splitext(request.path)[1][1:]
if camera_name in current_app.frigate_config.cameras:
frame = current_app.detected_frames_processor.get_current_frame(
@@ -147,10 +148,10 @@ def latest_frame(camera_name):
frame = cv2.resize(frame, dsize=(width, height), interpolation=cv2.INTER_AREA)
ret, img = cv2.imencode(
".webp", frame, [int(cv2.IMWRITE_WEBP_QUALITY), resize_quality]
f".{extension}", frame, [int(cv2.IMWRITE_WEBP_QUALITY), resize_quality]
)
response = make_response(img.tobytes())
response.headers["Content-Type"] = "image/webp"
response.headers["Content-Type"] = f"image/{extension}"
response.headers["Cache-Control"] = "no-store"
return response
elif camera_name == "birdseye" and current_app.frigate_config.birdseye.restream:
@@ -165,10 +166,10 @@ def latest_frame(camera_name):
frame = cv2.resize(frame, dsize=(width, height), interpolation=cv2.INTER_AREA)
ret, img = cv2.imencode(
".webp", frame, [int(cv2.IMWRITE_WEBP_QUALITY), resize_quality]
f".{extension}", frame, [int(cv2.IMWRITE_WEBP_QUALITY), resize_quality]
)
response = make_response(img.tobytes())
response.headers["Content-Type"] = "image/webp"
response.headers["Content-Type"] = f"image/{extension}"
response.headers["Cache-Control"] = "no-store"
return response
else: