Skip to content

set dar、scale、rotate preference，由外部控制动画，onRecord可测试 #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
CloudlessMoon wants to merge 8 commits into from
+87 −37
Closed

set dar、scale、rotate preference，由外部控制动画，onRecord可测试 #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
87297a0
set dar、scale、rotate preference，由外部控制动画，onRecord可测试
CloudlessMoon Jan 28, 2026
f45ebc5
fix
CloudlessMoon Jan 28, 2026
64dde7b
[self setNeedsRefreshCurrentPic];
CloudlessMoon Jan 28, 2026
b446cc5
Revert "[self setNeedsRefreshCurrentPic];"
CloudlessMoon Jan 28, 2026
915bb47
设置scalingMode/rotatePreference也标记下setNeedsRefreshCurrentPic
CloudlessMoon Jan 28, 2026
63fe0c0
修复macOS上runAnimationGroup可能不生效的问题
CloudlessMoon Jan 28, 2026
1d60737
Merge branch 'main' of https://github.com/debugly/fsplayer
CloudlessMoon Jan 29, 2026
f8d3c8a
Merge branch 'main' of https://github.com/debugly/fsplayer
CloudlessMoon Feb 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion examples/ios/FSPlayerDemo/ViewController/FSMoviePlayerViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ - (void)saveToPhotosAlbum

- (IBAction)onRecord:(UIButton *)sender
{
// test dar
// test dar
// int dar_num = 0;
// int dar_den = 1;
//
Expand All @@ -327,6 +327,15 @@ - (IBAction)onRecord:(UIButton *)sender
// } else {
// self.player.view.darPreference = (FSDARPreference){0.0};
// }
// [UIView animateWithDuration:0.75 delay:0 usingSpringWithDamping:0.45 initialSpringVelocity:1.5 options:UIViewAnimationOptionCurveEaseInOut animations:^{
// [self.view setNeedsLayout];
// [self.view layoutIfNeeded];
// // 或者
// // [self.player.view setNeedsLayout];
// // [self.player.view layoutIfNeeded];
// } completion:^(BOOL finished) {
//
// }];
// return;

if (sender.isSelected) {
Expand Down
22 changes: 22 additions & 0 deletions examples/macos/FSPlayerMacDemo/ViewController/MRRootViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1757,6 +1757,17 @@ - (void)observerCocoaBingsChange
__strongSelf__
int value = [v intValue];
[self.player setScalingMode:value];

[NSAnimationContext runAnimationGroup:^(NSAnimationContext * _Nonnull context) {
__strongSelf__
context.duration = 0.3;
context.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
context.allowsImplicitAnimation = YES;
[self.view setNeedsLayout:YES];
[self.view layoutSubtreeIfNeeded];
} completionHandler:^{

}];
} forKey:@"picture_fill_mode"];

