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

Add abillity to supply options for specific encoders

Browse Source
This commit is contained in:
loki
2020-03-31 23:46:41 +02:00
parent 3ceb9b37a0
commit 456d33cf77
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sunshine/video.cpp
View File

@@ -48,7 +48,7 @@ void nv_d3d_img_to_frame(sws_t &sws, platf::img_t &img, frame_t &frame);
struct encoder_t { struct encoder_t {
struct option_t { struct option_t {
std::string name; std::string name;
util::Either<std::int64_t, std::string> value; std::variant<int, int*, std::string, std::string*> value;
}; };
struct { struct {
@@ -109,10 +109,17 @@ static encoder_t software {
// kicked to the 2nd packet in the frame, breaking Moonlight's parsing logic. // kicked to the 2nd packet in the frame, breaking Moonlight's parsing logic.
// It also looks like gop_size isn't passed on to x265, so we have to set // It also looks like gop_size isn't passed on to x265, so we have to set
// 'keyint=-1' in the parameters ourselves. // 'keyint=-1' in the parameters ourselves.
{{ "x265-params"s, "info=0:keyint=-1"s }}, "libx265"s {
{ "x265-params"s, "info=0:keyint=-1"s },
{ "preset"s, &config::video.preset },
{ "tune"s, &config::video.tune }
}, "libx265"s
}, },
{ {
{{}}, "libx264"s {
{ "preset"s, &config::video.preset },
{ "tune"s, &config::video.tune }
}, "libx264"s
}, },
true, true,
@@ -286,7 +293,6 @@ util::Either<buffer_t, int> hwdevice_ctx(AVHWDeviceType type) {
AVBufferRef *ref; AVBufferRef *ref;
auto err = av_hwdevice_ctx_create(&ref, type, nullptr, nullptr, 0); auto err = av_hwdevice_ctx_create(&ref, type, nullptr, nullptr, 0);
// auto err = av_hwdevice_ctx_create(&ref, type, "/dev/dri/renderD129", nullptr, 0);
ctx.reset(ref); ctx.reset(ref);
if(err < 0) { if(err < 0) {
@@ -484,12 +490,12 @@ std::optional<session_t> make_session(const encoder_t &encoder, const config_t
AVDictionary *options {nullptr}; AVDictionary *options {nullptr};
for(auto &option : video_format.options) { for(auto &option : video_format.options) {
if(option.value.has_left()) { std::visit(util::overloaded {
av_dict_set_int(&options, option.name.c_str(), option.value.left(), 0); [&](int v) { av_dict_set_int(&options, option.name.c_str(), v, 0); },
} [&](int *v) { av_dict_set_int(&options, option.name.c_str(), *v, 0); },
else { [&](const std::string &v) { av_dict_set(&options, option.name.c_str(), v.c_str(), 0); },
av_dict_set(&options, option.name.c_str(), option.value.right().c_str(), 0); [&](std::string *v) { av_dict_set(&options, option.name.c_str(), v->c_str(), 0); }
} }, option.value);
} }
if(config.bitrate > 500) { if(config.bitrate > 500) {