procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Keep document byte data only in DocumentMedia.

This commit is contained in:
John Preston 2020-04-10 17:18:51 +04:00
parent 97bab388ea
commit 40f12a2584
26 changed files with 280 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/boxes/background_preview_box.cpp
View File

@ -433,7 +433,7 @@ void BackgroundPreviewBox::prepare() {
_paper.loadThumbnail(); _paper.loadThumbnail();
_paper.loadDocument(); _paper.loadDocument();
if (_paper.document() && _paper.document()->loading()) { if (_paper.document() && _paper.document()->loading()) {
_radial.start(_paper.document()->progress()); _radial.start(_media->progress());
} }
if (_paper.thumbnail() && !_paper.isPattern()) { if (_paper.thumbnail() && !_paper.isPattern()) {
createBlurCheckbox(); createBlurCheckbox();
@ -636,7 +636,7 @@ void BackgroundPreviewBox::radialAnimationCallback(crl::time now) {
const auto document = _paper.document(); const auto document = _paper.document();
const auto wasAnimating = _radial.animating(); const auto wasAnimating = _radial.animating();
const auto updated = _radial.update( const auto updated = _radial.update(
document->progress(), _media->progress(),
!document->loading(), !document->loading(),
now); now);
if ((wasAnimating || _radial.animating()) if ((wasAnimating || _radial.animating())
@ -746,7 +746,7 @@ void BackgroundPreviewBox::checkLoadedDocument() {
}); });
}; };
_generating = Data::ReadImageAsync( _generating = Data::ReadImageAsync(
document, _media.get(),
Window::Theme::ProcessBackgroundImage, Window::Theme::ProcessBackgroundImage,
generateCallback); generateCallback);
} }

4
Telegram/SourceFiles/boxes/stickers_box.cpp
View File

