jyapayne/Sunshine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into surround

Browse source
This commit is contained in:
loki 2021-05-20 11:02:26 +02:00
commit cb101eca16
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sunshine/platform/windows/input.cpp
View file

@ -2,11 +2,14 @@
#include <iomanip> #include <iomanip>
#include <sstream> #include <sstream>
// prevent clang format from "optimizing" the header include order
// clang-format off
#include <winsock2.h>
#include <iphlpapi.h> #include <iphlpapi.h>
#include <windows.h> #include <windows.h>
#include <winsock2.h>
#include <winuser.h> #include <winuser.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
// clang-format on
#include <ViGEm/Client.h> #include <ViGEm/Client.h>

1
sunshine/video.cpp
View file

@ -315,6 +315,7 @@ static encoder_t software {
// 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.
{ {
{ "forced-idr"s, 1 },
{ "x265-params"s, "info=0:keyint=-1"s }, { "x265-params"s, "info=0:keyint=-1"s },
{ "preset"s, &config::video.sw.preset }, { "preset"s, &config::video.sw.preset },
{ "tune"s, &config::video.sw.tune } }, { "tune"s, &config::video.sw.tune } },