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
2dafc9a8
Commit
2dafc9a8
authored
May 11, 2012
by
Vladislav Vinogradov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed build under MacOS (disabled video decoding, it's not supported)
parent
91e31295
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
22 additions
and
14 deletions
+22
-14
CMakeLists.txt
modules/gpu/CMakeLists.txt
+8
-2
ffmpeg_video_source.cpp
modules/gpu/src/ffmpeg_video_source.cpp
+1
-1
ffmpeg_video_source.h
modules/gpu/src/ffmpeg_video_source.h
+1
-1
frame_queue.cpp
modules/gpu/src/frame_queue.cpp
+1
-1
frame_queue.h
modules/gpu/src/frame_queue.h
+1
-1
precomp.hpp
modules/gpu/src/precomp.hpp
+2
-0
thread_wrappers.cpp
modules/gpu/src/thread_wrappers.cpp
+1
-1
thread_wrappers.h
modules/gpu/src/thread_wrappers.h
+1
-1
video_decoder.cpp
modules/gpu/src/video_decoder.cpp
+1
-1
video_decoder.h
modules/gpu/src/video_decoder.h
+1
-1
video_parser.cpp
modules/gpu/src/video_parser.cpp
+1
-1
video_parser.h
modules/gpu/src/video_parser.h
+1
-1
video_reader.cpp
modules/gpu/src/video_reader.cpp
+1
-1
video_writer.cpp
modules/gpu/src/video_writer.cpp
+1
-1
No files found.
modules/gpu/CMakeLists.txt
View file @
2dafc9a8
...
...
@@ -50,21 +50,27 @@ if (HAVE_CUDA)
OCV_CUDA_COMPILE
(
cuda_objs
${
lib_cuda
}
${
ncv_cuda
}
)
#CUDA_BUILD_CLEAN_TARGET()
if
(
NOT APPLE
)
unset
(
CUDA_nvcuvid_LIBRARY CACHE
)
find_cuda_helper_libs
(
nvcuvid
)
endif
()
if
(
WIN32
)
unset
(
CUDA_nvcuvenc_LIBRARY CACHE
)
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
}
)
if
(
NOT APPLE
)
set
(
cuda_link_libs
${
cuda_link_libs
}
${
CUDA_nvcuvid_LIBRARY
}
)
endif
()
if
(
WIN32
)
set
(
cuda_link_libs
${
cuda_link_libs
}
${
CUDA_nvcuvenc_LIBRARY
}
)
endif
()
if
(
WITH_FFMPEG
)
if
(
NOT APPLE AND
WITH_FFMPEG
)
set
(
cuda_link_libs
${
cuda_link_libs
}
${
HIGHGUI_LIBRARIES
}
)
endif
()
else
()
...
...
modules/gpu/src/ffmpeg_video_source.cpp
View file @
2dafc9a8
...
...
@@ -42,7 +42,7 @@
#include "ffmpeg_video_source.h"
#if
def HAVE_CUDA
#if
defined(HAVE_CUDA) && !defined(__APPLE__)
#ifdef HAVE_FFMPEG
#include "cap_ffmpeg_impl.hpp"
...
...
modules/gpu/src/ffmpeg_video_source.h
View file @
2dafc9a8
...
...
@@ -46,7 +46,7 @@
#include "precomp.hpp"
#include "thread_wrappers.h"
#if
def HAVE_CUDA
#if
defined(HAVE_CUDA) && !defined(__APPLE__)
struct
InputMediaStream_FFMPEG
;
...
...
modules/gpu/src/frame_queue.cpp
View file @
2dafc9a8
...
...
@@ -42,7 +42,7 @@
#include "frame_queue.h"
#if
def HAVE_CUDA
#if
defined(HAVE_CUDA) && !defined(__APPLE__)
cv
::
gpu
::
detail
::
FrameQueue
::
FrameQueue
()
:
endOfDecode_
(
0
),
...
...
modules/gpu/src/frame_queue.h
View file @
2dafc9a8
...
...
@@ -46,7 +46,7 @@
#include "precomp.hpp"
#include "thread_wrappers.h"
#if
def HAVE_CUDA
#if
defined(HAVE_CUDA) && !defined(__APPLE__)
namespace
cv
{
namespace
gpu
{
...
...
modules/gpu/src/precomp.hpp
View file @
2dafc9a8
...
...
@@ -88,7 +88,9 @@
#include <cublas.h>
#endif
#ifndef __APPLE__
#include <nvcuvid.h>
#endif
#ifdef WIN32
#include <NVEncoderAPI.h>
...
...
modules/gpu/src/thread_wrappers.cpp
View file @
2dafc9a8
...
...
@@ -42,7 +42,7 @@
#include "thread_wrappers.h"
#if
def HAVE_CUDA
#if
defined(HAVE_CUDA) && !defined(__APPLE__)
#ifdef WIN32
#define NOMINMAX
...
...
modules/gpu/src/thread_wrappers.h
View file @
2dafc9a8
...
...
@@ -45,7 +45,7 @@
#include "precomp.hpp"
#if
def HAVE_CUDA
#if
defined(HAVE_CUDA) && !defined(__APPLE__)
namespace
cv
{
namespace
gpu
{
...
...
modules/gpu/src/video_decoder.cpp
View file @
2dafc9a8
...
...
@@ -43,7 +43,7 @@
#include "video_decoder.h"
#include "frame_queue.h"
#if
def HAVE_CUDA
#if
defined(HAVE_CUDA) && !defined(__APPLE__)
void
cv
::
gpu
::
detail
::
VideoDecoder
::
create
(
const
VideoReader_GPU
::
FormatInfo
&
videoFormat
)
{
...
...
modules/gpu/src/video_decoder.h
View file @
2dafc9a8
...
...
@@ -46,7 +46,7 @@
#include "precomp.hpp"
#include "cu_safe_call.h"
#if
def HAVE_CUDA
#if
defined(HAVE_CUDA) && !defined(__APPLE__)
namespace
cv
{
namespace
gpu
{
...
...
modules/gpu/src/video_parser.cpp
View file @
2dafc9a8
...
...
@@ -43,7 +43,7 @@
#include "video_parser.h"
#include "cu_safe_call.h"
#if
def HAVE_CUDA
#if
defined(HAVE_CUDA) && !defined(__APPLE__)
cv
::
gpu
::
detail
::
VideoParser
::
VideoParser
(
VideoDecoder
*
videoDecoder
,
FrameQueue
*
frameQueue
)
:
videoDecoder_
(
videoDecoder
),
frameQueue_
(
frameQueue
),
unparsedPackets_
(
0
),
hasError_
(
false
)
...
...
modules/gpu/src/video_parser.h
View file @
2dafc9a8
...
...
@@ -48,7 +48,7 @@
#include "frame_queue.h"
#include "video_decoder.h"
#if
def HAVE_CUDA
#if
defined(HAVE_CUDA) && !defined(__APPLE__)
namespace
cv
{
namespace
gpu
{
...
...
modules/gpu/src/video_reader.cpp
View file @
2dafc9a8
...
...
@@ -42,7 +42,7 @@
#include "precomp.hpp"
#if
ndef HAVE_CUDA
#if
!defined(HAVE_CUDA) || defined(__APPLE__)
class
cv
::
gpu
::
VideoReader_GPU
::
Impl
{
...
...
modules/gpu/src/video_writer.cpp
View file @
2dafc9a8
...
...
@@ -42,7 +42,7 @@
#include "precomp.hpp"
#if !defined
HAVE_CUDA || !defined WIN32
#if !defined
(HAVE_CUDA) || !defined(WIN32)
class
cv
::
gpu
::
VideoWriter_GPU
::
Impl
{
...
...
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