Another fix for Safari: use JPEG if WEBP not supported

Author: elonen

client/src/lib/player_view/VideoPlayer.svelte

@@ -442,7 +442,12 @@ export function getScreenshot() : string
         if (!ctx) throw new Error("Cannot get canvas context");
         // ctx.drawImage(videoElem, 0, 0);   // Removed, as bgr frame capture is now done when draw mode is entered
         ctx.drawImage(draw_canvas, 0, 0);
-        return comb.toDataURL("image/webp", 0.8);
+        // Try WebP first, fall back to JPEG if not supported (Safari doesn't support WebP encoding)
+        const webp = comb.toDataURL("image/webp", 0.8);
+        if (webp.startsWith("data:image/webp")) {
+            return webp;
+        }
+        return comb.toDataURL("image/jpeg", 0.85);
 }
 
 export async function collabPlay(seek_time: number, looping: boolean) {

server/src/api_server/ws_handers.rs

@@ -268,9 +268,13 @@ pub async fn msg_add_comment(data: &proto::client::client_to_server_cmd::AddComm
             // Convert data URI to bytes
             let img_uri = DataUrl::process(&d).map_err(|e| anyhow!("Invalid drawing data URI"))?;
 
-            if img_uri.mime_type().type_ != "image" || img_uri.mime_type().subtype != "webp" {
-                bail!("Invalid mimetype in drawing: {:?}", img_uri.mime_type())
-            }
+            let mime = img_uri.mime_type();
+            let ext = match (mime.type_.as_str(), mime.subtype.as_str()) {
+                ("image", "webp") => "webp",
+                ("image", "jpeg") => "jpg",
+                ("image", "png") => "png",
+                _ => bail!("Invalid mimetype in drawing: {:?}", mime),
+            };
             let img_data = img_uri.decode_to_vec().map_err(|e| anyhow!("Failed to decode drawing data URI: {:?}", e))?;
 
             // Make up a filename
@@ -281,7 +285,7 @@ pub async fn msg_add_comment(data: &proto::client::client_to_server_cmd::AddComm
                 hex::encode(result)
             }
             let short_csum = sha256hex(img_data.0.as_ref())[..16].to_string();
-            let fname = format!("{}.webp", short_csum);
+            let fname = format!("{}.{}", short_csum, ext);
 
             // Write to file
             let drawing_path = server.media_files_dir.join(&media_file_id).join("drawings").join(&fname);