Lock inline HistoryView::Gif when playing fullscreen.

Telegram/SourceFiles/history/view/media/history_view_gif.cpp

@@ -314,9 +314,18 @@ void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms
 		request.resize = QSize(_thumbw, _thumbh) * cIntRetinaFactor();
 		request.corners = roundCorners;
 		request.radius = roundRadius;
-		p.drawImage(rthumb, streamed->frame(request));
+		if (streamed->playerLocked() && !activeRoundPlaying) {
-		if (!paused) {
+			if (_lockedFrameRequest != request || _lockedFrame.isNull()) {
-			streamed->markFrameShown();
+				_lockedFrameRequest = request;
+				_lockedFrame = streamed->frame(request);
+			}
+			p.drawImage(rthumb, _lockedFrame);
+		} else {
+			_lockedFrame = QImage();
+			p.drawImage(rthumb, streamed->frame(request));
+			if (!paused) {
+				streamed->markFrameShown();
+			}
 		}
 
 		if (const auto playback = videoPlayback()) {

Telegram/SourceFiles/history/view/media/history_view_gif.h

@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "history/view/media/history_view_file.h"
-#include "media/clip/media_clip_reader.h"
+#include "media/streaming/media_streaming_common.h"
 
 struct HistoryMessageVia;
 struct HistoryMessageReply;
@@ -154,6 +154,8 @@ private:
 	Ui::Text::String _caption;
 	std::unique_ptr<::Media::Streaming::Instance> _streamed;
 
+	mutable ::Media::Streaming::FrameRequest _lockedFrameRequest;
+	mutable QImage _lockedFrame;
 	QString _downloadSize;
 
 };

Telegram/SourceFiles/media/streaming/media_streaming_instance.cpp

@@ -36,6 +36,7 @@ Instance::Instance(
 
 Instance::~Instance() {
 	if (_shared) {
+		unlockPlayer();
 		_shared->unregisterInstance(this);
 	}
 }
@@ -147,9 +148,35 @@ QImage Instance::frame(const FrameRequest &request) const {
 }
 
 bool Instance::markFrameShown() {
+	Expects(_shared != nullptr);
+
 	return _shared->player().markFrameShown();
 }
 
+void Instance::lockPlayer() {
+	Expects(_shared != nullptr);
+
+	if (!_playerLocked) {
+		_playerLocked = true;
+		_shared->player().lock();
+	}
+}
+
+void Instance::unlockPlayer() {
+	Expects(_shared != nullptr);
+
+	if (_playerLocked) {
+		_playerLocked = false;
+		_shared->player().unlock();
+	}
+}
+
+bool Instance::playerLocked() const {
+	Expects(_shared != nullptr);
+
+	return _shared->player().locked();
+}
+
 rpl::lifetime &Instance::lifetime() {
 	return _lifetime;
 }

Telegram/SourceFiles/media/streaming/media_streaming_instance.h

@@ -63,11 +63,16 @@ public:
 	[[nodiscard]] QImage frame(const FrameRequest &request) const;
 	bool markFrameShown();
 
+	void lockPlayer();
+	void unlockPlayer();
+	[[nodiscard]] bool playerLocked() const;
+
 	[[nodiscard]] rpl::lifetime &lifetime();
 
 private:
 	const std::shared_ptr<Document> _shared;
 	Fn<void()> _waitingCallback;
+	bool _playerLocked = false;
 	rpl::lifetime _lifetime;
 
 };

Telegram/SourceFiles/media/streaming/media_streaming_player.cpp

@@ -883,6 +883,20 @@ crl::time Player::getCurrentReceivedTill(crl::time duration) const {
 		: result;
 }
 
+void Player::lock() {
+	++_locks;
+}
+
+void Player::unlock() {
+	Expects(_locks > 0);
+
+	--_locks;
+}
+
+bool Player::locked() const {
+	return (_locks > 0);
+}
+
 rpl::lifetime &Player::lifetime() {
 	return _lifetime;
 }

Telegram/SourceFiles/media/streaming/media_streaming_player.h

@@ -69,6 +69,10 @@ public:
 
 	[[nodiscard]] Media::Player::TrackState prepareLegacyState() const;
 
+	void lock();
+	void unlock();
+	[[nodiscard]] bool locked() const;
+
 	[[nodiscard]] rpl::lifetime &lifetime();
 
 	~Player();
@@ -194,6 +198,8 @@ private:
 	int _durationByLastAudioPacket = 0;
 	int _durationByLastVideoPacket = 0;
 
+	int _locks = 0;
+
 	rpl::lifetime _lifetime;
 	rpl::lifetime _sessionLifetime;
 

Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp

@@ -436,6 +436,7 @@ void OverlayWidget::clearStreaming() {
 	_fullScreenVideo = false;
 	if (_streamed) {
 		_streamed->instance.stop();
+		_streamed->instance.unlockPlayer();
 		_streamed = nullptr;
 	}
 }
@@ -2077,6 +2078,7 @@ void OverlayWidget::createStreamingObjects() {
 		this,
 		static_cast<PlaybackControls::Delegate*>(this),
 		[=] { waitingAnimationCallback(); });
+	_streamed->instance.lockPlayer();
 	_streamed->withSound = _doc->isAudioFile()
 		|| _doc->isVideoFile()
 		|| _doc->isVoiceMessage()