mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-06-16 05:55:20 +00:00
Merge commit '2d11baef8e4ee16b2051ff9fa6deaeea3fed1076'
This commit is contained in:
commit
d32df29bbd
@ -3790,7 +3790,7 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
|
|||||||
if let videoTrimRange = mediaEditor.values.videoTrimRange {
|
if let videoTrimRange = mediaEditor.values.videoTrimRange {
|
||||||
duration = videoTrimRange.upperBound - videoTrimRange.lowerBound
|
duration = videoTrimRange.upperBound - videoTrimRange.lowerBound
|
||||||
} else {
|
} else {
|
||||||
duration = asset.duration
|
duration = min(asset.duration, storyMaxVideoDuration)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
duration = 5.0
|
duration = 5.0
|
||||||
@ -3826,7 +3826,7 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
|
|||||||
if let videoTrimRange = mediaEditor.values.videoTrimRange {
|
if let videoTrimRange = mediaEditor.values.videoTrimRange {
|
||||||
duration = videoTrimRange.upperBound - videoTrimRange.lowerBound
|
duration = videoTrimRange.upperBound - videoTrimRange.lowerBound
|
||||||
} else {
|
} else {
|
||||||
duration = draft.duration ?? 5.0
|
duration = min(draft.duration ?? 5.0, storyMaxVideoDuration)
|
||||||
}
|
}
|
||||||
firstFrame = Signal<UIImage?, NoError> { subscriber in
|
firstFrame = Signal<UIImage?, NoError> { subscriber in
|
||||||
let avAsset = AVURLAsset(url: URL(fileURLWithPath: draft.fullPath()))
|
let avAsset = AVURLAsset(url: URL(fileURLWithPath: draft.fullPath()))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user