mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Code

Revert "obs-ffmpeg: Add option to use b-frames as reference"

Browse Source 
This reverts commit adf3337d3c.
Currently causing timestamp issues resulting in FPS issues.
This commit is contained in:
Gol-D-Ace 2019-03-14 10:05:55 +01:00
parent e001e2d1b9
commit f27a00d266
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/obs-ffmpeg/data/locale/en-US.ini
View File

@ -23,8 +23,6 @@ NVENC.LookAhead.ToolTip="Enables dynamic B-frames.\n\nIf disabled, the encoder w
NVENC.PsychoVisualTuning="Psycho Visual Tuning" NVENC.PsychoVisualTuning="Psycho Visual Tuning"
NVENC.PsychoVisualTuning.ToolTip="Enables encoder settings that optimize the use of bitrate for increased perceived visual quality,\nespecially in situations with high motion, at the cost of increased GPU utilization." NVENC.PsychoVisualTuning.ToolTip="Enables encoder settings that optimize the use of bitrate for increased perceived visual quality,\nespecially in situations with high motion, at the cost of increased GPU utilization."
NVENC.CQLevel="CQ Level" NVENC.CQLevel="CQ Level"
NVENC.BFramesAsRef="Use B-Frames as Reference"
NVENC.BFramesAsRef.ToolTip="Using B-Frames as a reference improves quality with negligible performance impact.\n\nIt is strongly recommended to enable this feature when using multiple B-Frames."
FFmpegSource="Media Source" FFmpegSource="Media Source"
LocalFile="Local File" LocalFile="Local File"

6
plugins/obs-ffmpeg/jim-nvenc.c
View File

@ -318,7 +318,6 @@ static bool init_encoder(struct nvenc_data *enc, obs_data_t *settings)
const char *profile = obs_data_get_string(settings, "profile"); const char *profile = obs_data_get_string(settings, "profile");
bool psycho_aq = obs_data_get_bool(settings, "psycho_aq"); bool psycho_aq = obs_data_get_bool(settings, "psycho_aq");
bool lookahead = obs_data_get_bool(settings, "lookahead"); bool lookahead = obs_data_get_bool(settings, "lookahead");
bool bframes_as_ref = obs_data_get_bool(settings, "bframes_as_ref");
int bf = (int)obs_data_get_int(settings, "bf"); int bf = (int)obs_data_get_int(settings, "bf");
bool vbr = astrcmpi(rc, "VBR") == 0; bool vbr = astrcmpi(rc, "VBR") == 0;
NVENCSTATUS err; NVENCSTATUS err;
@ -434,11 +433,6 @@ static bool init_encoder(struct nvenc_data *enc, obs_data_t *settings)
config->rcParams.enableTemporalAQ = psycho_aq; config->rcParams.enableTemporalAQ = psycho_aq;
} }
/* b-frames as reference */
if (bf >= 1 && bframes_as_ref &&
nv_get_cap(enc, NV_ENC_CAPS_SUPPORT_BFRAME_REF_MODE))
h264_config->useBFramesAsRef = NV_ENC_BFRAME_REF_MODE_MIDDLE;
/* -------------------------- */ /* -------------------------- */
/* rate control */ /* rate control */

5
plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c
View File

@ -404,7 +404,6 @@ void nvenc_defaults(obs_data_t *settings)
obs_data_set_default_string(settings, "preset", "hq"); obs_data_set_default_string(settings, "preset", "hq");
obs_data_set_default_string(settings, "profile", "high"); obs_data_set_default_string(settings, "profile", "high");
obs_data_set_default_bool(settings, "psycho_aq", true); obs_data_set_default_bool(settings, "psycho_aq", true);
obs_data_set_default_bool(settings, "bframes_as_ref", true);
obs_data_set_default_int(settings, "gpu", 0); obs_data_set_default_int(settings, "gpu", 0);
obs_data_set_default_int(settings, "bf", 2); obs_data_set_default_int(settings, "bf", 2);
} }
@ -498,10 +497,6 @@ obs_properties_t *nvenc_properties_internal(bool ffmpeg)
obs_module_text("NVENC.PsychoVisualTuning")); obs_module_text("NVENC.PsychoVisualTuning"));
obs_property_set_long_description(p, obs_property_set_long_description(p,
obs_module_text("NVENC.PsychoVisualTuning.ToolTip")); obs_module_text("NVENC.PsychoVisualTuning.ToolTip"));
p = obs_properties_add_bool(props, "bframes_as_ref",
obs_module_text("NVENC.BFramesAsRef"));
obs_property_set_long_description(p,
obs_module_text("NVENC.BFramesAsRef.ToolTip"));
} }
obs_properties_add_int(props, "gpu", obs_module_text("GPU"), 0, 8, 1); obs_properties_add_int(props, "gpu", obs_module_text("GPU"), 0, 8, 1);