From 7312114b7508fe6355cfff143f0ea0652a57eee8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 15 Apr 2017 22:51:53 +0300
Subject: [PATCH] Use full volume for video messages.

Set video volume to VideoVolume in MediaView and to 1 in HistoryGif.
---
 .../SourceFiles/history/history_media_types.cpp    |  3 +++
 Telegram/SourceFiles/media/media_audio.cpp         | 14 ++++++++++++--
 Telegram/SourceFiles/media/media_audio.h           |  5 +++++
 Telegram/SourceFiles/mediaview.cpp                 |  9 +++++++++
 Telegram/SourceFiles/mediaview.h                   |  1 +
 5 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_media_types.cpp b/Telegram/SourceFiles/history/history_media_types.cpp
index a20e57b71..3f68212ec 100644
--- a/Telegram/SourceFiles/history/history_media_types.cpp
+++ b/Telegram/SourceFiles/history/history_media_types.cpp
@@ -1773,6 +1773,9 @@ int HistoryGif::resizeGetHeight(int width) {
 			auto roundCorners = (isRound || inWebPage) ? ImageRoundCorner::All : ((isBubbleTop() ? (ImageRoundCorner::TopLeft | ImageRoundCorner::TopRight) : ImageRoundCorner::None)
 				| ((isBubbleBottom() && _caption.isEmpty()) ? (ImageRoundCorner::BottomLeft | ImageRoundCorner::BottomRight) : ImageRoundCorner::None));
 			_gif->start(_thumbw, _thumbh, _width, _height, roundRadius, roundCorners);
+			if (isRound) {
+				Media::Player::mixer()->setVideoVolume(1.);
+			}
 		}
 	} else {
 		_width = qMax(_width, gifMaxStatusWidth(_data) + 2 * int32(st::msgDateImgDelta + st::msgDateImgPadding.x()));
diff --git a/Telegram/SourceFiles/media/media_audio.cpp b/Telegram/SourceFiles/media/media_audio.cpp
index a9cf6a29a..773576870 100644
--- a/Telegram/SourceFiles/media/media_audio.cpp
+++ b/Telegram/SourceFiles/media/media_audio.cpp
@@ -72,6 +72,7 @@ namespace Media {
 namespace Player {
 namespace {
 
+constexpr auto kVideoVolumeRound = 10000;
 constexpr auto kPreloadSamples = 2LL * 48000; // preload next part if less than 2 seconds remains
 constexpr auto kFadeDuration = TimeMs(500);
 constexpr auto kCheckPlaybackPositionTimeout = TimeMs(100); // 100ms per check audio position
@@ -394,7 +395,7 @@ float64 ComputeVolume(AudioMsgId::Type type) {
 	switch (type) {
 	case AudioMsgId::Type::Voice: return suppressAllGain;
 	case AudioMsgId::Type::Song: return suppressSongGain * Global::SongVolume();
-	case AudioMsgId::Type::Video: return suppressSongGain * Global::VideoVolume();
+	case AudioMsgId::Type::Video: return suppressSongGain * mixer()->getVideoVolume();
 	}
 	return 1.;
 }
@@ -553,7 +554,8 @@ void Mixer::Track::resetStream() {
 }
 
 Mixer::Mixer()
-: _fader(new Fader(&_faderThread))
+: _videoVolume(kVideoVolumeRound)
+, _fader(new Fader(&_faderThread))
 , _loader(new Loaders(&_loaderThread)) {
 	connect(this, SIGNAL(faderOnTimer()), _fader, SLOT(onTimer()), Qt::QueuedConnection);
 	connect(this, SIGNAL(suppressSong()), _fader, SLOT(onSuppressSong()));
@@ -1234,6 +1236,14 @@ void Mixer::reattachTracks() {
 	}
 }
 
+void Mixer::setVideoVolume(float64 volume) {
+	_videoVolume.storeRelease(qRound(volume * kVideoVolumeRound));
+}
+
+float64 Mixer::getVideoVolume() const {
+	return float64(_videoVolume.loadAcquire()) / kVideoVolumeRound;
+}
+
 Fader::Fader(QThread *thread) : QObject()
 , _timer(this)
 , _suppressAllGain(1., 1.)
diff --git a/Telegram/SourceFiles/media/media_audio.h b/Telegram/SourceFiles/media/media_audio.h
index 0de039743..be4b5454d 100644
--- a/Telegram/SourceFiles/media/media_audio.h
+++ b/Telegram/SourceFiles/media/media_audio.h
@@ -122,6 +122,10 @@ public:
 	void reattachIfNeeded();
 	void reattachTracks();
 
+	// Thread safe.
+	void setVideoVolume(float64 volume);
+	float64 getVideoVolume() const;
+
 	~Mixer();
 
 private slots:
@@ -208,6 +212,7 @@ private:
 	Track _songTracks[kTogetherLimit];
 
 	Track _videoTrack;
+	QAtomicInt _videoVolume;
 	uint64 _lastVideoPlayId = 0;
 	TimeMs _lastVideoPlaybackWhen = 0;
 	TimeMs _lastVideoPlaybackCorrectedMs = 0;
diff --git a/Telegram/SourceFiles/mediaview.cpp b/Telegram/SourceFiles/mediaview.cpp
index 0f47eaade..e2b87cf07 100644
--- a/Telegram/SourceFiles/mediaview.cpp
+++ b/Telegram/SourceFiles/mediaview.cpp
@@ -229,6 +229,8 @@ bool MediaView::gifShown() const {
 			auto rounding = (_doc && _doc->isRoundVideo()) ? ImageRoundRadius::Ellipse : ImageRoundRadius::None;
 			_gif->start(_gif->width() / cIntRetinaFactor(), _gif->height() / cIntRetinaFactor(), _gif->width() / cIntRetinaFactor(), _gif->height() / cIntRetinaFactor(), rounding, ImageRoundCorner::All);
 			const_cast<MediaView*>(this)->_current = QPixmap();
+			updateMixerVideoVolume();
+			Global::RefVideoVolumeChanged().notify();
 		}
 		return true;// _gif->state() != Media::Clip::State::Error;
 	}
@@ -647,6 +649,12 @@ void MediaView::showSaveMsgFile() {
 	File::ShowInFolder(_saveMsgFilename);
 }
 
+void MediaView::updateMixerVideoVolume() const {
+	if (_doc && (_doc->isVideo() || _doc->isRoundVideo())) {
+		Media::Player::mixer()->setVideoVolume(Global::VideoVolume());
+	}
+}
+
 void MediaView::close() {
 	if (_menu) _menu->hideMenu(true);
 	if (App::wnd()) {
@@ -1571,6 +1579,7 @@ void MediaView::onVideoSeekFinished(TimeMs positionMs) {
 
 void MediaView::onVideoVolumeChanged(float64 volume) {
 	Global::SetVideoVolume(volume);
+	updateMixerVideoVolume();
 	Global::RefVideoVolumeChanged().notify();
 }
 
diff --git a/Telegram/SourceFiles/mediaview.h b/Telegram/SourceFiles/mediaview.h
index a8532a6d7..13807d2bf 100644
--- a/Telegram/SourceFiles/mediaview.h
+++ b/Telegram/SourceFiles/mediaview.h
@@ -154,6 +154,7 @@ private:
 	};
 
 	void showSaveMsgFile();
+	void updateMixerVideoVolume() const;
 
 	void dropdownHidden();
 	void updateDocSize();