Skip to content

Commit 9eb0914

Browse files
committed
codestyle fix
1 parent 839163a commit 9eb0914

1 file changed

Lines changed: 19 additions & 21 deletions

File tree

obs-studio-server/source/nodeobs_autoconfig.cpp

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class AutoConfigInfo {
5656
description = a_description;
5757
percentage = a_percentage;
5858
};
59-
~AutoConfigInfo(){};
59+
~AutoConfigInfo() {};
6060

6161
std::string event;
6262
std::string description;
@@ -583,8 +583,7 @@ void autoConfig::TestBandwidthThreadV2(void)
583583
obs_data_release(probe);
584584
}
585585
int testBitrate = std::max({userBitrate, platformCap, 6000});
586-
blog(LOG_INFO, "TestBandwidthV2: target %zu test bitrate %d (user=%d, platformCap=%d)", i, testBitrate, userBitrate,
587-
platformCap);
586+
blog(LOG_INFO, "TestBandwidthV2: target %zu test bitrate %d (user=%d, platformCap=%d)", i, testBitrate, userBitrate, platformCap);
588587

589588
targets[i]->testBandwidth(gotError, testBitrate);
590589

@@ -676,23 +675,23 @@ void autoConfig::TestBandwidthThreadV2(void)
676675
result.targetIndex = testingServiceTargetIdx[si];
677676

678677
// Use the per-target test bitrate (still active on the encoder
679-
// until CleanTestMode runs below) as the reference, not the
680-
// global runContext.startingBitrate which doesn't reflect the
681-
// per-target ceiling-search override.
682-
int testBitrateRef = 0;
683-
if (streaming->videoEncoder) {
684-
obs_data_t *encSettings = obs_encoder_get_settings(streaming->videoEncoder);
685-
testBitrateRef = (int)obs_data_get_int(encSettings, "bitrate");
686-
obs_data_release(encSettings);
687-
}
688-
if (testBitrateRef <= 0)
689-
testBitrateRef = runContext.startingBitrate;
678+
// until CleanTestMode runs below) as the reference, not the
679+
// global runContext.startingBitrate which doesn't reflect the
680+
// per-target ceiling-search override.
681+
int testBitrateRef = 0;
682+
if (streaming->videoEncoder) {
683+
obs_data_t *encSettings = obs_encoder_get_settings(streaming->videoEncoder);
684+
testBitrateRef = (int)obs_data_get_int(encSettings, "bitrate");
685+
obs_data_release(encSettings);
686+
}
687+
if (testBitrateRef <= 0)
688+
testBitrateRef = runContext.startingBitrate;
690689

691-
if (droppedFrames > 0 || (int)bitrate < (testBitrateRef * 75 / 100)) {
692-
result.bitrate = (int)bitrate * 70 / 100;
693-
} else {
694-
result.bitrate = testBitrateRef;
695-
}
690+
if (droppedFrames > 0 || (int)bitrate < (testBitrateRef * 75 / 100)) {
691+
result.bitrate = (int)bitrate * 70 / 100;
692+
} else {
693+
result.bitrate = testBitrateRef;
694+
}
696695

697696
testResults.push_back(result);
698697
}
@@ -1855,8 +1854,7 @@ static void applyResults()
18551854
obs_data_release(capSettings);
18561855
}
18571856

1858-
blog(LOG_INFO,
1859-
"applyResults: target %llu picked %llu (user=%d heuristic=%llu choseBeforeCaps=%llu measured=%llu platformCap=%llu)",
1857+
blog(LOG_INFO, "applyResults: target %llu picked %llu (user=%d heuristic=%llu choseBeforeCaps=%llu measured=%llu platformCap=%llu)",
18601858
st.id, finalBitrate, userBitrate, heuristic, preMeasured, targetBitrate, platformCapped);
18611859

18621860
obs_data_t *encSettings = obs_data_create();

0 commit comments

Comments
 (0)