From c8e3195daab8ff139b037bd2389e8a8a4b96edef Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Tue, 26 Sep 2023 11:40:36 +0400 Subject: [PATCH] Various fixes --- .../Sources/TGMediaPickerGalleryVideoItemView.m | 2 ++ .../LegacyComponents/Sources/TGMediaPickerPhotoStripCell.m | 6 ++++++ .../LegacyMediaPickerUI/Sources/LegacyMediaPickers.swift | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoItemView.m b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoItemView.m index 72209d0a68..72127e4ac4 100644 --- a/submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoItemView.m +++ b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoItemView.m @@ -138,6 +138,8 @@ _playerItemDisposable = [[SMetaDisposable alloc] init]; _facesDisposable = [[SMetaDisposable alloc] init]; + _thumbnailsDisposable = [[SMetaDisposable alloc] init]; + _videoDurationVar = [[SVariable alloc] init]; _videoDurationDisposable = [[SMetaDisposable alloc] init]; diff --git a/submodules/LegacyComponents/Sources/TGMediaPickerPhotoStripCell.m b/submodules/LegacyComponents/Sources/TGMediaPickerPhotoStripCell.m index 92e8eea200..cad9fb880f 100644 --- a/submodules/LegacyComponents/Sources/TGMediaPickerPhotoStripCell.m +++ b/submodules/LegacyComponents/Sources/TGMediaPickerPhotoStripCell.m @@ -180,6 +180,9 @@ NSString *const TGMediaPickerPhotoStripCellKind = @"PhotoStripCell"; { SSignal *adjustmentsSignal = [self.editingContext adjustmentsSignalForItem:video]; + if (_adjustmentsDisposable == nil) + _adjustmentsDisposable = [[SMetaDisposable alloc] init]; + __weak TGMediaPickerPhotoStripCell *weakSelf = self; [_adjustmentsDisposable setDisposable:[adjustmentsSignal startStrictWithNext:^(TGVideoEditAdjustments *next) { @@ -220,6 +223,9 @@ NSString *const TGMediaPickerPhotoStripCellKind = @"PhotoStripCell"; { SSignal *adjustmentsSignal = [self.editingContext adjustmentsSignalForItem:asset]; + if (_adjustmentsDisposable == nil) + _adjustmentsDisposable = [[SMetaDisposable alloc] init]; + __weak TGMediaPickerPhotoStripCell *weakSelf = self; [_adjustmentsDisposable setDisposable:[adjustmentsSignal startStrictWithNext:^(TGVideoEditAdjustments *next) { diff --git a/submodules/LegacyMediaPickerUI/Sources/LegacyMediaPickers.swift b/submodules/LegacyMediaPickerUI/Sources/LegacyMediaPickers.swift index 20c32435fc..fbeaa56168 100644 --- a/submodules/LegacyMediaPickerUI/Sources/LegacyMediaPickers.swift +++ b/submodules/LegacyMediaPickerUI/Sources/LegacyMediaPickers.swift @@ -749,9 +749,13 @@ public func legacyAssetPickerEnqueueMessages(context: AccountContext, account: A } } + let defaultPreset = TGMediaVideoConversionPreset(rawValue: UInt32(UserDefaults.standard.integer(forKey: "TG_preferredVideoPreset_v0"))) + var preset: TGMediaVideoConversionPreset = TGMediaVideoConversionPresetCompressedMedium if let selectedPreset = adjustments?.preset { preset = selectedPreset + } else if preset == TGMediaVideoConversionPresetCompressedDefault && defaultPreset != TGMediaVideoConversionPresetCompressedDefault { + preset = defaultPreset } if asAnimation { preset = TGMediaVideoConversionPresetAnimation