Merge pull request #977 from jet47:gpucodec-refactoring
Roman Donchenko
12 years ago
committed by
OpenCV Buildbot
commit
71db862dc2
26 changed files with 1284 additions and 1518 deletions
@ -0,0 +1,121 @@ |
||||
/*M///////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
|
||||
//
|
||||
// By downloading, copying, installing or using the software you agree to this license.
|
||||
// If you do not agree to this license, do not download, install,
|
||||
// copy or use the software.
|
||||
//
|
||||
//
|
||||
// License Agreement
|
||||
// For Open Source Computer Vision Library
|
||||
//
|
||||
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
|
||||
// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
|
||||
// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
|
||||
// Third party copyrights are property of their respective owners.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without modification,
|
||||
// are permitted provided that the following conditions are met:
|
||||
//
|
||||
// * Redistribution's of source code must retain the above copyright notice,
|
||||
// this list of conditions and the following disclaimer.
|
||||
//
|
||||
// * Redistribution's in binary form must reproduce the above copyright notice,
|
||||
// this list of conditions and the following disclaimer in the documentation
|
||||
// and/or other materials provided with the distribution.
|
||||
//
|
||||
// * The name of the copyright holders may not be used to endorse or promote products
|
||||
// derived from this software without specific prior written permission.
|
||||
//
|
||||
// This software is provided by the copyright holders and contributors "as is" and
|
||||
// any express or implied warranties, including, but not limited to, the implied
|
||||
// warranties of merchantability and fitness for a particular purpose are disclaimed.
|
||||
// In no event shall the Intel Corporation or contributors be liable for any direct,
|
||||
// indirect, incidental, special, exemplary, or consequential damages
|
||||
// (including, but not limited to, procurement of substitute goods or services;
|
||||
// loss of use, data, or profits; or business interruption) however caused
|
||||
// and on any theory of liability, whether in contract, strict liability,
|
||||
// or tort (including negligence or otherwise) arising in any way out of
|
||||
// the use of this software, even if advised of the possibility of such damage.
|
||||
//
|
||||
//M*/
|
||||
|
||||
#include "precomp.hpp" |
||||
|
||||
#ifdef HAVE_NVCUVID |
||||
|
||||
using namespace cv; |
||||
using namespace cv::gpucodec; |
||||
using namespace cv::gpucodec::detail; |
||||
|
||||
bool cv::gpucodec::detail::VideoSource::parseVideoData(const unsigned char* data, size_t size, bool endOfStream) |
||||
{ |
||||
return videoParser_->parseVideoData(data, size, endOfStream); |
||||
} |
||||
|
||||
cv::gpucodec::detail::RawVideoSourceWrapper::RawVideoSourceWrapper(const Ptr<RawVideoSource>& source) : |
||||
source_(source) |
||||
{ |
||||
CV_Assert( !source_.empty() ); |
||||
} |
||||
|
||||
cv::gpucodec::FormatInfo cv::gpucodec::detail::RawVideoSourceWrapper::format() const |
||||
{ |
||||
return source_->format(); |
||||
} |
||||
|
||||
void cv::gpucodec::detail::RawVideoSourceWrapper::start() |
||||
{ |
||||
stop_ = false; |
||||
hasError_ = false; |
||||
thread_ = new Thread(readLoop, this); |
||||
} |
||||
|
||||
void cv::gpucodec::detail::RawVideoSourceWrapper::stop() |
||||
{ |
||||
stop_ = true; |
||||
thread_->wait(); |
||||
thread_.release(); |
||||
} |
||||
|
||||
bool cv::gpucodec::detail::RawVideoSourceWrapper::isStarted() const |
||||
{ |
||||
return !stop_; |
||||
} |
||||
|
||||
bool cv::gpucodec::detail::RawVideoSourceWrapper::hasError() const |
||||
{ |
||||
return hasError_; |
||||
} |
||||
|
||||
void cv::gpucodec::detail::RawVideoSourceWrapper::readLoop(void* userData) |
||||
{ |
||||
RawVideoSourceWrapper* thiz = static_cast<RawVideoSourceWrapper*>(userData); |
||||
|
||||
for (;;) |
||||
{ |
||||
unsigned char* data; |
||||
int size; |
||||
bool endOfFile; |
||||
|
||||
if (!thiz->source_->getNextPacket(&data, &size, &endOfFile)) |
||||
{ |
||||
thiz->hasError_ = !endOfFile; |
||||
break; |
||||
} |
||||
|
||||
if (!thiz->parseVideoData(data, size)) |
||||
{ |
||||
thiz->hasError_ = true; |
||||
break; |
||||
} |
||||
|
||||
if (thiz->stop_) |
||||
break; |
||||
} |
||||
|
||||
thiz->parseVideoData(0, 0, true); |
||||
} |
||||
|
||||
#endif // HAVE_NVCUVID
|
||||
@ -0,0 +1,99 @@ |
||||
/*M///////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
|
||||
//
|
||||
// By downloading, copying, installing or using the software you agree to this license.
|
||||
// If you do not agree to this license, do not download, install,
|
||||
// copy or use the software.
|
||||
//
|
||||
//
|
||||
// License Agreement
|
||||
// For Open Source Computer Vision Library
|
||||
//
|
||||
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
|
||||
// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
|
||||
// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
|
||||
// Third party copyrights are property of their respective owners.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without modification,
|
||||
// are permitted provided that the following conditions are met:
|
||||
//
|
||||
// * Redistribution's of source code must retain the above copyright notice,
|
||||
// this list of conditions and the following disclaimer.
|
||||
//
|
||||
// * Redistribution's in binary form must reproduce the above copyright notice,
|
||||
// this list of conditions and the following disclaimer in the documentation
|
||||
// and/or other materials provided with the distribution.
|
||||
//
|
||||
// * The name of the copyright holders may not be used to endorse or promote products
|
||||
// derived from this software without specific prior written permission.
|
||||
//
|
||||
// This software is provided by the copyright holders and contributors "as is" and
|
||||
// any express or implied warranties, including, but not limited to, the implied
|
||||
// warranties of merchantability and fitness for a particular purpose are disclaimed.
|
||||
// In no event shall the Intel Corporation or contributors be liable for any direct,
|
||||
// indirect, incidental, special, exemplary, or consequential damages
|
||||
// (including, but not limited to, procurement of substitute goods or services;
|
||||
// loss of use, data, or profits; or business interruption) however caused
|
||||
// and on any theory of liability, whether in contract, strict liability,
|
||||
// or tort (including negligence or otherwise) arising in any way out of
|
||||
// the use of this software, even if advised of the possibility of such damage.
|
||||
//
|
||||
//M*/
|
||||
|
||||
#ifndef __GPUCODEC_VIDEO_SOURCE_H__ |
||||
#define __GPUCODEC_VIDEO_SOURCE_H__ |
||||
|
||||
#include "opencv2/core/private.gpu.hpp" |
||||
#include "opencv2/gpucodec.hpp" |
||||
#include "thread.hpp" |
||||
|
||||
namespace cv { namespace gpucodec { namespace detail |
||||
{ |
||||
|
||||
class VideoParser; |
||||
|
||||
class VideoSource |
||||
{ |
||||
public: |
||||
virtual ~VideoSource() {} |
||||
|
||||
virtual FormatInfo format() const = 0; |
||||
virtual void start() = 0; |
||||
virtual void stop() = 0; |
||||
virtual bool isStarted() const = 0; |
||||
virtual bool hasError() const = 0; |
||||
|
||||
void setVideoParser(detail::VideoParser* videoParser) { videoParser_ = videoParser; } |
||||
|
||||
protected: |
||||
bool parseVideoData(const uchar* data, size_t size, bool endOfStream = false); |
||||
|
||||
private: |
||||
detail::VideoParser* videoParser_; |
||||
}; |
||||
|
||||
class RawVideoSourceWrapper : public VideoSource |
||||
{ |
||||
public: |
||||
RawVideoSourceWrapper(const Ptr<RawVideoSource>& source); |
||||
|
||||
FormatInfo format() const; |
||||
void start(); |
||||
void stop(); |
||||
bool isStarted() const; |
||||
bool hasError() const; |
||||
|
||||
private: |
||||
Ptr<RawVideoSource> source_; |
||||
|
||||
Ptr<Thread> thread_; |
||||
volatile bool stop_; |
||||
volatile bool hasError_; |
||||
|
||||
static void readLoop(void* userData); |
||||
}; |
||||
|
||||
}}} |
||||
|
||||
#endif // __GPUCODEC_VIDEO_SOURCE_H__
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue