Display radial playback progress in round videos.

Telegram/Resources/colors.palette

@@ -395,6 +395,8 @@ historyFileThumbIconFgSelected: msgInBgSelected; // selected file with thumbnail
 historyFileThumbRadialFg: historyFileThumbIconFg; // file with thumbnail (or photo / video) radial download animation line
 historyFileThumbRadialFgSelected: historyFileThumbIconFgSelected; // selected file with thumbnail (or photo / video) radial download animation line
 
+historyVideoMessageProgressFg: historyFileThumbIconFg; // radial playback progress in round video messages
+
 msgWaveformInActive: windowBgActive; // inbox voice message active waveform lines (like played part of currently playing voice message)
 msgWaveformInActiveSelected: #51a3d3; // inbox selected voice message active waveform lines (like played part of currently playing voice message)
 msgWaveformInInactive: #d4dee6; // inbox voice message inactive waveform lines (like upcoming part of currently playing voice message)

Telegram/SourceFiles/history/history.style

@@ -444,3 +444,4 @@ msgWaveformMax: 20px;
 historyVideoMessageMute: icon {{ "volume_mute", historyFileThumbIconFg }};
 historyVideoMessageMuteSelected: icon {{ "volume_mute", historyFileThumbIconFgSelected }};
 historyVideoMessageMuteSize: 25px;
+historyVideoMessageProgressOpacity: 0.72;

Telegram/SourceFiles/history/history_media_types.cpp

@@ -27,6 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "media/media_audio.h"
 #include "media/media_clip_reader.h"
 #include "media/player/media_player_instance.h"
+#include "media/view/media_clip_playback.h"
 #include "boxes/confirm_box.h"
 #include "boxes/add_contact_box.h"
 #include "core/click_handler_types.h"
@@ -1959,9 +1960,35 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 			}
 		}
 		p.drawPixmap(rthumb.topLeft(), _gif->current(_thumbw, _thumbh, usew, height, roundRadius, roundCorners, paused ? 0 : ms));
+
+		if (displayMute) {
+			_roundPlayback.reset();
+		} else if (_roundPlayback) {
+			auto value = _roundPlayback->value();
+			if (value > 0.) {
+				auto pen = st::historyVideoMessageProgressFg->p;
+				auto was = p.pen();
+				pen.setWidth(st::radialLine);
+				pen.setCapStyle(Qt::RoundCap);
+				p.setPen(pen);
+				p.setOpacity(st::historyVideoMessageProgressOpacity);
+
+				auto from = QuarterArcLength;
+				auto len = -qRound(FullArcLength * value);
+				auto stepInside = st::radialLine / 2;
+				{
+					PainterHighQualityEnabler hq(p);
+					p.drawArc(rthumb.marginsRemoved(QMargins(stepInside, stepInside, stepInside, stepInside)), from, len);
+				}
+
+				p.setPen(was);
+				p.setOpacity(1.);
+			}
+		}
 	} else {
 		p.drawPixmap(rthumb.topLeft(), _data->thumb->pixBlurredSingle(_thumbw, _thumbh, usew, height, roundRadius, roundCorners));
 	}
+
 	if (selected) {
 		App::complexOverlayRect(p, rthumb, roundRadius, roundCorners);
 	}
@@ -2296,6 +2323,8 @@ void HistoryGif::updateStatusText() const {
 	} else if (_data->loaded()) {
 		statusSize = FileStatusSizeLoaded;
 		if (_gif && _gif->mode() == Media::Clip::Reader::Mode::Video) {
+			statusSize = -1 - _data->duration();
+
 			auto state = Media::Player::mixer()->currentState(AudioMsgId::Type::Video);
 			if (state.length) {
 				auto position = int64(0);
@@ -2304,9 +2333,10 @@ void HistoryGif::updateStatusText() const {
 				} else if (state.state == Media::Player::State::StoppedAtEnd) {
 					position = state.length;
 				}
-				statusSize = -1 - ((state.length - position) / state.frequency);
-			} else {
-				statusSize = -1 - _data->duration();
+				accumulate_max(statusSize, -1 - int((state.length - position) / state.frequency + 1));
+			}
+			if (_roundPlayback) {
+				_roundPlayback->updateState(state);
 			}
 		}
 	} else {
@@ -2381,6 +2411,10 @@ bool HistoryGif::playInline(bool autoplay) {
 			_parent->clipCallback(notification);
 		}, mode));
 		if (mode == Mode::Video) {
+			_roundPlayback = std::make_unique<Media::Clip::Playback>();
+			_roundPlayback->setValueChangedCallback([this](float64 value) {
+				Ui::repaintHistoryItem(_parent);
+			});
 			if (App::main()) {
 				App::main()->mediaMarkRead(_data);
 			}

Telegram/SourceFiles/history/history_media_types.h

@@ -22,6 +22,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 #include "ui/effects/radial_animation.h"
 
+namespace Media {
+namespace Clip {
+class Playback;
+} // namespace Clip
+} // namespace Media
+
 void historyInitMedia();
 
 class HistoryFileMedia : public HistoryMedia {
@@ -585,6 +591,7 @@ private:
 	int32 _thumbh = 1;
 	Text _caption;
 
+	mutable std::unique_ptr<Media::Clip::Playback> _roundPlayback;
 	Media::Clip::ReaderPointer _gif;
 
 	void setStatusSize(int32 newSize) const;

Telegram/SourceFiles/media/media_audio.cpp

@@ -312,9 +312,15 @@ void Mixer::Track::reattach(AudioMsgId::Type type) {
 	}
 
 	alSourcei(stream.source, AL_SAMPLE_OFFSET, qMax(state.position - bufferedPosition, 0LL));
-	if (IsActive(state.state)) {
+	if (!IsStopped(state.state)) {
 		alSourcef(stream.source, AL_GAIN, ComputeVolume(type));
 		alSourcePlay(stream.source);
+		if (IsPaused(state.state)) {
+			// We must always start the source if we want the AL_SAMPLE_OFFSET to be applied.
+			// Otherwise it won't be read by alGetSource and we'll get a corrupt position.
+			// So in case of a paused source we start it and then immediately pause it.
+			alSourcePause(stream.source);
+		}
 	}
 }
 
@@ -539,7 +545,6 @@ void Mixer::resetFadeStartPosition(AudioMsgId::Type type, int positionInBuffered
 		if (track->isStreamCreated()) {
 			ALint currentPosition = 0;
 			alGetSourcei(track->stream.source, AL_SAMPLE_OFFSET, &currentPosition);
-
 			if (Audio::PlaybackErrorHappened()) {
 				setStoppedState(track, State::StoppedAtError);
 				onError(track->state.id);

Telegram/SourceFiles/media/view/media_clip_playback.cpp

@@ -25,6 +25,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 namespace Media {
 namespace Clip {
+namespace {
+
+constexpr auto kPlaybackAnimationDurationMs = TimeMs(200);
+
+} // namespace
 
 Playback::Playback() : _a_value(animation(this, &Playback::step_value)) {
 }
@@ -53,11 +58,16 @@ void Playback::updateState(const Player::TrackState &state) {
 	if (position > length) {
 		progress = 1.;
 	} else if (length) {
-		progress = length ? snap(float64(position) / length, 0., 1.) : 0.;
+		progress = snap(float64(position) / length, 0., 1.);
 	}
+	auto animatedPosition = position + (state.frequency * kPlaybackAnimationDurationMs / 1000);
+	auto animatedProgress = length ? qMax(float64(animatedPosition) / length, 0.) : 0.;
 	if (length != _length || position != _position || wasInLoadingState) {
-		auto animated = (length && _length && progress > value());
-		setValue(progress, animated);
+		if (auto animated = (length && _length && animatedProgress > value())) {
+			setValue(animatedProgress, animated);
+		} else {
+			setValue(progress, animated);
+		}
 		_position = position;
 		_length = length;
 	}
@@ -74,9 +84,8 @@ void Playback::updateLoadingState(float64 progress) {
 	setValue(progress, animated);
 }
 
-
 float64 Playback::value() const {
-	return a_value.current();
+	return qMin(a_value.current(), 1.);
 }
 
 void Playback::setValue(float64 value, bool animated) {
@@ -93,12 +102,12 @@ void Playback::setValue(float64 value, bool animated) {
 }
 
 void Playback::step_value(float64 ms, bool timer) {
-	auto dt = ms / (2 * AudioVoiceMsgUpdateView);
-	if (dt >= 1) {
+	auto dt = ms / kPlaybackAnimationDurationMs;
+	if (dt >= 1.) {
 		_a_value.stop();
 		a_value.finish();
 	} else {
-		a_value.update(qMin(dt, 1.), anim::linear);
+		a_value.update(dt, anim::linear);
 	}
 	if (timer && _valueChanged) {
 		_valueChanged(a_value.current());

Telegram/SourceFiles/media/view/media_clip_playback.h

@@ -40,12 +40,12 @@ public:
 		_inLoadingStateChanged = std::move(callback);
 	}
 	void setValue(float64 value, bool animated);
+	float64 value() const;
 
 	void updateState(const Player::TrackState &state);
 	void updateLoadingState(float64 progress);
 
 private:
-	float64 value() const;
 	void step_value(float64 ms, bool timer);
 
 	// This can animate for a very long time (like in music playing),

Telegram/SourceFiles/ui/effects/radial_animation.cpp

@@ -70,10 +70,11 @@ void RadialAnimation::step(TimeMs ms) {
 }
 
 void RadialAnimation::draw(Painter &p, const QRect &inner, int32 thickness, style::color color) {
-	float64 o = p.opacity();
+	auto o = p.opacity();
 	p.setOpacity(o * _opacity);
 
-	QPen pen(color->p), was(p.pen());
+	auto pen = color->p;
+	auto was = p.pen();
 	pen.setWidth(thickness);
 	pen.setCapStyle(Qt::RoundCap);
 	p.setPen(pen);