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

encoders/generic: Allow overriding of thread count

Browse Source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks
2019-07-07 14:33:58 +02:00
parent df63677529
commit b6ad026eb3
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/locale/en-US.ini
+2
View File
@@ -11,6 +11,8 @@ Automatic="Automatic"
FFmpeg="FFmpeg Options" FFmpeg="FFmpeg Options"
FFmpeg.CustomSettings="Custom Settings" FFmpeg.CustomSettings="Custom Settings"
FFmpeg.CustomSettings.Description="Custom settings that override any detected options above, use with caution.\nThe input should be in the format 'key=value;key=value;...'." FFmpeg.CustomSettings.Description="Custom settings that override any detected options above, use with caution.\nThe input should be in the format 'key=value;key=value;...'."
FFmpeg.Threads="Number of Threads"
FFmpeg.Threads.Description="The number of threads to use for encoding, if supported by the encoder.\nA value of 0 is equal to 'auto-detect' and may result in excessive CPU usage."
FFmpeg.ColorFormat="Override Color Format" FFmpeg.ColorFormat="Override Color Format"
FFmpeg.ColorFormat.Description="Overriding the color format can unlock higher quality, but might cause additional stress.\nNot all encoders support all color formats, and you might end up causing errors or corrupted video due to this." FFmpeg.ColorFormat.Description="Overriding the color format can unlock higher quality, but might cause additional stress.\nNot all encoders support all color formats, and you might end up causing errors or corrupted video due to this."
FFmpeg.StandardCompliance="Standard Compliance" FFmpeg.StandardCompliance="Standard Compliance"
source/encoders/generic.cpp
+18 -5
View File
@@ -40,6 +40,7 @@ extern "C" {
// FFmpeg // FFmpeg
#define P_FFMPEG "FFmpeg" #define P_FFMPEG "FFmpeg"
#define P_FFMPEG_CUSTOMSETTINGS "FFmpeg.CustomSettings" #define P_FFMPEG_CUSTOMSETTINGS "FFmpeg.CustomSettings"
#define P_FFMPEG_THREADS "FFmpeg.Threads"
#define P_FFMPEG_COLORFORMAT "FFmpeg.ColorFormat" #define P_FFMPEG_COLORFORMAT "FFmpeg.ColorFormat"
#define P_FFMPEG_STANDARDCOMPLIANCE "FFmpeg.StandardCompliance" #define P_FFMPEG_STANDARDCOMPLIANCE "FFmpeg.StandardCompliance"
@@ -292,6 +293,7 @@ void encoder::generic_factory::get_defaults(obs_data_t* settings)
// FFmpeg // FFmpeg
obs_data_set_default_string(settings, P_FFMPEG_CUSTOMSETTINGS, ""); obs_data_set_default_string(settings, P_FFMPEG_CUSTOMSETTINGS, "");
obs_data_set_default_int(settings, P_FFMPEG_COLORFORMAT, AV_PIX_FMT_NONE); obs_data_set_default_int(settings, P_FFMPEG_COLORFORMAT, AV_PIX_FMT_NONE);
obs_data_set_default_int(settings, P_FFMPEG_THREADS, 0);
obs_data_set_default_int(settings, P_FFMPEG_STANDARDCOMPLIANCE, FF_COMPLIANCE_STRICT); obs_data_set_default_int(settings, P_FFMPEG_STANDARDCOMPLIANCE, FF_COMPLIANCE_STRICT);
} }
} }
@@ -322,6 +324,11 @@ void encoder::generic_factory::get_properties(obs_properties_t* props)
obs_property_list_add_int(p, ffmpeg::tools::get_pixel_format_name(*ptr), *ptr); obs_property_list_add_int(p, ffmpeg::tools::get_pixel_format_name(*ptr), *ptr);
} }
} }
{
auto p = obs_properties_add_int_slider(prs, P_FFMPEG_THREADS, TRANSLATE(P_FFMPEG_THREADS), 0,
std::thread::hardware_concurrency() * 2, 1);
obs_property_set_long_description(p, TRANSLATE(DESC(P_FFMPEG_THREADS)));
}
{ {
auto p = obs_properties_add_list(prs, P_FFMPEG_STANDARDCOMPLIANCE, auto p = obs_properties_add_list(prs, P_FFMPEG_STANDARDCOMPLIANCE,
TRANSLATE(P_FFMPEG_STANDARDCOMPLIANCE), OBS_COMBO_TYPE_LIST, TRANSLATE(P_FFMPEG_STANDARDCOMPLIANCE), OBS_COMBO_TYPE_LIST,
@@ -379,12 +386,18 @@ encoder::generic::generic(obs_data_t* settings, obs_encoder_t* encoder)
} else { } else {
this->context->thread_type = 0; this->context->thread_type = 0;
} }
if (this->codec->capabilities & AV_CODEC_CAP_AUTO_THREADS) { int64_t threads = obs_data_get_int(settings, P_FFMPEG_THREADS);
this->context->thread_count = 0; if (threads > 0) {
this->lag_in_frames = std::thread::hardware_concurrency(); this->context->thread_count = static_cast<int>(threads);
} else {
this->context->thread_count = std::thread::hardware_concurrency();
this->lag_in_frames = this->context->thread_count; this->lag_in_frames = this->context->thread_count;
} else {
if (this->codec->capabilities & AV_CODEC_CAP_AUTO_THREADS) {
this->context->thread_count = 0;
this->lag_in_frames = std::thread::hardware_concurrency();
} else {
this->context->thread_count = std::thread::hardware_concurrency();
this->lag_in_frames = this->context->thread_count;
}
} }
// Video and Audio exclusive setup // Video and Audio exclusive setup