generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "disabled video decoding under linux"

Browse Source 
This reverts commit 889674ef43.
This commit is contained in:
vlad
2012-12-20 13:31:22 +04:00
committed by Vladislav Vinogradov
parent 660d23aa04
commit 11293d071f
17 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gpu/src/cuvid_video_source.cpp
View File

@@ -1,7 +1,7 @@
#include "cuvid_video_source.h"
#include "cu_safe_call.h"
#if defined(HAVE_CUDA) && defined(WIN32)
#if defined(HAVE_CUDA) && !defined(__APPLE__)
cv::gpu::detail::CuvidVideoSource::CuvidVideoSource(const std::string& fname)
{

2
modules/gpu/src/cuvid_video_source.h
View File

@@ -45,7 +45,7 @@
#include "precomp.hpp"
#if defined(HAVE_CUDA) && defined(WIN32)
#if defined(HAVE_CUDA) && !defined(__APPLE__)
namespace cv { namespace gpu
{

2
modules/gpu/src/ffmpeg_video_source.cpp
View File

@@ -42,7 +42,7 @@
#include "ffmpeg_video_source.h"
#if defined(HAVE_CUDA) && defined(WIN32)
#if defined(HAVE_CUDA) && !defined(__APPLE__)
#if defined(HAVE_FFMPEG) && defined(BUILD_SHARED_LIBS)
#include "cap_ffmpeg_impl.hpp"

2
modules/gpu/src/ffmpeg_video_source.h
View File

@@ -46,7 +46,7 @@
#include "precomp.hpp"
#include "thread_wrappers.h"
#if defined(HAVE_CUDA) && defined(WIN32)
#if defined(HAVE_CUDA) && !defined(__APPLE__)
struct InputMediaStream_FFMPEG;

2
modules/gpu/src/frame_queue.cpp
View File

@@ -42,7 +42,7 @@
#include "frame_queue.h"
#if defined(HAVE_CUDA) && defined(WIN32)
#if defined(HAVE_CUDA) && !defined(__APPLE__)
cv::gpu::detail::FrameQueue::FrameQueue() :
endOfDecode_(0),

2
modules/gpu/src/frame_queue.h
View File

@@ -46,7 +46,7 @@
#include "precomp.hpp"
#include "thread_wrappers.h"
#if defined(HAVE_CUDA) && defined(WIN32)
#if defined(HAVE_CUDA) && !defined(__APPLE__)
namespace cv { namespace gpu
{

5
modules/gpu/src/precomp.hpp
View File

@@ -97,8 +97,11 @@
#include <cublas.h>
#endif
#ifdef WIN32
#ifndef __APPLE__
#include <nvcuvid.h>
#endif
#ifdef WIN32
#include <NVEncoderAPI.h>
#endif

2
modules/gpu/src/thread_wrappers.cpp
View File

@@ -42,7 +42,7 @@
#include "thread_wrappers.h"
#if defined(HAVE_CUDA) && defined(WIN32)
#if defined(HAVE_CUDA) && !defined(__APPLE__)
#ifdef WIN32
#define NOMINMAX

2
modules/gpu/src/thread_wrappers.h
View File

@@ -45,7 +45,7 @@
#include "precomp.hpp"
#if defined(HAVE_CUDA) && defined(WIN32)
#if defined(HAVE_CUDA) && !defined(__APPLE__)
namespace cv { namespace gpu
{

2
modules/gpu/src/video_decoder.cpp
View File

@@ -43,7 +43,7 @@
#include "video_decoder.h"
#include "frame_queue.h"
#if defined(HAVE_CUDA) && defined(WIN32)
#if defined(HAVE_CUDA) && !defined(__APPLE__)
void cv::gpu::detail::VideoDecoder::create(const VideoReader_GPU::FormatInfo& videoFormat)
{

2
modules/gpu/src/video_decoder.h
View File

@@ -46,7 +46,7 @@
#include "precomp.hpp"
#include "cu_safe_call.h"
#if defined(HAVE_CUDA) && defined(WIN32)
#if defined(HAVE_CUDA) && !defined(__APPLE__)
namespace cv { namespace gpu
{

2
modules/gpu/src/video_parser.cpp
View File

@@ -43,7 +43,7 @@
#include "video_parser.h"
#include "cu_safe_call.h"
#if defined(HAVE_CUDA) && defined(WIN32)
#if defined(HAVE_CUDA) && !defined(__APPLE__)
cv::gpu::detail::VideoParser::VideoParser(VideoDecoder* videoDecoder, FrameQueue* frameQueue) :
videoDecoder_(videoDecoder), frameQueue_(frameQueue), unparsedPackets_(0), hasError_(false)

2
modules/gpu/src/video_parser.h
View File

@@ -48,7 +48,7 @@
#include "frame_queue.h"
#include "video_decoder.h"
#if defined(HAVE_CUDA) && defined(WIN32)
#if defined(HAVE_CUDA) && !defined(__APPLE__)
namespace cv { namespace gpu
{

2
modules/gpu/src/video_reader.cpp
View File

@@ -42,7 +42,7 @@
#include "precomp.hpp"
#if !defined HAVE_CUDA || defined(CUDA_DISABLER) || !defined(WIN32)
#if !defined HAVE_CUDA || defined(CUDA_DISABLER) || defined(__APPLE__)
class cv::gpu::VideoReader_GPU::Impl
{