mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-05 00:46:08 +00:00
Code Issues Releases Wiki Activity

Fix stickers lagging on macOS.

Browse Source
This commit is contained in:
John Preston
2019-05-28 13:39:38 +02:00
parent ab16c88473
commit ff0ff1d99c
9 changed files with 56 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Telegram/SourceFiles/lottie/lottie_animation.cpp
View File

@@ -85,7 +85,7 @@ std::unique_ptr<Animation> FromData(const QByteArray &data) {
}
Animation::Animation(QByteArray &&content)
: _timer([=] { checkNextFrame(); }) {
: _timer([=] { checkNextFrameRender(); }) {
const auto weak = base::make_weak(this);
crl::async([=, content = base::take(content)]() mutable {
content = UnpackGzip(content);
@@ -130,13 +130,18 @@ void Animation::parseDone(std::unique_ptr<SharedState> state) {
|| information.framesCount <= 0
|| information.size.isEmpty()) {
_updates.fire_error(Error::NotSupported);
} else {
_state = state.get();
_state->start(this, crl::now());
_renderer = FrameRenderer::Instance();
_renderer->append(std::move(state));
_updates.fire({ std::move(information) });
return;
}
_state = state.get();
_state->start(this, crl::now());
_renderer = FrameRenderer::Instance();
_renderer->append(std::move(state));
_updates.fire({ std::move(information) });
crl::on_main_update_requests(
) | rpl::start_with_next([=] {
checkStep();
}, _lifetime);
}
void Animation::parseFailed() {
@@ -181,20 +186,35 @@ crl::time Animation::markFrameShown() {
return result;
}
void Animation::checkNextFrame() {
void Animation::checkStep() {
if (_nextFrameTime != kTimeUnknown) {
checkNextFrameRender();
} else {
checkNextFrameAvailability();
}
}
void Animation::checkNextFrameAvailability() {
Expects(_renderer != nullptr);
const auto time = _state->nextFrameDisplayTime();
if (time == kTimeUnknown) {
return;
_nextFrameTime = _state->nextFrameDisplayTime();
if (_nextFrameTime != kTimeUnknown) {
checkStep();
}
}
void Animation::checkNextFrameRender() {
Expects(_nextFrameTime != kTimeUnknown);
const auto now = crl::now();
if (time > now) {
_timer.callOnce(time - now);
if (now < _nextFrameTime) {
if (!_timer.isActive()) {
_timer.callOnce(_nextFrameTime - now);
}
} else {
_timer.cancel();
_nextFrameTime = kTimeUnknown;
const auto position = markFrameDisplayed(now);
_updates.fire({ DisplayFrameRequest{ position } });
}