Skip to content
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.

Sign up for GitHub

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

Jump to bottom

obs-ffmpeg: Fix VAAPI/NVENC ifdefs #11137

Merged
merged 1 commit into from
Aug 16, 2024
Merged

obs-ffmpeg: Fix VAAPI/NVENC ifdefs #11137

merged 1 commit into from
Aug 16, 2024

Conversation

viric
Copy link
Contributor

@viric viric commented Aug 15, 2024 •
edited
Loading

Somehow VAAPI was under NVENC, so disabled if no NVENC.

Description

Fix use of VAAPI when NVENC is not enabled.

Motivation and Context

VAAPI was disabled if NVENC was disabled, and they are unrelated.

How Has This Been Tested?

Tested on my NixOS 24.05.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)

Checklist:

  • My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the master branch.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • I have included updates to all appropriate documentation.

@tytan652
Copy link
Collaborator

tytan652 commented Aug 15, 2024 •
edited
Loading

Read the contributing document, follow the commit guidelines (use force push when fixing the commit name).
Otherwise the PR might be closed even if the fix is correct.

@tytan652
Copy link
Collaborator

Somehow VAAPI was under NVENC, so disabled if no NVENC.

"Somehow" is a bad wording, af555b9 from #10536 which refactored NVENC did introduce the issue.

I think the description in the commit should be removed or improved.

@viric
Copy link
Contributor Author

viric commented Aug 15, 2024

agreed. Updated.

@viric
obs-ffmpeg: Fix VAAPI/NVENC ifdefs
f3b73e4 
VAAPI init was under NVENC clauses, so it was disabled if no NVENC.

That was introduced in af555b9
from obsproject#10536, which refactored NVENC.
tytan652
tytan652 approved these changes Aug 15, 2024
View reviewed changes
Copy link
Collaborator

@tytan652 tytan652 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@tytan652 tytan652 added Bug Fix Non-breaking change which fixes an issue Linux Affects Linux labels Aug 15, 2024
@tytan652 tytan652 added this to the OBS Studio 31 milestone Aug 15, 2024
RytoEX
RytoEX approved these changes Aug 16, 2024
View reviewed changes
Copy link
Member

@RytoEX RytoEX left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@RytoEX RytoEX changed the title Fix obs-ffmpeg VAAPI ifdef obs-ffmpeg: Fix VAAPI/NVENC ifdefs Aug 16, 2024
@RytoEX RytoEX merged commit 7c85253 into obsproject:master Aug 16, 2024
15 checks passed
@viric viric deleted the fix-vaapi-ifdef branch August 17, 2024 08:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tytan652 tytan652 tytan652 approved these changes

@RytoEX RytoEX RytoEX approved these changes

@kkartaltepe kkartaltepe kkartaltepe approved these changes

Assignees
No one assigned
Labels
Bug Fix Non-breaking change which fixes an issue Linux Affects Linux
Projects
None yet
Milestone
OBS Studio 31.0
Development

Successfully merging this pull request may close these issues.
4 participants
@viric @tytan652 @kkartaltepe @RytoEX