From 95002b167e07b8d8c2da00d56142ccbe9b03e78a Mon Sep 17 00:00:00 2001 From: Gerrit Swaneveld Date: Tue, 6 Dec 2022 15:23:19 -0800 Subject: [PATCH 1/5] Remove invalid INF DeviceInstall32 Removes from the sample an invalid API call. --- general/SimpleMediaSource/README.md | 7 +++++-- .../SimpleMediaSourceDriver.inf | Bin 8500 -> 7650 bytes 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/general/SimpleMediaSource/README.md b/general/SimpleMediaSource/README.md index 4467f16b2..2fd109d0d 100644 --- a/general/SimpleMediaSource/README.md +++ b/general/SimpleMediaSource/README.md @@ -27,6 +27,9 @@ For more information, see the accompanying documentation at [Frame Server Custom 1. Deploy the driver package with the following command: - `devcon dp_add SimpleMediaSourceDriver.inf` + `devgen /add /bus ROOT /hardwareid root\SimpleMediaSource /compatibleid root\SimpleMediaSource` + `pnputil /add-driver SimpleMediaSourceDriver.inf` -1. In Device Manager, locate **SimpleMediaSource Capture Source**, under the Camera category. Open the Microsoft Camera App, switch cameras if necessary until the camera is streaming from the SimpleMediaSource. You should see a scrolling black and white gradient. +1. In Device Manager, locate **SimpleMediaSource Capture Source**, under the Camera category. If it is not present, locate **Unknown Device**, under Other devices category and choose to Update Driver. Search Automatically for Driver should update the device to SimpleMediaSource Capture Source, under the Camera category. + +1. Open the Microsoft Camera App, switch cameras if necessary until the camera is streaming from the SimpleMediaSource. You should see a scrolling black and white gradient. diff --git a/general/SimpleMediaSource/SimpleMediaSourceDriver/SimpleMediaSourceDriver.inf b/general/SimpleMediaSource/SimpleMediaSourceDriver/SimpleMediaSourceDriver.inf index dabb3237f014ed26cb807f63ce133fa01b47bf60..127e8e725e43b41bc96dc86d0882d7d93e3befa8 100644 GIT binary patch delta 12 Tcmdnu^vHTc7yITrToGabCwv85 delta 384 zcmaE4y~Sxm7dxZ%WJU?;$pR8=zMc$u48;s342cXmK&Swui@~G(b2!ktw6;PcEkgdP~5m8|9 z1hSkNd>BH3;;umP5C#vRSTK;~22>XWq#c3S14sq|RfL0SkUAG2-;*H>s3(X)aWW%& zzoiS3{iwb$W-wxi1-r-*=*kqJUW7{(7;GocWz}caVbGb}&#o*V4>S+rPh?f`K)b-< qGI_0tzAauAP@6n}AyWjjs~k+H0`;eWLlR_L Date: Thu, 12 Jan 2023 12:09:41 -0800 Subject: [PATCH 2/5] Update to SimpleMediaSource.inf Fixes to use public installation path --- general/SimpleMediaSource/README.md | 8 +++++--- .../SimpleMediaSourceDriver.inf | Bin 7650 -> 6712 bytes 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/general/SimpleMediaSource/README.md b/general/SimpleMediaSource/README.md index 2fd109d0d..baa17a301 100644 --- a/general/SimpleMediaSource/README.md +++ b/general/SimpleMediaSource/README.md @@ -27,9 +27,11 @@ For more information, see the accompanying documentation at [Frame Server Custom 1. Deploy the driver package with the following command: - `devgen /add /bus ROOT /hardwareid root\SimpleMediaSource /compatibleid root\SimpleMediaSource` - `pnputil /add-driver SimpleMediaSourceDriver.inf` + `devgen /add /bus ROOT /hardwareid root\SimpleMediaSource` + `pnputil /add-driver SimpleMediaSourceDriver.inf /install` -1. In Device Manager, locate **SimpleMediaSource Capture Source**, under the Camera category. If it is not present, locate **Unknown Device**, under Other devices category and choose to Update Driver. Search Automatically for Driver should update the device to SimpleMediaSource Capture Source, under the Camera category. +1. Verify installation with Device Manager, locate **SimpleMediaSource Capture Source**, under the Camera category. If device does not appear there, check %windir%\inf\setupapi.dev.log for installation logs. The device instance ID will be available as the output of the devgen command and can be used as input to pnputil to determine status of the device. + + `pnputil /enum-devices /instanceid "" /deviceids /services /stack /drivers` 1. Open the Microsoft Camera App, switch cameras if necessary until the camera is streaming from the SimpleMediaSource. You should see a scrolling black and white gradient. diff --git a/general/SimpleMediaSource/SimpleMediaSourceDriver/SimpleMediaSourceDriver.inf b/general/SimpleMediaSource/SimpleMediaSourceDriver/SimpleMediaSourceDriver.inf index 127e8e725e43b41bc96dc86d0882d7d93e3befa8..e2d228fe8600e10b2012d4388381865c6b066fc6 100644 GIT binary patch delta 402 zcmaE4y~AWf3!}6VgFb@+gC&qO0@6l6r~{<+7z`NiP&SQ$mw}7H4=9@o zR8x$h#*ZOnvpw5Ic1|S*Rgl>Xs*@8%RVOcy<(u5Zn=^S2U)$taqFj?>xYU65TTFHm zm=;bIOM%V{20E#Tp$zEEWFV_}vZH_|vj;=?u@Jv!NDpv(BSIQ(n1qajL8>c zlX7=7a;QKoqu&edg!>OhKOdIoj!wmw=vhaN2&>$+!UCRP5zCybsG!8P%y}8}WKoiLjuzjoDDGbTO>drAT8yc3-e3-O z?h3d^9;!}do&~c|m2EQLw9lqUzCnaVv{}Ip?OJ?TLp>h;>C^Lt4LUv6E=5vuDN>72 zTP#QoYa}R0Q6NRQms%u6^Y4}^jS?hxmq_a#N=Yyu#jm2-I-LE-0(pH}B29<-Ixv;W zv{G*^kBA``5@*g1Ng3?I6dw64ZznE=PMbPOmzKZM zRK21f`RPPPZjYbrC5K=BxvI{#nBGuL)!oB{J9wrG8tip}F25?J1XsUuf(3WIuNt-I zgI(ico8u{iIl4^$*Q0 Date: Wed, 8 Feb 2023 15:38:39 -0800 Subject: [PATCH 3/5] Fix to Public Samples to be Windows Drivers compliant Update AvsCamera, AvsCameraMFT0, Avshws, Avsamp, and MultipinMFT samples to be Windows Driver Compliant --- avstream/avscamera/mft0/AvsCameraMft0.vcxproj | 8 +- avstream/avscamera/sys/AvsCamera.vcxproj | 10 +- .../avscamera/sys/AvsCamera.vcxproj.Filters | 130 ++++++++++++++++++ avstream/avscamera/sys/avscamera.inx | Bin 25260 -> 25302 bytes avstream/avshws/avshws.vcxproj | 16 +-- avstream/avshws/avshws.vcxproj.Filters | 25 ++++ avstream/avssamp/avssamp.vcxproj | 8 +- avstream/avssamp/avssamp.vcxproj.Filters | 18 +++ avstream/sampledevicemft/multipinmft.vcxproj | 8 +- 9 files changed, 198 insertions(+), 25 deletions(-) diff --git a/avstream/avscamera/mft0/AvsCameraMft0.vcxproj b/avstream/avscamera/mft0/AvsCameraMft0.vcxproj index 518a324f4..f1c67d95a 100644 --- a/avstream/avscamera/mft0/AvsCameraMft0.vcxproj +++ b/avstream/avscamera/mft0/AvsCameraMft0.vcxproj @@ -31,7 +31,7 @@ Windows10 False - Universal + Windows Driver WindowsApplicationForDrivers10.0 DynamicLibrary @@ -39,7 +39,7 @@ Windows10 True - Universal + Windows Driver WindowsApplicationForDrivers10.0 DynamicLibrary @@ -47,7 +47,7 @@ Windows10 False - Universal + Windows Driver WindowsApplicationForDrivers10.0 DynamicLibrary @@ -55,7 +55,7 @@ Windows10 True - Universal + Windows Driver WindowsApplicationForDrivers10.0 DynamicLibrary diff --git a/avstream/avscamera/sys/AvsCamera.vcxproj b/avstream/avscamera/sys/AvsCamera.vcxproj index 5456ee7ac..74cada21f 100644 --- a/avstream/avscamera/sys/AvsCamera.vcxproj +++ b/avstream/avscamera/sys/AvsCamera.vcxproj @@ -31,7 +31,7 @@ Windows10 False - Universal + Windows Driver WDM WindowsKernelModeDriver10.0 Driver @@ -39,7 +39,7 @@ Windows10 True - Universal + Windows Driver WDM WindowsKernelModeDriver10.0 Driver @@ -47,7 +47,7 @@ Windows10 False - Universal + Windows Driver WDM WindowsKernelModeDriver10.0 Driver @@ -55,7 +55,7 @@ Windows10 True - Universal + Windows Driver WDM WindowsKernelModeDriver10.0 Driver @@ -256,4 +256,4 @@ - + \ No newline at end of file diff --git a/avstream/avscamera/sys/AvsCamera.vcxproj.Filters b/avstream/avscamera/sys/AvsCamera.vcxproj.Filters index 8d9ec4698..09df046c0 100644 --- a/avstream/avscamera/sys/AvsCamera.vcxproj.Filters +++ b/avstream/avscamera/sys/AvsCamera.vcxproj.Filters @@ -97,10 +97,140 @@ Source Files + + Source Files + Resource Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Driver Files + + \ No newline at end of file diff --git a/avstream/avscamera/sys/avscamera.inx b/avstream/avscamera/sys/avscamera.inx index f6f1e8469a320d21f701e534f321183d6fb87646..a8507243c6237c2440ccc5fd1b857fea180cf259 100644 GIT binary patch delta 90 zcmZ2;l=0e8#ti|X!a)o=49*NW42cZIK$r@|F_UA%R3}%3TH%m$o%}B}3Y*;K*f4({ E0DD*%C;$Ke delta 48 scmcb1lyS{b#ti|Xtj-KU3_6qB!&E1Cgj&IQu9Kz0q9DA@?P2~r0FeF;@&Et; diff --git a/avstream/avshws/avshws.vcxproj b/avstream/avshws/avshws.vcxproj index 407048b73..11fb4c396 100644 --- a/avstream/avshws/avshws.vcxproj +++ b/avstream/avshws/avshws.vcxproj @@ -45,7 +45,7 @@ Windows10 False - Universal + Windows Driver WDM WindowsKernelModeDriver10.0 Driver @@ -53,7 +53,7 @@ Windows10 True - Universal + Windows Driver WDM WindowsKernelModeDriver10.0 Driver @@ -61,7 +61,7 @@ Windows10 False - Universal + Windows Driver WDM WindowsKernelModeDriver10.0 Driver @@ -69,7 +69,7 @@ Windows10 False - Universal + Windows Driver WDM WindowsKernelModeDriver10.0 Driver @@ -77,7 +77,7 @@ Windows10 False - Universal + Windows Driver WDM WindowsKernelModeDriver10.0 Driver @@ -85,7 +85,7 @@ Windows10 True - Universal + Windows Driver WDM WindowsKernelModeDriver10.0 Driver @@ -93,7 +93,7 @@ Windows10 True - Universal + Windows Driver WDM WindowsKernelModeDriver10.0 Driver @@ -101,7 +101,7 @@ Windows10 True - Universal + Windows Driver WDM WindowsKernelModeDriver10.0 Driver diff --git a/avstream/avshws/avshws.vcxproj.Filters b/avstream/avshws/avshws.vcxproj.Filters index 4e32a73fd..9695d6212 100644 --- a/avstream/avshws/avshws.vcxproj.Filters +++ b/avstream/avshws/avshws.vcxproj.Filters @@ -43,4 +43,29 @@ Resource Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Driver Files + + \ No newline at end of file diff --git a/avstream/avssamp/avssamp.vcxproj b/avstream/avssamp/avssamp.vcxproj index 58d7992df..dfe36af75 100644 --- a/avstream/avssamp/avssamp.vcxproj +++ b/avstream/avssamp/avssamp.vcxproj @@ -29,7 +29,7 @@ Windows10 False - Universal + Windows Driver WDM WindowsKernelModeDriver10.0 Driver @@ -37,7 +37,7 @@ Windows10 True - Universal + Windows Driver WDM WindowsKernelModeDriver10.0 Driver @@ -45,7 +45,7 @@ Windows10 False - Universal + Windows Driver WDM WindowsKernelModeDriver10.0 Driver @@ -53,7 +53,7 @@ Windows10 True - Universal + Windows Driver WDM WindowsKernelModeDriver10.0 Driver diff --git a/avstream/avssamp/avssamp.vcxproj.Filters b/avstream/avssamp/avssamp.vcxproj.Filters index 8d3458319..59e3582b9 100644 --- a/avstream/avssamp/avssamp.vcxproj.Filters +++ b/avstream/avssamp/avssamp.vcxproj.Filters @@ -71,6 +71,24 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + diff --git a/avstream/sampledevicemft/multipinmft.vcxproj b/avstream/sampledevicemft/multipinmft.vcxproj index f13ed67d6..a236b1adc 100644 --- a/avstream/sampledevicemft/multipinmft.vcxproj +++ b/avstream/sampledevicemft/multipinmft.vcxproj @@ -30,7 +30,7 @@ Windows10 False - Universal + Windows Driver WindowsApplicationForDrivers10.0 DynamicLibrary @@ -38,7 +38,7 @@ Windows10 True - Universal + Windows Driver WindowsApplicationForDrivers10.0 DynamicLibrary @@ -46,7 +46,7 @@ Windows10 False - Universal + Windows Driver WindowsApplicationForDrivers10.0 DynamicLibrary @@ -54,7 +54,7 @@ Windows10 True - Universal + Windows Driver WindowsApplicationForDrivers10.0 DynamicLibrary From f6769f44db8fd77da7b07d3c18d085aa0c4d7b58 Mon Sep 17 00:00:00 2001 From: Gerrit Swaneveld Date: Wed, 8 Feb 2023 16:36:14 -0800 Subject: [PATCH 4/5] Filters Edit Fix Filters files autogenerated by VS --- .../avscamera/sys/AvsCamera.vcxproj.Filters | 119 +----------------- avstream/avshws/avshws.vcxproj.Filters | 17 +-- avstream/avssamp/avssamp.vcxproj.Filters | 38 +----- 3 files changed, 3 insertions(+), 171 deletions(-) diff --git a/avstream/avscamera/sys/AvsCamera.vcxproj.Filters b/avstream/avscamera/sys/AvsCamera.vcxproj.Filters index 09df046c0..1c346b6c2 100644 --- a/avstream/avscamera/sys/AvsCamera.vcxproj.Filters +++ b/avstream/avscamera/sys/AvsCamera.vcxproj.Filters @@ -1,4 +1,4 @@ - + @@ -110,123 +110,6 @@ Header Files - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - diff --git a/avstream/avshws/avshws.vcxproj.Filters b/avstream/avshws/avshws.vcxproj.Filters index 9695d6212..bc11045f2 100644 --- a/avstream/avshws/avshws.vcxproj.Filters +++ b/avstream/avshws/avshws.vcxproj.Filters @@ -1,4 +1,4 @@ - + @@ -47,21 +47,6 @@ Header Files - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - diff --git a/avstream/avssamp/avssamp.vcxproj.Filters b/avstream/avssamp/avssamp.vcxproj.Filters index 59e3582b9..5a9d5e00b 100644 --- a/avstream/avssamp/avssamp.vcxproj.Filters +++ b/avstream/avssamp/avssamp.vcxproj.Filters @@ -1,4 +1,4 @@ - + @@ -53,42 +53,6 @@ Header Files - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - From 4905672187780ad9173bcec81f79934f078ef955 Mon Sep 17 00:00:00 2001 From: Gerrit Swaneveld Date: Wed, 26 Jun 2024 14:32:56 -0700 Subject: [PATCH 5/5] Update avscamera.inx Update AVSCamera.inx to use AddComClass/AddComServer --- avstream/avscamera/sys/avscamera.inx | Bin 25302 -> 27580 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/avstream/avscamera/sys/avscamera.inx b/avstream/avscamera/sys/avscamera.inx index a8507243c6237c2440ccc5fd1b857fea180cf259..374fe5509252817da57cc9d7e52550888613bc03 100644 GIT binary patch delta 793 zcma)4%Su8~6kV52*#jH&z=T4noTh6d3%s8Qv# zX`^Ub@ez~h|%r#V>7;>o^>?NRL>0?$@ z?8+X38*^M?F1M^Motl6^8Gx3|vAzO3YH861Bg8Rxuz*dZaiqU)1c~R^HDOHBOfS6r zb5sy1?{Qz!;+UaP85)$pHp5~pWr^Sz`{dJXG-Zf8(_A03X`Z>RHIyR8bUnf9v4xUg z)aUxCG{n;qJUNr^d0TW=QlVDtaGBG6ca&=+6R+IWVd?*?OHU$C(Y7v2`IvqNTUzZn z=gClcno9RMdy=)?{DdBQi7qv Q+^sq5$2qxqTkTru7rfA%FaQ7m delta 74 zcmV-Q0JZ