Fix single-frame 60 fps lotties.

desktop-app · Sep 6, 2022 · 6ed1c22 · 6ed1c22
1 parent e66d57f
commit 6ed1c22
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/lottie/details/lottie_frame_provider_direct.cpp b/lottie/details/lottie_frame_provider_direct.cpp
@@ -22,7 +22,9 @@ int GetLottieFrameRate(not_null<rlottie::Animation*> animation, Quality quality)
 int GetLottieFramesCount(not_null<rlottie::Animation*> animation, Quality quality) {
 	const auto rate = int(qRound(animation->frameRate()));
 	const auto count = int(animation->totalFrame());
-	return (quality == Quality::Default && rate == 60) ? (count / 2) : count;
+	return (quality == Quality::Default && rate == 60)
+		? ((count + 1) / 2)
+		: count;
 }
 
 int GetLottieFrameIndex(not_null<rlottie::Animation*> animation, Quality quality, int index) {

diff --git a/lottie/lottie_frame_generator.cpp b/lottie/lottie_frame_generator.cpp
@@ -27,7 +27,8 @@ FrameGenerator::FrameGenerator(const QByteArray &bytes)
 		auto height = size_t();
 		_rlottie->size(width, height);
 		_size = QSize(width, height);
-		_framesCount = _rlottie->totalFrame() / _multiplier;
+		_framesCount = (_rlottie->totalFrame() + _multiplier - 1)
+			/ _multiplier;
 		_frameDuration = (rate > 0) ? (1000 * _multiplier / rate) : 0;
 	}
 	if (!_framesCount || !_frameDuration || _size.isEmpty()) {

diff --git a/lottie/lottie_icon.cpp b/lottie/lottie_icon.cpp
@@ -153,11 +153,11 @@ void Icon::Inner::prepareFromAsync(
 	auto width = size_t();
 	auto height = size_t();
 	rlottie->size(width, height);
-	_framesCount = rlottie->totalFrame();
 	if (_limitFps && rlottie->frameRate() == 60) {
 		_frameMultiplier = 2;
-		_framesCount /= _frameMultiplier;
 	}
+	_framesCount = (rlottie->totalFrame() + _frameMultiplier - 1)
+		/ _frameMultiplier;
 	if (!_framesCount || !width || !height) {
 		return;
 	}