Skip to content
This repository was archived by the owner on Jul 19, 2024. It is now read-only.

Commit 2f3f07c

Browse files
authored
Merge pull request #156 from fieldsJacksonG/master
Update spectator view documentation to reference OpenCV 3.2
2 parents 1ebce68 + 019a76e commit 2f3f07c

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

SpectatorView/Calibration/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Open the Calibration sln with Visual Studio under Calibration\Calibration.sln
1313

1414
![compositor sln](../DocumentationImages/calibration_sln.png)
1515

16-
### OpenCV 3.1
17-
+ Download and install OpenCV 3.1 from here: http://opencv.org/downloads.html
16+
### OpenCV 3.2
17+
+ Download and install OpenCV 3.2 from here: http://opencv.org/downloads.html
1818
+ Extract OpenCV anywhere on your computer.
1919
+ Update the OpenCV_vc14 user macro in dependencies.props with the corresponding path on your computer.
2020
+ Restart Visual Studio if the Calibration or Compositor sln's are open.

SpectatorView/Compositor/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ If you are using a Blackmagic capture card, you will need to install the SDK and
1919
+ Update the DeckLink_inc user macro in dependencies.props with the corresponding path on your computer.
2020
+ Restart Visual Studio if the Calibration or Compositor sln's are open.
2121

22-
### OpenCV 3.1
23-
If you are not using a black magic capture card, you will need to install Open CV to get color frames from a different capture device.
24-
+ Download and install OpenCV 3.1 from here: http://opencv.org/downloads.html
22+
### OpenCV 3.2
23+
If you are not using a capture card with an included FrameProvider, you will need to install Open CV to get color frames from a different capture device.
24+
+ Download and install OpenCV 3.2 from here: http://opencv.org/downloads.html
2525
+ Extract OpenCV anywhere on your computer.
2626
+ Update the OpenCV_vc14 user macro in dependencies.props with the corresponding path on your computer.
2727
+ Restart Visual Studio if the Calibration or Compositor sln's are open.
@@ -37,7 +37,7 @@ If you are not using a black magic capture card, you will need to install Open C
3737

3838
#### If you are using a different capture card that does not run on BlackMagic's DeckLink SDK:
3939
+ First try using the OpenCV FrameProvider:
40-
+ **NOTE:** This will require an x64 build of Unity unless you built your own x86 OpenCV 3.1 binaries
40+
+ **NOTE:** This will require an x64 build of Unity unless you built your own x86 OpenCV 3.2 binaries
4141
+ In CompositorShared.h in the SharedHeaders project, change **USE_OPENCV** to TRUE, change the other FrameProvider preprocessor definitions to FALSE.
4242
+ In OpenCVFrameProvider.h, change **CAMERA_ID** to be the index of the capture device you are using.
4343
+ If that did not work and your capture card has an SDK, use that:

SpectatorView/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ Make sure the materials you get are compatible with your existing camera.
4949
+ If using an Elgato capture card.
5050
+ [Elgato Filters](https://github.com/elgatosf/gamecapture)
5151
+ If using an Elgato capture card.
52-
+ [OpenCV 3.1](http://opencv.org/downloads.html)
53-
+ Download and install OpenCV **3.1**
52+
+ [OpenCV 3.2](http://opencv.org/downloads.html)
53+
+ Download and install OpenCV **3.2**
5454
+ [Canon SDK](https://www.usa.canon.com/internet/portal/us/home/explore/solutions-services/digital-camera-sdk-information) (Optional)
5555
+ If you are using a Canon camera and have access to the Canon EDSDK, you can tether your camera to your PC to take higher resolution images.
5656
+ [Unity3D](https://unity3d.com/unity/beta/)
@@ -63,8 +63,8 @@ The following dependencies require a manual download and a Visual Studio user ma
6363

6464
![Dependencies](./DocumentationImages/dependencies.png)
6565

66-
### OpenCV 3.1
67-
+ Download and install OpenCV **3.1** from [here](http://opencv.org/downloads.html).
66+
### OpenCV 3.2
67+
+ Download and install OpenCV **3.2** from [here](http://opencv.org/downloads.html).
6868
+ Extract OpenCV anywhere on your computer.
6969
+ Update the OpenCV_vc14 user macro in dependencies.props with the corresponding path on your computer.
7070
+ Restart Visual Studio if the Calibration or Compositor sln's are open.

0 commit comments

Comments
 (0)