moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-06-17 06:01:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Interpolate between entries in our default bitrate table

Browse Source
This commit is contained in:
Cameron Gutman
2023-09-10 22:34:20 -05:00
parent 85b5845ebb
commit e9ed4940cd
1 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/settings/streamingpreferences.cpp
+39 -22
View File
@@ -303,29 +303,46 @@ int StreamingPreferences::getDefaultBitrate(int width, int height, int fps)
// bitrate increase for frame rate once we get to values that high. // bitrate increase for frame rate once we get to values that high.
float frameRateFactor = (fps <= 60 ? fps : (qSqrt(fps / 60.f) * 60.f)) / 30.f; float frameRateFactor = (fps <= 60 ? fps : (qSqrt(fps / 60.f) * 60.f)) / 30.f;
// This table prefers 16:10 resolutions because they are // TODO: Collect some empirical data to see if these defaults make sense.
// only slightly more pixels than the 16:9 equivalents, so // We're just using the values that the Shield used, as we have for years.
// we don't want to bump those 16:10 resolutions up to the static const struct resTable {
// next 16:9 slot. int pixels;
int factor;
} resTable[] {
{ 640 * 360, 10 },
{ 854 * 480, 20 },
{ 1280 * 720, 50 },
{ 1920 * 1080, 100 },
{ 2560 * 1440, 200 },
{ 3840 * 2160, 400 },
{ -1, -1 },
};
// Calculate the resolution factor by linear interpolation of the resolution table
int resolutionFactor; int resolutionFactor;
if (width * height <= 640 * 360) { int pixels = width * height;
resolutionFactor = 10; for (int i = 0;; i++) {
} if (pixels == resTable[i].pixels) {
else if (width * height <= 854 * 480) { // We can bail immediately for exact matches
resolutionFactor = 15; resolutionFactor = resTable[i].factor;
} break;
// This covers 1280x720 and 1280x800 too }
else if (width * height <= 1366 * 768) { else if (pixels < resTable[i].pixels) {
resolutionFactor = 50; if (i == 0) {
} // Never go below the lowest resolution entry
else if (width * height <= 1920 * 1200) { resolutionFactor = resTable[i].factor;
resolutionFactor = 100; }
} else {
else if (width * height <= 2560 * 1600) { // Interpolate between the entry greater than the chosen resolution (i) and the entry less than the chosen resolution (i-1)
resolutionFactor = 200; resolutionFactor = ((float)(pixels - resTable[i-1].pixels) / (resTable[i].pixels - resTable[i-1].pixels)) * (resTable[i].factor - resTable[i-1].factor) + resTable[i-1].factor;
} }
else /* if (width * height <= 3840 * 2160) */ { break;
resolutionFactor = 400; }
else if (resTable[i].pixels == -1) {
// Never go above the highest resolution entry
resolutionFactor = resTable[i-1].factor;
break;
}
} }
return (int)(resolutionFactor * frameRateFactor) * 100; return (int)(resolutionFactor * frameRateFactor) * 100;