izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set a automatic value for min_fps_target

Browse Source 
resolves #942
resolves #956
resolves #982
This commit is contained in:
Yukino Song
2025-08-06 17:31:30 +08:00
parent 6c955482d9
commit d25f24131c
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/video.cpp
View File

@@ -1923,9 +1923,8 @@ namespace video {
});
// set max frame time based on client-requested target framerate.
double minimum_fps_target = (config::video.minimum_fps_target > 0.0) ? config::video.minimum_fps_target * 1000 : config.encodingFramerate;
double minimum_fps_target = (config::video.minimum_fps_target > 0.0) ? config::video.minimum_fps_target * 1000 : std::max(config.encodingFramerate / 5, 10000);
auto max_frametime = std::chrono::nanoseconds(1000ms) * 1000 / minimum_fps_target;
// auto max_frametime = std::chrono::nanoseconds(1000ms) * 1000 / config.encodingFramerate;
auto encode_frame_threshold = std::chrono::nanoseconds(1000ms) * 1000 / config.encodingFramerate;
auto frame_variation_threshold = encode_frame_threshold / 4;
auto min_frame_diff = encode_frame_threshold - frame_variation_threshold;

4
src_assets/common/assets/web/public/assets/locale/en.json
View File

@@ -340,9 +340,9 @@
"log_path": "Logfile Path",
"log_path_desc": "The file where the current logs of Apollo are stored.",
"max_bitrate": "Maximum Bitrate",
"max_bitrate_desc": "The maximum bitrate (in Kbps) that Apollo will encode the stream at. If set to 0, it will always use the bitrate requested by Artemis/Moonlight.",
"max_bitrate_desc": "The maximum bitrate (in Kbps) that Apollo will encode the stream at. If set to 0, it will always use the bitrate requested by the client.",
"minimum_fps_target": "Minimum FPS Target",
"minimum_fps_target_desc": "The lowest effective FPS a stream can reach. A value of 0 is treated as roughly half of the stream's FPS. A setting of 20 is recommended if you stream 24 or 30fps content.",
"minimum_fps_target_desc": "The lowest effective FPS a stream can reach. Set 0 for automatic.",
"min_threads": "Minimum CPU Thread Count",
"min_threads_desc": "Increasing the value slightly reduces encoding efficiency, but the tradeoff is usually worth it to gain the use of more CPU cores for encoding. The ideal value is the lowest value that can reliably encode at your desired streaming settings on your hardware.",
"misc": "Miscellaneous options",

4
src_assets/common/assets/web/public/assets/locale/zh.json
View File

@@ -334,6 +334,10 @@
"log_level_desc": "打印到标准输出的最小日志级别",
"log_path": "日志文件路径",
"log_path_desc": "Apollo 当前日志存储的文件。",
"max_bitrate": "最大比特率",
"max_bitrate_desc": "限制 Apollo 所编码的最大比特率 (Kbps)。 设 0 则总是使用客户端请求的值。",
"minimum_fps_target": "最低 FPS 目标",
"minimum_fps_target_desc": "设置最低的有效编码帧率。设 0 为自动。",
"min_threads": "最低 CPU 线程数",
"min_threads_desc": "提高该值会略微降低编码效率，但为了获得更多的 CPU 内核用于编码，通常是值得的。理想值是在您的硬件配置上以所需的串流设置进行可靠编码的最低值。",
"misc": "杂项选项",