Fix round video messages streaming.

Telegram/SourceFiles/data/data_document.cpp

@@ -1295,7 +1295,7 @@ bool DocumentData::useStreamingLoader() const {
 
 bool DocumentData::canBeStreamed() const {
 	// For now video messages are not streamed.
-	return hasRemoteLocation() && supportsStreaming() && !isVideoMessage();
+	return hasRemoteLocation() && supportsStreaming();
 }
 
 bool DocumentData::canBePlayed() const {

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

@@ -235,12 +235,17 @@ void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms
 	//auto loaded = _data->loaded();
 	auto displayLoading = (item->id < 0) || _data->displayLoading();
 	auto selected = (selection == FullSelection);
-	const auto startPlayAsync = autoplayEnabled()
+	const auto canBePlayed = _data->canBePlayed();
+	const auto activeRoundPlaying = activeRoundStreamed();
+	const auto autoplay = autoplayEnabled() && canBePlayed;
+	const auto streamingMode = _streamed || activeRoundPlaying || autoplay;
+	const auto startPlayAsync = autoplay
 		&& !_streamed
-		&& _data->canBePlayed()
+		&& !activeRoundPlaying;
-		&& !activeRoundStreamed();
 	if (startPlayAsync) {
 		_parent->delegate()->elementAnimationAutoplayAsync(_parent);
+	} else if (_streamed && !_streamed->active() && !_streamed->failed()) {
+		startStreamedPlayer();
 	}
 
 	auto paintx = 0, painty = 0, paintw = width(), painth = height();
@@ -254,7 +259,7 @@ void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms
 	auto displayMute = false;
 	const auto streamed = activeCurrentStreamed();
 
-	if ((!streamed || item->id < 0) && displayLoading) {
+	if ((!streamed || item->isSending()) && displayLoading) {
 		ensureAnimation();
 		if (!_animation->radial.animating()) {
 			_animation->radial.start(dataProgress());
@@ -369,16 +374,13 @@ void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms
 	}
 
 	if (radial
-		|| (!startPlayAsync
+		|| (!streamingMode
-			&& (!_streamed
-				|| _streamed->waitingShown()
-				|| _streamed->player().failed())
 			&& ((!_data->loaded() && !_data->loading())
 				|| !autoplayEnabled()))) {
-		auto radialOpacity = (radial && _data->loaded() && item->id > 0)
+		const auto radialOpacity = streamed
-			? _animation->radial.opacity()
-			: streamed
 			? streamed->waitingOpacity()
+			: (radial && _data->loaded() && !item->isSending())
+			? _animation->radial.opacity()
 			: 1.;
 		auto inner = QRect(rthumb.x() + (rthumb.width() - st::msgFileSize) / 2, rthumb.y() + (rthumb.height() - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
 		p.setPen(Qt::NoPen);
@@ -399,8 +401,10 @@ void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms
 		}
 
 		p.setOpacity(radialOpacity);
-		auto icon = [&]() -> const style::icon * {
+		const auto icon = [&]() -> const style::icon * {
-			if (_data->loaded() && !radial) {
+			if (streamingMode) {
+				return nullptr;
+			} else if ((_data->loaded() || canBePlayed) && !radial) {
 				return &(selected ? st::historyFileThumbPlaySelected : st::historyFileThumbPlay);
 			} else if (radial || _data->loading()) {
 				if (item->id > 0 || _data->uploading()) {
@@ -413,8 +417,8 @@ void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms
 		if (icon) {
 			icon->paintInCenter(p, inner);
 		}
+		p.setOpacity(1);
 		if (radial) {
-			p.setOpacity(1);
 			QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
 			const auto fg = selected
 				? st::historyFileThumbRadialFgSelected
@@ -437,7 +441,7 @@ void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms
 			}
 		}
 
-		if (!isRound && (!streamed || item->id < 0)) {
+		if (!isRound && (!streamingMode || item->isSending())) {
 			auto statusX = paintx + st::msgDateImgDelta + st::msgDateImgPadding.x();
 			auto statusY = painty + st::msgDateImgDelta + st::msgDateImgPadding.y();
 			auto statusW = st::normalFont->width(_statusText) + 2 * st::msgDateImgPadding.x();
@@ -660,7 +664,7 @@ TextState Gif::textState(QPoint point, StateRequest request) const {
 		if (_data->uploading()) {
 			result.link = _cancell;
 		} else {
-			result.link = _data->loaded()
+			result.link = (_data->loaded() || _data->canBePlayed())
 				? _openl :
 				_data->loading()
 				? _cancell
@@ -901,26 +905,16 @@ void Gif::playAnimation(bool autoplay) {
 		if (!autoplayEnabled()) {
 			history()->owner().checkPlayingVideoFiles();
 		}
-		if (!createStreamedPlayer()) {
+		createStreamedPlayer();
-			return;
-		}
-		auto options = ::Media::Streaming::PlaybackOptions();
-		options.audioId = AudioMsgId(_data, _realParent->fullId());
-		options.waitForMarkAsShown = true;
-		//if (!_streamed->withSound) {
-		options.mode = ::Media::Streaming::Mode::Video;
-		options.loop = true;
-		//}
-		_streamed->play(options);
 	}
 }
 
-bool Gif::createStreamedPlayer() {
+void Gif::createStreamedPlayer() {
 	auto shared = _data->owner().documentStreamer(
 		_data,
 		_realParent->fullId());
 	if (!shared) {
-		return false;
+		return;
 	}
 	setStreamed(std::make_unique<::Media::Streaming::Instance>(
 		std::move(shared),
@@ -936,7 +930,20 @@ bool Gif::createStreamedPlayer() {
 	if (_streamed->ready()) {
 		streamingReady(base::duplicate(_streamed->info()));
 	}
-	return true;
+	startStreamedPlayer();
+}
+
+void Gif::startStreamedPlayer() const {
+	Expects(_streamed != nullptr);
+
+	auto options = ::Media::Streaming::PlaybackOptions();
+	options.audioId = AudioMsgId(_data, _realParent->fullId());
+	options.waitForMarkAsShown = true;
+	//if (!_streamed->withSound) {
+	options.mode = ::Media::Streaming::Mode::Video;
+	options.loop = true;
+	//}
+	_streamed->play(options);
 }
 
 void Gif::setStreamed(std::unique_ptr<::Media::Streaming::Instance> value) {

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

@@ -100,7 +100,8 @@ private:
 	::Media::Streaming::Instance *activeCurrentStreamed() const;
 	::Media::View::PlaybackProgress *videoPlayback() const;
 
-	bool createStreamedPlayer();
+	void createStreamedPlayer();
+	void startStreamedPlayer() const;
 	void setStreamed(std::unique_ptr<::Media::Streaming::Instance> value);
 	void handleStreamingUpdate(::Media::Streaming::Update &&update);
 	void handleStreamingError(::Media::Streaming::Error &&error);

Telegram/SourceFiles/media/streaming/media_streaming_instance.cpp

@@ -94,6 +94,12 @@ bool Instance::ready() const {
 	return _shared->player().ready();
 }
 
+std::optional<Error> Instance::failed() const {
+	Expects(_shared != nullptr);
+
+	return _shared->player().failed();
+}
+
 bool Instance::paused() const {
 	Expects(_shared != nullptr);
 

Telegram/SourceFiles/media/streaming/media_streaming_instance.h

@@ -47,6 +47,7 @@ public:
 
 	[[nodiscard]] bool active() const;
 	[[nodiscard]] bool ready() const;
+	[[nodiscard]] std::optional<Error> failed() const;
 
 	[[nodiscard]] bool paused() const;
 
@@ -62,7 +63,7 @@ public:
 	[[nodiscard]] QImage frame(const FrameRequest &request) const;
 	bool markFrameShown();
 
-	rpl::lifetime &lifetime();
+	[[nodiscard]] rpl::lifetime &lifetime();
 
 private:
 	const std::shared_ptr<Document> _shared;

Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp

@@ -961,6 +961,9 @@ QImage VideoTrack::frame(
 		const auto j = none
 			? frame->prepared.emplace(instance, useRequest).first
 			: i;
+		if (changed && !none) {
+			i->second.request = useRequest;
+		}
 		if (frame->prepared.size() > 1) {
 			for (auto &[alreadyInstance, prepared] : frame->prepared) {
 				if (alreadyInstance != instance