ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-17 11:50:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Video avatar fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2020-06-25 22:28:00 +03:00
parent 43d6e01658
commit dcf1217fbf
7 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoAvatarCropView.h
View File

@ -7,6 +7,7 @@
@property (nonatomic, strong) UIImage *image; @property (nonatomic, strong) UIImage *image;
@property (nonatomic, strong) AVPlayer *player; @property (nonatomic, strong) AVPlayer *player;
@property (nonatomic, readonly) CGSize originalSize;
@property (nonatomic, assign) CGRect cropRect; @property (nonatomic, assign) CGRect cropRect;
@property (nonatomic, assign) UIImageOrientation cropOrientation; @property (nonatomic, assign) UIImageOrientation cropOrientation;
@property (nonatomic, assign) bool cropMirrored; @property (nonatomic, assign) bool cropMirrored;
@ -36,6 +37,8 @@
- (void)invalidateCropRect; - (void)invalidateCropRect;
- (void)invalidateVideoView; - (void)invalidateVideoView;
- (UIImage *)currentImage;
- (void)hideImageForCustomTransition; - (void)hideImageForCustomTransition;
- (CGRect)contentFrameForView:(UIView *)view; - (CGRect)contentFrameForView:(UIView *)view;

4
submodules/LegacyComponents/Sources/TGMediaAvatarMenuMixin.m
View File

@ -405,14 +405,14 @@
{ {
__strong TGMediaAssetsController *strongController = weakController; __strong TGMediaAssetsController *strongController = weakController;
if (strongController != nil) { if (strongController != nil) {
[strongController dismissViewControllerAnimated:true completion:nil]; [strongController dismissViewControllerAnimated:false completion:nil];
} }
__strong TGMediaAvatarMenuMixin *strongSelf = weakSelf; __strong TGMediaAvatarMenuMixin *strongSelf = weakSelf;
if (strongSelf == nil) if (strongSelf == nil)
return; return;
[strongSelf->_parentController dismissViewControllerAnimated:true completion:nil]; [strongSelf->_parentController dismissViewControllerAnimated:false completion:nil];
if (strongSelf.didDismiss != nil) if (strongSelf.didDismiss != nil)
strongSelf.didDismiss(); strongSelf.didDismiss();

1
submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoScrubber.h
View File

@ -37,6 +37,7 @@
- (void)reloadDataAndReset:(bool)reset; - (void)reloadDataAndReset:(bool)reset;
- (void)reloadThumbnails; - (void)reloadThumbnails;
- (void)reloadThumbnailsAnimated;
- (void)ignoreThumbnails; - (void)ignoreThumbnails;
- (void)resetThumbnails; - (void)resetThumbnails;

10
submodules/LegacyComponents/Sources/TGPhotoAvatarCropController.m
View File

@ -311,6 +311,12 @@ const CGFloat TGPhotoAvatarCropButtonsWrapperSize = 61.0f;
if (self.finishedPhotoProcessing != nil) if (self.finishedPhotoProcessing != nil)
self.finishedPhotoProcessing(); self.finishedPhotoProcessing();
} else { } else {
UIImage *image = _cropView.currentImage;
CGRect cropRect = _cropView.cropRect;
UIImageOrientation cropOrientation = _cropView.cropOrientation;
bool cropMirrored = _cropView.cropMirrored;
CGSize originalSize = _cropView.originalSize;
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^
{ {
if (dispatch_semaphore_wait(_waitSemaphore, dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3.0 * NSEC_PER_SEC)))) if (dispatch_semaphore_wait(_waitSemaphore, dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3.0 * NSEC_PER_SEC))))
@ -319,8 +325,8 @@ const CGFloat TGPhotoAvatarCropButtonsWrapperSize = 61.0f;
return; return;
} }
UIImage *croppedImage = [_cropView croppedImageWithMaxSize:TGPhotoEditorScreenImageMaxSize()]; UIImage *croppedImage = TGPhotoEditorCrop(image, nil, cropOrientation, 0.0f, cropRect, false, TGPhotoEditorScreenImageMaxSize(), originalSize, true);
[photoEditor setImage:croppedImage forCropRect:_cropView.cropRect cropRotation:0.0f cropOrientation:_cropView.cropOrientation cropMirrored:_cropView.cropMirrored fullSize:false]; [photoEditor setImage:croppedImage forCropRect:cropRect cropRotation:0.0f cropOrientation:cropOrientation cropMirrored:cropMirrored fullSize:false];
[photoEditor processAnimated:false completion:^ [photoEditor processAnimated:false completion:^
{ {

4
submodules/LegacyComponents/Sources/TGPhotoAvatarCropView.m
View File

@ -440,6 +440,10 @@ const CGFloat TGPhotoAvatarCropViewOverscreenSize = 1000;
return snapshotView; return snapshotView;
} }
- (UIImage *)currentImage {
return _imageView.image;
}
- (UIImage *)croppedImageWithMaxSize:(CGSize)maxSize - (UIImage *)croppedImageWithMaxSize:(CGSize)maxSize
{ {
return TGPhotoEditorCrop(_imageView.image, nil, self.cropOrientation, 0.0f, self.cropRect, false, maxSize, _originalSize, true); return TGPhotoEditorCrop(_imageView.image, nil, self.cropOrientation, 0.0f, self.cropRect, false, maxSize, _originalSize, true);

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

@ -1333,7 +1333,8 @@
case TGPhotoEditorPreviewTab: case TGPhotoEditorPreviewTab:
{ {
if ([_currentTabController isKindOfClass:[TGPhotoToolsController class]]) { if ([_currentTabController isKindOfClass:[TGPhotoToolsController class]]) {
[_scrubberView reloadThumbnails]; [_scrubberView reloadDataAndReset:false];
[self updateDotImage];
} }
TGPhotoAvatarPreviewController *previewController = [[TGPhotoAvatarPreviewController alloc] initWithContext:_context photoEditor:_photoEditor previewView:_previewView scrubberView:_scrubberView]; TGPhotoAvatarPreviewController *previewController = [[TGPhotoAvatarPreviewController alloc] initWithContext:_context photoEditor:_photoEditor previewView:_previewView scrubberView:_scrubberView];

4
submodules/LegacyComponents/Sources/TGVideoCameraPipeline.m
View File

@ -374,8 +374,8 @@ const NSInteger TGVideoCameraRetainedBufferCount = 16;
if (self.outputVideoFormatDescription == NULL) if (self.outputVideoFormatDescription == NULL)
[self setupVideoPipelineWithInputFormatDescription:formatDescription]; [self setupVideoPipelineWithInputFormatDescription:formatDescription];
else { else {
[_recorder appendVideoSampleBuffer:sampleBuffer]; // [_recorder appendVideoSampleBuffer:sampleBuffer];
// [self renderVideoSampleBuffer:sampleBuffer]; [self renderVideoSampleBuffer:sampleBuffer];
} }
} }
else if (connection == _audioConnection) else if (connection == _audioConnection)