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

removed detail:: prefix int video_reader

Browse Source 
it conflicts with cv::detail
This commit is contained in:
Vladislav Vinogradov 2013-09-06 16:48:13 +04:00
parent a0771630b0
commit 6ad72bfcb4
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/gpucodec/src/video_reader.cpp
View File

@ -58,12 +58,14 @@ namespace cv { namespace gpu { namespace cudev
void NV12_to_RGB(const PtrStepb decodedFrame, PtrStepSz<uint> interopFrame, cudaStream_t stream = 0); void NV12_to_RGB(const PtrStepb decodedFrame, PtrStepSz<uint> interopFrame, cudaStream_t stream = 0);
}}} }}}
using namespace cv::gpucodec::detail;
namespace namespace
{ {
class VideoReaderImpl : public VideoReader class VideoReaderImpl : public VideoReader
{ {
public: public:
explicit VideoReaderImpl(const Ptr<detail::VideoSource>& source); explicit VideoReaderImpl(const Ptr<VideoSource>& source);
~VideoReaderImpl(); ~VideoReaderImpl();
bool nextFrame(OutputArray frame); bool nextFrame(OutputArray frame);
@ -71,11 +73,11 @@ namespace
FormatInfo format() const; FormatInfo format() const;
private: private:
Ptr<detail::VideoSource> videoSource_; Ptr<VideoSource> videoSource_;
Ptr<detail::FrameQueue> frameQueue_; Ptr<FrameQueue> frameQueue_;
Ptr<detail::VideoDecoder> videoDecoder_; Ptr<VideoDecoder> videoDecoder_;
Ptr<detail::VideoParser> videoParser_; Ptr<VideoParser> videoParser_;
CUvideoctxlock lock_; CUvideoctxlock lock_;
@ -87,7 +89,7 @@ namespace
return videoSource_->format(); return videoSource_->format();
} }
VideoReaderImpl::VideoReaderImpl(const Ptr<detail::VideoSource>& source) : VideoReaderImpl::VideoReaderImpl(const Ptr<VideoSource>& source) :
videoSource_(source), videoSource_(source),
lock_(0) lock_(0)
{ {
@ -159,7 +161,7 @@ namespace
return false; return false;
// Wait a bit // Wait a bit
detail::Thread::sleep(1); Thread::sleep(1);
} }
bool isProgressive = displayInfo.progressive_frame != 0; bool isProgressive = displayInfo.progressive_frame != 0;
@ -212,7 +214,7 @@ Ptr<VideoReader> cv::gpucodec::createVideoReader(const String& filename)
{ {
CV_Assert( !filename.empty() ); CV_Assert( !filename.empty() );
Ptr<detail::VideoSource> videoSource; Ptr<VideoSource> videoSource;
try try
{ {
@ -220,7 +222,7 @@ Ptr<VideoReader> cv::gpucodec::createVideoReader(const String& filename)
} }
catch (...) catch (...)
{ {
Ptr<RawVideoSource> source(new detail::FFmpegVideoSource(filename)); Ptr<RawVideoSource> source(new FFmpegVideoSource(filename));
videoSource.reset(new RawVideoSourceWrapper(source)); videoSource.reset(new RawVideoSourceWrapper(source));
} }
@ -229,7 +231,7 @@ Ptr<VideoReader> cv::gpucodec::createVideoReader(const String& filename)
Ptr<VideoReader> cv::gpucodec::createVideoReader(const Ptr<RawVideoSource>& source) Ptr<VideoReader> cv::gpucodec::createVideoReader(const Ptr<RawVideoSource>& source)
{ {
Ptr<detail::VideoSource> videoSource(new detail::RawVideoSourceWrapper(source)); Ptr<VideoSource> videoSource(new RawVideoSourceWrapper(source));
return makePtr<VideoReaderImpl>(videoSource); return makePtr<VideoReaderImpl>(videoSource);
} }