diff --git a/assets/sunshine.conf b/assets/sunshine.conf index 356acd79..12377eda 100644 --- a/assets/sunshine.conf +++ b/assets/sunshine.conf @@ -183,13 +183,11 @@ # amd_preset = balanced # ####### rate control ##### -# auto -- let ffmpeg decide rate control -# constqp -- constant QP mode -# vbr -- variable bitrate -# cbr -- constant bitrate -# cbr_hq -- cbr high quality -# cbr_ld_hq -- cbr low delay high quality -# vbr_hq -- vbr high quality +# auto -- let ffmpeg decide rate control +# constqp -- constant QP mode +# vbr_latency -- Latency Constrained Variable Bitrate +# vbr_peak -- Peak Contrained Variable Bitrate +# cbr -- constant bitrate ########################## # amd_rc = auto diff --git a/sunshine/config.cpp b/sunshine/config.cpp index 88cc4502..9408578c 100644 --- a/sunshine/config.cpp +++ b/sunshine/config.cpp @@ -94,12 +94,10 @@ enum quality_e : int { }; enum rc_e : int { - constqp = 0x0, /**< Constant QP mode */ - vbr = 0x1, /**< Variable bitrate mode */ - cbr = 0x2, /**< Constant bitrate mode */ - cbr_ld_hq = 0x8, /**< low-delay CBR, high quality */ - cbr_hq = 0x10, /**< CBR, high quality (slower) */ - vbr_hq = 0x20 /**< VBR, high quality (slower) */ + constqp, /**< Constant QP mode */ + vbr_latency, /**< Latency Constrained Variable Bitrate */ + vbr_peak, /**< Peak Contrained Variable Bitrate */ + cbr, /**< Constant bitrate mode */ }; enum coder_e : int { @@ -121,11 +119,9 @@ std::optional quality_from_view(const std::string_view &quality) { std::optional rc_from_view(const std::string_view &rc) { #define _CONVERT_(x) if(rc == #x##sv) return x _CONVERT_(constqp); - _CONVERT_(vbr); + _CONVERT_(vbr_latency); + _CONVERT_(vbr_peak); _CONVERT_(cbr); - _CONVERT_(cbr_hq); - _CONVERT_(vbr_hq); - _CONVERT_(cbr_ld_hq); #undef _CONVERT_ return std::nullopt; }