@ -944,7 +944,9 @@ void StickersBox::Inner::paintRowThumbnail(
void StickersBox::Inner::validateLottieAnimation(not_null<Row*> set) { void StickersBox::Inner::validateLottieAnimation(not_null<Row*> set) {
if (set->lottie if (set->lottie
|| !Stickers::HasLottieThumbnail(set->thumbnail, set->sticker)) { || !Stickers::HasLottieThumbnail(
set->thumbnail,
set->stickerMedia.get())) {
return; return;
} }
auto player = Stickers::LottieThumbnail( auto player = Stickers::LottieThumbnail(

6
Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
View File

@ -1028,15 +1028,13 @@ void GifsListWidget::showPreview() {
auto layout = _rows[row].items[col]; auto layout = _rows[row].items[col];
if (const auto w = App::wnd()) { if (const auto w = App::wnd()) {
if (const auto previewDocument = layout->getPreviewDocument()) { if (const auto previewDocument = layout->getPreviewDocument()) {
w->showMediaPreview( _previewShown = w->showMediaPreview(
Data::FileOriginSavedGifs(), Data::FileOriginSavedGifs(),
previewDocument); previewDocument);
_previewShown = true;
} else if (const auto previewPhoto = layout->getPreviewPhoto()) { } else if (const auto previewPhoto = layout->getPreviewPhoto()) {
w->showMediaPreview( _previewShown = w->showMediaPreview(
Data::FileOrigin(), Data::FileOrigin(),
previewPhoto); previewPhoto);
_previewShown = true;
} }
} }
} }

11
Telegram/SourceFiles/chat_helpers/stickers.cpp
View File

@ -1220,7 +1220,8 @@ not_null<Lottie::Animation*> LottieAnimationFromDocument(
bool HasLottieThumbnail( bool HasLottieThumbnail(
ImagePtr thumbnail, ImagePtr thumbnail,
not_null<DocumentData*> sticker) { not_null<Data::DocumentMedia*> media) {
const auto document = media->owner();
if (thumbnail) { if (thumbnail) {
if (!thumbnail->loaded()) { if (!thumbnail->loaded()) {
return false; return false;
@ -1230,15 +1231,15 @@ bool HasLottieThumbnail(
return location.valid() return location.valid()
&& location.type() == StorageFileLocation::Type::StickerSetThumb && location.type() == StorageFileLocation::Type::StickerSetThumb
&& !bytes.isEmpty(); && !bytes.isEmpty();
} else if (const auto info = sticker->sticker()) { } else if (const auto info = document->sticker()) {
if (!info->animated) { if (!info->animated) {
return false; return false;
} }
sticker->automaticLoad(sticker->stickerSetOrigin(), nullptr); document->automaticLoad(document->stickerSetOrigin(), nullptr);
if (!sticker->loaded()) { if (!media->loaded()) {
return false; return false;
} }
return sticker->bigFileBaseCacheKey().has_value(); return document->bigFileBaseCacheKey().has_value();
} }
return false; return false;
} }

2
Telegram/SourceFiles/chat_helpers/stickers.h
View File

@ -160,7 +160,7 @@ enum class LottieSize : uchar {
[[nodiscard]] bool HasLottieThumbnail( [[nodiscard]] bool HasLottieThumbnail(
ImagePtr thumbnail, ImagePtr thumbnail,
not_null<DocumentData*> sticker); not_null<Data::DocumentMedia*> media);
[[nodiscard]] std::unique_ptr<Lottie::SinglePlayer> LottieThumbnail( [[nodiscard]] std::unique_ptr<Lottie::SinglePlayer> LottieThumbnail(
ImagePtr thumbnail, ImagePtr thumbnail,
not_null<Data::DocumentMedia*> media, not_null<Data::DocumentMedia*> media,

4
Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
View File

@ -701,7 +701,9 @@ void StickersListWidget::Footer::paintSearchIcon(Painter &p) const {
void StickersListWidget::Footer::validateIconLottieAnimation( void StickersListWidget::Footer::validateIconLottieAnimation(
const StickerIcon &icon) { const StickerIcon &icon) {
if (icon.lottie if (icon.lottie
|| !Stickers::HasLottieThumbnail(icon.thumbnail, icon.sticker)) { || !Stickers::HasLottieThumbnail(
icon.thumbnail,
icon.stickerMedia.get())) {
return; return;
} }
auto player = Stickers::LottieThumbnail( auto player = Stickers::LottieThumbnail(

77
Telegram/SourceFiles/data/data_document.cpp
View File

@ -44,17 +44,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
namespace { namespace {
// Updated Mar 3, 2020: Increase the size of the memory cache for media, to prevent items still being displayed from being unloaded.
constexpr auto kMemoryForCache = 128 * 1024 * 1024; // was 32, updated to 128
const auto kAnimatedStickerDimensions = QSize(512, 512); const auto kAnimatedStickerDimensions = QSize(512, 512);
Core::MediaActiveCache<DocumentData> &ActiveCache() {
static auto Instance = Core::MediaActiveCache<DocumentData>(
kMemoryForCache,
[](DocumentData *document) { document->unload(); });
return Instance;
}
QString JoinStringList(const QStringList &list, const QString &separator) { QString JoinStringList(const QStringList &list, const QString &separator) {
const auto count = list.size(); const auto count = list.size();
if (!count) { if (!count) {
@ -320,11 +311,12 @@ void DocumentOpenClickHandler::Open(
} }
LaunchWithWarning(location.name(), context); LaunchWithWarning(location.name(), context);
}; };
const auto media = data->createMediaView();
const auto &location = data->location(true); const auto &location = data->location(true);
if (data->isTheme() && data->loaded(true)) { if (data->isTheme() && media->loaded(true)) {
Core::App().showDocument(data, context); Core::App().showDocument(data, context);
location.accessDisable(); location.accessDisable();
} else if (data->canBePlayed()) { } else if (media->canBePlayed()) {
if (data->isAudioFile() if (data->isAudioFile()
|| data->isVoiceMessage() || data->isVoiceMessage()
|| data->isVideoMessage()) { || data->isVideoMessage()) {
@ -458,7 +450,6 @@ DocumentData::DocumentData(not_null<Data::Session*> owner, DocumentId id)
DocumentData::~DocumentData() { DocumentData::~DocumentData() {
destroyLoader(); destroyLoader();
unload(); unload();
ActiveCache().remove(this);
} }
Data::Session &DocumentData::owner() const { Data::Session &DocumentData::owner() const {
@ -578,7 +569,6 @@ void DocumentData::validateLottieSticker() {
} }
void DocumentData::setDataAndCache(const QByteArray &data) { void DocumentData::setDataAndCache(const QByteArray &data) {
_data = data;
if (const auto media = activeMediaView()) { if (const auto media = activeMediaView()) {
media->setBytes(data); media->setBytes(data);
} }
@ -744,16 +734,13 @@ void DocumentData::unload() {
// //
//_thumbnail->unload(); //_thumbnail->unload();
_replyPreview = nullptr; _replyPreview = nullptr;
if (!_data.isEmpty()) {
ActiveCache().decrement(_data.size());
_data.clear();
}
} }
void DocumentData::automaticLoad( void DocumentData::automaticLoad(
Data::FileOrigin origin, Data::FileOrigin origin,
const HistoryItem *item) { const HistoryItem *item) {
if (status != FileReady || loaded() || cancelled()) { const auto media = activeMediaView();
if (status != FileReady || !media || media->loaded() || cancelled()) {
return; return;
} else if (!item && type != StickerDocument && !isAnimation()) { } else if (!item && type != StickerDocument && !isAnimation()) {
return; return;
@ -794,10 +781,6 @@ void DocumentData::automaticLoadSettingsChanged() {
_flags &= ~Flag::DownloadCancelled; _flags &= ~Flag::DownloadCancelled;
} }
bool DocumentData::loaded(bool check) const {
return !rawBytes().isEmpty() || !filepath(check).isEmpty();
}
void DocumentData::finishLoad() { void DocumentData::finishLoad() {
const auto guard = gsl::finally([&] { const auto guard = gsl::finally([&] {
destroyLoader(); destroyLoader();
@ -807,18 +790,11 @@ void DocumentData::finishLoad() {
return; return;
} }
setLocation(FileLocation(_loader->fileName())); setLocation(FileLocation(_loader->fileName()));
ActiveCache().decrement(_data.size());
_data = _loader->bytes();
ActiveCache().increment(_data.size());
setGoodThumbnailDataReady(); setGoodThumbnailDataReady();
if (const auto media = activeMediaView()) { if (const auto media = activeMediaView()) {
media->setBytes(_loader->bytes()); media->setBytes(_loader->bytes());
media->checkStickerLarge(_loader.get()); media->checkStickerLarge(_loader.get());
} }
if (!_data.isEmpty()) {
ActiveCache().up(this);
}
} }
void DocumentData::destroyLoader() const { void DocumentData::destroyLoader() const {
@ -854,7 +830,7 @@ float64 DocumentData::progress() const {
} }
return 0.; return 0.;
} }
return loading() ? _loader->currentProgress() : (loaded() ? 1. : 0.); return loading() ? _loader->currentProgress() : 0.;
} }
int DocumentData::loadOffset() const { int DocumentData::loadOffset() const {
@ -909,13 +885,13 @@ void DocumentData::save(
const QString &toFile, const QString &toFile,
LoadFromCloudSetting fromCloud, LoadFromCloudSetting fromCloud,
bool autoLoading) { bool autoLoading) {
if (loaded(true)) { if (const auto media = activeMediaView(); media->loaded(true)) {
auto &l = location(true); auto &l = location(true);
if (!toFile.isEmpty()) { if (!toFile.isEmpty()) {
if (!rawBytes().isEmpty()) { if (!media->bytes().isEmpty()) {
QFile f(toFile); QFile f(toFile);
f.open(QIODevice::WriteOnly); f.open(QIODevice::WriteOnly);
f.write(rawBytes()); f.write(media->bytes());
f.close(); f.close();
setLocation(FileLocation(toFile)); setLocation(FileLocation(toFile));
@ -1108,13 +1084,6 @@ QByteArray documentWaveformEncode5bit(const VoiceWaveform &waveform) {
return result; return result;
} }
QByteArray DocumentData::rawBytes() const {
if (!_data.isEmpty()) {
ActiveCache().up(const_cast<DocumentData*>(this));
}
return _data;
}
const FileLocation &DocumentData::location(bool check) const { const FileLocation &DocumentData::location(bool check) const {
if (check && !_location.check()) { if (check && !_location.check()) {
const auto location = Local::readFileLocation(mediaKey()); const auto location = Local::readFileLocation(mediaKey());
@ -1272,12 +1241,6 @@ bool DocumentData::canBeStreamed() const {
return hasRemoteLocation() && supportsStreaming(); return hasRemoteLocation() && supportsStreaming();
} }
bool DocumentData::canBePlayed() const {
return !(_flags & Flag::StreamingPlaybackFailed)
&& useStreamingLoader()
&& (loaded() || canBeStreamed());
}
void DocumentData::setInappPlaybackFailed() { void DocumentData::setInappPlaybackFailed() {
_flags |= Flag::StreamingPlaybackFailed; _flags |= Flag::StreamingPlaybackFailed;
} }
@ -1294,9 +1257,10 @@ auto DocumentData::createStreamingLoader(
return nullptr; return nullptr;
} }
if (!forceRemoteLoader) { if (!forceRemoteLoader) {
const auto media = activeMediaView();
const auto &location = this->location(true); const auto &location = this->location(true);
if (!rawBytes().isEmpty()) { if (media && !media->bytes().isEmpty()) {
return Media::Streaming::MakeBytesLoader(rawBytes()); return Media::Streaming::MakeBytesLoader(media->bytes());
} else if (!location.isEmpty() && location.accessEnable()) { } else if (!location.isEmpty() && location.accessEnable()) {
auto result = Media::Streaming::MakeFileLoader(location.name()); auto result = Media::Streaming::MakeFileLoader(location.name());
location.accessDisable(); location.accessDisable();
@ -1574,15 +1538,10 @@ void DocumentData::collectLocalData(not_null<DocumentData*> local) {
} }
_owner->cache().copyIfEmpty(local->cacheKey(), cacheKey()); _owner->cache().copyIfEmpty(local->cacheKey(), cacheKey());
if (!local->_data.isEmpty()) { const auto localMedia = local->activeMediaView();
ActiveCache().decrement(_data.size()); if (!localMedia->bytes().isEmpty()) {
_data = local->_data;
if (const auto media = activeMediaView()) { if (const auto media = activeMediaView()) {
media->setBytes(local->_data); media->setBytes(localMedia->bytes());
}
ActiveCache().increment(_data.size());
if (!_data.isEmpty()) {
ActiveCache().up(this);
} }
} }
if (!local->_location.inMediaCache() && !local->_location.isEmpty()) { if (!local->_location.inMediaCache() && !local->_location.isEmpty()) {
@ -1672,13 +1631,13 @@ website ws wsc wsf wsh xbap xll xnk xs");
} }
base::binary_guard ReadImageAsync( base::binary_guard ReadImageAsync(
not_null<DocumentData*> document, not_null<Data::DocumentMedia*> media,
FnMut<QImage(QImage)> postprocess, FnMut<QImage(QImage)> postprocess,
FnMut<void(QImage&&)> done) { FnMut<void(QImage&&)> done) {
auto result = base::binary_guard(); auto result = base::binary_guard();
crl::async([ crl::async([
bytes = document->rawBytes(), bytes = media->bytes(),
path = document->filepath(), path = media->owner()->filepath(),
postprocess = std::move(postprocess), postprocess = std::move(postprocess),
guard = result.make_guard(), guard = result.make_guard(),
callback = std::move(done) callback = std::move(done)

8
Telegram/SourceFiles/data/data_document.h
View File

@ -100,7 +100,6 @@ public:
const HistoryItem *item); const HistoryItem *item);
void automaticLoadSettingsChanged(); void automaticLoadSettingsChanged();
[[nodiscard]] bool loaded(bool check = false) const;
[[nodiscard]] bool loading() const; [[nodiscard]] bool loading() const;
[[nodiscard]] QString loadingFilePath() const; [[nodiscard]] QString loadingFilePath() const;
[[nodiscard]] bool displayLoading() const; [[nodiscard]] bool displayLoading() const;
@ -120,7 +119,6 @@ public:
void setWaitingForAlbum(); void setWaitingForAlbum();
[[nodiscard]] bool waitingForAlbum() const; [[nodiscard]] bool waitingForAlbum() const;
[[nodiscard]] QByteArray rawBytes() const;
[[nodiscard]] const FileLocation &location(bool check = false) const; [[nodiscard]] const FileLocation &location(bool check = false) const;
void setLocation(const FileLocation &loc); void setLocation(const FileLocation &loc);
@ -225,12 +223,12 @@ public:
const QString &songPerformer); const QString &songPerformer);
[[nodiscard]] QString composeNameString() const; [[nodiscard]] QString composeNameString() const;
[[nodiscard]] bool canBePlayed() const;
[[nodiscard]] bool canBeStreamed() const; [[nodiscard]] bool canBeStreamed() const;
[[nodiscard]] auto createStreamingLoader( [[nodiscard]] auto createStreamingLoader(
Data::FileOrigin origin, Data::FileOrigin origin,
bool forceRemoteLoader) const bool forceRemoteLoader) const
-> std::unique_ptr<Media::Streaming::Loader>; -> std::unique_ptr<Media::Streaming::Loader>;
[[nodiscard]] bool useStreamingLoader() const;
void setInappPlaybackFailed(); void setInappPlaybackFailed();
[[nodiscard]] bool inappPlaybackFailed() const; [[nodiscard]] bool inappPlaybackFailed() const;
@ -291,7 +289,6 @@ private:
void handleLoaderUpdates(); void handleLoaderUpdates();
void destroyLoader() const; void destroyLoader() const;
[[nodiscard]] bool useStreamingLoader() const;
bool saveFromDataChecked(); bool saveFromDataChecked();
// Two types of location: from MTProto by dc+access or from web by url // Two types of location: from MTProto by dc+access or from web by url
@ -312,7 +309,6 @@ private:
not_null<Data::Session*> _owner; not_null<Data::Session*> _owner;
FileLocation _location; FileLocation _location;
QByteArray _data;
std::unique_ptr<DocumentAdditionalData> _additional; std::unique_ptr<DocumentAdditionalData> _additional;
int32 _duration = -1; int32 _duration = -1;
mutable Flags _flags = kStreamingSupportedUnknown; mutable Flags _flags = kStreamingSupportedUnknown;
@ -440,7 +436,7 @@ QString FileExtension(const QString &filepath);
bool IsValidMediaFile(const QString &filepath); bool IsValidMediaFile(const QString &filepath);
bool IsExecutableName(const QString &filepath); bool IsExecutableName(const QString &filepath);
base::binary_guard ReadImageAsync( base::binary_guard ReadImageAsync(
not_null<DocumentData*> document, not_null<Data::DocumentMedia*> media,
FnMut<QImage(QImage)> postprocess, FnMut<QImage(QImage)> postprocess,
FnMut<void(QImage&&)> done); FnMut<void(QImage&&)> done);

36
Telegram/SourceFiles/data/data_document_media.cpp
View File

@ -82,8 +82,7 @@ enum class FileType {
} // namespace } // namespace
DocumentMedia::DocumentMedia(not_null<DocumentData*> owner) DocumentMedia::DocumentMedia(not_null<DocumentData*> owner)
: _owner(owner) : _owner(owner) {
, _bytes(owner->rawBytes()) {
} }
DocumentMedia::~DocumentMedia() = default; DocumentMedia::~DocumentMedia() = default;
@ -140,8 +139,7 @@ void DocumentMedia::checkStickerLarge() {
if (data->animated || !loaded()) { if (data->animated || !loaded()) {
return; return;
} }
const auto bytes = _owner->rawBytes(); if (_bytes.isEmpty()) {
if (bytes.isEmpty()) {
const auto &loc = _owner->location(true); const auto &loc = _owner->location(true);
if (loc.accessEnable()) { if (loc.accessEnable()) {
_sticker = std::make_unique<Image>( _sticker = std::make_unique<Image>(
@ -150,11 +148,11 @@ void DocumentMedia::checkStickerLarge() {
} }
} else { } else {
auto format = QByteArray(); auto format = QByteArray();
auto image = App::readImage(bytes, &format, false); auto image = App::readImage(_bytes, &format, false);
_sticker = std::make_unique<Image>( _sticker = std::make_unique<Image>(
std::make_unique<Images::LocalFileSource>( std::make_unique<Images::LocalFileSource>(
QString(), QString(),
bytes, _bytes,
format, format,
std::move(image))); std::move(image)));
} }
@ -171,7 +169,19 @@ QByteArray DocumentMedia::bytes() const {
} }
bool DocumentMedia::loaded(bool check) const { bool DocumentMedia::loaded(bool check) const {
return !_bytes.isEmpty() || _owner->loaded(check);// checkLoadedTo(this); return !_bytes.isEmpty() || !_owner->filepath(check).isEmpty();
}
float64 DocumentMedia::progress() const {
return (owner()->uploading() || owner()->loading())
? owner()->progress()
: (loaded() ? 1. : 0.);
}
bool DocumentMedia::canBePlayed() const {
return !owner()->inappPlaybackFailed()
&& owner()->useStreamingLoader()
&& (loaded() || owner()->canBeStreamed());
} }
void DocumentMedia::checkStickerSmall() { void DocumentMedia::checkStickerSmall() {
@ -203,18 +213,19 @@ void DocumentMedia::checkStickerLarge(not_null<FileLoader*> loader) {
if (_owner->sticker() if (_owner->sticker()
&& !_sticker && !_sticker
&& !loader->imageData().isNull() && !loader->imageData().isNull()
&& !_owner->rawBytes().isEmpty()) { && !_bytes.isEmpty()) {
_sticker = std::make_unique<Image>( _sticker = std::make_unique<Image>(
std::make_unique<Images::LocalFileSource>( std::make_unique<Images::LocalFileSource>(
QString(), QString(),
_owner->rawBytes(), _bytes,
loader->imageFormat(), loader->imageFormat(),
loader->imageData())); loader->imageData()));
} }
} }
void DocumentMedia::GenerateGoodThumbnail(not_null<DocumentData*> document) { void DocumentMedia::GenerateGoodThumbnail(
const auto data = document->rawBytes(); not_null<DocumentData*> document,
QByteArray data) {
const auto type = document->isWallPaper() const auto type = document->isWallPaper()
? FileType::WallPaper ? FileType::WallPaper
: document->isTheme() : document->isTheme()
@ -282,8 +293,9 @@ void DocumentMedia::ReadOrGenerateThumbnail(
const auto active = document->activeMediaView(); const auto active = document->activeMediaView();
const auto got = [=](QByteArray value) { const auto got = [=](QByteArray value) {
if (value.isEmpty()) { if (value.isEmpty()) {
const auto bytes = active ? active->bytes() : QByteArray();
crl::on_main(guard, [=] { crl::on_main(guard, [=] {
GenerateGoodThumbnail(document); GenerateGoodThumbnail(document, bytes);
}); });
} else if (active) { } else if (active) {
crl::async([=] { crl::async([=] {

6
Telegram/SourceFiles/data/data_document_media.h
View File

@ -35,6 +35,8 @@ public:
void setBytes(const QByteArray &bytes); void setBytes(const QByteArray &bytes);
[[nodiscard]] QByteArray bytes() const; [[nodiscard]] QByteArray bytes() const;
[[nodiscard]] bool loaded(bool check = false) const; [[nodiscard]] bool loaded(bool check = false) const;
[[nodiscard]] float64 progress() const;
[[nodiscard]] bool canBePlayed() const;
// For DocumentData. // For DocumentData.
static void CheckGoodThumbnail(not_null<DocumentData*> document); static void CheckGoodThumbnail(not_null<DocumentData*> document);
@ -47,7 +49,9 @@ private:
using Flags = base::flags<Flag>; using Flags = base::flags<Flag>;
static void ReadOrGenerateThumbnail(not_null<DocumentData*> document); static void ReadOrGenerateThumbnail(not_null<DocumentData*> document);
static void GenerateGoodThumbnail(not_null<DocumentData*> document); static void GenerateGoodThumbnail(
not_null<DocumentData*> document,
QByteArray data);
const not_null<DocumentData*> _owner; const not_null<DocumentData*> _owner;
std::unique_ptr<Image> _goodThumbnail; std::unique_ptr<Image> _goodThumbnail;

45
Telegram/SourceFiles/history/view/media/history_view_document.cpp
View File

@ -85,7 +85,8 @@ Document::Document(
} }
float64 Document::dataProgress() const { float64 Document::dataProgress() const {
return _data->progress(); ensureDataMediaCreated();
return _dataMedia->progress();
} }
bool Document::dataFinished() const { bool Document::dataFinished() const {
@ -93,7 +94,8 @@ bool Document::dataFinished() const {
} }
bool Document::dataLoaded() const { bool Document::dataLoaded() const {
return _dataMedia ? _dataMedia->loaded() : _data->loaded(); ensureDataMediaCreated();
return _dataMedia->loaded();
} }
void Document::createComponents(bool caption) { void Document::createComponents(bool caption) {
@ -240,12 +242,14 @@ QSize Document::countCurrentSize(int newWidth) {
void Document::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms) const { void Document::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms) const {
if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) return; if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) return;
ensureDataMediaCreated();
const auto cornerDownload = downloadInCorner(); const auto cornerDownload = downloadInCorner();
if (!_data->canBePlayed()) { if (!_dataMedia->canBePlayed()) {
_data->automaticLoad(_realParent->fullId(), _parent->data()); _data->automaticLoad(_realParent->fullId(), _parent->data());
} }
bool loaded = _data->loaded(), displayLoading = _data->displayLoading(); bool loaded = dataLoaded(), displayLoading = _data->displayLoading();
bool selected = (selection == FullSelection); bool selected = (selection == FullSelection);
int captionw = width() - st::msgPadding.left() - st::msgPadding.right(); int captionw = width() - st::msgPadding.left() - st::msgPadding.right();
@ -254,7 +258,7 @@ void Document::draw(Painter &p, const QRect &r, TextSelection selection, crl::ti
if (displayLoading) { if (displayLoading) {
ensureAnimation(); ensureAnimation();
if (!_animation->radial.animating()) { if (!_animation->radial.animating()) {
_animation->radial.start(_data->progress()); _animation->radial.start(dataProgress());
} }
} }
const auto showPause = updateStatusText(); const auto showPause = updateStatusText();
@ -263,8 +267,6 @@ void Document::draw(Painter &p, const QRect &r, TextSelection selection, crl::ti
auto topMinus = isBubbleTop() ? 0 : st::msgFileTopMinus; auto topMinus = isBubbleTop() ? 0 : st::msgFileTopMinus;
int nameleft = 0, nametop = 0, nameright = 0, statustop = 0, linktop = 0, bottom = 0; int nameleft = 0, nametop = 0, nameright = 0, statustop = 0, linktop = 0, bottom = 0;
if (auto thumbed = Get<HistoryDocumentThumbed>()) { if (auto thumbed = Get<HistoryDocumentThumbed>()) {
ensureDataMediaCreated();
nameleft = st::msgFileThumbPadding.left() + st::msgFileThumbSize + st::msgFileThumbPadding.right(); nameleft = st::msgFileThumbPadding.left() + st::msgFileThumbSize + st::msgFileThumbPadding.right();
nametop = st::msgFileThumbNameTop - topMinus; nametop = st::msgFileThumbNameTop - topMinus;
nameright = st::msgFileThumbPadding.left(); nameright = st::msgFileThumbPadding.left();
@ -328,7 +330,7 @@ void Document::draw(Painter &p, const QRect &r, TextSelection selection, crl::ti
if (_data->status != FileUploadFailed) { if (_data->status != FileUploadFailed) {
const auto &lnk = (_data->loading() || _data->uploading()) const auto &lnk = (_data->loading() || _data->uploading())
? thumbed->_linkcancell ? thumbed->_linkcancell
: _data->loaded() : dataLoaded()
? thumbed->_linkopenwithl ? thumbed->_linkopenwithl
: thumbed->_linksavel; : thumbed->_linksavel;
bool over = ClickHandler::showAsActive(lnk); bool over = ClickHandler::showAsActive(lnk);
@ -361,8 +363,8 @@ void Document::draw(Painter &p, const QRect &r, TextSelection selection, crl::ti
return &(outbg ? (selected ? st::historyFileOutCancelSelected : st::historyFileOutCancel) : (selected ? st::historyFileInCancelSelected : st::historyFileInCancel)); return &(outbg ? (selected ? st::historyFileOutCancelSelected : st::historyFileOutCancel) : (selected ? st::historyFileInCancelSelected : st::historyFileInCancel));
} else if (showPause) { } else if (showPause) {
return &(outbg ? (selected ? st::historyFileOutPauseSelected : st::historyFileOutPause) : (selected ? st::historyFileInPauseSelected : st::historyFileInPause)); return &(outbg ? (selected ? st::historyFileOutPauseSelected : st::historyFileOutPause) : (selected ? st::historyFileInPauseSelected : st::historyFileInPause));
} else if (loaded || _data->canBePlayed()) { } else if (loaded || _dataMedia->canBePlayed()) {
if (_data->canBePlayed()) { if (_dataMedia->canBePlayed()) {
return &(outbg ? (selected ? st::historyFileOutPlaySelected : st::historyFileOutPlay) : (selected ? st::historyFileInPlaySelected : st::historyFileInPlay)); return &(outbg ? (selected ? st::historyFileOutPlaySelected : st::historyFileOutPlay) : (selected ? st::historyFileInPlaySelected : st::historyFileInPlay));
} else if (_data->isImage()) { } else if (_data->isImage()) {
return &(outbg ? (selected ? st::historyFileOutImageSelected : st::historyFileOutImage) : (selected ? st::historyFileInImageSelected : st::historyFileInImage)); return &(outbg ? (selected ? st::historyFileOutImageSelected : st::historyFileOutImage) : (selected ? st::historyFileInImageSelected : st::historyFileInImage));
@ -379,7 +381,9 @@ void Document::draw(Painter &p, const QRect &r, TextSelection selection, crl::ti
_animation->radial.draw(p, rinner, st::msgFileRadialLine, fg); _animation->radial.draw(p, rinner, st::msgFileRadialLine, fg);
} }
drawCornerDownload(p, selected); if (!loaded) {
drawCornerDownload(p, selected);
}
} }
auto namewidth = width() - nameleft - nameright; auto namewidth = width() - nameleft - nameright;
auto statuswidth = namewidth; auto statuswidth = namewidth;
@ -522,7 +526,7 @@ bool Document::downloadInCorner() const {
} }
void Document::drawCornerDownload(Painter &p, bool selected) const { void Document::drawCornerDownload(Painter &p, bool selected) const {
if (_data->loaded() || !downloadInCorner()) { if (!downloadInCorner()) {
return; return;
} }
auto outbg = _parent->hasOutLayout(); auto outbg = _parent->hasOutLayout();
@ -562,7 +566,7 @@ TextState Document::cornerDownloadTextState(
QPoint point, QPoint point,
StateRequest request) const { StateRequest request) const {
auto result = TextState(_parent); auto result = TextState(_parent);
if (!downloadInCorner() || _data->loaded()) { if (!downloadInCorner()) {
return result; return result;
} }
auto topMinus = isBubbleTop() ? 0 : st::msgFileTopMinus; auto topMinus = isBubbleTop() ? 0 : st::msgFileTopMinus;
@ -583,7 +587,8 @@ TextState Document::textState(QPoint point, StateRequest request) const {
return result; return result;
} }
bool loaded = _data->loaded(); ensureDataMediaCreated();
bool loaded = dataLoaded();
bool showPause = updateStatusText(); bool showPause = updateStatusText();
@ -606,7 +611,7 @@ TextState Document::textState(QPoint point, StateRequest request) const {
if (style::rtlrect(nameleft, linktop, thumbed->_linkw, st::semiboldFont->height, width()).contains(point)) { if (style::rtlrect(nameleft, linktop, thumbed->_linkw, st::semiboldFont->height, width()).contains(point)) {
result.link = (_data->loading() || _data->uploading()) result.link = (_data->loading() || _data->uploading())
? thumbed->_linkcancell ? thumbed->_linkcancell
: _data->loaded() : dataLoaded()
? thumbed->_linkopenwithl ? thumbed->_linkopenwithl
: thumbed->_linksavel; : thumbed->_linksavel;
return result; return result;
@ -618,8 +623,10 @@ TextState Document::textState(QPoint point, StateRequest request) const {
nametop = st::msgFileNameTop - topMinus; nametop = st::msgFileNameTop - topMinus;
bottom = st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom() - topMinus; bottom = st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom() - topMinus;
if (const auto state = cornerDownloadTextState(point, request); state.link) { if (!loaded) {
return state; if (const auto state = cornerDownloadTextState(point, request); state.link) {
return state;
}
} }
QRect inner(style::rtlrect(st::msgFilePadding.left(), st::msgFilePadding.top() - topMinus, st::msgFileSize, st::msgFileSize, width())); QRect inner(style::rtlrect(st::msgFilePadding.left(), st::msgFilePadding.top() - topMinus, st::msgFileSize, st::msgFileSize, width()));
if ((_data->loading() || _data->uploading()) && inner.contains(point) && !downloadInCorner()) { if ((_data->loading() || _data->uploading()) && inner.contains(point) && !downloadInCorner()) {
@ -663,7 +670,7 @@ TextState Document::textState(QPoint point, StateRequest request) const {
&& (!_data->loading() || downloadInCorner()) && (!_data->loading() || downloadInCorner())
&& !_data->uploading() && !_data->uploading()
&& !_data->isNull()) { && !_data->isNull()) {
if (loaded || _data->canBePlayed()) { if (loaded || _dataMedia->canBePlayed()) {
result.link = _openl; result.link = _openl;
} else { } else {
result.link = _savel; result.link = _savel;
@ -755,7 +762,7 @@ bool Document::updateStatusText() const {
statusSize = _data->uploadingData->offset; statusSize = _data->uploadingData->offset;
} else if (_data->loading()) { } else if (_data->loading()) {
statusSize = _data->loadOffset(); statusSize = _data->loadOffset();
} else if (_data->loaded()) { } else if (dataLoaded()) {
statusSize = FileStatusSizeLoaded; statusSize = FileStatusSizeLoaded;
} else { } else {
statusSize = FileStatusSizeReady; statusSize = FileStatusSizeReady;

2
Telegram/SourceFiles/history/view/media/history_view_document.h
View File

@ -24,7 +24,7 @@ class String;
namespace HistoryView { namespace HistoryView {
class Document class Document final
: public File : public File
, public RuntimeComposer<Document> { , public RuntimeComposer<Document> {
public: public:

42
Telegram/SourceFiles/history/view/media/history_view_gif.cpp
View File

@ -265,12 +265,14 @@ bool Gif::autoplayEnabled() const {
void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms) const { void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms) const {
if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) return; if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) return;
ensureDataMediaCreated();
const auto item = _parent->data(); const auto item = _parent->data();
const auto loaded = dataLoaded();
const auto displayLoading = item->isSending() || _data->displayLoading(); const auto displayLoading = item->isSending() || _data->displayLoading();
const auto selected = (selection == FullSelection); const auto selected = (selection == FullSelection);
const auto autoPaused = App::wnd()->sessionController()->isGifPausedAtLeastFor(Window::GifPauseReason::Any); const auto autoPaused = App::wnd()->sessionController()->isGifPausedAtLeastFor(Window::GifPauseReason::Any);
const auto cornerDownload = downloadInCorner(); const auto cornerDownload = downloadInCorner();
const auto canBePlayed = _data->canBePlayed(); const auto canBePlayed = _dataMedia->canBePlayed();
const auto autoplay = autoplayEnabled() const auto autoplay = autoplayEnabled()
&& canBePlayed && canBePlayed
&& CanPlayInline(_data); && CanPlayInline(_data);
@ -449,12 +451,12 @@ void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms
if (radial if (radial
|| (!streamingMode || (!streamingMode
&& ((!_data->loaded() && !_data->loading()) || !autoplay))) { && ((!loaded && !_data->loading()) || !autoplay))) {
const auto radialOpacity = (item->isSending() || _data->uploading()) const auto radialOpacity = (item->isSending() || _data->uploading())
? 1. ? 1.
: streamedForWaiting : streamedForWaiting
? streamedForWaiting->waitingOpacity() ? streamedForWaiting->waitingOpacity()
: (radial && _data->loaded()) : (radial && loaded)
? _animation->radial.opacity() ? _animation->radial.opacity()
: 1.; : 1.;
auto inner = QRect(rthumb.x() + (rthumb.width() - st::msgFileSize) / 2, rthumb.y() + (rthumb.height() - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize); auto inner = QRect(rthumb.x() + (rthumb.width() - st::msgFileSize) / 2, rthumb.y() + (rthumb.height() - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
@ -479,7 +481,7 @@ void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms
const auto icon = [&]() -> const style::icon * { const auto icon = [&]() -> const style::icon * {
if (streamingMode && !_data->uploading()) { if (streamingMode && !_data->uploading()) {
return nullptr; return nullptr;
} else if ((_data->loaded() || canBePlayed) && (!radial || cornerDownload)) { } else if ((loaded || canBePlayed) && (!radial || cornerDownload)) {
return &(selected ? st::historyFileThumbPlaySelected : st::historyFileThumbPlay); return &(selected ? st::historyFileThumbPlaySelected : st::historyFileThumbPlay);
} else if (radial || _data->loading()) { } else if (radial || _data->loading()) {
if (!item->isSending() || _data->uploading()) { if (!item->isSending() || _data->uploading()) {
@ -640,7 +642,7 @@ void Gif::drawCornerStatus(Painter &p, bool selected, QPoint position) const {
: _statusText; : _statusText;
const auto padding = st::msgDateImgPadding; const auto padding = st::msgDateImgPadding;
const auto radial = _animation && _animation->radial.animating(); const auto radial = _animation && _animation->radial.animating();
const auto cornerDownload = downloadInCorner() && !_data->loaded() && !_data->loadedInMediaCache(); const auto cornerDownload = downloadInCorner() && !dataLoaded() && !_data->loadedInMediaCache();
const auto cornerMute = _streamed && _data->isVideoFile() && !cornerDownload; const auto cornerMute = _streamed && _data->isVideoFile() && !cornerDownload;
const auto addLeft = cornerDownload ? (st::historyVideoDownloadSize + 2 * padding.y()) : 0; const auto addLeft = cornerDownload ? (st::historyVideoDownloadSize + 2 * padding.y()) : 0;
const auto addRight = cornerMute ? st::historyVideoMuteSize : 0; const auto addRight = cornerMute ? st::historyVideoMuteSize : 0;
@ -682,7 +684,7 @@ TextState Gif::cornerStatusTextState(
StateRequest request, StateRequest request,
QPoint position) const { QPoint position) const {
auto result = TextState(_parent); auto result = TextState(_parent);
if (!needCornerStatusDisplay() || !downloadInCorner() || _data->loaded()) { if (!needCornerStatusDisplay() || !downloadInCorner() || dataLoaded()) {
return result; return result;
} }
const auto padding = st::msgDateImgPadding; const auto padding = st::msgDateImgPadding;
@ -702,6 +704,7 @@ TextState Gif::textState(QPoint point, StateRequest request) const {
if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) { if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) {
return result; return result;
} }
ensureDataMediaCreated();
auto paintx = 0, painty = 0, paintw = width(), painth = height(); auto paintx = 0, painty = 0, paintw = width(), painth = height();
auto bubble = _parent->hasBubble(); auto bubble = _parent->hasBubble();
@ -804,7 +807,7 @@ TextState Gif::textState(QPoint point, StateRequest request) const {
? _cancell ? _cancell
: _realParent->isSending() : _realParent->isSending()
? nullptr ? nullptr
: (_data->loaded() || _data->canBePlayed()) : (dataLoaded() || _dataMedia->canBePlayed())
? _openl ? _openl
: _data->loading() : _data->loading()
? _cancell ? _cancell
@ -871,13 +874,15 @@ void Gif::drawGrouped(
RectParts corners, RectParts corners,
not_null<uint64*> cacheKey, not_null<uint64*> cacheKey,
not_null<QPixmap*> cache) const { not_null<QPixmap*> cache) const {
ensureDataMediaCreated();
const auto item = _parent->data(); const auto item = _parent->data();
const auto loaded = dataLoaded();
const auto displayLoading = (item->id < 0) || _data->displayLoading(); const auto displayLoading = (item->id < 0) || _data->displayLoading();
const auto selected = (selection == FullSelection); const auto selected = (selection == FullSelection);
const auto autoPaused = App::wnd()->sessionController()->isGifPausedAtLeastFor(Window::GifPauseReason::Any); const auto autoPaused = App::wnd()->sessionController()->isGifPausedAtLeastFor(Window::GifPauseReason::Any);
const auto fullFeatured = fullFeaturedGrouped(sides); const auto fullFeatured = fullFeaturedGrouped(sides);
const auto cornerDownload = fullFeatured && downloadInCorner(); const auto cornerDownload = fullFeatured && downloadInCorner();
const auto canBePlayed = _data->canBePlayed(); const auto canBePlayed = _dataMedia->canBePlayed();
const auto autoplay = fullFeatured const auto autoplay = fullFeatured
&& autoplayEnabled() && autoplayEnabled()
&& canBePlayed && canBePlayed
@ -961,12 +966,12 @@ void Gif::drawGrouped(
if (radial if (radial
|| (!streamingMode || (!streamingMode
&& ((!_data->loaded() && !_data->loading()) || !autoplay))) { && ((!loaded && !_data->loading()) || !autoplay))) {
const auto radialOpacity = (item->isSending() || _data->uploading()) const auto radialOpacity = (item->isSending() || _data->uploading())
? 1. ? 1.
: streamedForWaiting : streamedForWaiting
? streamedForWaiting->waitingOpacity() ? streamedForWaiting->waitingOpacity()
: (radial && _data->loaded()) : (radial && loaded)
? _animation->radial.opacity() ? _animation->radial.opacity()
: 1.; : 1.;
const auto radialSize = st::historyGroupRadialSize; const auto radialSize = st::historyGroupRadialSize;
@ -998,7 +1003,7 @@ void Gif::drawGrouped(
return &(selected ? st::historyFileThumbWaitingSelected : st::historyFileThumbWaiting); return &(selected ? st::historyFileThumbWaitingSelected : st::historyFileThumbWaiting);
} else if (streamingMode && !_data->uploading()) { } else if (streamingMode && !_data->uploading()) {
return nullptr; return nullptr;
} else if ((_data->loaded() || canBePlayed) && (!radial || cornerDownload)) { } else if ((loaded || canBePlayed) && (!radial || cornerDownload)) {
return &(selected ? st::historyFileThumbPlaySelected : st::historyFileThumbPlay); return &(selected ? st::historyFileThumbPlaySelected : st::historyFileThumbPlay);
} else if (radial || _data->loading()) { } else if (radial || _data->loading()) {
if (!item->isSending() || _data->uploading()) { if (!item->isSending() || _data->uploading()) {
@ -1064,11 +1069,12 @@ TextState Gif::getStateGrouped(
return state; return state;
} }
} }
ensureDataMediaCreated();
return TextState(_parent, _data->uploading() return TextState(_parent, _data->uploading()
? _cancell ? _cancell
: _realParent->isSending() : _realParent->isSending()
? nullptr ? nullptr
: (_data->loaded() || _data->canBePlayed()) : (dataLoaded() || _dataMedia->canBePlayed())
? _openl ? _openl
: _data->loading() : _data->loading()
? _cancell ? _cancell
@ -1206,6 +1212,7 @@ void Gif::setStatusSize(int newSize) const {
} }
void Gif::updateStatusText() const { void Gif::updateStatusText() const {
ensureDataMediaCreated();
auto showPause = false; auto showPause = false;
auto statusSize = 0; auto statusSize = 0;
auto realDuration = 0; auto realDuration = 0;
@ -1215,7 +1222,7 @@ void Gif::updateStatusText() const {
statusSize = _data->uploadingData->offset; statusSize = _data->uploadingData->offset;
} else if (!downloadInCorner() && _data->loading()) { } else if (!downloadInCorner() && _data->loading()) {
statusSize = _data->loadOffset(); statusSize = _data->loadOffset();
} else if (_data->loaded() || _data->canBePlayed()) { } else if (dataLoaded() || _dataMedia->canBePlayed()) {
statusSize = FileStatusSizeLoaded; statusSize = FileStatusSizeLoaded;
} else { } else {
statusSize = FileStatusSizeReady; statusSize = FileStatusSizeReady;
@ -1331,6 +1338,7 @@ Gif::Streamed *Gif::activeOwnStreamed() const {
} }
void Gif::playAnimation(bool autoplay) { void Gif::playAnimation(bool autoplay) {
ensureDataMediaCreated();
if (_data->isVideoMessage() && !autoplay) { if (_data->isVideoMessage() && !autoplay) {
return; return;
} else if (_streamed && autoplay) { } else if (_streamed && autoplay) {
@ -1342,7 +1350,7 @@ void Gif::playAnimation(bool autoplay) {
} }
if (_streamed) { if (_streamed) {
stopAnimation(); stopAnimation();
} else if (_data->canBePlayed()) { } else if (_dataMedia->canBePlayed()) {
if (!autoplayEnabled()) { if (!autoplayEnabled()) {
history()->owner().checkPlayingVideoFiles(); history()->owner().checkPlayingVideoFiles();
} }
@ -1470,8 +1478,9 @@ int Gif::checkAnimationCount() {
} }
float64 Gif::dataProgress() const { float64 Gif::dataProgress() const {
ensureDataMediaCreated();
return (_data->uploading() || _parent->data()->id > 0) return (_data->uploading() || _parent->data()->id > 0)
? _data->progress() ? _dataMedia->progress()
: 0; : 0;
} }
@ -1482,7 +1491,8 @@ bool Gif::dataFinished() const {
} }
bool Gif::dataLoaded() const { bool Gif::dataLoaded() const {
return (_parent->data()->id > 0) ? _data->loaded() : false; ensureDataMediaCreated();
return (_parent->data()->id > 0) ? _dataMedia->loaded() : false;
} }
bool Gif::needInfoDisplay() const { bool Gif::needInfoDisplay() const {

2
Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
View File

@ -102,7 +102,7 @@ bool Sticker::readyToDrawLottie() {
ensureDataMediaCreated(); ensureDataMediaCreated();
_dataMedia->checkStickerLarge(); _dataMedia->checkStickerLarge();
const auto loaded = _data->loaded(); const auto loaded = _dataMedia->loaded();
if (sticker->animated && !_lottie && loaded) { if (sticker->animated && !_lottie && loaded) {
setupLottie(); setupLottie();
} }

32
Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
View File

@ -108,9 +108,11 @@ QSize ThemeDocument::countCurrentSize(int newWidth) {
void ThemeDocument::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms) const { void ThemeDocument::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms) const {
if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) return; if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) return;
ensureDataMediaCreated();
_data->automaticLoad(_realParent->fullId(), _parent->data()); _data->automaticLoad(_realParent->fullId(), _parent->data());
auto selected = (selection == FullSelection); auto selected = (selection == FullSelection);
auto loaded = _data->loaded(); auto loaded = dataLoaded();
auto displayLoading = _data->displayLoading(); auto displayLoading = _data->displayLoading();
auto inWebPage = (_parent->media() != this); auto inWebPage = (_parent->media() != this);
@ -121,7 +123,7 @@ void ThemeDocument::draw(Painter &p, const QRect &r, TextSelection selection, cr
if (displayLoading) { if (displayLoading) {
ensureAnimation(); ensureAnimation();
if (!_animation->radial.animating()) { if (!_animation->radial.animating()) {
_animation->radial.start(_data->progress()); _animation->radial.start(dataProgress());
} }
} }
const auto radial = isRadialAnimation(); const auto radial = isRadialAnimation();
@ -185,15 +187,20 @@ void ThemeDocument::draw(Painter &p, const QRect &r, TextSelection selection, cr
} }
} }
void ThemeDocument::ensureDataMediaCreated() const {
if (_dataMedia) {
return;
}
_dataMedia = _data->createMediaView();
_dataMedia->goodThumbnailWanted();
_parent->history()->owner().registerHeavyViewPart(_parent);
}
void ThemeDocument::validateThumbnail() const { void ThemeDocument::validateThumbnail() const {
if (_thumbnailGood > 0) { if (_thumbnailGood > 0) {
return; return;
} }
if (!_dataMedia) { ensureDataMediaCreated();
_dataMedia = _data->createMediaView();
_dataMedia->goodThumbnailWanted();
_parent->history()->owner().registerHeavyViewPart(_parent);
}
if (const auto good = _dataMedia->goodThumbnail()) { if (const auto good = _dataMedia->goodThumbnail()) {
if (good->loaded()) { if (good->loaded()) {
prepareThumbnailFrom(good, 1); prepareThumbnailFrom(good, 1);
@ -261,7 +268,7 @@ TextState ThemeDocument::textState(QPoint point, StateRequest request) const {
if (QRect(paintx, painty, paintw, painth).contains(point)) { if (QRect(paintx, painty, paintw, painth).contains(point)) {
if (_data->uploading()) { if (_data->uploading()) {
result.link = _cancell; result.link = _cancell;
} else if (_data->loaded()) { } else if (dataLoaded()) {
result.link = _openl; result.link = _openl;
} else if (_data->loading()) { } else if (_data->loading()) {
result.link = _cancell; result.link = _cancell;
@ -273,7 +280,8 @@ TextState ThemeDocument::textState(QPoint point, StateRequest request) const {
} }
float64 ThemeDocument::dataProgress() const { float64 ThemeDocument::dataProgress() const {
return _data->progress(); ensureDataMediaCreated();
return _dataMedia->progress();
} }
bool ThemeDocument::dataFinished() const { bool ThemeDocument::dataFinished() const {
@ -282,11 +290,13 @@ bool ThemeDocument::dataFinished() const {
} }
bool ThemeDocument::dataLoaded() const { bool ThemeDocument::dataLoaded() const {
return _data->loaded(); ensureDataMediaCreated();
return _dataMedia->loaded();
} }
bool ThemeDocument::isReadyForOpen() const { bool ThemeDocument::isReadyForOpen() const {
return _data->loaded(); ensureDataMediaCreated();
return _dataMedia->loaded();
} }
QString ThemeDocument::additionalInfoString() const { QString ThemeDocument::additionalInfoString() const {

1
Telegram/SourceFiles/history/view/media/history_view_theme_document.h
View File

@ -61,6 +61,7 @@ private:
void fillPatternFieldsFrom(const QString &url); void fillPatternFieldsFrom(const QString &url);
void validateThumbnail() const; void validateThumbnail() const;
void prepareThumbnailFrom(not_null<Image*> image, int good) const; void prepareThumbnailFrom(not_null<Image*> image, int good) const;
void ensureDataMediaCreated() const;
const not_null<DocumentData*> _data; const not_null<DocumentData*> _data;
int _pixw = 1; int _pixw = 1;

90
Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
View File

@ -146,12 +146,10 @@ int Gif::resizeGetHeight(int width) {
void Gif::paint(Painter &p, const QRect &clip, const PaintContext *context) const { void Gif::paint(Painter &p, const QRect &clip, const PaintContext *context) const {
const auto document = getShownDocument(); const auto document = getShownDocument();
if (document) { ensureDataMediaCreated(document);
ensureDataMediaCreated(document);
}
document->automaticLoad(fileOrigin(), nullptr); document->automaticLoad(fileOrigin(), nullptr);
bool loaded = document->loaded(), loading = document->loading(), displayLoading = document->displayLoading(); bool loaded = _dataMedia->loaded(), loading = document->loading(), displayLoading = document->displayLoading();
if (loaded if (loaded
&& !_gif && !_gif
&& !_gif.isBad() && !_gif.isBad()
@ -167,7 +165,7 @@ void Gif::paint(Painter &p, const QRect &clip, const PaintContext *context) cons
if (displayLoading) { if (displayLoading) {
ensureAnimation(); ensureAnimation();
if (!_animation->radial.animating()) { if (!_animation->radial.animating()) {
_animation->radial.start(document->progress()); _animation->radial.start(_dataMedia->progress());
} }
} }
const auto radial = isRadialAnimation(); const auto radial = isRadialAnimation();
@ -260,7 +258,8 @@ void Gif::clickHandlerActiveChanged(const ClickHandlerPtr &p, bool active) {
if (p == _delete || p == _send) { if (p == _delete || p == _send) {
bool wasactive = (_state & StateFlag::Over); bool wasactive = (_state & StateFlag::Over);
if (active != wasactive) { if (active != wasactive) {
if (!getShownDocument()->loaded()) { ensureDataMediaCreated(getShownDocument());
if (!_dataMedia->loaded()) {
ensureAnimation(); ensureAnimation();
auto from = active ? 0. : 1., to = active ? 1. : 0.; auto from = active ? 0. : 1., to = active ? 1. : 0.;
_animation->_a_over.start([this] { update(); }, from, to, st::stickersRowDuration); _animation->_a_over.start([this] { update(); }, from, to, st::stickersRowDuration);
@ -356,8 +355,11 @@ bool Gif::isRadialAnimation() const {
if (_animation) { if (_animation) {
if (_animation->radial.animating()) { if (_animation->radial.animating()) {
return true; return true;
} else if (getShownDocument()->loaded()) { } else {
_animation = nullptr; ensureDataMediaCreated(getShownDocument());
if (_dataMedia->loaded()) {
_animation = nullptr;
}
} }
} }
return false; return false;
@ -365,16 +367,17 @@ bool Gif::isRadialAnimation() const {
void Gif::radialAnimationCallback(crl::time now) const { void Gif::radialAnimationCallback(crl::time now) const {
const auto document = getShownDocument(); const auto document = getShownDocument();
ensureDataMediaCreated(document);
const auto updated = [&] { const auto updated = [&] {
return _animation->radial.update( return _animation->radial.update(
document->progress(), _dataMedia->progress(),
!document->loading() || document->loaded(), !document->loading() || _dataMedia->loaded(),
now); now);
}(); }();
if (!anim::Disabled() || updated) { if (!anim::Disabled() || updated) {
update(); update();
} }
if (!_animation->radial.animating() && document->loaded()) { if (!_animation->radial.animating() && _dataMedia->loaded()) {
_animation = nullptr; _animation = nullptr;
} }
} }
@ -452,7 +455,8 @@ void Sticker::ensureDataMediaCreated(not_null<DocumentData*> document) const {
} }
void Sticker::paint(Painter &p, const QRect &clip, const PaintContext *context) const { void Sticker::paint(Painter &p, const QRect &clip, const PaintContext *context) const {
bool loaded = getShownDocument()->loaded(); ensureDataMediaCreated(getShownDocument());
bool loaded = _dataMedia->loaded();
auto over = _a_over.value(_active ? 1. : 0.); auto over = _a_over.value(_active ? 1. : 0.);
if (over > 0) { if (over > 0) {
@ -534,12 +538,12 @@ void Sticker::prepareThumbnail() const {
if (!_lottie if (!_lottie
&& document->sticker() && document->sticker()
&& document->sticker()->animated && document->sticker()->animated
&& document->loaded()) { && _dataMedia->loaded()) {
setupLottie(); setupLottie();
} }
_dataMedia->checkStickerSmall(); _dataMedia->checkStickerSmall();
if (const auto sticker = _dataMedia->getStickerSmall()) { if (const auto sticker = _dataMedia->getStickerSmall()) {
if (!_lottie && !_thumbLoaded && sticker->loaded()) { if (!_lottie && !_thumbLoaded && _dataMedia->loaded()) {
const auto thumbSize = getThumbSize(); const auto thumbSize = getThumbSize();
_thumb = sticker->pix( _thumb = sticker->pix(
document->stickerSetOrigin(), document->stickerSetOrigin(),
@ -831,12 +835,13 @@ void File::initDimensions() {
void File::paint(Painter &p, const QRect &clip, const PaintContext *context) const { void File::paint(Painter &p, const QRect &clip, const PaintContext *context) const {
const auto left = st::msgFileSize + st::inlineThumbSkip; const auto left = st::msgFileSize + st::inlineThumbSkip;
const auto loaded = _document->loaded(); ensureDataMediaCreated();
const auto loaded = _documentMedia->loaded();
const auto displayLoading = _document->displayLoading(); const auto displayLoading = _document->displayLoading();
if (displayLoading) { if (displayLoading) {
ensureAnimation(); ensureAnimation();
if (!_animation->radial.animating()) { if (!_animation->radial.animating()) {
_animation->radial.start(_document->progress()); _animation->radial.start(_documentMedia->progress());
} }
} }
const auto showPause = updateStatusText(); const auto showPause = updateStatusText();
@ -862,21 +867,18 @@ void File::paint(Painter &p, const QRect &clip, const PaintContext *context) con
_animation->radial.draw(p, radialCircle, st::msgFileRadialLine, st::historyFileInRadialFg); _animation->radial.draw(p, radialCircle, st::msgFileRadialLine, st::historyFileInRadialFg);
} }
auto icon = [&] { const auto icon = [&] {
if (radial || _document->loading()) { if (radial || _document->loading()) {
return &st::historyFileInCancel; return &st::historyFileInCancel;
} else if (showPause) { } else if (showPause) {
return &st::historyFileInPause; return &st::historyFileInPause;
} else if (true || _document->loaded()) { } else if (_document->isImage()) {
if (_document->isImage()) { return &st::historyFileInImage;
return &st::historyFileInImage; } else if (_document->isVoiceMessage()
} else if (_document->isVoiceMessage() || _document->isAudioFile()) {
|| _document->isAudioFile()) { return &st::historyFileInPlay;
return &st::historyFileInPlay;
}
return &st::historyFileInDocument;
} }
return &st::historyFileInDownload; return &st::historyFileInDocument;
}(); }();
icon->paintInCenter(p, inner); icon->paintInCenter(p, inner);
@ -934,10 +936,11 @@ void File::thumbAnimationCallback() {
} }
void File::radialAnimationCallback(crl::time now) const { void File::radialAnimationCallback(crl::time now) const {
ensureDataMediaCreated();
const auto updated = [&] { const auto updated = [&] {
return _animation->radial.update( return _animation->radial.update(
_document->progress(), _documentMedia->progress(),
!_document->loading() || _document->loaded(), !_document->loading() || _documentMedia->loaded(),
now); now);
}(); }();
if (!anim::Disabled() || updated) { if (!anim::Disabled() || updated) {
@ -956,17 +959,26 @@ void File::ensureAnimation() const {
} }
} }
void File::ensureDataMediaCreated() const {
if (_documentMedia) {
return;
}
_documentMedia = _document->createMediaView();
}
void File::checkAnimationFinished() const { void File::checkAnimationFinished() const {
if (_animation if (_animation
&& !_animation->a_thumbOver.animating() && !_animation->a_thumbOver.animating()
&& !_animation->radial.animating()) { && !_animation->radial.animating()) {
if (_document->loaded()) { ensureDataMediaCreated();
if (_documentMedia->loaded()) {
_animation.reset(); _animation.reset();
} }
} }
} }
bool File::updateStatusText() const { bool File::updateStatusText() const {
ensureDataMediaCreated();
bool showPause = false; bool showPause = false;
int32 statusSize = 0, realDuration = 0; int32 statusSize = 0, realDuration = 0;
if (_document->status == FileDownloadFailed || _document->status == FileUploadFailed) { if (_document->status == FileDownloadFailed || _document->status == FileUploadFailed) {
@ -975,7 +987,7 @@ bool File::updateStatusText() const {
statusSize = _document->uploadingData->offset; statusSize = _document->uploadingData->offset;
} else if (_document->loading()) { } else if (_document->loading()) {
statusSize = _document->loadOffset(); statusSize = _document->loadOffset();
} else if (_document->loaded()) { } else if (_documentMedia->loaded()) {
statusSize = FileStatusSizeLoaded; statusSize = FileStatusSizeLoaded;
} else { } else {
statusSize = FileStatusSizeReady; statusSize = FileStatusSizeReady;
@ -1331,7 +1343,7 @@ void Game::paint(Painter &p, const QRect &clip, const PaintContext *context) con
if (animatedThumb) { if (animatedThumb) {
document->automaticLoad(fileOrigin(), nullptr); document->automaticLoad(fileOrigin(), nullptr);
bool loaded = document->loaded(), loading = document->loading(), displayLoading = document->displayLoading(); bool loaded = _dataMedia->loaded(), loading = document->loading(), displayLoading = document->displayLoading();
if (loaded && !_gif && !_gif.isBad()) { if (loaded && !_gif && !_gif.isBad()) {
auto that = const_cast<Game*>(this); auto that = const_cast<Game*>(this);
that->_gif = Media::Clip::MakeReader(_dataMedia.get(), FullMsgId(), [that](Media::Clip::Notification notification) { that->_gif = Media::Clip::MakeReader(_dataMedia.get(), FullMsgId(), [that](Media::Clip::Notification notification) {
@ -1348,7 +1360,7 @@ void Game::paint(Painter &p, const QRect &clip, const PaintContext *context) con
}); });
} }
if (!_radial->animating()) { if (!_radial->animating()) {
_radial->start(document->progress()); _radial->start(_dataMedia->progress());
} }
} }
radial = isRadialAnimation(); radial = isRadialAnimation();
@ -1466,8 +1478,11 @@ bool Game::isRadialAnimation() const {
if (_radial) { if (_radial) {
if (_radial->animating()) { if (_radial->animating()) {
return true; return true;
} else if (getResultDocument()->loaded()) { } else {
_radial = nullptr; ensureDataMediaCreated(getResultDocument());
if (_dataMedia->loaded()) {
_radial = nullptr;
}
} }
} }
return false; return false;
@ -1475,16 +1490,17 @@ bool Game::isRadialAnimation() const {
void Game::radialAnimationCallback(crl::time now) const { void Game::radialAnimationCallback(crl::time now) const {
const auto document = getResultDocument(); const auto document = getResultDocument();
ensureDataMediaCreated(document);
const auto updated = [&] { const auto updated = [&] {
return _radial->update( return _radial->update(
document->progress(), _dataMedia->progress(),
!document->loading() || document->loaded(), !document->loading() || _dataMedia->loaded(),
now); now);
}(); }();
if (!anim::Disabled() || updated) { if (!anim::Disabled() || updated) {
update(); update();
} }
if (!_radial->animating() && document->loaded()) { if (!_radial->animating() && _dataMedia->loaded()) {
_radial = nullptr; _radial = nullptr;
} }
} }

2
Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.h
View File

@ -279,6 +279,7 @@ private:
void radialAnimationCallback(crl::time now) const; void radialAnimationCallback(crl::time now) const;
void ensureAnimation() const; void ensureAnimation() const;
void ensureDataMediaCreated() const;
void checkAnimationFinished() const; void checkAnimationFinished() const;
bool updateStatusText() const; bool updateStatusText() const;
@ -326,6 +327,7 @@ private:
void setStatusSize(int32 newSize, int32 fullSize, int32 duration, qint64 realDuration) const; void setStatusSize(int32 newSize, int32 fullSize, int32 duration, qint64 realDuration) const;
not_null<DocumentData*> _document; not_null<DocumentData*> _document;
mutable std::shared_ptr<Data::DocumentMedia> _documentMedia;
}; };

21
Telegram/SourceFiles/inline_bots/inline_bot_layout_item.cpp
View File

@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_document.h" #include "data/data_document.h"
#include "data/data_peer.h" #include "data/data_peer.h"
#include "data/data_file_origin.h" #include "data/data_file_origin.h"
#include "data/data_document_media.h"
#include "core/click_handler_types.h" #include "core/click_handler_types.h"
#include "inline_bots/inline_bot_result.h" #include "inline_bots/inline_bot_result.h"
#include "inline_bots/inline_bot_layout_internal.h" #include "inline_bots/inline_bot_layout_internal.h"
@ -48,19 +49,10 @@ PhotoData *ItemBase::getPhoto() const {
} }
DocumentData *ItemBase::getPreviewDocument() const { DocumentData *ItemBase::getPreviewDocument() const {
auto previewDocument = [this]() -> DocumentData* { if (_doc) {
if (_doc) { return _doc;
return _doc; } else if (_result) {
} return _result->_document;
if (_result) {
return _result->_document;
}
return nullptr;
};
if (DocumentData *result = previewDocument()) {
if (result->sticker() || result->loaded()) {
return result;
}
} }
return nullptr; return nullptr;
} }
@ -193,7 +185,8 @@ ClickHandlerPtr ItemBase::getResultPreviewHandler() const {
return std::make_shared<UrlClickHandler>( return std::make_shared<UrlClickHandler>(
_result->_content_url, _result->_content_url,
false); false);
} else if (_result->_document && _result->_document->canBePlayed()) { } else if (_result->_document
&& _result->_document->createMediaView()->canBePlayed()) { // #TODO optimize
return std::make_shared<DocumentOpenClickHandler>( return std::make_shared<DocumentOpenClickHandler>(
_result->_document); _result->_document);
} else if (_result->_photo) { } else if (_result->_photo) {

4
Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
View File

@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_document.h" #include "data/data_document.h"
#include "data/data_session.h" #include "data/data_session.h"
#include "data/data_file_origin.h" #include "data/data_file_origin.h"
#include "data/data_document_media.h"
#include "inline_bots/inline_bot_layout_item.h" #include "inline_bots/inline_bot_layout_item.h"
#include "inline_bots/inline_bot_send_data.h" #include "inline_bots/inline_bot_send_data.h"
#include "storage/file_download.h" #include "storage/file_download.h"
@ -268,7 +269,8 @@ bool Result::onChoose(Layout::ItemBase *layout) {
_type == Type::File || _type == Type::File ||
_type == Type::Gif)) { _type == Type::Gif)) {
if (_type == Type::Gif) { if (_type == Type::Gif) {
if (_document->loaded()) { const auto media = _document->activeMediaView();
if (!media || media->loaded()) {
return true; return true;
} else if (_document->loading()) { } else if (_document->loading()) {
_document->cancel(); _document->cancel();

6
Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
View File

@ -723,11 +723,9 @@ void Inner::showPreview() {
auto layout = _rows.at(row).items.at(col); auto layout = _rows.at(row).items.at(col);
if (const auto w = App::wnd()) { if (const auto w = App::wnd()) {
if (const auto previewDocument = layout->getPreviewDocument()) { if (const auto previewDocument = layout->getPreviewDocument()) {
w->showMediaPreview(Data::FileOrigin(), previewDocument); _previewShown = w->showMediaPreview(Data::FileOrigin(), previewDocument);
_previewShown = true;
} else if (const auto previewPhoto = layout->getPreviewPhoto()) { } else if (const auto previewPhoto = layout->getPreviewPhoto()) {
w->showMediaPreview(Data::FileOrigin(), previewPhoto); _previewShown = w->showMediaPreview(Data::FileOrigin(), previewPhoto);
_previewShown = true;
} }
} }
} }

18
Telegram/SourceFiles/mainwidget.cpp
View File

@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <rpl/flatten_latest.h> #include <rpl/flatten_latest.h>
#include "data/data_photo.h" #include "data/data_photo.h"
#include "data/data_document.h" #include "data/data_document.h"
#include "data/data_document_media.h"
#include "data/data_web_page.h" #include "data/data_web_page.h"
#include "data/data_game.h" #include "data/data_game.h"
#include "data/data_peer_values.h" #include "data/data_peer_values.h"
@ -365,6 +366,7 @@ struct MainWidget::SettingBackground {
explicit SettingBackground(const Data::WallPaper &data); explicit SettingBackground(const Data::WallPaper &data);
Data::WallPaper data; Data::WallPaper data;
std::shared_ptr<Data::DocumentMedia> dataMedia;
base::binary_guard generating; base::binary_guard generating;
}; };
@ -1326,6 +1328,9 @@ void MainWidget::setChatBackground(
} }
_background = std::make_unique<SettingBackground>(background); _background = std::make_unique<SettingBackground>(background);
if (const auto document = _background->data.document()) {
_background->dataMedia = document->createMediaView();
}
_background->data.loadDocument(); _background->data.loadDocument();
checkChatBackground(); checkChatBackground();
@ -1375,7 +1380,7 @@ float64 MainWidget::chatBackgroundProgress() const {
if (_background->generating) { if (_background->generating) {
return 1.; return 1.;
} else if (const auto document = _background->data.document()) { } else if (const auto document = _background->data.document()) {
return document->progress(); return _background->dataMedia->progress();
} else if (const auto thumbnail = _background->data.thumbnail()) { } else if (const auto thumbnail = _background->data.thumbnail()) {
return thumbnail->progress(); return thumbnail->progress();
} }
@ -1387,12 +1392,15 @@ void MainWidget::checkChatBackground() {
if (!_background || _background->generating) { if (!_background || _background->generating) {
return; return;
} }
const auto document = _background->data.document(); const auto &media = _background->dataMedia;
Assert(document != nullptr); Assert(media != nullptr);
if (!document->loaded()) { if (!media->loaded()) {
return; return;
} }
const auto document = _background->data.document();
Assert(document != nullptr);
const auto generateCallback = [=](QImage &&image) { const auto generateCallback = [=](QImage &&image) {
const auto background = base::take(_background); const auto background = base::take(_background);
const auto ready = image.isNull() const auto ready = image.isNull()
@ -1401,7 +1409,7 @@ void MainWidget::checkChatBackground() {
setReadyChatBackground(ready, std::move(image)); setReadyChatBackground(ready, std::move(image));
}; };
_background->generating = Data::ReadImageAsync( _background->generating = Data::ReadImageAsync(
document, media.get(),
Window::Theme::ProcessBackgroundImage, Window::Theme::ProcessBackgroundImage,
generateCallback); generateCallback);
} }

16
Telegram/SourceFiles/mainwindow.cpp
View File

@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_document.h" #include "data/data_document.h"
#include "data/data_session.h" #include "data/data_session.h"
#include "data/data_document_media.h"
#include "dialogs/dialogs_layout.h" #include "dialogs/dialogs_layout.h"
#include "history/history.h" #include "history/history.h"
#include "ui/widgets/popup_menu.h" #include "ui/widgets/popup_menu.h"
@ -429,11 +430,13 @@ bool MainWindow::ui_isLayerShown() {
return _layer != nullptr; return _layer != nullptr;
} }
void MainWindow::showMediaPreview( bool MainWindow::showMediaPreview(
Data::FileOrigin origin, Data::FileOrigin origin,
not_null<DocumentData*> document) { not_null<DocumentData*> document) {
if (!document || ((!document->isAnimation() || !document->loaded()) && !document->sticker())) { const auto media = document->activeMediaView();
return; if (!document->sticker()
&& (!document->isAnimation() || !media || !media->loaded())) {
return false;
} }
if (!_mediaPreview) { if (!_mediaPreview) {
_mediaPreview.create(bodyWidget(), sessionController()); _mediaPreview.create(bodyWidget(), sessionController());
@ -443,14 +446,12 @@ void MainWindow::showMediaPreview(
fixOrder(); fixOrder();
} }
_mediaPreview->showPreview(origin, document); _mediaPreview->showPreview(origin, document);
return true;
} }
void MainWindow::showMediaPreview( bool MainWindow::showMediaPreview(
Data::FileOrigin origin, Data::FileOrigin origin,
not_null<PhotoData*> photo) { not_null<PhotoData*> photo) {
if (!photo) {
return;
}
if (!_mediaPreview) { if (!_mediaPreview) {
_mediaPreview.create(bodyWidget(), sessionController()); _mediaPreview.create(bodyWidget(), sessionController());
updateControlsGeometry(); updateControlsGeometry();
@ -459,6 +460,7 @@ void MainWindow::showMediaPreview(
fixOrder(); fixOrder();
} }
_mediaPreview->showPreview(origin, photo); _mediaPreview->showPreview(origin, photo);
return true;
} }
void MainWindow::hideMediaPreview() { void MainWindow::hideMediaPreview() {

4
Telegram/SourceFiles/mainwindow.h
View File

@ -110,10 +110,10 @@ public:
void ui_hideSettingsAndLayer(anim::type animated); void ui_hideSettingsAndLayer(anim::type animated);
void ui_removeLayerBlackout(); void ui_removeLayerBlackout();
bool ui_isLayerShown(); bool ui_isLayerShown();
void showMediaPreview( bool showMediaPreview(
Data::FileOrigin origin, Data::FileOrigin origin,
not_null<DocumentData*> document); not_null<DocumentData*> document);
void showMediaPreview( bool showMediaPreview(
Data::FileOrigin origin, Data::FileOrigin origin,
not_null<PhotoData*> photo); not_null<PhotoData*> photo);
void hideMediaPreview(); void hideMediaPreview();

28
Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
View File

@ -927,7 +927,7 @@ void OverlayWidget::resizeContentByScreenSize() {
float64 OverlayWidget::radialProgress() const { float64 OverlayWidget::radialProgress() const {
if (_doc) { if (_doc) {
return _doc->progress(); return _docMedia->progress();
} else if (_photo) { } else if (_photo) {
return _photo->large()->progress(); return _photo->large()->progress();
} }
@ -983,7 +983,7 @@ bool OverlayWidget::radialAnimationCallback(crl::time now) {
update(radialRect()); update(radialRect());
} }
const auto ready = _doc && _docMedia->loaded(); const auto ready = _doc && _docMedia->loaded();
const auto streamVideo = ready && _doc->canBePlayed(); const auto streamVideo = ready && _docMedia->canBePlayed();
const auto tryOpenImage = ready && (_doc->size < App::kImageSizeLimit); const auto tryOpenImage = ready && (_doc->size < App::kImageSizeLimit);
if (ready && ((tryOpenImage && !_radial.animating()) || streamVideo)) { if (ready && ((tryOpenImage && !_radial.animating()) || streamVideo)) {
_streamingStartPaused = false; _streamingStartPaused = false;
@ -1296,7 +1296,7 @@ void OverlayWidget::onDocClick() {
_doc, _doc,
Auth().data().message(_msgid)); Auth().data().message(_msgid));
if (_doc->loading() && !_radial.animating()) { if (_doc->loading() && !_radial.animating()) {
_radial.start(_doc->progress()); _radial.start(_docMedia->progress());
} }
} }
} }
@ -1371,7 +1371,7 @@ void OverlayWidget::onDownload() {
void OverlayWidget::onSaveCancel() { void OverlayWidget::onSaveCancel() {
if (_doc && _doc->loading()) { if (_doc && _doc->loading()) {
_doc->cancel(); _doc->cancel();
if (_doc->canBePlayed()) { if (_docMedia->canBePlayed()) {
redisplayContent(); redisplayContent();
} }
} }
@ -1997,7 +1997,8 @@ void OverlayWidget::displayDocument(
_doc->dimensions.height()); _doc->dimensions.height());
} }
} else { } else {
if (_doc->canBePlayed() && initStreaming(continueStreaming)) { if (_docMedia->canBePlayed()
&& initStreaming(continueStreaming)) {
} else if (_doc->isVideoFile()) { } else if (_doc->isVideoFile()) {
_doc->automaticLoad(fileOrigin(), item); _doc->automaticLoad(fileOrigin(), item);
initStreamingThumbnail(); initStreamingThumbnail();
@ -2132,7 +2133,7 @@ void OverlayWidget::displayFinished() {
bool OverlayWidget::initStreaming(bool continueStreaming) { bool OverlayWidget::initStreaming(bool continueStreaming) {
Expects(_doc != nullptr); Expects(_doc != nullptr);
Expects(_doc->canBePlayed()); Expects(_docMedia->canBePlayed());
if (_streamed) { if (_streamed) {
return true; return true;
@ -2316,12 +2317,14 @@ void OverlayWidget::handleStreamingUpdate(Streaming::Update &&update) {
} }
void OverlayWidget::handleStreamingError(Streaming::Error &&error) { void OverlayWidget::handleStreamingError(Streaming::Error &&error) {
Expects(_doc != nullptr);
if (error == Streaming::Error::NotStreamable) { if (error == Streaming::Error::NotStreamable) {
_doc->setNotSupportsStreaming(); _doc->setNotSupportsStreaming();
} else if (error == Streaming::Error::OpenFailed) { } else if (error == Streaming::Error::OpenFailed) {
_doc->setInappPlaybackFailed(); _doc->setInappPlaybackFailed();
} }
if (!_doc->canBePlayed()) { if (!_docMedia->canBePlayed()) {
redisplayContent(); redisplayContent();
} else { } else {
updatePlaybackState(); updatePlaybackState();
@ -2490,7 +2493,7 @@ void OverlayWidget::playbackPauseResume() {
_streamed->resumeOnCallEnd = false; _streamed->resumeOnCallEnd = false;
if (_streamed->instance.player().failed()) { if (_streamed->instance.player().failed()) {
clearStreaming(); clearStreaming();
if (!_doc->canBePlayed() || !initStreaming()) { if (!_docMedia->canBePlayed() || !initStreaming()) {
redisplayContent(); redisplayContent();
} }
} else if (_streamed->instance.player().finished() } else if (_streamed->instance.player().finished()
@ -3489,11 +3492,12 @@ void OverlayWidget::preloadData(int delta) {
auto entity = entityByIndex(index); auto entity = entityByIndex(index);
if (auto photo = base::get_if<not_null<PhotoData*>>(&entity.data)) { if (auto photo = base::get_if<not_null<PhotoData*>>(&entity.data)) {
(*photo)->download(fileOrigin()); (*photo)->download(fileOrigin());
} else if (auto document = base::get_if<not_null<DocumentData*>>(&entity.data)) { } else if (auto document = base::get_if<not_null<DocumentData*>>(
&entity.data)) {
(*document)->loadThumbnail(fileOrigin()); (*document)->loadThumbnail(fileOrigin());
if (!(*document)->canBePlayed()) { //if (!(*document)->canBePlayed()) { // #TODO optimize
(*document)->automaticLoad(fileOrigin(), entity.item); // (*document)->automaticLoad(fileOrigin(), entity.item);
} //}
} }
} }
} }

48
Telegram/SourceFiles/overview/overview_layout.cpp
View File

@ -447,7 +447,7 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
if (displayLoading) { if (displayLoading) {
ensureRadial(); ensureRadial();
if (!_radial->animating()) { if (!_radial->animating()) {
_radial->start(_data->progress()); _radial->start(dataProgress());
} }
} }
updateStatusText(); updateStatusText();
@ -490,7 +490,7 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
if (!selected && !context->selecting && radialOpacity < 1.) { if (!selected && !context->selecting && radialOpacity < 1.) {
if (clip.intersects(QRect(0, _height - st::normalFont->height, _width, st::normalFont->height))) { if (clip.intersects(QRect(0, _height - st::normalFont->height, _width, st::normalFont->height))) {
const auto download = !loaded && !_data->canBePlayed(); const auto download = !loaded && !_dataMedia->canBePlayed();
const auto &icon = download const auto &icon = download
? (selected ? st::overviewVideoDownloadSelected : st::overviewVideoDownload) ? (selected ? st::overviewVideoDownloadSelected : st::overviewVideoDownload)
: (selected ? st::overviewVideoPlaySelected : st::overviewVideoPlay); : (selected ? st::overviewVideoPlaySelected : st::overviewVideoPlay);
@ -516,7 +516,7 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
if (selected) { if (selected) {
p.setBrush(st::msgDateImgBgSelected); p.setBrush(st::msgDateImgBgSelected);
} else { } else {
auto over = ClickHandler::showAsActive((_data->loading() || _data->uploading()) ? _cancell : (loaded || _data->canBePlayed()) ? _openl : _savel); auto over = ClickHandler::showAsActive((_data->loading() || _data->uploading()) ? _cancell : (loaded || _dataMedia->canBePlayed()) ? _openl : _savel);
p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, _a_iconOver.value(over ? 1. : 0.))); p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, _a_iconOver.value(over ? 1. : 0.)));
} }
@ -552,7 +552,8 @@ void Video::ensureDataMediaCreated() const {
} }
float64 Video::dataProgress() const { float64 Video::dataProgress() const {
return _data->progress(); ensureDataMediaCreated();
return _dataMedia->progress();
} }
bool Video::dataFinished() const { bool Video::dataFinished() const {
@ -560,7 +561,8 @@ bool Video::dataFinished() const {
} }
bool Video::dataLoaded() const { bool Video::dataLoaded() const {
return _dataMedia ? _dataMedia->loaded() : !_data->filepath().isEmpty(); ensureDataMediaCreated();
return _dataMedia->loaded();
} }
bool Video::iconAnimated() const { bool Video::iconAnimated() const {
@ -571,9 +573,10 @@ TextState Video::getState(
QPoint point, QPoint point,
StateRequest request) const { StateRequest request) const {
if (hasPoint(point)) { if (hasPoint(point)) {
ensureDataMediaCreated();
const auto link = (_data->loading() || _data->uploading()) const auto link = (_data->loading() || _data->uploading())
? _cancell ? _cancell
: (dataLoaded() || _data->canBePlayed()) : (dataLoaded() || _dataMedia->canBePlayed())
? _openl ? _openl
: _savel; : _savel;
return { parent(), link }; return { parent(), link };
@ -641,13 +644,14 @@ void Voice::initDimensions() {
} }
void Voice::paint(Painter &p, const QRect &clip, TextSelection selection, const PaintContext *context) { void Voice::paint(Painter &p, const QRect &clip, TextSelection selection, const PaintContext *context) {
ensureDataMediaCreated();
bool selected = (selection == FullSelection); bool selected = (selection == FullSelection);
bool loaded = dataLoaded(), displayLoading = _data->displayLoading(); bool loaded = dataLoaded(), displayLoading = _data->displayLoading();
if (displayLoading) { if (displayLoading) {
ensureRadial(); ensureRadial();
if (!_radial->animating()) { if (!_radial->animating()) {
_radial->start(_data->progress()); _radial->start(dataProgress());
} }
} }
const auto showPause = updateStatusText(); const auto showPause = updateStatusText();
@ -699,7 +703,7 @@ void Voice::paint(Painter &p, const QRect &clip, TextSelection selection, const
} }
const auto &checkLink = (_data->loading() || _data->uploading()) const auto &checkLink = (_data->loading() || _data->uploading())
? _cancell ? _cancell
: (_data->canBePlayed() || loaded) : (_dataMedia->canBePlayed() || loaded)
? _openl ? _openl
: _savel; : _savel;
if (selected) { if (selected) {
@ -727,7 +731,7 @@ void Voice::paint(Painter &p, const QRect &clip, TextSelection selection, const
return &(selected ? _st.songCancelSelected : _st.songCancel); return &(selected ? _st.songCancelSelected : _st.songCancel);
} else if (showPause) { } else if (showPause) {
return &(selected ? _st.songPauseSelected : _st.songPause); return &(selected ? _st.songPauseSelected : _st.songPause);
} else if (_data->canBePlayed()) { } else if (_dataMedia->canBePlayed()) {
return &(selected ? _st.songPlaySelected : _st.songPlay); return &(selected ? _st.songPlaySelected : _st.songPlay);
} }
return &(selected ? _st.songDownloadSelected : _st.songDownload); return &(selected ? _st.songDownloadSelected : _st.songDownload);
@ -776,6 +780,7 @@ void Voice::paint(Painter &p, const QRect &clip, TextSelection selection, const
TextState Voice::getState( TextState Voice::getState(
QPoint point, QPoint point,
StateRequest request) const { StateRequest request) const {
ensureDataMediaCreated();
const auto loaded = dataLoaded(); const auto loaded = dataLoaded();
const auto nameleft = _st.songPadding.left() const auto nameleft = _st.songPadding.left()
@ -794,7 +799,7 @@ TextState Voice::getState(
if (inner.contains(point)) { if (inner.contains(point)) {
const auto link = (_data->loading() || _data->uploading()) const auto link = (_data->loading() || _data->uploading())
? _cancell ? _cancell
: (_data->canBePlayed() || loaded) : (_dataMedia->canBePlayed() || loaded)
? _openl ? _openl
: _savel; : _savel;
return { parent(), link }; return { parent(), link };
@ -839,7 +844,8 @@ void Voice::ensureDataMediaCreated() const {
} }
float64 Voice::dataProgress() const { float64 Voice::dataProgress() const {
return _data->progress(); ensureDataMediaCreated();
return _dataMedia->progress();
} }
bool Voice::dataFinished() const { bool Voice::dataFinished() const {
@ -847,7 +853,8 @@ bool Voice::dataFinished() const {
} }
bool Voice::dataLoaded() const { bool Voice::dataLoaded() const {
return _dataMedia ? _dataMedia->loaded() : !_data->filepath().isEmpty(); ensureDataMediaCreated();
return _dataMedia->loaded();
} }
bool Voice::iconAnimated() const { bool Voice::iconAnimated() const {
@ -959,6 +966,8 @@ void Document::initDimensions() {
} }
void Document::paint(Painter &p, const QRect &clip, TextSelection selection, const PaintContext *context) { void Document::paint(Painter &p, const QRect &clip, TextSelection selection, const PaintContext *context) {
ensureDataMediaCreated();
const auto selected = (selection == FullSelection); const auto selected = (selection == FullSelection);
const auto cornerDownload = downloadInCorner(); const auto cornerDownload = downloadInCorner();
@ -970,7 +979,7 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
if (displayLoading) { if (displayLoading) {
ensureRadial(); ensureRadial();
if (!_radial->animating()) { if (!_radial->animating()) {
_radial->start(_data->progress()); _radial->start(dataProgress());
} }
} }
const auto showPause = updateStatusText(); const auto showPause = updateStatusText();
@ -992,7 +1001,7 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
if (selected) { if (selected) {
p.setBrush(st::msgFileInBgSelected); p.setBrush(st::msgFileInBgSelected);
} else { } else {
auto over = ClickHandler::showAsActive((!cornerDownload && (_data->loading() || _data->uploading())) ? _cancell : (loaded || _data->canBePlayed()) ? _openl : _savel); auto over = ClickHandler::showAsActive((!cornerDownload && (_data->loading() || _data->uploading())) ? _cancell : (loaded || _dataMedia->canBePlayed()) ? _openl : _savel);
p.setBrush(anim::brush(_st.songIconBg, _st.songOverBg, _a_iconOver.value(over ? 1. : 0.))); p.setBrush(anim::brush(_st.songIconBg, _st.songOverBg, _a_iconOver.value(over ? 1. : 0.)));
} }
@ -1006,7 +1015,7 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
return &(selected ? _st.songCancelSelected : _st.songCancel); return &(selected ? _st.songCancelSelected : _st.songCancel);
} else if (showPause) { } else if (showPause) {
return &(selected ? _st.songPauseSelected : _st.songPause); return &(selected ? _st.songPauseSelected : _st.songPause);
} else if (loaded || _data->canBePlayed()) { } else if (loaded || _dataMedia->canBePlayed()) {
return &(selected ? _st.songPlaySelected : _st.songPlay); return &(selected ? _st.songPlaySelected : _st.songPlay);
} }
return &(selected ? _st.songDownloadSelected : _st.songDownload); return &(selected ? _st.songDownloadSelected : _st.songDownload);
@ -1187,6 +1196,7 @@ TextState Document::cornerDownloadTextState(
TextState Document::getState( TextState Document::getState(
QPoint point, QPoint point,
StateRequest request) const { StateRequest request) const {
ensureDataMediaCreated();
const auto loaded = dataLoaded(); const auto loaded = dataLoaded();
const auto wthumb = withThumb(); const auto wthumb = withThumb();
@ -1213,7 +1223,7 @@ TextState Document::getState(
const auto link = (!downloadInCorner() const auto link = (!downloadInCorner()
&& (_data->loading() || _data->uploading())) && (_data->loading() || _data->uploading()))
? _cancell ? _cancell
: (loaded || _data->canBePlayed()) : (loaded || _dataMedia->canBePlayed())
? _openl ? _openl
: _savel; : _savel;
return { parent(), link }; return { parent(), link };
@ -1300,7 +1310,8 @@ void Document::ensureDataMediaCreated() const {
} }
float64 Document::dataProgress() const { float64 Document::dataProgress() const {
return _data->progress(); ensureDataMediaCreated();
return _dataMedia->progress();
} }
bool Document::dataFinished() const { bool Document::dataFinished() const {
@ -1308,7 +1319,8 @@ bool Document::dataFinished() const {
} }
bool Document::dataLoaded() const { bool Document::dataLoaded() const {
return _dataMedia ? _dataMedia->loaded() : !_data->filepath().isEmpty(); ensureDataMediaCreated();
return _dataMedia->loaded();
} }
bool Document::iconAnimated() const { bool Document::iconAnimated() const {