etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-12-17 22:10:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

encoders/ffmpeg/nvenc: Don't migrate already correct settings

Browse source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2021-12-01 13:57:24 +01:00
parent b5e6c581d1
commit afa47646f5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/encoders/handlers/nvenc_shared.cpp
View file

@ -759,10 +759,10 @@ void streamfx::encoder::ffmpeg::handler::nvenc::migrate(obs_data_t* settings, ui
// Only test for A.B.C in A.B.C.D // Only test for A.B.C in A.B.C.D
version = version & STREAMFX_MASK_UPDATE; version = version & STREAMFX_MASK_UPDATE;
#define COPY_UNSET(TYPE, NAME, OLDNAME) \ #define COPY_UNSET(TYPE, FROM, TO) \
if (obs_data_has_user_value(settings, OLDNAME)) { \ if (obs_data_has_user_value(settings, FROM)) { \
obs_data_set_##TYPE(settings, NAME, obs_data_get_##TYPE(settings, OLDNAME)); \ obs_data_set_##TYPE(settings, TO, obs_data_get_##TYPE(settings, FROM)); \
obs_data_unset_user_value(settings, OLDNAME); \ obs_data_unset_user_value(settings, FROM); \
} }
if (version <= STREAMFX_MAKE_VERSION(0, 8, 0, 0)) { if (version <= STREAMFX_MAKE_VERSION(0, 8, 0, 0)) {
@ -774,7 +774,7 @@ void streamfx::encoder::ffmpeg::handler::nvenc::migrate(obs_data_t* settings, ui
COPY_UNSET(double, "RateControl.Quality.Target", ST_KEY_RATECONTROL_LIMITS_QUALITY); COPY_UNSET(double, "RateControl.Quality.Target", ST_KEY_RATECONTROL_LIMITS_QUALITY);
} }
if (version <= STREAMFX_MAKE_VERSION(0, 11, 0, 0)) { if (version < STREAMFX_MAKE_VERSION(0, 11, 0, 0)) {
obs_data_unset_user_value(settings, "Other.AccessUnitDelimiter"); obs_data_unset_user_value(settings, "Other.AccessUnitDelimiter");
obs_data_unset_user_value(settings, "Other.DecodedPictureBufferSize"); obs_data_unset_user_value(settings, "Other.DecodedPictureBufferSize");
} }