swift/Beam
swift/Beam
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2025-03-10 21:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #980 - Generated thumbnail size when uploading media (#1613)

Browse Source
This commit is contained in:
Stefan Ceriu 2023-09-01 14:58:36 +03:00 committed by GitHub
parent 38d6ffb363
commit d90d7adb21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ElementX/Sources/Services/Media/MediaUploadingPreprocessor.swift
View File

@ -319,7 +319,7 @@ struct MediaUploadingPreprocessor {
/// - targetSize: maximum resulting size
/// - Returns: the resized image
private func resizeImage(withSource imageSource: CGImageSource, targetSize: CGSize) async -> Result<UIImage, MediaUploadingPreprocessorError> {
let maximumSize = min(targetSize.height, targetSize.width)
let maximumSize = max(targetSize.height, targetSize.width)
let options: [NSString: Any] = [
// The maximum width and height in pixels of a thumbnail.

23
UnitTests/Sources/MediaUploadingPreprocessorTests.swift
View File

@ -144,9 +144,9 @@ final class MediaUploadingPreprocessorTests: XCTestCase {
XCTAssertNotNil(imageInfo.thumbnailInfo)
XCTAssertEqual(imageInfo.thumbnailInfo?.mimetype, "image/jpeg")
XCTAssertEqual(imageInfo.thumbnailInfo?.size, 52159)
XCTAssertEqual(imageInfo.thumbnailInfo?.width, 600)
XCTAssertEqual(imageInfo.thumbnailInfo?.height, 257)
XCTAssertEqual(imageInfo.thumbnailInfo?.size, 89553)
XCTAssertEqual(imageInfo.thumbnailInfo?.width, 800)
XCTAssertEqual(imageInfo.thumbnailInfo?.height, 344)
}
func testPortraitImageProcessing() async {
@ -165,16 +165,16 @@ final class MediaUploadingPreprocessorTests: XCTestCase {
// Check resulting image info
XCTAssertEqual(imageInfo.mimetype, "image/jpeg")
XCTAssertEqual(imageInfo.blurhash, "KdE:ess+RP^-n*RP%hWAV@")
XCTAssertEqual(imageInfo.blurhash, "KdE:ets+RP^-n*RP%OWAV@")
XCTAssertEqual(imageInfo.size, 4_414_666)
XCTAssertEqual(imageInfo.width, 3024)
XCTAssertEqual(imageInfo.height, 4032)
XCTAssertNotNil(imageInfo.thumbnailInfo)
XCTAssertEqual(imageInfo.thumbnailInfo?.mimetype, "image/jpeg")
XCTAssertEqual(imageInfo.thumbnailInfo?.size, 156_948)
XCTAssertEqual(imageInfo.thumbnailInfo?.width, 450)
XCTAssertEqual(imageInfo.thumbnailInfo?.height, 600)
XCTAssertEqual(imageInfo.thumbnailInfo?.size, 264_500)
XCTAssertEqual(imageInfo.thumbnailInfo?.width, 600)
XCTAssertEqual(imageInfo.thumbnailInfo?.height, 800)
}
// MARK: - Private
@ -225,7 +225,12 @@ final class MediaUploadingPreprocessorTests: XCTestCase {
return
}
XCTAssert(thumbnail.size.width <= MediaUploadingPreprocessor.Constants.maximumThumbnailSize.width)
XCTAssert(thumbnail.size.height <= MediaUploadingPreprocessor.Constants.maximumThumbnailSize.height)
if thumbnail.size.width > thumbnail.size.height {
XCTAssert(thumbnail.size.width <= MediaUploadingPreprocessor.Constants.maximumThumbnailSize.width)
XCTAssert(thumbnail.size.height <= MediaUploadingPreprocessor.Constants.maximumThumbnailSize.height)
} else {
XCTAssert(thumbnail.size.width <= MediaUploadingPreprocessor.Constants.maximumThumbnailSize.height)
XCTAssert(thumbnail.size.height <= MediaUploadingPreprocessor.Constants.maximumThumbnailSize.width)
}
}
}

1
changelog.d/980.bugfix Normal file
View File

@ -0,0 +1 @@
Fix the size of the generated thumbnail when uploading media