Bring back original video quality option

Author: comdev1337

Telegram/SourceFiles/core/core_settings.cpp

@@ -102,7 +102,13 @@ void LogPosition(const WindowPosition &position, const QString &name) {
 	auto result = Media::VideoQuality();
 	const auto data = static_cast<void*>(&result);
 	memcpy(data, &value, sizeof(result));
-	return (result.height <= 4320) ? result : Media::VideoQuality();
+
+	const auto height = result.height;
+	const auto offset = Media::kVideoQualityOriginalOffset;
+	const auto max = 4320;
+	return (height <= max || (height >= offset && height <= offset + max))
+		? result
+		: Media::VideoQuality();
 }
 
 } // namespace

Telegram/SourceFiles/data/data_document.cpp

@@ -578,18 +578,35 @@ void DocumentData::setVideoQualities(
 	}
 	qualities.erase(qualities.begin() + count, qualities.end());
 	if (!qualities.empty()) {
-		if (const auto mine = resolveVideoQuality()) {
-			if (mine > qualities.front()->resolveVideoQuality()) {
-				qualities.insert(begin(qualities), this);
+		auto mine = resolveVideoQuality();
+		for (const auto &quality : qualities) {
+			const auto qres = quality->resolveVideoQuality();
+			if (qres > mine) {
+				mine = qres;
 			}
 		}
+		if (mine) {
+			qualities.insert(begin(qualities), this);
+		}
 	}
 	data->qualities = std::move(qualities);
 }
 
 int DocumentData::resolveVideoQuality() const {
 	const auto size = isVideoFile() ? dimensions : QSize();
-	return size.isEmpty() ? 0 : std::min(size.width(), size.height());
+	auto result = size.isEmpty() ? 0 : std::min(size.width(), size.height());
+	if (const auto data = video()) {
+		for (const auto &quality : data->qualities) {
+			if (quality != this) {
+				const auto qsize = quality->dimensions;
+				const auto qres = qsize.isEmpty() ? 0 : std::min(qsize.width(), qsize.height());
+				if (qres > result) {
+					result = qres;
+				}
+			}
+		}
+	}
+	return result;
 }
 
 auto DocumentData::resolveQualities(HistoryItem *context) const
@@ -611,19 +628,30 @@ not_null<DocumentData*> DocumentData::chooseQuality(
 		return this;
 	}
 	const auto height = int(request.height);
-	auto closest = this;
-	auto closestAbs = std::abs(height - resolveVideoQuality());
-	auto closestSize = size;
+	if (height >= Media::kVideoQualityOriginalOffset) {
+		return this;
+	}
+	
+	// If a standard quality is requested, try to find the best match among transcoded streams only.
+	auto closest = (DocumentData*)nullptr;
+	auto closestAbs = -1;
+	auto closestSize = -1;
+	
 	for (const auto &quality : list) {
+		if (quality == this) {
+			continue; // Skip Original stream for standard quality requests
+		}
 		const auto abs = std::abs(height - quality->resolveVideoQuality());
-		if (abs < closestAbs
+		if (!closest 
+			|| abs < closestAbs
 			|| (abs == closestAbs && quality->size < closestSize)) {
 			closest = quality;
 			closestAbs = abs;
 			closestSize = quality->size;
 		}
 	}
-	return closest;
+	
+	return closest ? closest : this;
 }
 
 void DocumentData::validateLottieSticker() {

Telegram/SourceFiles/media/media_common.h

@@ -41,6 +41,8 @@ inline constexpr auto kSpeedMin = 0.5;
 inline constexpr auto kSpeedMax = 2.5;
 inline constexpr auto kSpedUpDefault = 1.7;
 
+inline constexpr auto kVideoQualityOriginalOffset = 1000000;
+
 [[nodiscard]] inline bool EqualSpeeds(float64 a, float64 b) {
 	return int(base::SafeRound(a * 10.)) == int(base::SafeRound(b * 10.));
 }

Telegram/SourceFiles/media/player/media_player_button.cpp

@@ -437,13 +437,16 @@ void SettingsButton::prepareFrame() {
 			: u"%1X"_q.arg(rounded / 10);
 		paintBadge(p, text, RectPart::TopLeft, color);
 	}
-	const auto text = (!_quality)
+	const auto displayQuality = (_quality >= Media::kVideoQualityOriginalOffset)
+		? (_quality - Media::kVideoQualityOriginalOffset)
+		: _quality;
+	const auto text = (!displayQuality)
 		? QString()
-		: (_quality > 2000)
+		: (displayQuality > 2000)
 		? u"4K"_q
-		: (_quality > 1000)
+		: (displayQuality > 1000)
 		? u"FHD"_q
-		: (_quality > 700)
+		: (displayQuality > 700)
 		? u"HD"_q
 		: u"SD"_q;
 	if (!text.isEmpty()) {

Telegram/SourceFiles/media/player/media_player_dropdown.cpp

@@ -819,7 +819,14 @@ void SpeedController::fillMenu(not_null<Ui::DropdownMenu*> menu) {
 
 	const auto add = [&](int quality) {
 		const auto automatic = tr::lng_mediaview_quality_auto(tr::now);
-		const auto text = quality ? u"%1p"_q.arg(quality) : automatic;
+		auto text = automatic;
+		if (quality) {
+			if (quality >= Media::kVideoQualityOriginalOffset) {
+				text = u"Original (%1p)"_q.arg(quality - Media::kVideoQualityOriginalOffset);
+			} else {
+				text = u"%1p"_q.arg(quality);
+			}
+		}
 		auto action = base::make_unique_q<Ui::Menu::Action>(
 			raw,
 			st.qualityMenu,
@@ -852,8 +859,12 @@ void SpeedController::fillMenu(not_null<Ui::DropdownMenu*> menu) {
 				: !quality;
 			raw->action()->setEnabled(!chosen);
 			if (!quality) {
+				auto displayHeight = now.height;
+				if (displayHeight >= Media::kVideoQualityOriginalOffset) {
+					displayHeight -= Media::kVideoQualityOriginalOffset;
+				}
 				raw->action()->setText(automatic
-					+ (now.manual ? QString() : u"\t%1p"_q.arg(now.height)));
+					+ (now.manual ? QString() : u"\t%1p"_q.arg(displayHeight)));
 			}
 			check->setVisible(chosen);
 		}, raw->lifetime());

Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp

@@ -4267,6 +4267,9 @@ void OverlayWidget::streamingReady(Streaming::Information &&info) {
 	if (videoShown()) {
 		applyVideoSize();
 		_streamedQualityChangeFrame = QImage();
+		if (_streamed && _streamed->controls) {
+			_streamed->controls->updateSpeedToggleQuality();
+		}
 	} else {
 		updateContentRect();
 	}
@@ -4770,20 +4773,29 @@ std::vector<int> OverlayWidget::playbackControlsQualities() {
 	auto result = std::vector<int>();
 	result.reserve(list.size());
 	for (const auto &quality : list) {
-		result.push_back(quality->resolveVideoQuality());
+		if (quality == _document) {
+			result.push_back(Media::kVideoQualityOriginalOffset + quality->resolveVideoQuality());
+		} else {
+			result.push_back(quality->resolveVideoQuality());
+		}
 	}
 	return result;
 }
 
 VideoQuality OverlayWidget::playbackControlsCurrentQuality() {
-	return _chosenQuality
-		? VideoQuality{
-			.manual = _quality.manual,
-			.height = uint32(_chosenQuality->resolveVideoQuality()),
+	if (!_chosenQuality) {
+		return _quality;
+	}
+	auto height = uint32(_chosenQuality->resolveVideoQuality());
+	if (_chosenQuality == _document && _streamed && _streamed->ready) {
+		const auto stream = _streamed->instance.info().video.size;
+		if (!stream.isEmpty()) {
+			height = std::max(height, uint32(std::min(stream.width(), stream.height())));
 		}
-		: _quality;
+		height += Media::kVideoQualityOriginalOffset;
+	}
+	return { .manual = _quality.manual, .height = height };
 }
-
 void OverlayWidget::playbackControlsQualityChanged(int quality) {
 	applyVideoQuality({
 		.manual = (quality > 0),

Telegram/SourceFiles/media/view/media_view_playback_controls.cpp

@@ -224,7 +224,7 @@ void PlaybackControls::saveQuality(int quality) {
 
 void PlaybackControls::updateSpeedToggleQuality() {
 	const auto quality = _delegate->playbackControlsCurrentQuality();
-	_speedToggle->setQuality(_qualitiesList.empty() ? 0 : quality.height);
+	_speedToggle->setQuality(quality.height);
 }
 
 void PlaybackControls::updatePlaybackSpeed(float64 speed) {

Telegram/SourceFiles/media/view/media_view_playback_controls.h

@@ -64,6 +64,7 @@ class PlaybackControls : public Ui::RpWidget {
 	void updatePlayback(const Player::TrackState &state);
 	void setLoadingProgress(int64 ready, int64 total);
 	void setInFullScreen(bool inFullScreen);
+	void updateSpeedToggleQuality();
 	[[nodiscard]] bool hasMenu() const;
 	[[nodiscard]] bool dragging() const;
 
@@ -96,7 +97,6 @@ class PlaybackControls : public Ui::RpWidget {
 	void saveSpeed(float64 speed);
 
 	void saveQuality(int quality);
-	void updateSpeedToggleQuality();
 
 	const not_null<Delegate*> _delegate;