-
-
Notifications
You must be signed in to change notification settings - Fork 944
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(win/nvenc): dynamic sdk version selection at runtime #3040
base: master
Are you sure you want to change the base?
Conversation
"${CMAKE_SOURCE_DIR}/src/nvenc/*.h" | ||
"${CMAKE_SOURCE_DIR}/src/nvenc/*.cpp") | ||
|
||
include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/third-party/nvenc-headers/12.0/include") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/third-party/nvenc-headers/12.0/include") | |
include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/third-party/nvenc-headers/1200/include") |
Unless I'm missing something, this path doesn't exist.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, it used what we ship with ffmpeg in this case. I will think about how to handle this best, either remove these particular headers from windows ffmpeg, or somehow use them (not trivial and may have drawbacks).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Decided to drop this "default version" logic to minimize potential problems.
One extra version of some classes will be compiled with ffmpeg version of nvenc sdk, but then discarded by the linker.
e6f32a6
to
2ae93f7
Compare
bd4995b
to
1e8dd52
Compare
Ready. Split-frame encoding will be done in a separate PR since it's a separate feature and we're now auto-squashing commits. |
1e8dd52
to
33991a3
Compare
33991a3
to
e06db26
Compare
Quality Gate failedFailed conditions See analysis details on SonarCloud Catch issues before they fail your Quality Gate with our IDE extension SonarLint |
The code in this pull request is Not a Contribution under LizardByte Individual Contributor License Agreement. |
Reopening now that the CLA has been revoked and this can now be accepted under the GPLv3 terms alone. |
Description
Notes
nv-codec-headers
tonvenc-headers
to avoid conflicts during branch switchingTodo
Screenshot
Issues Fixed or Closed
Type of Change
.github/...
)Checklist