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

Commit

Permalink
Merge pull request #156 from fieldsJacksonG/master
Browse files Browse the repository at this point in the history
Update spectator view documentation to reference OpenCV 3.2
  • Loading branch information
keveleigh authored Jun 28, 2017
2 parents 1ebce68 + 019a76e commit 2f3f07c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions SpectatorView/Calibration/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Open the Calibration sln with Visual Studio under Calibration\Calibration.sln

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

### OpenCV 3.1
+ Download and install OpenCV 3.1 from here: http://opencv.org/downloads.html
### OpenCV 3.2
+ Download and install OpenCV 3.2 from here: http://opencv.org/downloads.html
+ Extract OpenCV anywhere on your computer.
+ Update the OpenCV_vc14 user macro in dependencies.props with the corresponding path on your computer.
+ Restart Visual Studio if the Calibration or Compositor sln's are open.
Expand Down
8 changes: 4 additions & 4 deletions SpectatorView/Compositor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ If you are using a Blackmagic capture card, you will need to install the SDK and
+ Update the DeckLink_inc user macro in dependencies.props with the corresponding path on your computer.
+ Restart Visual Studio if the Calibration or Compositor sln's are open.

### OpenCV 3.1
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.
+ Download and install OpenCV 3.1 from here: http://opencv.org/downloads.html
### OpenCV 3.2
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.
+ Download and install OpenCV 3.2 from here: http://opencv.org/downloads.html
+ Extract OpenCV anywhere on your computer.
+ Update the OpenCV_vc14 user macro in dependencies.props with the corresponding path on your computer.
+ Restart Visual Studio if the Calibration or Compositor sln's are open.
Expand All @@ -37,7 +37,7 @@ If you are not using a black magic capture card, you will need to install Open C

#### If you are using a different capture card that does not run on BlackMagic's DeckLink SDK:
+ First try using the OpenCV FrameProvider:
+ **NOTE:** This will require an x64 build of Unity unless you built your own x86 OpenCV 3.1 binaries
+ **NOTE:** This will require an x64 build of Unity unless you built your own x86 OpenCV 3.2 binaries
+ In CompositorShared.h in the SharedHeaders project, change **USE_OPENCV** to TRUE, change the other FrameProvider preprocessor definitions to FALSE.
+ In OpenCVFrameProvider.h, change **CAMERA_ID** to be the index of the capture device you are using.
+ If that did not work and your capture card has an SDK, use that:
Expand Down
8 changes: 4 additions & 4 deletions SpectatorView/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ Make sure the materials you get are compatible with your existing camera.
+ If using an Elgato capture card.
+ [Elgato Filters](https://github.com/elgatosf/gamecapture)
+ If using an Elgato capture card.
+ [OpenCV 3.1](http://opencv.org/downloads.html)
+ Download and install OpenCV **3.1**
+ [OpenCV 3.2](http://opencv.org/downloads.html)
+ Download and install OpenCV **3.2**
+ [Canon SDK](https://www.usa.canon.com/internet/portal/us/home/explore/solutions-services/digital-camera-sdk-information) (Optional)
+ 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.
+ [Unity3D](https://unity3d.com/unity/beta/)
Expand All @@ -63,8 +63,8 @@ The following dependencies require a manual download and a Visual Studio user ma

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

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

0 comments on commit 2f3f07c

Please sign in to comment.