Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix wrong durations for uploaded media #3245

Merged
merged 1 commit into from
Sep 10, 2024
Merged

Fix wrong durations for uploaded media #3245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ElementX/Sources/Services/Media/MediaUploadingPreprocessor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ private struct VideoProcessingInfo {
let url: URL
let height: Double
let width: Double
let duration: Double
let duration: Double // seconds
let mimeType: String
}

Expand Down Expand Up @@ -213,7 +213,7 @@ struct MediaUploadingPreprocessor {
return .failure(.failedProcessingAudio)
}

let audioInfo = AudioInfo(duration: durationInSeconds * 1000, size: fileSize, mimetype: mimeType)
let audioInfo = AudioInfo(duration: durationInSeconds, size: fileSize, mimetype: mimeType)
return .success(.audio(audioURL: url, audioInfo: audioInfo))
}

Expand Down Expand Up @@ -413,7 +413,7 @@ struct MediaUploadingPreprocessor {
return .success(.init(url: newOutputURL,
height: adjustedNaturalSize.height,
width: adjustedNaturalSize.width,
duration: durationInSeconds * 1000,
duration: durationInSeconds,
mimeType: "video/mp4"))
} catch {
return .failure(.failedConvertingVideo)
Expand Down
6 changes: 3 additions & 3 deletions UnitTests/Sources/MediaUploadingPreprocessorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ final class MediaUploadingPreprocessorTests: XCTestCase {
XCTAssertEqual(audioURL.lastPathComponent, "test_audio.mp3")

XCTAssertEqual(audioInfo.mimetype, "audio/mpeg")
XCTAssertEqual(audioInfo.duration ?? 0, 27252, accuracy: 100)
XCTAssertEqual(audioInfo.duration ?? 0, 27, accuracy: 100)
XCTAssertEqual(audioInfo.size ?? 0, 764_176, accuracy: 100)
}

Expand Down Expand Up @@ -63,7 +63,7 @@ final class MediaUploadingPreprocessorTests: XCTestCase {
XCTAssertEqual(videoInfo.size ?? 0, 1_431_959, accuracy: 100)
XCTAssertEqual(videoInfo.width, 1280)
XCTAssertEqual(videoInfo.height, 720)
XCTAssertEqual(videoInfo.duration ?? 0, 30483, accuracy: 100)
XCTAssertEqual(videoInfo.duration ?? 0, 30, accuracy: 100)

XCTAssertNotNil(videoInfo.thumbnailInfo)
XCTAssertEqual(videoInfo.thumbnailInfo?.mimetype, "image/jpeg")
Expand Down Expand Up @@ -103,7 +103,7 @@ final class MediaUploadingPreprocessorTests: XCTestCase {
XCTAssertEqual(videoInfo.size ?? 0, 9_775_822, accuracy: 100)
XCTAssertEqual(videoInfo.width, 1080)
XCTAssertEqual(videoInfo.height, 1920)
XCTAssertEqual(videoInfo.duration ?? 0, 21000, accuracy: 100)
XCTAssertEqual(videoInfo.duration ?? 0, 21, accuracy: 100)

XCTAssertNotNil(videoInfo.thumbnailInfo)
XCTAssertEqual(videoInfo.thumbnailInfo?.mimetype, "image/jpeg")
Expand Down
Loading