Commit Graph

59 Commits

Author SHA1 Message Date
capitalistspz
1dd35c8aff No longer require manually setting include path in dependants 2025-03-18 17:49:18 +00:00
markus
6b18ea4474 Using CoInitializeEx(NULL, COINIT_APARTMENTTHREADED) to be compatible with Java 17. 2023-05-18 14:30:29 +02:00
markus
3bec8e354f Avoid double Release() in FindCaptureDevice().
This fixes a semantic conflict from merging 5e8b963c27 using ScopedComPtr<> and 58d4be4d7d using explicit Release().
2023-04-12 14:52:37 +02:00
Yauheni Akhotnikau
13b7d1932c Remove code that seems to be unused.
There were declaration of non-virtual methods hasNewFrame and
captureFrame in PlatformStream class (Windows implementation).
But there weren't any implementations of them.
It seems that there wasn't any sense in those methods and they
can safely be removed from PlatformStream class.
2022-07-08 11:49:10 +03:00
Jason von Nieda
c57d02b1ee (Hopefully) fix my bad merge. 2022-03-17 16:38:34 -05:00
Jason von Nieda
438c7a0b4d
Merge branch 'master' into wine_support 2022-03-17 14:55:17 -05:00
Jason von Nieda
f9304e1be3
Merge pull request #52 from sandman42292/fix_resource_leak
Release resources correctly for Windows
2022-03-17 14:48:27 -05:00
sandman42292
4e363a63de remove warnings 2021-11-22 22:17:02 +09:00
sandman42292
5e8b963c27 add fallback device path with device index feature 2021-11-22 21:58:29 +09:00
sandman42292
e3a04f51c1 make not an error the QueryInterface about IID_IAMCameraControl 2021-11-22 21:58:29 +09:00
sandman42292
384cfe9363 remove redundant enum pins checking 2021-11-22 21:58:29 +09:00
sandman42292
83713c080b remove not needed ControlStream 2021-11-22 21:58:29 +09:00
sandman42292
56b9337069 add ks.h include 2021-11-21 23:54:12 +09:00
sandman42292
24134d0ad5 fix for mingw compiler 2021-11-21 23:44:11 +09:00
sandman42292
58d4be4d7d release resources correctly 2021-11-21 23:43:11 +09:00
zhangkun(company)
1624306967 [Windows] Do not keep moniker in platformDeviceInfo 2020-12-30 18:21:45 +08:00
Niels Moseley
2246c3e55c Added power line frequency setting to windows 2018-01-07 02:09:30 +01:00
Niels Moseley
d041db5677 Added backlight compensation to windows 2018-01-07 02:03:26 +01:00
Niels Moseley
45a7790da4 Implemented hue, color enable, sharpness, backlight compensation properties on windows 2018-01-07 01:26:43 +01:00
Niels Moseley
e0dedb06e4 Changed windows CreatePlatformContext COM error into a warning, which it is.. 2017-11-16 17:36:17 +01:00
Niels Moseley
e04312224e Merge pull request #23 from PeeJay/streaming
Misc cleanups
2017-10-16 22:02:53 +02:00
Paul Jones
0bae8135e9 Add licence text where missing
Signed-off-by: Paul Jones <paul@pauljones.id.au>
2017-10-16 13:06:39 +11:00
Paul Jones
2d0d46f4f6 Fix incorrect/inconsistant/duplicate header file defines
Standardise to platform_filename_h

