From 621a5cc4ab69447c1ee31f4cd52ad9e476f4c044 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 21 Dec 2019 16:57:06 +0300
Subject: [PATCH] Fix GIFs freezing playback.

---
 Telegram/SourceFiles/media/streaming/media_streaming_file.cpp | 2 +-
 .../media/streaming/media_streaming_file_delegate.h           | 4 ++--
 .../SourceFiles/media/streaming/media_streaming_player.cpp    | 3 +--
 Telegram/SourceFiles/media/streaming/media_streaming_player.h | 2 +-
 .../media/streaming/media_streaming_video_track.cpp           | 2 --
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp
index 19fd90eb5..dc50f0036 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp
@@ -317,7 +317,7 @@ void File::Context::readNextPacket() {
 }
 
 void File::Context::handleEndOfFile() {
-	const auto more = _delegate->fileProcessEndOfFile();
+	_delegate->fileProcessEndOfFile();
 	if (_delegate->fileReadMore()) {
 		_readTillEnd = false;
 		auto error = FFmpeg::AvErrorWrap(av_seek_frame(
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_file_delegate.h b/Telegram/SourceFiles/media/streaming/media_streaming_file_delegate.h
index 2facdbe74..2c832b10f 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_file_delegate.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_file_delegate.h
@@ -27,12 +27,12 @@ public:
 	virtual void fileWaitingForData() = 0;
 	virtual void fileFullInCache(bool fullInCache) = 0;
 
+	virtual void fileProcessEndOfFile() = 0;
 	// Return true if reading and processing more packets is desired.
 	// Return false if sleeping until 'wake()' is called is desired.
 	[[nodiscard]] virtual bool fileProcessPackets(
 		base::flat_map<int, std::vector<FFmpeg::Packet>> &packets) = 0;
-	// Return true if looping is desired.
-	[[nodiscard]] virtual bool fileProcessEndOfFile() = 0;
+	// Also returns true after fileProcessEndOfFile() if looping is desired.
 	[[nodiscard]] virtual bool fileReadMore() = 0;
 };
 
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
index 96f85e17f..542cf8e80 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
@@ -397,7 +397,7 @@ bool Player::fileProcessPackets(
 	return fileReadMore();
 }
 
-bool Player::fileProcessEndOfFile() {
+void Player::fileProcessEndOfFile() {
 	_waitingForData = false;
 	_readTillEnd = true;
 	setDurationByPackets();
@@ -420,7 +420,6 @@ bool Player::fileProcessEndOfFile() {
 		});
 		_video->process(generateEmptyQueue());
 	}
-	return fileReadMore();
 }
 
 bool Player::fileReadMore() {
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_player.h b/Telegram/SourceFiles/media/streaming/media_streaming_player.h
index 73eecb7d3..3ac0fc2ee 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_player.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_player.h
@@ -99,7 +99,7 @@ private:
 	void fileFullInCache(bool fullInCache) override;
 	bool fileProcessPackets(
 		base::flat_map<int, std::vector<FFmpeg::Packet>> &packets) override;
-	bool fileProcessEndOfFile() override;
+	void fileProcessEndOfFile() override;
 	bool fileReadMore() override;
 
 	// Called from the main thread.
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp
index 058739442..0bdb38785 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp
@@ -564,7 +564,6 @@ void VideoTrackObject::callReady() {
 		? _stream.duration
 		: _syncTimePoint.trackTime;
 	base::take(_ready)({ data });
-	LOG(("READY CALLED!"));
 }
 
 TimePoint VideoTrackObject::trackTime() const {
@@ -906,7 +905,6 @@ crl::time VideoTrack::streamDuration() const {
 }
 
 void VideoTrack::process(std::vector<FFmpeg::Packet> &&packets) {
-	LOG(("PACKETS! (%1)").arg(packets.size()));
 	_wrapped.with([
 		packets = std::move(packets)
 	](Implementation &unwrapped) mutable {