Skip to content

videoio(dshow) fix incompatible media type left set on video device#20210

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
kstuedem:fix_invalid_media_type
Jun 5, 2021
Merged

videoio(dshow) fix incompatible media type left set on video device#20210
opencv-pushbot merged 1 commit intoopencv:3.4from
kstuedem:fix_invalid_media_type

Conversation

@kstuedem
Copy link
Copy Markdown
Contributor

@kstuedem kstuedem commented Jun 3, 2021

setSizeAndSubtype didn't reset VD->pAmMediaType to the original value when SetFormat fails even though the value is used in multiple places afterwards.

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
  • The PR is proposed to proper branch
  • There is reference to original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake

@asmorkalov asmorkalov added category: videoio bug pr: needs rebase Rebase patch (and squash fixup commits) on the top of target branch labels Jun 4, 2021
@asmorkalov
Copy link
Copy Markdown
Contributor

asmorkalov commented Jun 4, 2021

Thanks for the nice catch! This patch should go into 3.4 branch first. We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

So, please:

  • change "base" branch of this PR: master => 3.4 (use "Edit" button near PR title)
  • rebase your commits from master onto 3.4 branch. For example:
    git rebase -i --onto upstream/3.4 upstream/master
    (check list of your commits, save and quit (Esc + "wq" + Enter)
    where upstream is configured by following this GitHub guide and fetched (git fetch upstream).
  • push rebased commits into source branch of your fork (with --force option)

Note: no need to re-open PR, apply changes "inplace".

@kstuedem kstuedem changed the base branch from master to 3.4 June 4, 2021 08:44
@kstuedem kstuedem force-pushed the fix_invalid_media_type branch from 68a973f to 636db09 Compare June 4, 2021 08:46
@asmorkalov asmorkalov removed the pr: needs rebase Rebase patch (and squash fixup commits) on the top of target branch label Jun 4, 2021
alalek
alalek approved these changes Jun 5, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

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

Thank you 👍

@opencv-pushbot opencv-pushbot merged commit d332f33 into opencv:3.4 Jun 5, 2021
This was referenced Jun 7, 2021
Merged
Merged
@alalek alalek mentioned this pull request Oct 15, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

Assignees

@alalek alalek

Labels

bug category: videoio

Projects

None yet

Milestone

3.4.15

Development

Successfully merging this pull request may close these issues.

4 participants

@kstuedem @asmorkalov @alalek @opencv-pushbot