Signed-off-by: Paul Jones <paul@pauljones.id.au>
2017-10-16 13:03:29 +11:00
Paul Jones
5d826b000b Fix various typos and incorrect comments
Signed-off-by: Paul Jones <paul@pauljones.id.au>
2017-10-16 12:51:00 +11:00
Niels Moseley
33da1da2ce Fixed bug in Win:setProperty() that returns an undefined status code. Updated QtCaptureText to include more camera properties. 2017-10-06 00:46:49 +02:00
Niels Moseley
ff53270e51 Added a custom log callback facility to capture log output 2017-10-04 17:10:35 +02:00
Niels Moseley
cb209ece81 API change: Cap_setAutoProperty now returns a default value. OSX: changed USB PIPE stall error to VERBOSE to avoid log pollution. 2017-10-04 14:35:37 +02:00
Niels Moseley
a5c0fe1cc1 Appveyor test for 32-bit and 64-bit windows libs 2017-10-02 16:56:12 +02:00
Niels Moseley
4a68ed4d3b Implemented brightness/contrast/saturation/gamma controls for windows 2017-09-28 16:46:32 +02:00
Niels Moseley
a4cca8bb90 Win: updated Stream::open with FPS argument (which is ignored for now) 2017-09-28 13:34:00 +02:00
Niels Moseley
cb4be52124 * Fixed linux CloseStream bug that caused a delay of multiple seconds.
* Added FPS support on Linux.
* Increased frame polling speed of Linux oc-gtk test program.
* Added support for brightness, contrast, autogain etc. properties.
2017-09-28 13:22:42 +02:00
Niels Moseley
b5a2d1ffe7 Fixed bug in getAutoProperty that set properties.. Updated windows test program. 2017-09-21 17:05:13 +02:00
Niels Moseley
d14a305abc Disabled the preview window in release builds (windows only). 2017-08-15 00:19:57 +02:00
Niels Moseley
c56148b2d2 Added more error checking to windows test program 2017-08-14 23:54:24 +02:00
Niels Moseley
e5ffe86c37 Removed unsafe function warnings for Visual C++ 2017-08-14 18:54:10 +02:00
Niels Moseley
00630b2723 Added Cap_getDeviceUniqueID() to C API for getting a decorated device name to (hopefully) uniquely ID a camera. Still needs Linux updates. 2017-08-02 21:51:19 +02:00
Niels Moseley
c238631ed0 Added estimation of frame rate to Win test program 2017-08-01 23:18:11 +02:00
Niels Moseley
07272e3737 Added white balance and gain properties. Updated windows test program to control these properties. 2017-08-01 18:19:48 +02:00
Niels Moseley
b75c525ec6 Added platform defines to CMakeFiles.txt. Fixed bug on windows that caused a failure to find an uncompressed RGB video mode (Logitech C270 camera). 2017-08-01 16:39:17 +02:00
Niels Moseley
82faea124a removed experimental Media Foundation code from Windows platform 2017-08-01 01:52:14 +02:00
Niels Moseley
271b75d9b0 Unified the focus/exposure/zoom interface to three get/set calls. 2017-08-01 01:49:24 +02:00
Niels Moseley
8949cded94 Extended the C API to include focus controls and implemented them for windows 2017-07-25 17:07:57 +02:00
Niels Moseley
c4a9bc27c4 * Stream::submitBuffer is now virtual so platforms can implement their frame buffer conversion routines there. (note: might be useful to have deferred conversion later on).
* Added const to bitmap pointer in Stream::submitBuffer to make clear that it should not modify the buffer.
* Added saving of frames using 'w' key in windows test program.
2017-07-17 17:22:28 +02:00
Niels Moseley
f5b37dff1b Fixed memory leak where destroying the context class didn't destroy the streams. As a result, only Platformstream destructor should now call close(), not Stream::~Stream. 2017-07-14 16:37:01 +02:00
Niels Moseley
57e75ae27f Made the windows test program more user friendly and removed the write-to-disk experimental code. 2017-07-13 22:45:05 +02:00
Niels Moseley
13cf37160e updated windows-specific frame format code and test program. 2017-07-12 23:24:43 +02:00
Niels Moseley
9416f72ce7 Update for windows-specific frame format enumeration. Needs refactoring. 2017-07-12 22:24:21 +02:00
Niels Moseley
58f882aef5 Added windows-specific frame buffer enumeration functions. 2017-07-12 18:11:51 +02:00
Niels Moseley
f44a08d53d * Added buffer format support in the C API.
* Added frame info to DeviceInfo and Context classes.
* Updated windows test program to show the frame infos.
TODO: actually fill the frame info data in device enumeration on windows/linux platforms.
2017-07-12 16:29:18 +02:00
Niels Moseley
176f8423d0 Added more platform separation between libmain.cpp, Context and PlatformContext. 2017-07-11 16:17:44 +02:00