[Option][GUI/JSON] Multithreaded video decoding

This commit is contained in:
Eric Kotato 2022-08-30 13:55:07 +03:00 committed by Eric Kotato
parent e3b0e10857
commit 667a4d0f16
4 changed files with 21 additions and 1 deletions

View file

@ -50,6 +50,8 @@
"ktg_profile_group_id": "Group ID", "ktg_profile_group_id": "Group ID",
"ktg_profile_supergroup_id": "Supergroup ID", "ktg_profile_supergroup_id": "Supergroup ID",
"ktg_profile_channel_id": "Channel ID", "ktg_profile_channel_id": "Channel ID",
"ktg_settings_ffmpeg_multithread": "Multithread video decoding",
"ktg_settings_ffmpeg_multithread_about": "When enabled, CPU and RAM consumption is higher, video decodes faster. When disabled, CPU and RAM consumption is lower, video decodes slower. The more CPU cores you have, the more RAM consumption you have when this option is enabled. You can set exact number of threads in the JSON configuration file.",
"ktg_settings_adaptive_bubbles": "Adaptive bubbles", "ktg_settings_adaptive_bubbles": "Adaptive bubbles",
"ktg_settings_filters": "Folders", "ktg_settings_filters": "Folders",
"ktg_settings_messages": "Messages", "ktg_settings_messages": "Messages",

View file

@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#include "ffmpeg/ffmpeg_utility.h" #include "ffmpeg/ffmpeg_utility.h"
#include "kotato/kotato_settings.h"
#include "base/algorithm.h" #include "base/algorithm.h"
#include "logs.h" #include "logs.h"
@ -337,7 +338,13 @@ CodecPointer MakeCodecPointer(CodecDescriptor descriptor) {
return {}; return {};
} }
context->pkt_timebase = stream->time_base; context->pkt_timebase = stream->time_base;
av_opt_set(context, "threads", "auto", 0); if(::Kotato::JsonSettings::GetBool("ffmpeg_multithread")) {
if (::Kotato::JsonSettings::GetInt("ffmpeg_thread_count") > 0) {
av_opt_set(context, "threads", std::to_string(::Kotato::JsonSettings::GetInt("ffmpeg_thread_count")).c_str(), 0);
} else {
av_opt_set(context, "threads", "auto", 0);
}
}
av_opt_set_int(context, "refcounted_frames", 1, 0); av_opt_set_int(context, "refcounted_frames", 1, 0);
const auto codec = FindDecoder(context); const auto codec = FindDecoder(context);

View file

@ -282,6 +282,13 @@ const std::map<QString, Definition, std::greater<QString>> DefinitionMap {
{ "replaces", { { "replaces", {
.type = SettingType::QJsonArraySetting, .type = SettingType::QJsonArraySetting,
.limitHandler = ReplacesLimit(), }}, .limitHandler = ReplacesLimit(), }},
{ "ffmpeg_multithread", {
.type = SettingType::BoolSetting,
.defaultValue = true, }},
{ "ffmpeg_thread_count", {
.type = SettingType::IntSetting,
.defaultValue = 0,
.limitHandler = IntLimitMin(0) }},
}; };
using OldOptionKey = QString; using OldOptionKey = QString;

View file

@ -279,6 +279,10 @@ void SetupKotatoOther(
})); }));
}); });
SettingsMenuJsonSwitch(ktg_settings_ffmpeg_multithread, ffmpeg_multithread);
Ui::AddSkip(container);
Ui::AddDividerText(container, rktr("ktg_settings_ffmpeg_multithread_about"));
Ui::AddSkip(container); Ui::AddSkip(container);
} }