Vicente Olivert Riera
e96b8ce781
superres: Fix return value VideoFrameSource_GPU
...
superres module fails to compile with the following error messages:
[100%] Building CXX object modules/superres/CMakeFiles/opencv_superres.dir/src/super_resolution.cpp.o
/opencv-2.4.10/modules/superres/src/frame_source.cpp: In function 'cv::Ptr<cv::superres::FrameSource> cv::superres::createFrameSource_Video_GPU(const string&)':
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected type-specifier before 'VideoFrameSource'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: could not convert '(int*)operator new(4ul)' from 'int*' to 'cv::Ptr<cv::superres::FrameSource>'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected ';' before 'VideoFrameSource'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:41: error: 'VideoFrameSource' was not declared in this scope
/opencv-2.4.10/modules/superres/src/frame_source.cpp:264:1: error: control reaches end of non-void function [-Werror=return-type]
cc1plus: some warnings being treated as errors
make[3]: *** [modules/superres/CMakeFiles/opencv_superres.dir/src/frame_source.cpp.o] Error 1
make[3]: *** Waiting for unfinished jobs....
This is caused because the return value of the createFrameSource_Video_GPU function should be a VideoFrameSource_GPU object.
Conflicts:
modules/superres/src/frame_source.cpp
10 years ago
Maksim Shabunin
97c78838a4
Fixed windows build and one warning
10 years ago
Vadim Pisarevsky
052593c760
1. Input/OutputArray optimizations;
...
2. Algorithm::load/save added (moved from StatModel)
3. copyrights updated; added copyright/licensing info for ffmpeg
4. some warnings from Xcode 6.x are fixed
10 years ago
Maksim Shabunin
79e8f0680c
Updated ml module interfaces and documentation
10 years ago
Maksim Shabunin
da383e65e2
Remove deprecated methods from cv::Algorithm
10 years ago
Vladislav Vinogradov
03ae1e5aae
fix superres module compilation
10 years ago
Vladislav Vinogradov
53862687d5
rename CudaMem -> HostMem to better reflect its purpose
10 years ago
Vadim Pisarevsky
257463719b
removed optim module; moved its functionality to core and photo modules; moved drawing functions from core to imgproc. Removed FilterEngine etc. from public API
11 years ago
Vadim Pisarevsky
d0137b6d2d
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
11 years ago
Alexander Alekhin
55188fe991
world fix
11 years ago
vbystricky
d58f736935
Split highgui module to videoio and highgui
11 years ago
Ilya Lavrenov
63d8a61b9b
enabled 3-channels support for cv::createSuperResolution_BTVL1
11 years ago
Alexander Smorkalov
b4e4f13f9e
Superres module enabled for Android. GPU samples build fixed for Android.
11 years ago
Alexander Smorkalov
b3e18d23a3
Implicit CUDA and OpenCL control for module definition added.
...
Feature allows to exclude CUDA or OpenCL optimizations at all even CUDA is used
on build. Exclusion of CUDA or OpenCL cut unwanted dependencies.
11 years ago
Ilya Lavrenov
e190d3fd36
added perf test
11 years ago
Ilya Lavrenov
6ad4823f0c
ported superres to T-API
11 years ago
Ilya Lavrenov
6b9ebcbf3d
deleted extra semicolons
11 years ago
Vadim Pisarevsky
d914f20a4c
updated patch to bring in the first functions with "transparent API"
11 years ago
Andrey Pavlenko
2b6fca68bf
fixing typo
11 years ago
Vadim Pisarevsky
d8c8339bec
the first draft of transparent API and new UMat class. more files
11 years ago
peng xiao
7285341083
1. Let btvRegWeights to be constant per `process` call.
...
2. Let Farneback to be the default optical flow method.
3. Fix a timing method bug for ocl path.
4. Remove useless finish operation in farneback
5. Refactor buffer usage.
11 years ago
Alexander Alekhin
b00f79ac5f
ocl: move program names into opencl_kernels.hpp
12 years ago
Alexander Alekhin
e8d9ed8955
ocl: split initialization.cpp into 3 files: context, operations, programcache
12 years ago
Vladislav Vinogradov
0c7663eb3b
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
12 years ago
Roman Donchenko
93f757f8a2
Boring changes - superres.
12 years ago
Vladislav Vinogradov
fd88654b45
replaced GPU -> CUDA
12 years ago
Vladislav Vinogradov
3c34b24f1f
replaced gpu->cuda in files names
12 years ago
Vladislav Vinogradov
5660d6a680
renamed gpuoptflow -> cudaoptflow
12 years ago
Vladislav Vinogradov
a0ae602bb7
renamed gpuimgproc -> cudaimgproc
12 years ago
Vladislav Vinogradov
219b662127
renamed gpufilters -> cudafilters
12 years ago
Vladislav Vinogradov
d4901a99ea
renamed gpuwarping -> cudawarping
12 years ago
Vladislav Vinogradov
dcd600cc47
renamed gpuarithm -> cudaarithm
12 years ago
Vladislav Vinogradov
dbeb3e2968
renamed gpucodec -> cudacodec
12 years ago
Vladislav Vinogradov
cfe4a71dc6
renamed gpu* source to cuda* in core module
12 years ago
Vladislav Vinogradov
5a85f1b6da
renamed gpucodec namespace -> cudacodec
12 years ago
Vladislav Vinogradov
8282f6ebc1
renamed gpu::cudev namespace -> cuda::device
...
cudev is used for new device layer
12 years ago
Vladislav Vinogradov
e895b7455e
renamed gpu namespace -> cuda
12 years ago
Roman Donchenko
e9a28f66ee
Normalized file endings.
12 years ago
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
12 years ago
Roman Donchenko
d9f71b762f
Deleted almost all of the precomp.cpp files.
...
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
12 years ago
Jin Ma
027b8021b1
Added farneback to superres module.
12 years ago
Vladislav Vinogradov
9eea9835ab
switched to Input/Output Array in Color Processing
12 years ago
Roman Donchenko
ac39bfb4cc
Remove HAVE_CVCONFIG_H - it's always defined.
12 years ago
peng xiao
9b3c318e85
Add super resolution's OpenCL implementation.
...
Accuracy and performance tests are also provided.
12 years ago
Vladislav Vinogradov
12ae11e2ff
refactored Separable Linear Filters
12 years ago
Vladislav Vinogradov
76211709a3
refactored VideoReader (convert it to abstract interface)
...
also refactored VideoSource interface (made it simplier, now it has only 2 abstract methods)
12 years ago
Vladislav Vinogradov
439c3574ed
renamed gpu_private.hpp to private.gpu.hpp
12 years ago
Vladislav Vinogradov
4c9773d55f
renamed gpu headers (made it more consistent)
12 years ago
Vladislav Vinogradov
2fae1d9507
removed ogl::Texture2D support from InputArray
12 years ago
Vladislav Vinogradov
3eeaa9189c
Revert "Revert "Merge pull request #836 from jet47:gpu-modules""
12 years ago