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

Change threads option to min_threads

Browse Source
This commit is contained in:
Cameron Gutman
2020-01-20 17:23:57 -08:00
parent 6f3927b6ae
commit 460a45268b
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
assets/sunshine.conf
View File

@@ -80,8 +80,11 @@ crf = 0
# If crf != 0, then this parameter is ignored # If crf != 0, then this parameter is ignored
qp = 28 qp = 28
# Number of threads used by ffmpeg to encode the video # Minimum number of threads used by ffmpeg to encode the video.
threads = 8 # 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.
min_threads = 2
# Allows the client to request HEVC Main or HEVC Main10 video streams. # Allows the client to request HEVC Main or HEVC Main10 video streams.
# HEVC is more CPU-intensive to encode, so enabling this may reduce performance. # HEVC is more CPU-intensive to encode, so enabling this may reduce performance.

4
sunshine/config.cpp
View File

@@ -19,7 +19,7 @@ video_t video {
35, // crf 35, // crf
35, // qp 35, // qp
4, // threads 2, // min_threads
0, // hevc_mode 0, // hevc_mode
"superfast"s, // preset "superfast"s, // preset
@@ -156,7 +156,7 @@ void parse_file(const char *file) {
int_f(vars, "crf", video.crf); int_f(vars, "crf", video.crf);
int_f(vars, "qp", video.qp); int_f(vars, "qp", video.qp);
int_f(vars, "threads", video.threads); int_f(vars, "min_threads", video.min_threads);
int_between_f(vars, "hevc_mode", video.hevc_mode, { int_between_f(vars, "hevc_mode", video.hevc_mode, {
0, 2 0, 2
}); });

2
sunshine/config.h
View File

@@ -10,7 +10,7 @@ struct video_t {
int crf; // higher == more compression and less quality int crf; // higher == more compression and less quality
int qp; // higher == more compression and less quality, ignored if crf != 0 int qp; // higher == more compression and less quality, ignored if crf != 0
int threads; // Number threads used by ffmpeg int min_threads; // Minimum number of threads/slices for CPU encoding
int hevc_mode; int hevc_mode;
std::string preset; std::string preset;

8
sunshine/video.cpp
View File

@@ -165,10 +165,12 @@ void encodeThread(
// Some client decoders have limits on the number of reference frames // Some client decoders have limits on the number of reference frames
ctx->refs = config.numRefFrames; ctx->refs = config.numRefFrames;
ctx->slices = config.slicesPerFrame; // Clients will request for the fewest slices per frame to get the
// most efficient encode, but we may want to provide more slices than
// requested to ensure we have enough parallelism for good performance.
ctx->slices = std::max(config.slicesPerFrame, config::video.min_threads);
ctx->thread_type = FF_THREAD_SLICE; ctx->thread_type = FF_THREAD_SLICE;
ctx->thread_count = std::min(ctx->slices, config::video.threads); ctx->thread_count = ctx->slices;
AVDictionary *options {nullptr}; AVDictionary *options {nullptr};
av_dict_set(&options, "preset", config::video.preset.c_str(), 0); av_dict_set(&options, "preset", config::video.preset.c_str(), 0);