From 24907139c6c9c5dae097cb642d188092f13b5995 Mon Sep 17 00:00:00 2001
From: Ilya Laktyushin <ilya@laktyush.in>
Date: Fri, 17 Jul 2020 12:48:27 +0300
Subject: [PATCH] Video avatar fixes

---
 .../Sources/TGMediaVideoConverter.m           |  2 +-
 .../Sources/TGPhotoEditorController.m         | 25 ++++++++++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/submodules/LegacyComponents/Sources/TGMediaVideoConverter.m b/submodules/LegacyComponents/Sources/TGMediaVideoConverter.m
index f2387de000..32340c5c77 100644
--- a/submodules/LegacyComponents/Sources/TGMediaVideoConverter.m
+++ b/submodules/LegacyComponents/Sources/TGMediaVideoConverter.m
@@ -1356,7 +1356,7 @@ static CGFloat progressOfSampleBufferInTimeRange(CMSampleBufferRef sampleBuffer,
             return 2000;
             
         case TGMediaVideoConversionPresetProfileVeryHigh:
-            return 2300;
+            return 2400;
             
         default:
             return 900;
diff --git a/submodules/LegacyComponents/Sources/TGPhotoEditorController.m b/submodules/LegacyComponents/Sources/TGPhotoEditorController.m
index 9585088885..ee9c1d8db9 100644
--- a/submodules/LegacyComponents/Sources/TGPhotoEditorController.m
+++ b/submodules/LegacyComponents/Sources/TGPhotoEditorController.m
@@ -622,7 +622,10 @@
 
 - (NSTimeInterval)trimEndValue {
     if (_scrubberView != nil) {
-        return _scrubberView.trimEndValue;
+        if (_scrubberView.trimEndValue > 0.0)
+            return _scrubberView.trimEndValue;
+        else
+            return MIN(9.9, _scrubberView.duration);
     } else {
         return _photoEditor.trimEndValue;
     }
@@ -1925,7 +1928,7 @@
     {
         videoStartValue = _dotPosition;
         trimStartValue = self.trimStartValue;
-        trimEndValue = self.trimEndValue;
+        trimEndValue = MIN(self.trimStartValue + 9.9, self.trimEndValue);
     }
     
     [self stopVideoPlayback:true];
@@ -1989,14 +1992,18 @@
                 
                 NSTimeInterval duration = trimEndValue - trimStartValue;
                 TGMediaVideoConversionPreset preset;
-                if (duration <= 2.5) {
-                    preset = TGMediaVideoConversionPresetProfileVeryHigh;
-                } else if (duration <= 5.0) {
-                    preset = TGMediaVideoConversionPresetProfileHigh;
-                } else if (duration <= 8.0) {
-                    preset = TGMediaVideoConversionPresetProfile;
+                if (duration > 0.0) {
+                    if (duration <= 2.0) {
+                        preset = TGMediaVideoConversionPresetProfileVeryHigh;
+                    } else if (duration <= 5.0) {
+                        preset = TGMediaVideoConversionPresetProfileHigh;
+                    } else if (duration <= 8.0) {
+                        preset = TGMediaVideoConversionPresetProfile;
+                    } else {
+                        preset = TGMediaVideoConversionPresetProfileLow;
+                    }
                 } else {
-                    preset = TGMediaVideoConversionPresetProfileLow;
+                    preset = TGMediaVideoConversionPresetProfile;
                 }
                 
                 TGDispatchOnMainThread(^{