jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Do not allow post-GPU rescaling on gpu encoders

Browse Source
This commit is contained in:
jp9000 2019-02-26 08:03:13 -08:00
parent 17e85f04fd
commit 6bf39f763d
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
UI/window-basic-main-outputs.cpp
View File

@ -1236,9 +1236,14 @@ inline void AdvancedOutput::SetupStreaming()
"Rescale");
const char *rescaleRes = config_get_string(main->Config(), "AdvOut",
"RescaleRes");
uint32_t caps = obs_encoder_get_caps(h264Streaming);
unsigned int cx = 0;
unsigned int cy = 0;
if ((caps & OBS_ENCODER_CAP_PASS_TEXTURE) != 0) {
rescale = false;
}
if (rescale && rescaleRes && *rescaleRes) {
if (sscanf(rescaleRes, "%ux%u", &cx, &cy) != 2) {
cx = 0;
@ -1272,6 +1277,11 @@ inline void AdvancedOutput::SetupRecording()
obs_output_set_video_encoder(replayBuffer,
h264Streaming);
} else {
uint32_t caps = obs_encoder_get_caps(h264Recording);
if ((caps & OBS_ENCODER_CAP_PASS_TEXTURE) != 0) {
rescale = false;
}
if (rescale && rescaleRes && *rescaleRes) {
if (sscanf(rescaleRes, "%ux%u", &cx, &cy) != 2) {
cx = 0;