ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-10-09 03:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Video avatar fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2020-07-17 12:48:27 +03:00
parent a911b403ca
commit 24907139c6
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/LegacyComponents/Sources/TGMediaVideoConverter.m
View File

@ -1356,7 +1356,7 @@ static CGFloat progressOfSampleBufferInTimeRange(CMSampleBufferRef sampleBuffer,
return 2000; return 2000;
case TGMediaVideoConversionPresetProfileVeryHigh: case TGMediaVideoConversionPresetProfileVeryHigh:
return 2300; return 2400;
default: default:
return 900; return 900;

25
submodules/LegacyComponents/Sources/TGPhotoEditorController.m
View File

@ -622,7 +622,10 @@
- (NSTimeInterval)trimEndValue { - (NSTimeInterval)trimEndValue {
if (_scrubberView != nil) { if (_scrubberView != nil) {
return _scrubberView.trimEndValue; if (_scrubberView.trimEndValue > 0.0)
return _scrubberView.trimEndValue;
else
return MIN(9.9, _scrubberView.duration);
} else { } else {
return _photoEditor.trimEndValue; return _photoEditor.trimEndValue;
} }
@ -1925,7 +1928,7 @@
{ {
videoStartValue = _dotPosition; videoStartValue = _dotPosition;
trimStartValue = self.trimStartValue; trimStartValue = self.trimStartValue;
trimEndValue = self.trimEndValue; trimEndValue = MIN(self.trimStartValue + 9.9, self.trimEndValue);
} }
[self stopVideoPlayback:true]; [self stopVideoPlayback:true];
@ -1989,14 +1992,18 @@
NSTimeInterval duration = trimEndValue - trimStartValue; NSTimeInterval duration = trimEndValue - trimStartValue;
TGMediaVideoConversionPreset preset; TGMediaVideoConversionPreset preset;
if (duration <= 2.5) { if (duration > 0.0) {
preset = TGMediaVideoConversionPresetProfileVeryHigh; if (duration <= 2.0) {
} else if (duration <= 5.0) { preset = TGMediaVideoConversionPresetProfileVeryHigh;
preset = TGMediaVideoConversionPresetProfileHigh; } else if (duration <= 5.0) {
} else if (duration <= 8.0) { preset = TGMediaVideoConversionPresetProfileHigh;
preset = TGMediaVideoConversionPresetProfile; } else if (duration <= 8.0) {
preset = TGMediaVideoConversionPresetProfile;
} else {
preset = TGMediaVideoConversionPresetProfileLow;
}
} else { } else {
preset = TGMediaVideoConversionPresetProfileLow; preset = TGMediaVideoConversionPresetProfile;
} }
TGDispatchOnMainThread(^{ TGDispatchOnMainThread(^{