opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

libobs: Change service max res. to res. list

Browse Source 
(This commit also modifies rtmp-services and UI)

Changes the maximum resolution size to a resolution list, and splits the
maximum FPS to its own function.

(Note: ABI has not been modified because the last changes still haven't
been released yet, so it's safe to modify this as long as the changes
haven't been officially released)
This commit is contained in:
jp9000
2020-11-13 18:22:53 -08:00
parent 4f74ffe993
commit ebbe8d1bf9
7 changed files with 126 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/window-basic-auto-config-test.cpp
+32 -6
View File
@@ -963,6 +963,27 @@ void AutoConfigTestPage::TestRecordingEncoderThread()
#define QUALITY_SAME "Basic.Settings.Output.Simple.RecordingQuality.Stream"
#define QUALITY_HIGH "Basic.Settings.Output.Simple.RecordingQuality.Small"
void set_closest_res(int &cx, int &cy, struct obs_service_resolution *res_list,
size_t count)
{
int best_pixel_diff = 0x7FFFFFFF;
int start_cx = cx;
int start_cy = cy;
for (size_t i = 0; i < count; i++) {
struct obs_service_resolution &res = res_list[i];
int pixel_cx_diff = abs(start_cx - res.cx);
int pixel_cy_diff = abs(start_cy - res.cy);
int pixel_diff = pixel_cx_diff + pixel_cy_diff;
if (pixel_diff < best_pixel_diff) {
best_pixel_diff = pixel_diff;
cx = res.cx;
cy = res.cy;
}
}
}
void AutoConfigTestPage::FinalizeResults()
{
ui->stackedWidget->setCurrentIndex(1);
@@ -1013,13 +1034,18 @@ void AutoConfigTestPage::FinalizeResults()
obs_service_apply_encoder_settings(service, vencoder_settings,
nullptr);
int maxCX, maxCY, maxFPS;
obs_service_get_max_res_fps(service, &maxCX, &maxCY, &maxFPS);
struct obs_service_resolution *res_list;
size_t res_count;
int maxFPS;
obs_service_get_supported_resolutions(service, &res_list,
&res_count);
obs_service_get_max_fps(service, &maxFPS);
if (maxCX && wiz->idealResolutionCX > maxCX)
wiz->idealResolutionCX = maxCX;
if (maxCY && wiz->idealResolutionCY > maxCY)
wiz->idealResolutionCY = maxCY;
if (res_list) {
set_closest_res(wiz->idealResolutionCX,
wiz->idealResolutionCY, res_list,
res_count);
}
if (maxFPS) {
double idealFPS = (double)wiz->idealFPSNum /
(double)wiz->idealFPSDen;