mixa/tdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move Webm sticker to UnwrappedMedia.

Browse Source
This commit is contained in:
John Preston
2022-08-04 13:35:08 +03:00
parent 5b0d023a88
commit f8e22210e7
33 changed files with 458 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Telegram/SourceFiles/editor/scene/scene_item_sticker.cpp
View File

@@ -34,7 +34,7 @@ ItemSticker::ItemSticker(
}
const auto updateThumbnail = [=] {
const auto guard = gsl::finally([&] {
if (_pixmap.isNull()) {
if (_image.isNull()) {
setAspectRatio(1.);
}
});
@@ -47,8 +47,7 @@ ItemSticker::ItemSticker(
Lottie::Quality::High);
_lottie.player->updates(
) | rpl::start_with_next([=] {
updatePixmap(Ui::PixmapFromImage(
_lottie.player->frame()));
updatePixmap(_lottie.player->frame());
_lottie.player = nullptr;
_lottie.lifetime.destroy();
update();
@@ -81,7 +80,7 @@ ItemSticker::ItemSticker(
const auto ratio = style::DevicePixelRatio();
auto pixmap = sticker->pixNoCache(sticker->size() * ratio);
pixmap.setDevicePixelRatio(ratio);
updatePixmap(std::move(pixmap));
updatePixmap(pixmap.toImage());
return true;
};
if (!updateThumbnail()) {
@@ -95,15 +94,15 @@ ItemSticker::ItemSticker(
}
}
void ItemSticker::updatePixmap(QPixmap &&pixmap) {
_pixmap = std::move(pixmap);
void ItemSticker::updatePixmap(QImage &&image) {
_image = std::move(image);
if (flipped()) {
performFlip();
} else {
update();
}
if (!_pixmap.isNull()) {
setAspectRatio(_pixmap.height() / float64(_pixmap.width()));
if (!_image.isNull()) {
setAspectRatio(_image.height() / float64(_image.width()));
}
}
@@ -111,7 +110,7 @@ void ItemSticker::paint(
QPainter *p,
const QStyleOptionGraphicsItem *option,
QWidget *w) {
p->drawPixmap(contentRect().toRect(), _pixmap);
p->drawImage(contentRect().toRect(), _image);
ItemBase::paint(p, option, w);
}
@@ -124,7 +123,7 @@ int ItemSticker::type() const {
}
void ItemSticker::performFlip() {
_pixmap = _pixmap.transformed(QTransform().scale(-1, 1));
_image = _image.transformed(QTransform().scale(-1, 1));
update();
}

4
Telegram/SourceFiles/editor/scene/scene_item_sticker.h
View File

@@ -42,14 +42,14 @@ private:
const not_null<DocumentData*> _document;
const std::shared_ptr<::Data::DocumentMedia> _mediaView;
void updatePixmap(QPixmap &&pixmap);
void updatePixmap(QImage &&image);
struct {
std::unique_ptr<Lottie::SinglePlayer> player;
rpl::lifetime lifetime;
} _lottie;
::Media::Clip::ReaderPointer _webm;
QPixmap _pixmap;
QImage _image;
rpl::lifetime _loadingLifetime;