Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions Mactrix/Models/MatrixClient.swift
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,25 @@ extension MatrixClient: MatrixRustSDK.ClientSessionDelegate {
}

extension MatrixClient: UI.ImageLoader {
static let imageCache = NSCache<NSString, NSImage>()
// In-memory cache of decoded NSImage objects. Purpose is rendering performance —
// keeping decoded bitmaps ready to display prevents flicker when scrolling back to
// previously viewed images. This is distinct from the SDK-level media download cache
// (see clearCaches / getMediaFile(useCache:)) which avoids re-fetching from the server.
// Costs are tracked in decoded RGBA bytes (width × height × 4), not compressed sizes,
// since a typical JPEG can be 20-50× larger once decoded.
static let imageCache: NSCache<NSString, NSImage> = {
let cache = NSCache<NSString, NSImage>()
cache.totalCostLimit = 256 * 1024 * 1024 // 256MB decoded pixels
return cache
}()

private static let imageCacheMaxObjectCost = 64 * 1024 * 1024 // 64MB per object (~8000x2000px RGBA)

static func setCachedImage(_ image: NSImage, forKey key: NSString) {
let cost = Int(image.size.width * image.size.height) * 4 // decoded RGBA bytes
guard cost <= imageCacheMaxObjectCost else { return }
imageCache.setObject(image, forKey: key, cost: cost)
}

func cachedImage(matrixUrl: String) -> Image? {
guard let nsImage = Self.imageCache.object(forKey: NSString(string: matrixUrl)) else { return nil }
Expand Down Expand Up @@ -270,7 +288,7 @@ extension MatrixClient: UI.ImageLoader {

do {
let nsImage = try imageData.toOrientedImage(contentType: imageData.computeMimeType())
Self.imageCache.setObject(nsImage, forKey: cacheKey, cost: imageData.count)
Self.setCachedImage(nsImage, forKey: cacheKey)
return Image(nsImage: nsImage)
} catch {
Logger.matrixClient.error("failed convert matrix media data to Image: \(error) \(imageData)")
Expand Down
2 changes: 1 addition & 1 deletion Mactrix/Views/ChatView/MessageImageView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ struct MessageImageView: View {
let data = try await matrixClient.client.getMediaContent(mediaSource: content.source)
imageData = data
let nsImage = try data.toOrientedImage(contentType: contentType)
MatrixClient.imageCache.setObject(nsImage, forKey: cacheKey, cost: data.count)
MatrixClient.setCachedImage(nsImage, forKey: cacheKey)
image = Image(nsImage: nsImage)
} catch {
errorMessage = error.localizedDescription
Expand Down
2 changes: 1 addition & 1 deletion Mactrix/Views/MatrixImageView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ struct MatrixImageView: View {
let contentType = mimeType.flatMap { UTType(mimeType: $0) }
image = try await Image(importing: data, contentType: contentType)
if let nsImage = NSImage(data: data) {
MatrixClient.imageCache.setObject(nsImage, forKey: cacheKey, cost: data.count)
MatrixClient.setCachedImage(nsImage, forKey: cacheKey)
}
} catch {
errorMessage = error.localizedDescription
Expand Down
Loading