[[MRCocoaBindingUserDefault sharedDefault] onChange:^(id _Nonnull v, BOOL * _Nonnull r) {
Expand All @@ -1767,6 +1778,17 @@ - (void)observerCocoaBingsChange
[[MRCocoaBindingUserDefault sharedDefault] onChange:^(id _Nonnull v, BOOL * _Nonnull r) {
__strongSelf__
[self applyRotate];

[NSAnimationContext runAnimationGroup:^(NSAnimationContext * _Nonnull context) {
__strongSelf__
context.duration = 0.3;
context.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
context.allowsImplicitAnimation = YES;
[self.view setNeedsLayout:YES];
[self.view layoutSubtreeIfNeeded];
} completionHandler:^{

}];
} forKey:@"picture_ratate_mode"];

[[MRCocoaBindingUserDefault sharedDefault] onChange:^(id _Nonnull v, BOOL * _Nonnull r) {
Expand Down
91 changes: 55 additions & 36 deletions ijkmedia/ijksdl/metal/FSMetalView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,49 @@
typedef CGRect NSRect;
#endif

typedef NS_ENUM(NSInteger, FSMetalDecimalRoundingRule) {
FSMetalDecimalRoundingRuleRound,
FSMetalDecimalRoundingRuleCeil,
FSMetalDecimalRoundingRuleFloor,
};

CG_INLINE CGFloat
__FSMetalCGFloatMakePixelValue(CGFloat value, FSMetalDecimalRoundingRule rule) {
/// 以下算法是由「yoga -> YGPixelGrid.h -> YGRoundValueToPixelGrid」中翻译

BOOL(^inexactEquals)(CGFloat, CGFloat) = ^BOOL(CGFloat a, CGFloat b) {
if (!isnan(a) && !isnan(b)) {
return ABS(a - b) < 0.0001;
}
return isnan(a) && isnan(b);
};

#if TARGET_OS_IPHONE
CGFloat pointScaleFactor = MAX(UIScreen.mainScreen.traitCollection.displayScale, 1);
#else
CGFloat pointScaleFactor = MAX(NSScreen.mainScreen.backingScaleFactor, 1);
#endif
CGFloat scaledValue = value * pointScaleFactor;
CGFloat fractial = fmod(scaledValue, 1.0);
if (fractial < 0) {
++fractial;
}
if (inexactEquals(fractial, 0)) {
scaledValue = scaledValue - fractial;
} else if (inexactEquals(fractial, 1.0)) {
scaledValue = scaledValue - fractial + 1.0;
} else if (rule == FSMetalDecimalRoundingRuleCeil) {
scaledValue = scaledValue - fractial + 1.0;
} else if (rule == FSMetalDecimalRoundingRuleFloor) {
scaledValue = scaledValue - fractial;
} else if (rule == FSMetalDecimalRoundingRuleRound) {
scaledValue = scaledValue - fractial + (!isnan(fractial) && (fractial > 0.5 || inexactEquals(fractial, 0.5)) ? 1.0 : 0.0);
} else {
NSCAssert(NO, @"");
}
return isnan(scaledValue) ? 0 : (scaledValue / pointScaleFactor);
}

NS_CLASS_AVAILABLE(10_13, 11_0)
@interface FSMetalRenderedView: MTKView <FSVideoRenderingProtocol>

Expand All @@ -39,7 +82,6 @@ @interface FSMetalView ()
@property (atomic, assign) int attachSarNum;
@property (atomic, assign) int attachSarDen;
@property (atomic, assign) int attachAutoZRotate;
@property (atomic, assign) BOOL animating;

@end

Expand Down Expand Up @@ -74,9 +116,7 @@ - (void)prepare {
#if TARGET_OS_OSX
- (void)layout {
[super layout];
if (!self.animating) {
[self updateRenderedViewFrameWithAnimate:NO];
}
[self updateRenderedViewFrame];
}

#else
Expand All @@ -89,14 +129,11 @@ - (void)layout {
//frame #6: 0x000000018436f9a8 QuartzCore`CA::Transaction::flush_as_runloop_observer(bool) + 84
- (void)layoutSubviews {
[super layoutSubviews];
//ignore animate caused layoutSubviews
if (!self.animating) {
[self updateRenderedViewFrameWithAnimate:NO];
}
[self updateRenderedViewFrame];
}
#endif

- (void)updateRenderedViewFrameWithAnimate:(BOOL)animate {
- (void)updateRenderedViewFrame {
if (self.scalingMode == FSScalingModeFill) {
self.renderedView.frame = self.bounds;
} else {
Expand Down Expand Up @@ -155,31 +192,12 @@ - (void)updateRenderedViewFrameWithAnimate:(BOOL)animate {
attachSize.height * ratio);
CGPoint origin = CGPointMake(CGRectGetMidX(self.bounds) - size.width / 2,
CGRectGetMidY(self.bounds) - size.height / 2);

if (animate) {
self.animating = YES;
[self setNeedsRefreshCurrentPic];
#if TARGET_OS_OSX
[NSAnimationContext runAnimationGroup:^(NSAnimationContext * _Nonnull context) {
context.duration = 0.3;
context.allowsImplicitAnimation = YES;
context.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
self.renderedView.animator.frame = CGRectMake(origin.x, origin.y, size.width, size.height);
} completionHandler:^{
self.animating = NO;
[self setNeedsRefreshCurrentPic];
}];
#else
[UIView animateWithDuration:0.3 animations:^{
self.renderedView.frame = CGRectMake(origin.x, origin.y, size.width, size.height);
} completion:^(BOOL finished) {
self.animating = NO;
[self setNeedsRefreshCurrentPic];
}];
// 需进行像素对齐，解决外部使用runAnimationGroup可能不会生效的问题
origin.x = __FSMetalCGFloatMakePixelValue(origin.x, FSMetalDecimalRoundingRuleRound);
origin.y = __FSMetalCGFloatMakePixelValue(origin.y, FSMetalDecimalRoundingRuleRound);
#endif
} else {
self.renderedView.frame = CGRectMake(origin.x, origin.y, size.width, size.height);
}
self.renderedView.frame = CGRectMake(origin.x, origin.y, size.width, size.height);
} else {
self.renderedView.frame = CGRectZero;
}
Expand All @@ -189,7 +207,7 @@ - (void)updateRenderedViewFrameWithAnimate:(BOOL)animate {
- (void)makeNeedsLayout {
void(^setNeedsLayout)(void) = ^{
#if TARGET_OS_OSX
self.needsLayout = YES;
[self setNeedsLayout:YES];
#else
[self setNeedsLayout];
#endif
Expand All @@ -214,7 +232,7 @@ - (void)setDisplayDelegate:(id<FSVideoRenderingDelegate>)displayDelegate {
- (void)setScalingMode:(FSScalingMode)scalingMode {
if (self.renderedView.scalingMode != scalingMode) {
self.renderedView.scalingMode = scalingMode;
[self updateRenderedViewFrameWithAnimate:YES];
[self makeNeedsLayout];
}
}

Expand All @@ -235,7 +253,8 @@ - (CGFloat)scaleFactor {
- (void)setRotatePreference:(FSRotatePreference)rotatePreference {
if (self.renderedView.rotatePreference.type != rotatePreference.type || self.renderedView.rotatePreference.degrees != rotatePreference.degrees) {
self.renderedView.rotatePreference = rotatePreference;
[self updateRenderedViewFrameWithAnimate:YES];
[self makeNeedsLayout];
[self setNeedsRefreshCurrentPic];
}
}

Expand All @@ -257,7 +276,7 @@ - (FSColorConvertPreference)colorPreference {
- (void)setDarPreference:(FSDARPreference)darPreference {
if (self.renderedView.darPreference.ratio != darPreference.ratio) {
self.renderedView.darPreference = darPreference;
[self updateRenderedViewFrameWithAnimate:YES];
[self makeNeedsLayout];
}
}

Expand Down