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

UI: Allow rescaling for texture-based encoders

Browse Source
This commit is contained in:
jp9000
2020-02-18 21:00:57 -08:00
parent 55d80e82e1
commit cce734a0aa
2 changed files with 4 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/window-basic-main-outputs.cpp
-10
View File
@@ -1284,14 +1284,9 @@ inline void AdvancedOutput::SetupStreaming()
config_get_string(main->Config(), "AdvOut", "RescaleRes");
int streamTrack =
config_get_int(main->Config(), "AdvOut", "TrackIndex") - 1;
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;
@@ -1339,11 +1334,6 @@ 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;