xaymar/obs-ffmpeg-encoder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 14 Wiki Activity

ui/nvenc_shared: Fix lag calculation for rc-lookahead

Browse Source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks
2019-10-19 02:40:50 +02:00
parent 403b43e77b
commit f21cbe9aba
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/ui/nvenc_shared.cpp
+6 -3
View File
@@ -20,6 +20,7 @@
// SOFTWARE. // SOFTWARE.
#include "nvenc_shared.hpp" #include "nvenc_shared.hpp"
#include <algorithm>
#include "codecs/hevc.hpp" #include "codecs/hevc.hpp"
#include "plugin.hpp" #include "plugin.hpp"
#include "strings.hpp" #include "strings.hpp"
@@ -131,15 +132,17 @@ std::map<b_ref_mode, std::string> obsffmpeg::nvenc::b_ref_mode_to_opt{
{b_ref_mode::MIDDLE, "middle"}, {b_ref_mode::MIDDLE, "middle"},
}; };
void obsffmpeg::nvenc::override_lag_in_frames(size_t& lag, obs_data_t*, const AVCodec*, void obsffmpeg::nvenc::override_lag_in_frames(size_t& lag, obs_data_t*, const AVCodec*, AVCodecContext* context)
AVCodecContext* context)
{ {
// With NVENC, the number of frames lagged before we get our first // With NVENC, the number of frames lagged before we get our first
// packet is determined by the number of b-frames. Threads, lookahead // packet is determined by the number of b-frames. Threads, lookahead
// frames and various other settings are ignored. // frames and various other settings are ignored.
// The minimum number of lagged frames is 1. // The minimum number of lagged frames is 1.
lag = 1ull + static_cast<size_t>(context->max_b_frames); int64_t rcla = 0;
av_opt_get_int(context, "rc-lookahead", AV_OPT_SEARCH_CHILDREN, &rcla);
lag = static_cast<size_t>(std::max(1ll + static_cast<int64_t>(context->max_b_frames), rcla));
} }
void obsffmpeg::nvenc::get_defaults(obs_data_t* settings, const AVCodec*, AVCodecContext*) void obsffmpeg::nvenc::get_defaults(obs_data_t* settings, const AVCodec*, AVCodecContext*)