From 041670b8e7a6760a987425436c31ef8b07885e9f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 19 Dec 2019 14:13:27 +0300
Subject: [PATCH] Fix download of short videos in media overlay.

---
 .../history/view/media/history_view_gif.cpp     | 17 +++++++++++++----
 .../history/view/media/history_view_gif.h       |  1 +
 .../media/streaming/media_streaming_file.cpp    | 13 +++++++++++--
 .../media/streaming/media_streaming_file.h      |  3 ++-
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index 5aa24ffeb..45dff2f92 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -261,10 +261,8 @@ void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms
 		if (!autoPaused) {
 			_parent->delegate()->elementAnimationAutoplayAsync(_parent);
 		}
-	} else if (_streamed
-		&& !_streamed->instance.active()
-		&& !_streamed->instance.failed()) {
-		startStreamedPlayer();
+	} else {
+		checkStreamedIsStarted();
 	}
 	const auto streamingMode = _streamed || activeRoundPlaying || autoplay;
 	const auto activeOwnPlaying = activeOwnStreamed();
@@ -1204,6 +1202,17 @@ void Gif::startStreamedPlayer() const {
 	_streamed->instance.play(options);
 }
 
+void Gif::checkStreamedIsStarted() const {
+	if (!_streamed) {
+		return;
+	} else if (_streamed->instance.paused()) {
+		_streamed->instance.resume();
+	}
+	if (!_streamed->instance.active() && !_streamed->instance.failed()) {
+		startStreamedPlayer();
+	}
+}
+
 void Gif::setStreamed(std::unique_ptr<Streamed> value) {
 	const auto removed = (_streamed && !value);
 	const auto set = (!_streamed && value);
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.h b/Telegram/SourceFiles/history/view/media/history_view_gif.h
index 0206ac6d4..18b4907ef 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.h
@@ -120,6 +120,7 @@ private:
 	::Media::View::PlaybackProgress *videoPlayback() const;
 
 	void createStreamedPlayer();
+	void checkStreamedIsStarted() const;
 	void startStreamedPlayer() const;
 	void setStreamed(std::unique_ptr<Streamed> value);
 	void handleStreamingUpdate(::Media::Streaming::Update &&update);
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp
index 3762a4180..cec4f762f 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp
@@ -27,6 +27,8 @@ File::Context::Context(
 , _size(reader->size()) {
 }
 
+File::Context::~Context() = default;
+
 int File::Context::Read(void *opaque, uint8_t *buffer, int bufferSize) {
 	return static_cast<Context*>(opaque)->read(
 		bytes::make_span(buffer, bufferSize));
@@ -344,12 +346,18 @@ void File::Context::fail(Error error) {
 	_delegate->fileError(error);
 }
 
-File::Context::~Context() = default;
-
 bool File::Context::finished() const {
 	return unroll() || _readTillEnd;
 }
 
+void File::Context::waitTillInterrupted() {
+	while (!interrupted()) {
+		_reader->startSleep(&_semaphore);
+		_semaphore.acquire();
+	}
+	_reader->stopSleep();
+}
+
 File::File(
 	not_null<Data::Session*> owner,
 	std::shared_ptr<Reader> reader)
@@ -366,6 +374,7 @@ void File::start(not_null<FileDelegate*> delegate, crl::time position) {
 		while (!context->finished()) {
 			context->readNextPacket();
 		}
+		context->waitTillInterrupted();
 	});
 }
 
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_file.h b/Telegram/SourceFiles/media/streaming/media_streaming_file.h
index 08f6118f8..773cbe926 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_file.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_file.h
@@ -44,6 +44,7 @@ private:
 	class Context final : public base::has_weak_ptr {
 	public:
 		Context(not_null<FileDelegate*> delegate, not_null<Reader*> reader);
+		~Context();
 
 		void start(crl::time position);
 		void readNextPacket();
@@ -54,7 +55,7 @@ private:
 		[[nodiscard]] bool failed() const;
 		[[nodiscard]] bool finished() const;
 
-		~Context();
+		void waitTillInterrupted();
 
 	private:
 		static int Read(void *opaque, uint8_t *buffer, int bufferSize);