Use api path to determine type (#12031)

* Use api path to determine type * Use in both cases * Fix extension parsing
blakeblackshear · Jun 17, 2024 · 4635e64 · 4635e64
1 parent 5b60785
commit 4635e64
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/frigate/api/media.py b/frigate/api/media.py
@@ -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:

diff --git a/web/src/components/camera/CameraImage.tsx b/web/src/components/camera/CameraImage.tsx
@@ -47,7 +47,7 @@ export default function CameraImage({
  return;
  }
 
- imgRef.current.src = `${apiHost}api/${name}/latest.jpg?h=${requestHeight}${
+ imgRef.current.src = `${apiHost}api/${name}/latest.webp?h=${requestHeight}${
  searchParams ? `&${searchParams}` : ""
  }`;
  }, [apiHost, name, imgRef, searchParams, requestHeight, config]);

diff --git a/web/src/components/camera/ResizingCameraImage.tsx b/web/src/components/camera/ResizingCameraImage.tsx
@@ -89,7 +89,7 @@ export default function CameraImage({
  if (!config || scaledHeight === 0 || !canvasRef.current) {
  return;
  }
- img.src = `${apiHost}api/${name}/latest.jpg?h=${scaledHeight}${
+ img.src = `${apiHost}api/${name}/latest.webp?h=${scaledHeight}${
  searchParams ? `&${searchParams}` : ""
  }`;
  }, [apiHost, canvasRef, name, img, searchParams, scaledHeight, config]);

diff --git a/web/src/components/settings/PolygonCanvas.tsx b/web/src/components/settings/PolygonCanvas.tsx
@@ -39,7 +39,7 @@ export function PolygonCanvas({
  const element = new window.Image();
  element.width = width;
  element.height = height;
- element.src = `${apiHost}api/${camera}/latest.jpg`;
+ element.src = `${apiHost}api/${camera}/latest.webp`;
  return element;
  }
  }, [camera, width, height, apiHost]);