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

Support Occlusion Image in AvsCamera #1155

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions avstream/avscamera/mft0/AvsCameraMFT0.rc
Expand Up @@ -11,3 +11,8 @@

#include "common.ver"

#ifndef ID_OCCLUSION_IMAGE
#define ID_OCCLUSION_IMAGE 200
#endif

ID_OCCLUSION_IMAGE RCDATA "TestImage.bmp"
Binary file added avstream/avscamera/mft0/TestImage.bmp
Binary file not shown.
Binary file modified avstream/avscamera/sys/avscamera.inx

Choose a reason for hiding this comment

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

Is this a binary file? CodeFlow and GitHub previews are confused about it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, it's just a normal text file

Copy link
Contributor

Choose a reason for hiding this comment

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

The inx files can't be rendered by GitHub. It sucks. @jasonknichel and/or @NeoAdonis and/or @zlockard : Do we have a support ticket to GitHub to fix this?

Copy link
Collaborator

Choose a reason for hiding this comment

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

@NaveenThum - git in general, and also github, don't like UTF-16 files and INFs are required to be either ASCII or UTF-16 LE with UTF-16 LE greatly preferred. git/github treat UTF-16 files as binary files instead of text files so you don't get a good diff experience. I work around this by having a local clone of the repo and manually using 'git difftool -d <commit ID from parent this PR is based on> <commit ID of latest commit in PR>' to launch my local diff client which can diff UTF-16.

@JakobL-MSFT - I'm not aware of a support ticket about this.

Copy link
Collaborator

Choose a reason for hiding this comment

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

@NaveenThum - so for this PR, if you have a local clone of the official driver sample repo, you could go there and do:

git remote add gerritsMSFT https://github.com/gerritsMSFT/Windows-driver-samples
git fetch
git fetch gerritsMSFT

then look at the branch being merged into the sample repo:
image

and do a git log on there (git log gerritsMSFT/patch-4) to find the commit it was based on, in this case:

commit b968cfb
Author: JakobL-MSFT 110699333+JakobL-MSFT@users.noreply.github.com
Date: Mon Feb 26 08:40:07 2024 -0800

and then run the diff:

git difftool -d b968cfb gerritsMSFT/patch-4

Not a great experience, but it gets you a diff of the UTF-16 files.

Binary file not shown.