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.

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

obs-qsv11: Remove old MSDK 1.6 code #11473

Merged
merged 3 commits into from
Nov 7, 2024

Conversation

RytoEX
Copy link
Member

@RytoEX RytoEX commented Nov 1, 2024

Description

The old MSDK 1.6 code paths were for older devices which we no longer support. Typically, version 1.0 is reported when QSV fails to initialize. The lowest version that should be supported is 1.35, so we should not need code that covers versions 1.0 to 1.6.

Motivation and Context

Don't want dead code.

How Has This Been Tested?

Tested locally on Windows 11 with an Arc A770M.

Types of changes

  • Code cleanup (non-breaking change which makes code smaller or more readable)

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.

@RytoEX RytoEX added the Code Cleanup Non-breaking change which makes code smaller or more readable label Nov 1, 2024
@RytoEX RytoEX self-assigned this Nov 1, 2024
@RytoEX RytoEX force-pushed the remove-msdk-1-6-from-qsv branch 2 times, most recently from c1e531a to e2414da Compare November 1, 2024 21:19
@RytoEX
Copy link
Member Author

RytoEX commented Nov 1, 2024

As a note, I commented out one or two lines of the frame type checking code in the first commit and then moved and uncommented it in the second commit. This is mostly to try to keep the original diff (the first commit) sane and readable, but both commits can be squashed if that makes more sense.

Copy link
Collaborator

@kkartaltepe kkartaltepe left a comment

Choose a reason for hiding this comment

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

Didnt test it, but it looks good.

The old MSDK 1.6 code paths were for older devices which we no longer
support. Typically, version 1.0 is reported when QSV fails to
initialize. The lowest version that should be supported is 1.35, so we
should not need code that covers versions 1.0 to 1.6.
The code that checked frame types was used by both the MSDK < 1.7 code
and by the debug code afterward that was conditionally enabled with a
preprocessor check. Since the frame type checks are no longer used by
user code, move it to the debug/dev code.
@RytoEX RytoEX added this to the OBS Studio 31 milestone Nov 7, 2024
@RytoEX RytoEX merged commit 110efc0 into obsproject:master Nov 7, 2024
14 checks passed
@RytoEX RytoEX deleted the remove-msdk-1-6-from-qsv branch November 7, 2024 21:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Cleanup Non-breaking change which makes code smaller or more readable
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants