Restore CameraControl and VideoProcAmp property support #63

Open

prgmitchell wants to merge 1 commit from prgmitchell/restoreCameraSettings into master

prgmitchell commented

2026-09-20 15:46:57 -05:00

(Migrated from github.com)

Description

Restore camera property support based on Exeldro's #37 with added validation of driver responses and property values to avoid restoring invalid settings. Although this is based on the original implementation, I have tried to simplify a bit. The original implementation was querying IDs 0-255 rather than just querying the 7 defined CameraControl properties and 10 defined VideoProcAmp properties, then accepting any non-failing Get result regardless of if GetRange succeeded. Tried to make this as safe as possible by required S_OK from both calls and rejecting unsupported IDs/modes/values. Further validation done on the win-dshow side before restoring settings as well.

Docs for reference:
CameraControlProperty
VideoProcAmpProperty

Motivation and Context

People ask for this often enough, there are even some third party tools meant to save/restore these settings for you so I wanted to try to fix it within obs-studio again.

How Has This Been Tested?

Built a version of OBS with win-dshow changes that I will be PRing as well, tested that properties were saved and restored without issues. I previously had issues with the original implementation using my Camlink so I tested the same scenario to confirm that invalid settings were no longer being restored as well.

Types of changes

New feature (non-breaking change which adds functionality)

Checklist:

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

### Description   Restore camera property support based on Exeldro's #37 with added validation of driver responses and property values to avoid restoring invalid settings. Although this is based on the original implementation, I have tried to simplify a bit. The original implementation was querying IDs 0-255 rather than just querying the 7 defined CameraControl properties and 10 defined VideoProcAmp properties, then accepting any non-failing Get result regardless of if GetRange succeeded. Tried to make this as safe as possible by required S_OK from both calls and rejecting unsupported IDs/modes/values. Further validation done on the win-dshow side before restoring settings as well. Docs for reference: [CameraControlProperty](https://learn.microsoft.com/en-us/windows/win32/api/strmif/ne-strmif-cameracontrolproperty) [VideoProcAmpProperty](https://learn.microsoft.com/en-us/windows/win32/api/strmif/ne-strmif-videoprocampproperty) ### Motivation and Context    People ask for this often enough, there are even some third party tools meant to save/restore these settings for you so I wanted to try to fix it within obs-studio again. ### How Has This Been Tested?    Built a version of OBS with win-dshow changes that I will be PRing as well, tested that properties were saved and restored without issues. I previously had issues with the original implementation using my Camlink so I tested the same scenario to confirm that invalid settings were no longer being restored as well. ### Types of changes   - New feature (non-breaking change which adds functionality)      ### Checklist:   - [x] I have read the [**contributing** document](https://github.com/obsproject/obs-studio/blob/master/CONTRIBUTING.md). - [x] My code has been run through [clang-format](https://github.com/obsproject/obs-studio/blob/master/.clang-format). - [x] My code follows the project's [**style guidelines**](https://github.com/obsproject/obs-studio/blob/master/CODESTYLE.md) - [x] My code is not on the master branch. - [x] My code has been tested. - [x] All commit messages are properly formatted and commits squashed where appropriate. - [x] I have included updates to all appropriate documentation.

This pull request is broken due to missing fork information.

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin 'prgmitchell/restoreCameraSettings:prgmitchell/restoreCameraSettings'

git switch 'prgmitchell/restoreCameraSettings'

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch 'master'

git merge --no-ff 'prgmitchell/restoreCameraSettings'

git switch 'prgmitchell/restoreCameraSettings'

git rebase 'master'

git switch 'master'

git merge --ff-only 'prgmitchell/restoreCameraSettings'

git switch 'prgmitchell/restoreCameraSettings'

git rebase 'master'

git switch 'master'

git merge --no-ff 'prgmitchell/restoreCameraSettings'

git switch 'master'

git merge --squash 'prgmitchell/restoreCameraSettings'