Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
c2935a65
Commit
c2935a65
authored
Apr 24, 2012
by
Vladislav Vinogradov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed build of gpu module without CUDA (video encoding/decoding)
parent
f65d841d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
3 deletions
+11
-3
CMakeLists.txt
modules/gpu/CMakeLists.txt
+2
-2
video_reader.cpp
modules/gpu/src/video_reader.cpp
+5
-1
video_writer.cpp
modules/gpu/src/video_writer.cpp
+4
-0
No files found.
modules/gpu/CMakeLists.txt
View file @
c2935a65
...
...
@@ -58,7 +58,7 @@ if (HAVE_CUDA)
find_cuda_helper_libs
(
nvcuvenc
)
endif
()
set
(
cuda_link_libs
${
CUDA_LIBRARIES
}
${
CUDA_npp_LIBRARY
}
${
CUDA_nvcuvid_LIBRARY
}
)
set
(
cuda_link_libs
${
CUDA_LIBRARIES
}
${
CUDA_npp_LIBRARY
}
${
CUDA_nvcuvid_LIBRARY
}
${
HIGHGUI_LIBRARIES
}
)
if
(
WIN32
)
set
(
cuda_link_libs
${
cuda_link_libs
}
${
CUDA_nvcuvenc_LIBRARY
}
)
...
...
@@ -75,7 +75,7 @@ ocv_set_module_sources(
SOURCES
${
lib_int_hdrs
}
${
lib_cuda_hdrs
}
${
lib_device_hdrs
}
${
lib_device_hdrs_detail
}
${
lib_srcs
}
${
lib_cuda
}
${
ncv_files
}
${
cuda_objs
}
)
ocv_create_module
(
${
cuda_link_libs
}
${
HIGHGUI_LIBRARIES
}
)
ocv_create_module
(
${
cuda_link_libs
}
)
if
(
HAVE_CUDA
)
if
(
HAVE_CUFFT
)
...
...
modules/gpu/src/video_reader.cpp
View file @
c2935a65
...
...
@@ -44,6 +44,10 @@
#ifndef HAVE_CUDA
class
cv
::
gpu
::
VideoReader_GPU
::
Impl
{
};
cv
::
gpu
::
VideoReader_GPU
::
VideoReader_GPU
()
{
throw_nogpu
();
}
cv
::
gpu
::
VideoReader_GPU
::
VideoReader_GPU
(
const
std
::
string
&
)
{
throw_nogpu
();
}
cv
::
gpu
::
VideoReader_GPU
::
VideoReader_GPU
(
const
cv
::
Ptr
<
VideoSource
>&
)
{
throw_nogpu
();
}
...
...
@@ -53,7 +57,7 @@ void cv::gpu::VideoReader_GPU::open(const cv::Ptr<VideoSource>&) { throw_nogpu()
bool
cv
::
gpu
::
VideoReader_GPU
::
isOpened
()
const
{
return
false
;
}
void
cv
::
gpu
::
VideoReader_GPU
::
close
()
{
}
bool
cv
::
gpu
::
VideoReader_GPU
::
read
(
GpuMat
&
)
{
throw_nogpu
();
return
false
;
}
cv
::
gpu
::
VideoReader_GPU
::
FormatInfo
cv
::
gpu
::
VideoReader_GPU
::
format
()
const
{
throw_nogpu
();
FormatInfo
format
;
return
format
;
}
cv
::
gpu
::
VideoReader_GPU
::
FormatInfo
cv
::
gpu
::
VideoReader_GPU
::
format
()
const
{
throw_nogpu
();
FormatInfo
format
=
{
MPEG1
,
Monochrome
,
0
,
0
}
;
return
format
;
}
bool
cv
::
gpu
::
VideoReader_GPU
::
VideoSource
::
parseVideoData
(
const
unsigned
char
*
,
size_t
,
bool
)
{
throw_nogpu
();
return
false
;
}
void
cv
::
gpu
::
VideoReader_GPU
::
dumpFormat
(
std
::
ostream
&
)
{
throw_nogpu
();
}
...
...
modules/gpu/src/video_writer.cpp
View file @
c2935a65
...
...
@@ -44,6 +44,10 @@
#if !defined HAVE_CUDA || !defined WIN32
class
cv
::
gpu
::
VideoWriter_GPU
::
Impl
{
};
cv
::
gpu
::
VideoWriter_GPU
::
VideoWriter_GPU
()
{
throw_nogpu
();
}
cv
::
gpu
::
VideoWriter_GPU
::
VideoWriter_GPU
(
const
std
::
string
&
,
cv
::
Size
,
double
,
SurfaceFormat
)
{
throw_nogpu
();
}
cv
::
gpu
::
VideoWriter_GPU
::
VideoWriter_GPU
(
const
std
::
string
&
,
cv
::
Size
,
double
,
const
EncoderParams
&
,
SurfaceFormat
)
{
throw_nogpu
();
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment