Skip to content

Commit 97937f2

Browse files
committed
fix(build): align adaptive bitrate tests with NVENC SDK selection
Signed-off-by: burnrazor <128198300+Dragon-kanji@users.noreply.github.com>
1 parent 898d947 commit 97937f2

4 files changed

Lines changed: 16 additions & 6 deletions

File tree

src/nvenc/nvenc_base.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#include "nvenc_config.h"
1010
#include "nvenc_encoded_frame.h"
1111
#include "nvenc_encoder.h"
12-
#include "nvenc_sdk.h"
1312
#include "nvenc_reconfigure.h"
13+
#include "nvenc_sdk.h"
1414
#include "src/logging.h"
1515
#include "src/video.h"
1616
#include "src/video_colorspace.h"

tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ target_compile_options(${PROJECT_NAME} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${SUNSH
184184
target_link_options(${PROJECT_NAME} PRIVATE ${SUNSHINE_LINK_OPTIONS})
185185

186186
if (WIN32)
187-
target_include_directories(${PROJECT_NAME} PRIVATE "${NV_CODEC_HEADERS_13_INCLUDE_DIR}")
187+
target_include_directories(${PROJECT_NAME} BEFORE PRIVATE "${NV_CODEC_HEADERS_13_INCLUDE_DIR}")
188188

189189
# prefer static libraries since we're linking statically
190190
# this fixes libcurl linking errors when using non MSYS2 version of CMake

tests/unit/test_nvenc_dynamic_factory.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
// local includes
1919
#include "src/nvenc/nvenc_dynamic_factory.h"
20+
#include "src/video.h"
2021

2122
namespace {
2223

@@ -59,6 +60,15 @@ namespace {
5960
return true;
6061
}
6162

63+
video::bitrate_reconfigure_result_t reconfigure_bitrate(std::uint32_t target_kbps) override {
64+
return {
65+
video::bitrate_reconfigure_status_e::unsupported,
66+
0,
67+
target_kbps,
68+
0,
69+
};
70+
}
71+
6272
ID3D11Texture2D *get_input_texture() override {
6373
return nullptr;
6474
}

tests/unit/test_nvenc_reconfigure.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
#ifdef _WIN32
88

9-
#include <limits>
9+
#include <limits>
1010

11-
#define NVENC_NAMESPACE nvenc_1300
12-
#define NVENC_SDK_VERSION 1300
13-
#include <src/nvenc/nvenc_reconfigure.h>
11+
#define NVENC_NAMESPACE nvenc_1300
12+
#define NVENC_SDK_VERSION 1300
13+
#include <src/nvenc/nvenc_reconfigure.h>
1414

1515
using namespace nvenc_1300;
1616

0 commit comments

Comments
 (0)