FFmpeg 5 and pre-built CBS

CMakeLists.txt

@@ -401,6 +401,8 @@ endif()
 set(FFMPEG_LIBRARIES
 	${FFMPEG_PREPARED_BINARIES}/lib/libavcodec.a
 	${FFMPEG_PREPARED_BINARIES}/lib/libavutil.a
+	${FFMPEG_PREPARED_BINARIES}/lib/libcbs.a
+	${FFMPEG_PREPARED_BINARIES}/lib/libSvtAv1Enc.a
 	${FFMPEG_PREPARED_BINARIES}/lib/libswscale.a
 	${FFMPEG_PREPARED_BINARIES}/lib/libx264.a
 	${FFMPEG_PREPARED_BINARIES}/lib/libx265.a
@@ -410,15 +412,12 @@ set(FFMPEG_LIBRARIES
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/third-party
-  ${CMAKE_CURRENT_SOURCE_DIR}/third-party/cbs/include
   ${CMAKE_CURRENT_SOURCE_DIR}/third-party/moonlight-common-c/enet/include
   ${CMAKE_CURRENT_SOURCE_DIR}/third-party/moonlight-common-c/reedsolomon
   ${FFMPEG_INCLUDE_DIRS}
   ${PLATFORM_INCLUDE_DIRS}
 )
 
-add_subdirectory(third-party/cbs)
-
 string(TOUPPER "x${CMAKE_BUILD_TYPE}" BUILD_TYPE)
 if("${BUILD_TYPE}" STREQUAL "XDEBUG")
 	list(APPEND SUNSHINE_COMPILE_OPTIONS -O0 -ggdb3)
@@ -446,13 +445,8 @@ else()
 endif()
 list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_ASSETS_DIR="${SUNSHINE_ASSETS_DIR_DEF}")
 
-
-list(APPEND CBS_EXTERNAL_LIBRARIES
-	cbs)
-
 list(APPEND SUNSHINE_EXTERNAL_LIBRARIES
 		libminiupnpc-static
-		${CBS_EXTERNAL_LIBRARIES}
 		${CMAKE_THREAD_LIBS_INIT}
 		enet
 		opus

docs/source/about/advanced_usage.rst

@@ -958,7 +958,7 @@ amd_rc
    Value       Description
    =========== ===========
    auto        let ffmpeg decide
-   constqp     constant QP mode
+   cqp         constant QP mode
    cbr         constant bitrate
    vbr_latency variable bitrate, latency constrained
    vbr_peak    variable bitrate, peak constrained

src/cbs.cpp

@@ -1,7 +1,7 @@
 extern "C" {
 #include <cbs/cbs_h264.h>
 #include <cbs/cbs_h265.h>
-#include <cbs/video_levels.h>
+#include <cbs/h264_levels.h>
 #include <libavcodec/avcodec.h>
 #include <libavutil/pixdesc.h>
 }

src/config.cpp

@@ -103,14 +103,14 @@ enum quality_e : int {
 };
 
 enum class rc_hevc_e : int {
-  constqp,     /**< Constant QP mode */
+  cqp,         /**< Constant QP mode */
   vbr_latency, /**< Latency Constrained Variable Bitrate */
   vbr_peak,    /**< Peak Constrained Variable Bitrate */
   cbr,         /**< Constant bitrate mode */
 };
 
 enum class rc_h264_e : int {
-  constqp,     /**< Constant QP mode */
+  cqp,         /**< Constant QP mode */
   cbr,         /**< Constant bitrate mode */
   vbr_peak,    /**< Peak Constrained Variable Bitrate */
   vbr_latency, /**< Latency Constrained Variable Bitrate */
@@ -135,7 +135,7 @@ std::optional<quality_e> quality_from_view(const std::string_view &quality) {
 std::optional<int> rc_h264_from_view(const std::string_view &rc) {
 #define _CONVERT_(x) \
   if(rc == #x##sv) return (int)rc_h264_e::x
-  _CONVERT_(constqp);
+  _CONVERT_(cqp);
   _CONVERT_(vbr_latency);
   _CONVERT_(vbr_peak);
   _CONVERT_(cbr);
@@ -146,7 +146,7 @@ std::optional<int> rc_h264_from_view(const std::string_view &rc) {
 std::optional<int> rc_hevc_from_view(const std::string_view &rc) {
 #define _CONVERT_(x) \
   if(rc == #x##sv) return (int)rc_hevc_e::x
-  _CONVERT_(constqp);
+  _CONVERT_(cqp);
   _CONVERT_(vbr_latency);
   _CONVERT_(vbr_peak);
   _CONVERT_(cbr);

src_assets/common/assets/web/config.html

@@ -700,7 +700,7 @@ <h1 class="my-4">Configuration</h1>
         <label for="amd_rc" class="form-label">AMD AMF Rate Control</label>
         <select id="amd_rc" class="form-select" v-model="config.amd_rc">
           <option value="auto">auto -- let ffmpeg decide rate control</option>
-          <option value="constqp">constqp -- constant QP mode</option>
+          <option value="cqp">cqp -- constant QP mode</option>
           <option value="vbr_latency">vbr_latency -- Latency Constrained Variable Bitrate</option>
           <option value="vbr_peak">vbr_peak -- Peak Contrained Variable Bitrate</option>
           <option value="cbr">cbr -- constant bitrate</option>