From 6a757ac0e58b5121e33af6a6ec1e714d498351c7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 31 Jan 2025 01:44:19 +0000
Subject: Update dependency FsCheck.Xunit to 3.1.0
---
Directory.Packages.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'Directory.Packages.props')
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 20282af0b..80966e369 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -16,7 +16,7 @@
-
+
--
cgit v1.2.3
From cfeb879519539573575ccc0b60c9c6010fda1543 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 3 Feb 2025 16:38:29 +0100
Subject: Update dependency z440.atl.core to 6.15.0 (#13477)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
Directory.Packages.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'Directory.Packages.props')
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 20282af0b..808f03e02 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -79,7 +79,7 @@
-
+
--
cgit v1.2.3
From 533464e186298e44d0e4eab635683ccfe8bda1cc Mon Sep 17 00:00:00 2001
From: Bond-009
Date: Mon, 3 Feb 2025 16:56:00 -0500
Subject: Backport pull request #13188 from jellyfin/release-10.10.z
Fix possible infinite loops in incomplete MKV files
Original-merge: 6f7ce439d308a270309b5de22b3d7776cb53263e
Merged-by: Bond-009
Backported-by: Bond_009
---
Directory.Packages.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'Directory.Packages.props')
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 808f03e02..fe239c7f6 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -50,7 +50,7 @@
-
+
--
cgit v1.2.3
From 10f4f8b2ab727f6a0b30b7e8edcc6c9d47205add Mon Sep 17 00:00:00 2001
From: Bond-009
Date: Mon, 3 Feb 2025 17:07:12 -0500
Subject: Backport pull request #13425 from jellyfin/release-10.10.z
Open files with FileShare.Read for BlurHash calculations
Original-merge: bfe0fdbcdca03436a08430d723fc2b34a6016e25
Merged-by: crobibero
Backported-by: Bond_009
---
Directory.Packages.props | 4 ++--
src/Jellyfin.Drawing.Skia/SkiaEncoder.cs | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
(limited to 'Directory.Packages.props')
diff --git a/Directory.Packages.props b/Directory.Packages.props
index fe239c7f6..f6f68daef 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs b/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs
index c5aadc890..2dac5598f 100644
--- a/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs
+++ b/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs
@@ -195,8 +195,10 @@ public class SkiaEncoder : IImageEncoder
return string.Empty;
}
+ // Use FileStream with FileShare.Read instead of having Skia open the file to allow concurrent read access
+ using var fileStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read);
// Any larger than 128x128 is too slow and there's no visually discernible difference
- return BlurHashEncoder.Encode(xComp, yComp, path, 128, 128);
+ return BlurHashEncoder.Encode(xComp, yComp, fileStream, 128, 128);
}
private bool RequiresSpecialCharacterHack(string path)
--
cgit v1.2.3