Skip to content

O
Opencv

Greenplum / Opencv
大约 1 年 前同步成功

通知 7
Star 0
Fork 0
O
Opencv

体验新版 GitCode，发现更多精彩内容 >>

提交 76211709 编写于 作者: V Vladislav Vinogradov
浏览文件
操作

refactored VideoReader (convert it to abstract interface) 

also refactored VideoSource interface (made it simplier, now it has only 2 abstract methods)
上级 e9a74c17
隐藏空白更改
内联 并排
Showing with 590 addition and 702 deletion
modules/gpucodec/doc/videodec.rst
浏览文件 @ 76211709
...@@ -5,20 +5,37 @@ Video Decoding ...@@ -5,20 +5,37 @@ Video Decoding
gpu::VideoReader_GPU gpucodec::VideoReader
-------------------- ---------------------
Video reader class. Video reader interface.
.. ocv:class:: gpu::VideoReader_GPU .. ocv:class:: gpucodec::VideoReader
gpu::VideoReader_GPU::Codec gpucodec::VideoReader::nextFrame
--------------------------- --------------------------------
Grabs, decodes and returns the next video frame.
.. ocv:function:: bool gpucodec::VideoReader::nextFrame(OutputArray frame)
If no frames has been grabbed (there are no more frames in video file), the methods return ``false`` . The method throws :ocv:class:`Exception` if error occurs.
gpucodec::VideoReader::format
-----------------------------
Returns information about video file format.
.. ocv:function:: FormatInfo gpucodec::VideoReader::format() const
Video codecs supported by :ocv:class:`gpu::VideoReader_GPU` .
.. ocv:enum:: gpu::VideoReader_GPU::Codec gpucodec::Codec
---------------
Video codecs supported by :ocv:class:`gpucodec::VideoReader` .
.. ocv:enum:: gpucodec::Codec
.. ocv:emember:: MPEG1 = 0 .. ocv:emember:: MPEG1 = 0
.. ocv:emember:: MPEG2 .. ocv:emember:: MPEG2
...@@ -50,12 +67,12 @@ Video codecs supported by :ocv:class:`gpu::VideoReader_GPU` . ...@@ -50,12 +67,12 @@ Video codecs supported by :ocv:class:`gpu::VideoReader_GPU` .
UYVY (4:2:2) UYVY (4:2:2)
gpu::VideoReader_GPU::ChromaFormat
----------------------------------
Chroma formats supported by :ocv:class:`gpu::VideoReader_GPU` . gpucodec::ChromaFormat
----------------------
Chroma formats supported by :ocv:class:`gpucodec::VideoReader` .
.. ocv:enum:: gpu::VideoReader_GPU::ChromaFormat .. ocv:enum:: gpucodec::ChromaFormat
.. ocv:emember:: Monochrome = 0 .. ocv:emember:: Monochrome = 0
.. ocv:emember:: YUV420 .. ocv:emember:: YUV420
...@@ -63,9 +80,10 @@ Chroma formats supported by :ocv:class:`gpu::VideoReader_GPU` . ...@@ -63,9 +80,10 @@ Chroma formats supported by :ocv:class:`gpu::VideoReader_GPU` .
.. ocv:emember:: YUV444 .. ocv:emember:: YUV444
gpu::VideoReader_GPU::FormatInfo
-------------------------------- gpucodec::FormatInfo
.. ocv:struct:: gpu::VideoReader_GPU::FormatInfo --------------------
.. ocv:struct:: gpucodec::FormatInfo
Struct providing information about video file format. :: Struct providing information about video file format. ::
...@@ -78,157 +96,58 @@ Struct providing information about video file format. :: ...@@ -78,157 +96,58 @@ Struct providing information about video file format. ::
}; };
gpu::VideoReader_GPU::VideoReader_GPU
-------------------------------------
Constructors.
.. ocv:function:: gpu::VideoReader_GPU::VideoReader_GPU()
.. ocv:function:: gpu::VideoReader_GPU::VideoReader_GPU(const String& filename)
.. ocv:function:: gpu::VideoReader_GPU::VideoReader_GPU(const cv::Ptr<VideoSource>& source)
:param filename: Name of the input video file.
:param source: Video file parser implemented by user. gpucodec::createVideoReader
The constructors initialize video reader. FFMPEG is used to read videos. User can implement own demultiplexing with :ocv:class:`gpu::VideoReader_GPU::VideoSource` .
gpu::VideoReader_GPU::open
--------------------------
Initializes or reinitializes video reader.
.. ocv:function:: void gpu::VideoReader_GPU::open(const String& filename)
.. ocv:function:: void gpu::VideoReader_GPU::open(const cv::Ptr<VideoSource>& source)
The method opens video reader. Parameters are the same as in the constructor :ocv:func:`gpu::VideoReader_GPU::VideoReader_GPU` . The method throws :ocv:class:`Exception` if error occurs.
gpu::VideoReader_GPU::isOpened
------------------------------
Returns true if video reader has been successfully initialized.
.. ocv:function:: bool gpu::VideoReader_GPU::isOpened() const
gpu::VideoReader_GPU::close
--------------------------- ---------------------------
Releases the video reader. Creates video reader.
.. ocv:function:: void gpu::VideoReader_GPU::close()
.. ocv:function:: Ptr<VideoReader> gpucodec::createVideoReader(const String& filename)
.. ocv:function:: Ptr<VideoReader> gpucodec::createVideoReader(const Ptr<RawVideoSource>& source)
gpu::VideoReader_GPU::read :param filename: Name of the input video file.
--------------------------
Grabs, decodes and returns the next video frame.
.. ocv:function:: bool gpu::VideoReader_GPU::read(GpuMat& image)
If no frames has been grabbed (there are no more frames in video file), the methods return ``false`` . The method throws :ocv:class:`Exception` if error occurs.
gpu::VideoReader_GPU::format
----------------------------
Returns information about video file format.
.. ocv:function:: FormatInfo gpu::VideoReader_GPU::format() const
The method throws :ocv:class:`Exception` if video reader wasn't initialized.
gpu::VideoReader_GPU::dumpFormat
--------------------------------
Dump information about video file format to specified stream.
.. ocv:function:: void gpu::VideoReader_GPU::dumpFormat(std::ostream& st)
:param st: Output stream. :param source: RAW video source implemented by user.
The method throws :ocv:class:`Exception` if video reader wasn't initialized. FFMPEG is used to read videos. User can implement own demultiplexing with :ocv:class:`gpucodec::RawVideoSource` .
gpu::VideoReader_GPU::VideoSource gpucodec::RawVideoSource
----------------------------------- ------------------------
.. ocv:class:: gpu::VideoReader_GPU::VideoSource .. ocv:class:: gpucodec::RawVideoSource
Interface for video demultiplexing. :: Interface for video demultiplexing. ::
class VideoSource class RawVideoSource
{ {
public: public:
VideoSource(); virtual ~RawVideoSource() {}
virtual ~VideoSource() {}
virtual FormatInfo format() const = 0; virtual bool getNextPacket(unsigned char** data, int* size, bool* endOfFile) = 0;
virtual void start() = 0;
virtual void stop() = 0;
virtual bool isStarted() const = 0;
virtual bool hasError() const = 0;
protected: virtual FormatInfo format() const = 0;
bool parseVideoData(const unsigned char* data, size_t size, bool endOfStream = false);
}; };
User can implement own demultiplexing by implementing this interface. User can implement own demultiplexing by implementing this interface.
gpu::VideoReader_GPU::VideoSource::format gpucodec::RawVideoSource::getNextPacket
-----------------------------------------
Returns information about video file format.
.. ocv:function:: virtual FormatInfo gpu::VideoReader_GPU::VideoSource::format() const = 0
gpu::VideoReader_GPU::VideoSource::start
----------------------------------------
Starts processing.
.. ocv:function:: virtual void gpu::VideoReader_GPU::VideoSource::start() = 0
Implementation must create own thread with video processing and call periodic :ocv:func:`gpu::VideoReader_GPU::VideoSource::parseVideoData` .
gpu::VideoReader_GPU::VideoSource::stop
--------------------------------------- ---------------------------------------
Stops processing. Returns next packet with RAW video frame.
.. ocv:function:: virtual void gpu::VideoReader_GPU::VideoSource::stop() = 0
gpu::VideoReader_GPU::VideoSource::isStarted
--------------------------------------------
Returns ``true`` if processing was successfully started.
.. ocv:function:: virtual bool gpu::VideoReader_GPU::VideoSource::isStarted() const = 0
.. ocv:function:: bool gpucodec::VideoSource::getNextPacket(unsigned char** data, int* size, bool* endOfFile) = 0
:param data: Pointer to frame data.
gpu::VideoReader_GPU::VideoSource::hasError :param size: Size in bytes of current frame.
-------------------------------------------
Returns ``true`` if error occured during processing.
.. ocv:function:: virtual bool gpu::VideoReader_GPU::VideoSource::hasError() const = 0
gpu::VideoReader_GPU::VideoSource::parseVideoData :param endOfStream: Indicates that it is end of stream.
-------------------------------------------------
Parse next video frame. Implementation must call this method after new frame was grabbed.
.. ocv:function:: bool gpu::VideoReader_GPU::VideoSource::parseVideoData(const uchar* data, size_t size, bool endOfStream = false)
:param data: Pointer to frame data. Can be ``NULL`` if ``endOfStream`` if ``true`` .
:param size: Size in bytes of current frame. gpucodec::RawVideoSource::format
--------------------------------
Returns information about video file format.
:param endOfStream: Indicates that it is end of stream. .. ocv:function:: virtual FormatInfo gpucodec::RawVideoSource::format() const = 0
modules/gpucodec/include/opencv2/gpucodec.hpp
浏览文件 @ 76211709
...@@ -48,8 +48,6 @@ ...@@ -48,8 +48,6 @@
# error gpucodec.hpp header must be compiled as C++ # error gpucodec.hpp header must be compiled as C++
#endif #endif
#include <iosfwd>
#include "opencv2/core/gpu.hpp" #include "opencv2/core/gpu.hpp"
namespace cv { namespace gpucodec { namespace cv { namespace gpucodec {
...@@ -144,112 +142,65 @@ CV_EXPORTS Ptr<VideoWriter> createVideoWriter(const String& fileName, Size frame ...@@ -144,112 +142,65 @@ CV_EXPORTS Ptr<VideoWriter> createVideoWriter(const String& fileName, Size frame
CV_EXPORTS Ptr<VideoWriter> createVideoWriter(const Ptr<EncoderCallBack>& encoderCallback, Size frameSize, double fps, SurfaceFormat format = SF_BGR); CV_EXPORTS Ptr<VideoWriter> createVideoWriter(const Ptr<EncoderCallBack>& encoderCallback, Size frameSize, double fps, SurfaceFormat format = SF_BGR);
CV_EXPORTS Ptr<VideoWriter> createVideoWriter(const Ptr<EncoderCallBack>& encoderCallback, Size frameSize, double fps, const EncoderParams& params, SurfaceFormat format = SF_BGR); CV_EXPORTS Ptr<VideoWriter> createVideoWriter(const Ptr<EncoderCallBack>& encoderCallback, Size frameSize, double fps, const EncoderParams& params, SurfaceFormat format = SF_BGR);
}} // namespace cv { namespace gpucodec {
namespace cv { namespace gpu {
////////////////////////////////// Video Decoding ////////////////////////////////////////// ////////////////////////////////// Video Decoding //////////////////////////////////////////
namespace detail enum Codec
{ {
class FrameQueue; MPEG1 = 0,
class VideoParser; MPEG2,
} MPEG4,
VC1,
H264,
JPEG,
H264_SVC,
H264_MVC,
Uncompressed_YUV420 = (('I'<<24)|('Y'<<16)|('U'<<8)|('V')), // Y,U,V (4:2:0)
Uncompressed_YV12 = (('Y'<<24)|('V'<<16)|('1'<<8)|('2')), // Y,V,U (4:2:0)
Uncompressed_NV12 = (('N'<<24)|('V'<<16)|('1'<<8)|('2')), // Y,UV (4:2:0)
Uncompressed_YUYV = (('Y'<<24)|('U'<<16)|('Y'<<8)|('V')), // YUYV/YUY2 (4:2:2)
Uncompressed_UYVY = (('U'<<24)|('Y'<<16)|('V'<<8)|('Y')) // UYVY (4:2:2)
};
class CV_EXPORTS VideoReader_GPU enum ChromaFormat
{ {
public: Monochrome = 0,
enum Codec YUV420,
{ YUV422,
MPEG1 = 0, YUV444
MPEG2, };
MPEG4,
VC1,
H264,
JPEG,
H264_SVC,
H264_MVC,
Uncompressed_YUV420 = (('I'<<24)|('Y'<<16)|('U'<<8)|('V')), // Y,U,V (4:2:0)
Uncompressed_YV12 = (('Y'<<24)|('V'<<16)|('1'<<8)|('2')), // Y,V,U (4:2:0)
Uncompressed_NV12 = (('N'<<24)|('V'<<16)|('1'<<8)|('2')), // Y,UV (4:2:0)
Uncompressed_YUYV = (('Y'<<24)|('U'<<16)|('Y'<<8)|('V')), // YUYV/YUY2 (4:2:2)
Uncompressed_UYVY = (('U'<<24)|('Y'<<16)|('V'<<8)|('Y')), // UYVY (4:2:2)
};
enum ChromaFormat
{
Monochrome=0,
YUV420,
YUV422,
YUV444,
};
struct FormatInfo
{
Codec codec;
ChromaFormat chromaFormat;
int width;
int height;
};
class VideoSource;
VideoReader_GPU();
explicit VideoReader_GPU(const String& filename);
explicit VideoReader_GPU(const cv::Ptr<VideoSource>& source);
~VideoReader_GPU();
void open(const String& filename);
void open(const cv::Ptr<VideoSource>& source);
bool isOpened() const;
void close();
bool read(GpuMat& image);
FormatInfo format() const;
void dumpFormat(std::ostream& st);
class CV_EXPORTS VideoSource
{
public:
VideoSource() : frameQueue_(0), videoParser_(0) {}
virtual ~VideoSource() {}
virtual FormatInfo format() const = 0; struct FormatInfo
virtual void start() = 0; {
virtual void stop() = 0; Codec codec;
virtual bool isStarted() const = 0; ChromaFormat chromaFormat;
virtual bool hasError() const = 0; int width;
int height;
};
void setFrameQueue(detail::FrameQueue* frameQueue) { frameQueue_ = frameQueue; } class CV_EXPORTS VideoReader
void setVideoParser(detail::VideoParser* videoParser) { videoParser_ = videoParser; } {
public:
virtual ~VideoReader() {}
protected: virtual bool nextFrame(OutputArray frame) = 0;
bool parseVideoData(const uchar* data, size_t size, bool endOfStream = false);
private: virtual FormatInfo format() const = 0;
VideoSource(const VideoSource&); };
VideoSource& operator =(const VideoSource&);
detail::FrameQueue* frameQueue_; class CV_EXPORTS RawVideoSource
detail::VideoParser* videoParser_; {
}; public:
virtual ~RawVideoSource() {}
class Impl; virtual bool getNextPacket(unsigned char** data, int* size, bool* endOfFile) = 0;
private: virtual FormatInfo format() const = 0;
cv::Ptr<Impl> impl_;
}; };
}} // namespace cv { namespace gpu { CV_EXPORTS Ptr<VideoReader> createVideoReader(const String& filename);
CV_EXPORTS Ptr<VideoReader> createVideoReader(const Ptr<RawVideoSource>& source);
namespace cv {
template <> CV_EXPORTS void Ptr<cv::gpu::VideoReader_GPU::Impl>::delete_obj(); }} // namespace cv { namespace gpucodec {
}
#endif /* __OPENCV_GPUCODEC_HPP__ */ #endif /* __OPENCV_GPUCODEC_HPP__ */
modules/gpucodec/perf/perf_video.cpp
浏览文件 @ 76211709
...@@ -74,12 +74,11 @@ PERF_TEST_P(FileName, VideoReader, Values("gpu/video/768x576.avi", "gpu/video/19 ...@@ -74,12 +74,11 @@ PERF_TEST_P(FileName, VideoReader, Values("gpu/video/768x576.avi", "gpu/video/19
if (PERF_RUN_GPU()) if (PERF_RUN_GPU())
{ {
cv::gpu::VideoReader_GPU d_reader(inputFile); cv::Ptr<cv::gpucodec::VideoReader> d_reader = cv::gpucodec::createVideoReader(inputFile);
ASSERT_TRUE( d_reader.isOpened() );
cv::gpu::GpuMat frame; cv::gpu::GpuMat frame;
TEST_CYCLE_N(10) d_reader.read(frame); TEST_CYCLE_N(10) d_reader->nextFrame(frame);
GPU_SANITY_CHECK(frame); GPU_SANITY_CHECK(frame);
} }
......
modules/gpucodec/src/cuda/nv12_to_rgb.cu
浏览文件 @ 76211709
...@@ -51,12 +51,7 @@ ...@@ -51,12 +51,7 @@
namespace cv { namespace gpu { namespace cudev namespace cv { namespace gpu { namespace cudev
{ {
__constant__ float constHueColorSpaceMat[9]; __constant__ float constHueColorSpaceMat[9] = {1.1644f, 0.0f, 1.596f, 1.1644f, -0.3918f, -0.813f, 1.1644f, 2.0172f, 0.0f};
void loadHueCSC(float hueCSC[9])
{
cudaSafeCall( cudaMemcpyToSymbol(constHueColorSpaceMat, hueCSC, 9 * sizeof(float)) );
}
__device__ void YUV2RGB(const uint* yuvi, float* red, float* green, float* blue) __device__ void YUV2RGB(const uint* yuvi, float* red, float* green, float* blue)
{ {
......
modules/gpucodec/src/cuvid_video_source.cpp
浏览文件 @ 76211709
...@@ -7,11 +7,12 @@ ...@@ -7,11 +7,12 @@
// copy or use the software. // copy or use the software.
// //
// //
// License Agreement // License Agreement
// For Open Source Computer Vision Library // For Open Source Computer Vision Library
// //
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. // Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
// Copyright (C) 2009, Willow Garage Inc., 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. // Third party copyrights are property of their respective owners.
// //
// Redistribution and use in source and binary forms, with or without modification, // Redistribution and use in source and binary forms, with or without modification,
...@@ -44,7 +45,11 @@ ...@@ -44,7 +45,11 @@
#ifdef HAVE_NVCUVID #ifdef HAVE_NVCUVID
cv::gpu::detail::CuvidVideoSource::CuvidVideoSource(const String& fname) using namespace cv;
using namespace cv::gpucodec;
using namespace cv::gpucodec::detail;
cv::gpucodec::detail::CuvidVideoSource::CuvidVideoSource(const String& fname)
{ {
CUVIDSOURCEPARAMS params; CUVIDSOURCEPARAMS params;
std::memset(&params, 0, sizeof(CUVIDSOURCEPARAMS)); std::memset(&params, 0, sizeof(CUVIDSOURCEPARAMS));
...@@ -55,51 +60,51 @@ cv::gpu::detail::CuvidVideoSource::CuvidVideoSource(const String& fname) ...@@ -55,51 +60,51 @@ cv::gpu::detail::CuvidVideoSource::CuvidVideoSource(const String& fname)
params.pfnAudioDataHandler = 0; params.pfnAudioDataHandler = 0;
// now create the actual source // now create the actual source
CUresult res = cuvidCreateVideoSource(&videoSource_, fname.c_str(), &params); CUresult cuRes = cuvidCreateVideoSource(&videoSource_, fname.c_str(), &params);
if (res == CUDA_ERROR_INVALID_SOURCE) if (cuRes == CUDA_ERROR_INVALID_SOURCE)
throw std::runtime_error("Unsupported video source"); throw std::runtime_error("");
cuSafeCall( res ); cuSafeCall( cuRes );
CUVIDEOFORMAT vidfmt; CUVIDEOFORMAT vidfmt;
cuSafeCall( cuvidGetSourceVideoFormat(videoSource_, &vidfmt, 0) ); cuSafeCall( cuvidGetSourceVideoFormat(videoSource_, &vidfmt, 0) );
format_.codec = static_cast<VideoReader_GPU::Codec>(vidfmt.codec); format_.codec = static_cast<Codec>(vidfmt.codec);
format_.chromaFormat = static_cast<VideoReader_GPU::ChromaFormat>(vidfmt.chroma_format); format_.chromaFormat = static_cast<ChromaFormat>(vidfmt.chroma_format);
format_.width = vidfmt.coded_width; format_.width = vidfmt.coded_width;
format_.height = vidfmt.coded_height; format_.height = vidfmt.coded_height;
} }
cv::gpu::detail::CuvidVideoSource::~CuvidVideoSource() cv::gpucodec::detail::CuvidVideoSource::~CuvidVideoSource()
{ {
cuvidDestroyVideoSource(videoSource_); cuvidDestroyVideoSource(videoSource_);
} }
cv::gpu::VideoReader_GPU::FormatInfo cv::gpu::detail::CuvidVideoSource::format() const FormatInfo cv::gpucodec::detail::CuvidVideoSource::format() const
{ {
return format_; return format_;
} }
void cv::gpu::detail::CuvidVideoSource::start() void cv::gpucodec::detail::CuvidVideoSource::start()
{ {
cuSafeCall( cuvidSetVideoSourceState(videoSource_, cudaVideoState_Started) ); cuSafeCall( cuvidSetVideoSourceState(videoSource_, cudaVideoState_Started) );
} }
void cv::gpu::detail::CuvidVideoSource::stop() void cv::gpucodec::detail::CuvidVideoSource::stop()
{ {
cuSafeCall( cuvidSetVideoSourceState(videoSource_, cudaVideoState_Stopped) ); cuSafeCall( cuvidSetVideoSourceState(videoSource_, cudaVideoState_Stopped) );
} }
bool cv::gpu::detail::CuvidVideoSource::isStarted() const bool cv::gpucodec::detail::CuvidVideoSource::isStarted() const
{ {
return (cuvidGetVideoSourceState(videoSource_) == cudaVideoState_Started); return (cuvidGetVideoSourceState(videoSource_) == cudaVideoState_Started);
} }
bool cv::gpu::detail::CuvidVideoSource::hasError() const bool cv::gpucodec::detail::CuvidVideoSource::hasError() const
{ {
return (cuvidGetVideoSourceState(videoSource_) == cudaVideoState_Error); return (cuvidGetVideoSourceState(videoSource_) == cudaVideoState_Error);
} }
int CUDAAPI cv::gpu::detail::CuvidVideoSource::HandleVideoData(void* userData, CUVIDSOURCEDATAPACKET* packet) int CUDAAPI cv::gpucodec::detail::CuvidVideoSource::HandleVideoData(void* userData, CUVIDSOURCEDATAPACKET* packet)
{ {
CuvidVideoSource* thiz = static_cast<CuvidVideoSource*>(userData); CuvidVideoSource* thiz = static_cast<CuvidVideoSource*>(userData);
......
modules/gpucodec/src/cuvid_video_source.h → modules/gpucodec/src/cuvid_video_source.hpp
浏览文件 @ 76211709
...@@ -7,11 +7,12 @@ ...@@ -7,11 +7,12 @@
// copy or use the software. // copy or use the software.
// //
// //
// License Agreement // License Agreement
// For Open Source Computer Vision Library // For Open Source Computer Vision Library
// //
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. // Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
// Copyright (C) 2009, Willow Garage Inc., 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. // Third party copyrights are property of their respective owners.
// //
// Redistribution and use in source and binary forms, with or without modification, // Redistribution and use in source and binary forms, with or without modification,
...@@ -40,25 +41,25 @@ ...@@ -40,25 +41,25 @@
// //
//M*/ //M*/
#ifndef __CUVUD_VIDEO_SOURCE_H__ #ifndef __CUVID_VIDEO_SOURCE_HPP__
#define __CUVUD_VIDEO_SOURCE_H__ #define __CUVID_VIDEO_SOURCE_HPP__
#include <nvcuvid.h>
#include "opencv2/core/private.gpu.hpp" #include "opencv2/core/private.gpu.hpp"
#include "opencv2/gpucodec.hpp" #include "opencv2/gpucodec.hpp"
#include "thread.h" #include "video_source.hpp"
#include <nvcuvid.h>
namespace cv { namespace gpu { namespace detail namespace cv { namespace gpucodec { namespace detail
{ {
class CuvidVideoSource : public VideoReader_GPU::VideoSource class CuvidVideoSource : public VideoSource
{ {
public: public:
explicit CuvidVideoSource(const String& fname); explicit CuvidVideoSource(const String& fname);
~CuvidVideoSource(); ~CuvidVideoSource();
VideoReader_GPU::FormatInfo format() const; FormatInfo format() const;
void start(); void start();
void stop(); void stop();
bool isStarted() const; bool isStarted() const;
...@@ -78,9 +79,9 @@ private: ...@@ -78,9 +79,9 @@ private:
static int CUDAAPI HandleVideoData(void* pUserData, CUVIDSOURCEDATAPACKET* pPacket); static int CUDAAPI HandleVideoData(void* pUserData, CUVIDSOURCEDATAPACKET* pPacket);
CUvideosource videoSource_; CUvideosource videoSource_;
VideoReader_GPU::FormatInfo format_; FormatInfo format_;
}; };
}}} }}}
#endif // __CUVUD_VIDEO_SOURCE_H__ #endif // __CUVID_VIDEO_SOURCE_HPP__
modules/gpucodec/src/ffmpeg_video_source.cpp
浏览文件 @ 76211709
...@@ -7,11 +7,12 @@ ...@@ -7,11 +7,12 @@
// copy or use the software. // copy or use the software.
// //
// //
// License Agreement // License Agreement
// For Open Source Computer Vision Library // For Open Source Computer Vision Library
// //
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. // Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
// Copyright (C) 2009, Willow Garage Inc., 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. // Third party copyrights are property of their respective owners.
// //
// Redistribution and use in source and binary forms, with or without modification, // Redistribution and use in source and binary forms, with or without modification,
...@@ -48,6 +49,10 @@ ...@@ -48,6 +49,10 @@
#include "../src/cap_ffmpeg_impl.hpp" #include "../src/cap_ffmpeg_impl.hpp"
#endif #endif
using namespace cv;
using namespace cv::gpucodec;
using namespace cv::gpucodec::detail;
namespace namespace
{ {
Create_InputMediaStream_FFMPEG_Plugin create_InputMediaStream_FFMPEG_p = 0; Create_InputMediaStream_FFMPEG_Plugin create_InputMediaStream_FFMPEG_p = 0;
...@@ -94,7 +99,7 @@ namespace ...@@ -94,7 +99,7 @@ namespace
} }
} }
cv::gpu::detail::FFmpegVideoSource::FFmpegVideoSource(const String& fname) : cv::gpucodec::detail::FFmpegVideoSource::FFmpegVideoSource(const String& fname) :
stream_(0) stream_(0)
{ {
CV_Assert( init_MediaStream_FFMPEG() ); CV_Assert( init_MediaStream_FFMPEG() );
...@@ -106,75 +111,33 @@ cv::gpu::detail::FFmpegVideoSource::FFmpegVideoSource(const String& fname) : ...@@ -106,75 +111,33 @@ cv::gpu::detail::FFmpegVideoSource::FFmpegVideoSource(const String& fname) :
stream_ = create_InputMediaStream_FFMPEG_p(fname.c_str(), &codec, &chroma_format, &width, &height); stream_ = create_InputMediaStream_FFMPEG_p(fname.c_str(), &codec, &chroma_format, &width, &height);
if (!stream_) if (!stream_)
CV_Error(cv::Error::StsUnsupportedFormat, "Unsupported video source"); CV_Error(Error::StsUnsupportedFormat, "Unsupported video source");
format_.codec = static_cast<VideoReader_GPU::Codec>(codec); format_.codec = static_cast<Codec>(codec);
format_.chromaFormat = static_cast<VideoReader_GPU::ChromaFormat>(chroma_format); format_.chromaFormat = static_cast<ChromaFormat>(chroma_format);
format_.width = width; format_.width = width;
format_.height = height; format_.height = height;
} }
cv::gpu::VideoReader_GPU::FormatInfo cv::gpu::detail::FFmpegVideoSource::format() const cv::gpucodec::detail::FFmpegVideoSource::~FFmpegVideoSource()
{
return format_;
}
void cv::gpu::detail::FFmpegVideoSource::start()
{
stop_ = false;
hasError_ = false;
thread_ = new Thread(readLoop, this);
}
void cv::gpu::detail::FFmpegVideoSource::stop()
{
stop_ = true;
thread_->wait();
thread_.release();
}
bool cv::gpu::detail::FFmpegVideoSource::isStarted() const
{ {
return !stop_; if (stream_)
release_InputMediaStream_FFMPEG_p(stream_);
} }
bool cv::gpu::detail::FFmpegVideoSource::hasError() const FormatInfo cv::gpucodec::detail::FFmpegVideoSource::format() const
{ {
return hasError_; return format_;
} }
void cv::gpu::detail::FFmpegVideoSource::readLoop(void* userData) bool cv::gpucodec::detail::FFmpegVideoSource::getNextPacket(unsigned char** data, int* size, bool* bEndOfFile)
{ {
FFmpegVideoSource* thiz = static_cast<FFmpegVideoSource*>(userData); int endOfFile;
for (;;) int res = read_InputMediaStream_FFMPEG_p(stream_, data, size, &endOfFile);
{
unsigned char* data;
int size;
int endOfFile;
if (!read_InputMediaStream_FFMPEG_p(thiz->stream_, &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); *bEndOfFile = (endOfFile != 0);
} return res != 0;
template <> void cv::Ptr<InputMediaStream_FFMPEG>::delete_obj()
{
if (obj) release_InputMediaStream_FFMPEG_p(obj);
} }
#endif // HAVE_CUDA #endif // HAVE_CUDA
modules/gpucodec/src/ffmpeg_video_source.h → modules/gpucodec/src/ffmpeg_video_source.hpp
浏览文件 @ 76211709
...@@ -7,11 +7,12 @@ ...@@ -7,11 +7,12 @@
// copy or use the software. // copy or use the software.
// //
// //
// License Agreement // License Agreement
// For Open Source Computer Vision Library // For Open Source Computer Vision Library
// //
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. // Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
// Copyright (C) 2009, Willow Garage Inc., 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. // Third party copyrights are property of their respective owners.
// //
// Redistribution and use in source and binary forms, with or without modification, // Redistribution and use in source and binary forms, with or without modification,
...@@ -40,43 +41,31 @@ ...@@ -40,43 +41,31 @@
// //
//M*/ //M*/
#ifndef __FFMPEG_VIDEO_SOURCE_H__ #ifndef __FFMPEG_VIDEO_SOURCE_HPP__
#define __FFMPEG_VIDEO_SOURCE_H__ #define __FFMPEG_VIDEO_SOURCE_HPP__
#include "opencv2/gpucodec.hpp" #include "opencv2/gpucodec.hpp"
#include "thread.h"
struct InputMediaStream_FFMPEG; struct InputMediaStream_FFMPEG;
namespace cv { namespace gpu { namespace detail { namespace cv { namespace gpucodec { namespace detail {
class FFmpegVideoSource : public VideoReader_GPU::VideoSource class FFmpegVideoSource : public RawVideoSource
{ {
public: public:
FFmpegVideoSource(const String& fname); FFmpegVideoSource(const String& fname);
~FFmpegVideoSource();
VideoReader_GPU::FormatInfo format() const; bool getNextPacket(unsigned char** data, int* size, bool* endOfFile);
void start();
void stop();
bool isStarted() const;
bool hasError() const;
private: FormatInfo format() const;
VideoReader_GPU::FormatInfo format_;
cv::Ptr<InputMediaStream_FFMPEG> stream_;
cv::Ptr<Thread> thread_; private:
volatile bool stop_; FormatInfo format_;
volatile bool hasError_;
static void readLoop(void* userData); InputMediaStream_FFMPEG* stream_;
}; };
}}} }}}
namespace cv { #endif // __FFMPEG_VIDEO_SOURCE_HPP__
template <> void Ptr<InputMediaStream_FFMPEG>::delete_obj();
}
#endif // __FFMPEG_VIDEO_SOURCE_H__
modules/gpucodec/src/frame_queue.cpp
浏览文件 @ 76211709
...@@ -7,11 +7,12 @@ ...@@ -7,11 +7,12 @@
// copy or use the software. // copy or use the software.
// //
// //
// License Agreement // License Agreement
// For Open Source Computer Vision Library // For Open Source Computer Vision Library
// //
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. // Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
// Copyright (C) 2009, Willow Garage Inc., 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. // Third party copyrights are property of their respective owners.
// //
// Redistribution and use in source and binary forms, with or without modification, // Redistribution and use in source and binary forms, with or without modification,
...@@ -44,16 +45,16 @@ ...@@ -44,16 +45,16 @@
#ifdef HAVE_NVCUVID #ifdef HAVE_NVCUVID
cv::gpu::detail::FrameQueue::FrameQueue() : cv::gpucodec::detail::FrameQueue::FrameQueue() :
endOfDecode_(0), endOfDecode_(0),
framesInQueue_(0), framesInQueue_(0),
readPosition_(0) readPosition_(0)
{ {
std::memset(displayQueue_, 0, sizeof(displayQueue_)); std::memset(displayQueue_, 0, sizeof(displayQueue_));
std::memset((void*)isFrameInUse_, 0, sizeof(isFrameInUse_)); std::memset((void*) isFrameInUse_, 0, sizeof(isFrameInUse_));
} }
bool cv::gpu::detail::FrameQueue::waitUntilFrameAvailable(int pictureIndex) bool cv::gpucodec::detail::FrameQueue::waitUntilFrameAvailable(int pictureIndex)
{ {
while (isInUse(pictureIndex)) while (isInUse(pictureIndex))
{ {
...@@ -67,7 +68,7 @@ bool cv::gpu::detail::FrameQueue::waitUntilFrameAvailable(int pictureIndex) ...@@ -67,7 +68,7 @@ bool cv::gpu::detail::FrameQueue::waitUntilFrameAvailable(int pictureIndex)
return true; return true;
} }
void cv::gpu::detail::FrameQueue::enqueue(const CUVIDPARSERDISPINFO* picParams) void cv::gpucodec::detail::FrameQueue::enqueue(const CUVIDPARSERDISPINFO* picParams)
{ {
// Mark the frame as 'in-use' so we don't re-use it for decoding until it is no longer needed // Mark the frame as 'in-use' so we don't re-use it for decoding until it is no longer needed
// for display // for display
...@@ -98,7 +99,7 @@ void cv::gpu::detail::FrameQueue::enqueue(const CUVIDPARSERDISPINFO* picParams) ...@@ -98,7 +99,7 @@ void cv::gpu::detail::FrameQueue::enqueue(const CUVIDPARSERDISPINFO* picParams)
} while (!isEndOfDecode()); } while (!isEndOfDecode());
} }
bool cv::gpu::detail::FrameQueue::dequeue(CUVIDPARSERDISPINFO& displayInfo) bool cv::gpucodec::detail::FrameQueue::dequeue(CUVIDPARSERDISPINFO& displayInfo)
{ {
AutoLock autoLock(mtx_); AutoLock autoLock(mtx_);
......
modules/gpucodec/src/frame_queue.h → modules/gpucodec/src/frame_queue.hpp
浏览文件 @ 76211709
...@@ -7,11 +7,12 @@ ...@@ -7,11 +7,12 @@
// copy or use the software. // copy or use the software.
// //
// //
// License Agreement // License Agreement
// For Open Source Computer Vision Library // For Open Source Computer Vision Library
// //
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. // Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
// Copyright (C) 2009, Willow Garage Inc., 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. // Third party copyrights are property of their respective owners.
// //
// Redistribution and use in source and binary forms, with or without modification, // Redistribution and use in source and binary forms, with or without modification,
...@@ -40,15 +41,15 @@ ...@@ -40,15 +41,15 @@
// //
//M*/ //M*/
#ifndef __FRAME_QUEUE_H__ #ifndef __FRAME_QUEUE_HPP__
#define __FRAME_QUEUE_H__ #define __FRAME_QUEUE_HPP__
#include "opencv2/core/utility.hpp" #include "opencv2/core/utility.hpp"
#include "opencv2/core/private.gpu.hpp" #include "opencv2/core/private.gpu.hpp"
#include <nvcuvid.h> #include <nvcuvid.h>
namespace cv { namespace gpu { namespace detail namespace cv { namespace gpucodec { namespace detail
{ {
class FrameQueue class FrameQueue
...@@ -94,4 +95,4 @@ private: ...@@ -94,4 +95,4 @@ private:
}}} }}}
#endif // __FRAME_QUEUE_H__ #endif // __FRAME_QUEUE_HPP__
modules/gpucodec/src/precomp.hpp
浏览文件 @ 76211709
...@@ -67,12 +67,13 @@ ...@@ -67,12 +67,13 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#include "thread.h" #include "thread.hpp"
#include "ffmpeg_video_source.h" #include "video_source.hpp"
#include "cuvid_video_source.h" #include "ffmpeg_video_source.hpp"
#include "frame_queue.h" #include "cuvid_video_source.hpp"
#include "video_decoder.h" #include "frame_queue.hpp"
#include "video_parser.h" #include "video_decoder.hpp"
#include "video_parser.hpp"
#include "../src/cap_ffmpeg_api.hpp" #include "../src/cap_ffmpeg_api.hpp"
#endif #endif
......
modules/gpucodec/src/thread.cpp
浏览文件 @ 76211709
...@@ -7,11 +7,12 @@ ...@@ -7,11 +7,12 @@
// copy or use the software. // copy or use the software.
// //
// //
// License Agreement // License Agreement
// For Open Source Computer Vision Library // For Open Source Computer Vision Library
// //
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. // Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
// Copyright (C) 2009, Willow Garage Inc., 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. // Third party copyrights are property of their respective owners.
// //
// Redistribution and use in source and binary forms, with or without modification, // Redistribution and use in source and binary forms, with or without modification,
...@@ -44,7 +45,7 @@ ...@@ -44,7 +45,7 @@
#ifdef HAVE_NVCUVID #ifdef HAVE_NVCUVID
using namespace cv::gpu::detail; using namespace cv::gpucodec::detail;
#ifdef WIN32 #ifdef WIN32
...@@ -66,7 +67,7 @@ namespace ...@@ -66,7 +67,7 @@ namespace
} }
} }
class cv::gpu::detail::Thread::Impl class cv::gpucodec::detail::Thread::Impl
{ {
public: public:
Impl(Thread::Func func, void* userData) Impl(Thread::Func func, void* userData)
...@@ -119,7 +120,7 @@ namespace ...@@ -119,7 +120,7 @@ namespace
} }
} }
class cv::gpu::detail::Thread::Impl class cv::gpucodec::detail::Thread::Impl
{ {
public: public:
Impl(Thread::Func func, void* userData) Impl(Thread::Func func, void* userData)
...@@ -147,17 +148,17 @@ private: ...@@ -147,17 +148,17 @@ private:
#endif #endif
cv::gpu::detail::Thread::Thread(Func func, void* userData) : cv::gpucodec::detail::Thread::Thread(Func func, void* userData) :
impl_(new Impl(func, userData)) impl_(new Impl(func, userData))
{ {
} }
void cv::gpu::detail::Thread::wait() void cv::gpucodec::detail::Thread::wait()
{ {
impl_->wait(); impl_->wait();
} }
void cv::gpu::detail::Thread::sleep(int ms) void cv::gpucodec::detail::Thread::sleep(int ms)
{ {
#ifdef WIN32 #ifdef WIN32
::Sleep(ms); ::Sleep(ms);
...@@ -166,7 +167,7 @@ void cv::gpu::detail::Thread::sleep(int ms) ...@@ -166,7 +167,7 @@ void cv::gpu::detail::Thread::sleep(int ms)
#endif #endif
} }
template <> void cv::Ptr<cv::gpu::detail::Thread::Impl>::delete_obj() template <> void cv::Ptr<cv::gpucodec::detail::Thread::Impl>::delete_obj()
{ {
if (obj) delete obj; if (obj) delete obj;
} }
......
modules/gpucodec/src/thread.h → modules/gpucodec/src/thread.hpp
浏览文件 @ 76211709
...@@ -7,11 +7,12 @@ ...@@ -7,11 +7,12 @@
// copy or use the software. // copy or use the software.
// //
// //
// License Agreement // License Agreement
// For Open Source Computer Vision Library // For Open Source Computer Vision Library
// //
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. // Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
// Copyright (C) 2009, Willow Garage Inc., 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. // Third party copyrights are property of their respective owners.
// //
// Redistribution and use in source and binary forms, with or without modification, // Redistribution and use in source and binary forms, with or without modification,
...@@ -40,12 +41,12 @@ ...@@ -40,12 +41,12 @@
// //
//M*/ //M*/
#ifndef __THREAD_WRAPPERS_H__ #ifndef __THREAD_WRAPPERS_HPP__
#define __THREAD_WRAPPERS_H__ #define __THREAD_WRAPPERS_HPP__
#include "opencv2/core.hpp" #include "opencv2/core.hpp"
namespace cv { namespace gpu { namespace detail { namespace cv { namespace gpucodec { namespace detail {
class Thread class Thread
{ {
...@@ -67,7 +68,7 @@ private: ...@@ -67,7 +68,7 @@ private:
}}} }}}
namespace cv { namespace cv {
template <> void Ptr<cv::gpu::detail::Thread::Impl>::delete_obj(); template <> void Ptr<cv::gpucodec::detail::Thread::Impl>::delete_obj();
} }
#endif // __THREAD_WRAPPERS_H__ #endif // __THREAD_WRAPPERS_HPP__
modules/gpucodec/src/video_decoder.cpp
浏览文件 @ 76211709
...@@ -7,11 +7,12 @@ ...@@ -7,11 +7,12 @@
// copy or use the software. // copy or use the software.
// //
// //
// License Agreement // License Agreement
// For Open Source Computer Vision Library // For Open Source Computer Vision Library
// //
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. // Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
// Copyright (C) 2009, Willow Garage Inc., 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. // Third party copyrights are property of their respective owners.
// //
// Redistribution and use in source and binary forms, with or without modification, // Redistribution and use in source and binary forms, with or without modification,
...@@ -44,7 +45,7 @@ ...@@ -44,7 +45,7 @@
#ifdef HAVE_NVCUVID #ifdef HAVE_NVCUVID
void cv::gpu::detail::VideoDecoder::create(const VideoReader_GPU::FormatInfo& videoFormat) void cv::gpucodec::detail::VideoDecoder::create(const FormatInfo& videoFormat)
{ {
release(); release();
...@@ -103,7 +104,7 @@ void cv::gpu::detail::VideoDecoder::create(const VideoReader_GPU::FormatInfo& vi ...@@ -103,7 +104,7 @@ void cv::gpu::detail::VideoDecoder::create(const VideoReader_GPU::FormatInfo& vi
cuSafeCall( cuvidCreateDecoder(&decoder_, &createInfo_) ); cuSafeCall( cuvidCreateDecoder(&decoder_, &createInfo_) );
} }
void cv::gpu::detail::VideoDecoder::release() void cv::gpucodec::detail::VideoDecoder::release()
{ {
if (decoder_) if (decoder_)
{ {
......
modules/gpucodec/src/video_decoder.h → modules/gpucodec/src/video_decoder.hpp
浏览文件 @ 76211709
...@@ -7,11 +7,12 @@ ...@@ -7,11 +7,12 @@
// copy or use the software. // copy or use the software.
// //
// //
// License Agreement // License Agreement
// For Open Source Computer Vision Library // For Open Source Computer Vision Library
// //
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. // Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
// Copyright (C) 2009, Willow Garage Inc., 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. // Third party copyrights are property of their respective owners.
// //
// Redistribution and use in source and binary forms, with or without modification, // Redistribution and use in source and binary forms, with or without modification,
...@@ -40,21 +41,21 @@ ...@@ -40,21 +41,21 @@
// //
//M*/ //M*/
#ifndef __VIDEO_DECODER_H__ #ifndef __VIDEO_DECODER_HPP__
#define __VIDEO_DECODER_H__ #define __VIDEO_DECODER_HPP__
#include <nvcuvid.h>
#include "opencv2/core/private.gpu.hpp" #include "opencv2/core/private.gpu.hpp"
#include "opencv2/gpucodec.hpp" #include "opencv2/gpucodec.hpp"
#include <nvcuvid.h> namespace cv { namespace gpucodec { namespace detail
namespace cv { namespace gpu { namespace detail
{ {
class VideoDecoder class VideoDecoder
{ {
public: public:
VideoDecoder(const VideoReader_GPU::FormatInfo& videoFormat, CUvideoctxlock lock) : lock_(lock), decoder_(0) VideoDecoder(const FormatInfo& videoFormat, CUvideoctxlock lock) : lock_(lock), decoder_(0)
{ {
create(videoFormat); create(videoFormat);
} }
...@@ -64,7 +65,7 @@ public: ...@@ -64,7 +65,7 @@ public:
release(); release();
} }
void create(const VideoReader_GPU::FormatInfo& videoFormat); void create(const FormatInfo& videoFormat);
void release(); void release();
// Get the code-type currently used. // Get the code-type currently used.
...@@ -84,17 +85,17 @@ public: ...@@ -84,17 +85,17 @@ public:
return cuvidDecodePicture(decoder_, picParams) == CUDA_SUCCESS; return cuvidDecodePicture(decoder_, picParams) == CUDA_SUCCESS;
} }
cv::gpu::GpuMat mapFrame(int picIdx, CUVIDPROCPARAMS& videoProcParams) gpu::GpuMat mapFrame(int picIdx, CUVIDPROCPARAMS& videoProcParams)
{ {
CUdeviceptr ptr; CUdeviceptr ptr;
unsigned int pitch; unsigned int pitch;
cuSafeCall( cuvidMapVideoFrame(decoder_, picIdx, &ptr, &pitch, &videoProcParams) ); cuSafeCall( cuvidMapVideoFrame(decoder_, picIdx, &ptr, &pitch, &videoProcParams) );
return GpuMat(targetHeight() * 3 / 2, targetWidth(), CV_8UC1, (void*) ptr, pitch); return gpu::GpuMat(targetHeight() * 3 / 2, targetWidth(), CV_8UC1, (void*) ptr, pitch);
} }
void unmapFrame(cv::gpu::GpuMat& frame) void unmapFrame(gpu::GpuMat& frame)
{ {
cuSafeCall( cuvidUnmapVideoFrame(decoder_, (CUdeviceptr) frame.data) ); cuSafeCall( cuvidUnmapVideoFrame(decoder_, (CUdeviceptr) frame.data) );
frame.release(); frame.release();
...@@ -108,4 +109,4 @@ private: ...@@ -108,4 +109,4 @@ private:
}}} }}}
#endif // __VIDEO_DECODER_H__ #endif // __VIDEO_DECODER_HPP__
modules/gpucodec/src/video_parser.cpp
浏览文件 @ 76211709
...@@ -7,11 +7,12 @@ ...@@ -7,11 +7,12 @@
// copy or use the software. // copy or use the software.
// //
// //
// License Agreement // License Agreement
// For Open Source Computer Vision Library // For Open Source Computer Vision Library
// //
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. // Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
// Copyright (C) 2009, Willow Garage Inc., 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. // Third party copyrights are property of their respective owners.
// //
// Redistribution and use in source and binary forms, with or without modification, // Redistribution and use in source and binary forms, with or without modification,
...@@ -44,11 +45,11 @@ ...@@ -44,11 +45,11 @@
#ifdef HAVE_NVCUVID #ifdef HAVE_NVCUVID
cv::gpu::detail::VideoParser::VideoParser(VideoDecoder* videoDecoder, FrameQueue* frameQueue) : cv::gpucodec::detail::VideoParser::VideoParser(VideoDecoder* videoDecoder, FrameQueue* frameQueue) :
videoDecoder_(videoDecoder), frameQueue_(frameQueue), unparsedPackets_(0), hasError_(false) videoDecoder_(videoDecoder), frameQueue_(frameQueue), unparsedPackets_(0), hasError_(false)
{ {
CUVIDPARSERPARAMS params; CUVIDPARSERPARAMS params;
memset(&params, 0, sizeof(CUVIDPARSERPARAMS)); std::memset(&params, 0, sizeof(CUVIDPARSERPARAMS));
params.CodecType = videoDecoder->codec(); params.CodecType = videoDecoder->codec();
params.ulMaxNumDecodeSurfaces = videoDecoder->maxDecodeSurfaces(); params.ulMaxNumDecodeSurfaces = videoDecoder->maxDecodeSurfaces();
...@@ -61,7 +62,7 @@ cv::gpu::detail::VideoParser::VideoParser(VideoDecoder* videoDecoder, FrameQueue ...@@ -61,7 +62,7 @@ cv::gpu::detail::VideoParser::VideoParser(VideoDecoder* videoDecoder, FrameQueue
cuSafeCall( cuvidCreateVideoParser(&parser_, &params) ); cuSafeCall( cuvidCreateVideoParser(&parser_, &params) );
} }
bool cv::gpu::detail::VideoParser::parseVideoData(const unsigned char* data, size_t size, bool endOfStream) bool cv::gpucodec::detail::VideoParser::parseVideoData(const unsigned char* data, size_t size, bool endOfStream)
{ {
CUVIDSOURCEDATAPACKET packet; CUVIDSOURCEDATAPACKET packet;
std::memset(&packet, 0, sizeof(CUVIDSOURCEDATAPACKET)); std::memset(&packet, 0, sizeof(CUVIDSOURCEDATAPACKET));
...@@ -95,7 +96,7 @@ bool cv::gpu::detail::VideoParser::parseVideoData(const unsigned char* data, siz ...@@ -95,7 +96,7 @@ bool cv::gpu::detail::VideoParser::parseVideoData(const unsigned char* data, siz
return !frameQueue_->isEndOfDecode(); return !frameQueue_->isEndOfDecode();
} }
int CUDAAPI cv::gpu::detail::VideoParser::HandleVideoSequence(void* userData, CUVIDEOFORMAT* format) int CUDAAPI cv::gpucodec::detail::VideoParser::HandleVideoSequence(void* userData, CUVIDEOFORMAT* format)
{ {
VideoParser* thiz = static_cast<VideoParser*>(userData); VideoParser* thiz = static_cast<VideoParser*>(userData);
...@@ -106,10 +107,10 @@ int CUDAAPI cv::gpu::detail::VideoParser::HandleVideoSequence(void* userData, CU ...@@ -106,10 +107,10 @@ int CUDAAPI cv::gpu::detail::VideoParser::HandleVideoSequence(void* userData, CU
format->coded_height != thiz->videoDecoder_->frameHeight() || format->coded_height != thiz->videoDecoder_->frameHeight() ||
format->chroma_format != thiz->videoDecoder_->chromaFormat()) format->chroma_format != thiz->videoDecoder_->chromaFormat())
{ {
VideoReader_GPU::FormatInfo newFormat; FormatInfo newFormat;
newFormat.codec = static_cast<VideoReader_GPU::Codec>(format->codec); newFormat.codec = static_cast<Codec>(format->codec);
newFormat.chromaFormat = static_cast<VideoReader_GPU::ChromaFormat>(format->chroma_format); newFormat.chromaFormat = static_cast<ChromaFormat>(format->chroma_format);
newFormat.width = format->coded_width; newFormat.width = format->coded_width;
newFormat.height = format->coded_height; newFormat.height = format->coded_height;
...@@ -127,7 +128,7 @@ int CUDAAPI cv::gpu::detail::VideoParser::HandleVideoSequence(void* userData, CU ...@@ -127,7 +128,7 @@ int CUDAAPI cv::gpu::detail::VideoParser::HandleVideoSequence(void* userData, CU
return true; return true;
} }
int CUDAAPI cv::gpu::detail::VideoParser::HandlePictureDecode(void* userData, CUVIDPICPARAMS* picParams) int CUDAAPI cv::gpucodec::detail::VideoParser::HandlePictureDecode(void* userData, CUVIDPICPARAMS* picParams)
{ {
VideoParser* thiz = static_cast<VideoParser*>(userData); VideoParser* thiz = static_cast<VideoParser*>(userData);
...@@ -147,7 +148,7 @@ int CUDAAPI cv::gpu::detail::VideoParser::HandlePictureDecode(void* userData, CU ...@@ -147,7 +148,7 @@ int CUDAAPI cv::gpu::detail::VideoParser::HandlePictureDecode(void* userData, CU
return true; return true;
} }
int CUDAAPI cv::gpu::detail::VideoParser::HandlePictureDisplay(void* userData, CUVIDPARSERDISPINFO* picParams) int CUDAAPI cv::gpucodec::detail::VideoParser::HandlePictureDisplay(void* userData, CUVIDPARSERDISPINFO* picParams)
{ {
VideoParser* thiz = static_cast<VideoParser*>(userData); VideoParser* thiz = static_cast<VideoParser*>(userData);
......
modules/gpucodec/src/video_parser.h → modules/gpucodec/src/video_parser.hpp
浏览文件 @ 76211709
...@@ -7,11 +7,12 @@ ...@@ -7,11 +7,12 @@
// copy or use the software. // copy or use the software.
// //
// //
// License Agreement // License Agreement
// For Open Source Computer Vision Library // For Open Source Computer Vision Library
// //
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. // Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
// Copyright (C) 2009, Willow Garage Inc., 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. // Third party copyrights are property of their respective owners.
// //
// Redistribution and use in source and binary forms, with or without modification, // Redistribution and use in source and binary forms, with or without modification,
...@@ -40,17 +41,17 @@ ...@@ -40,17 +41,17 @@
// //
//M*/ //M*/
#ifndef __VIDEO_PARSER_H__ #ifndef __VIDEO_PARSER_HPP__
#define __VIDEO_PARSER_H__ #define __VIDEO_PARSER_HPP__
#include <nvcuvid.h>
#include "opencv2/core/private.gpu.hpp" #include "opencv2/core/private.gpu.hpp"
#include "opencv2/gpucodec.hpp" #include "opencv2/gpucodec.hpp"
#include "frame_queue.h" #include "frame_queue.hpp"
#include "video_decoder.h" #include "video_decoder.hpp"
#include <nvcuvid.h>
namespace cv { namespace gpu { namespace detail namespace cv { namespace gpucodec { namespace detail
{ {
class VideoParser class VideoParser
...@@ -91,4 +92,4 @@ private: ...@@ -91,4 +92,4 @@ private:
}}} }}}
#endif // __VIDEO_PARSER_H__ #endif // __VIDEO_PARSER_HPP__
modules/gpucodec/src/video_reader.cpp
浏览文件 @ 76211709
...@@ -42,88 +42,77 @@ ...@@ -42,88 +42,77 @@
#include "precomp.hpp" #include "precomp.hpp"
using namespace cv;
using namespace cv::gpu;
using namespace cv::gpucodec;
#ifndef HAVE_NVCUVID #ifndef HAVE_NVCUVID
class cv::gpu::VideoReader_GPU::Impl Ptr<VideoReader> cv::gpucodec::createVideoReader(const String&) { throw_no_cuda(); return Ptr<VideoReader>(); }
{ Ptr<VideoReader> cv::gpucodec::createVideoReader(const Ptr<RawVideoSource>&) { throw_no_cuda(); return Ptr<VideoReader>(); }
};
cv::gpu::VideoReader_GPU::VideoReader_GPU() { throw_no_cuda(); }
cv::gpu::VideoReader_GPU::VideoReader_GPU(const String&) { throw_no_cuda(); }
cv::gpu::VideoReader_GPU::VideoReader_GPU(const cv::Ptr<VideoSource>&) { throw_no_cuda(); }
cv::gpu::VideoReader_GPU::~VideoReader_GPU() { }
void cv::gpu::VideoReader_GPU::open(const String&) { throw_no_cuda(); }
void cv::gpu::VideoReader_GPU::open(const cv::Ptr<VideoSource>&) { throw_no_cuda(); }
bool cv::gpu::VideoReader_GPU::isOpened() const { return false; }
void cv::gpu::VideoReader_GPU::close() { }
bool cv::gpu::VideoReader_GPU::read(GpuMat&) { throw_no_cuda(); return false; }
cv::gpu::VideoReader_GPU::FormatInfo cv::gpu::VideoReader_GPU::format() const { throw_no_cuda(); FormatInfo format_ = {MPEG1,Monochrome,0,0}; return format_; }
bool cv::gpu::VideoReader_GPU::VideoSource::parseVideoData(const unsigned char*, size_t, bool) { throw_no_cuda(); return false; }
void cv::gpu::VideoReader_GPU::dumpFormat(std::ostream&) { throw_no_cuda(); }
#else // HAVE_NVCUVID #else // HAVE_NVCUVID
class cv::gpu::VideoReader_GPU::Impl namespace cv { namespace gpu { namespace cudev
{ {
public: void NV12_to_RGB(const PtrStepb decodedFrame, PtrStepSz<uint> interopFrame, cudaStream_t stream = 0);
explicit Impl(const cv::Ptr<cv::gpu::VideoReader_GPU::VideoSource>& source); }}}
~Impl();
bool grab(cv::gpu::GpuMat& frame);
cv::gpu::VideoReader_GPU::FormatInfo format() const { return videoSource_->format(); } namespace
{
class VideoReaderImpl : public VideoReader
{
public:
explicit VideoReaderImpl(const Ptr<detail::VideoSource>& source);
~VideoReaderImpl();
private: bool nextFrame(OutputArray frame);
cv::Ptr<cv::gpu::VideoReader_GPU::VideoSource> videoSource_;
cv::Ptr<cv::gpu::detail::FrameQueue> frameQueue_; FormatInfo format() const;
cv::Ptr<cv::gpu::detail::VideoDecoder> videoDecoder_;
cv::Ptr<cv::gpu::detail::VideoParser> videoParser_;
CUvideoctxlock lock_; private:
Ptr<detail::VideoSource> videoSource_;
std::deque< std::pair<CUVIDPARSERDISPINFO, CUVIDPROCPARAMS> > frames_; Ptr<detail::FrameQueue> frameQueue_;
}; Ptr<detail::VideoDecoder> videoDecoder_;
Ptr<detail::VideoParser> videoParser_;
cv::gpu::VideoReader_GPU::Impl::Impl(const cv::Ptr<VideoSource>& source) : CUvideoctxlock lock_;
videoSource_(source),
lock_(0)
{
// init context
GpuMat temp(1, 1, CV_8UC1);
temp.release();
DeviceInfo devInfo; std::deque< std::pair<CUVIDPARSERDISPINFO, CUVIDPROCPARAMS> > frames_;
CV_Assert( devInfo.supports(FEATURE_SET_COMPUTE_11) ); };
CUcontext ctx; FormatInfo VideoReaderImpl::format() const
cuSafeCall( cuCtxGetCurrent(&ctx) ); {
cuSafeCall( cuvidCtxLockCreate(&lock_, ctx) ); return videoSource_->format();
}
frameQueue_ = new detail::FrameQueue; VideoReaderImpl::VideoReaderImpl(const Ptr<detail::VideoSource>& source) :
videoDecoder_ = new detail::VideoDecoder(videoSource_->format(), lock_); videoSource_(source),
videoParser_ = new detail::VideoParser(videoDecoder_, frameQueue_); lock_(0)
{
// init context
GpuMat temp(1, 1, CV_8UC1);
temp.release();
videoSource_->setFrameQueue(frameQueue_); CUcontext ctx;
videoSource_->setVideoParser(videoParser_); cuSafeCall( cuCtxGetCurrent(&ctx) );
cuSafeCall( cuvidCtxLockCreate(&lock_, ctx) );
videoSource_->start(); frameQueue_ = new detail::FrameQueue;
} videoDecoder_ = new detail::VideoDecoder(videoSource_->format(), lock_);
videoParser_ = new detail::VideoParser(videoDecoder_, frameQueue_);
cv::gpu::VideoReader_GPU::Impl::~Impl() videoSource_->setVideoParser(videoParser_);
{ videoSource_->start();
frameQueue_->endDecode(); }
videoSource_->stop();
}
namespace cv { namespace gpu { namespace cudev VideoReaderImpl::~VideoReaderImpl()
{ {
void loadHueCSC(float hueCSC[9]); frameQueue_->endDecode();
void NV12_to_RGB(const PtrStepb decodedFrame, PtrStepSz<uint> interopFrame, cudaStream_t stream = 0); videoSource_->stop();
}}} }
namespace
{
class VideoCtxAutoLock class VideoCtxAutoLock
{ {
public: public:
...@@ -134,259 +123,114 @@ namespace ...@@ -134,259 +123,114 @@ namespace
CUvideoctxlock m_lock; CUvideoctxlock m_lock;
}; };
enum ColorSpace void cudaPostProcessFrame(const GpuMat& decodedFrame, OutputArray _outFrame, int width, int height)
{
ITU601 = 1,
ITU709 = 2
};
void setColorSpaceMatrix(ColorSpace CSC, float hueCSC[9], float hue)
{
float hueSin = std::sin(hue);
float hueCos = std::cos(hue);
if (CSC == ITU601)
{
//CCIR 601
hueCSC[0] = 1.1644f;
hueCSC[1] = hueSin * 1.5960f;
hueCSC[2] = hueCos * 1.5960f;
hueCSC[3] = 1.1644f;
hueCSC[4] = (hueCos * -0.3918f) - (hueSin * 0.8130f);
hueCSC[5] = (hueSin * 0.3918f) - (hueCos * 0.8130f);
hueCSC[6] = 1.1644f;
hueCSC[7] = hueCos * 2.0172f;
hueCSC[8] = hueSin * -2.0172f;
}
else if (CSC == ITU709)
{
//CCIR 709
hueCSC[0] = 1.0f;
hueCSC[1] = hueSin * 1.57480f;
hueCSC[2] = hueCos * 1.57480f;
hueCSC[3] = 1.0;
hueCSC[4] = (hueCos * -0.18732f) - (hueSin * 0.46812f);
hueCSC[5] = (hueSin * 0.18732f) - (hueCos * 0.46812f);
hueCSC[6] = 1.0f;
hueCSC[7] = hueCos * 1.85560f;
hueCSC[8] = hueSin * -1.85560f;
}
}
void cudaPostProcessFrame(const cv::gpu::GpuMat& decodedFrame, cv::gpu::GpuMat& interopFrame, int width, int height)
{ {
using namespace cv::gpu::cudev; using namespace cv::gpu::cudev;
static bool updateCSC = true;
static float hueColorSpaceMat[9];
// Upload the Color Space Conversion Matrices
if (updateCSC)
{
const ColorSpace colorSpace = ITU601;
const float hue = 0.0f;
// CCIR 601/709
setColorSpaceMatrix(colorSpace, hueColorSpaceMat, hue);
updateCSC = false;
}
// Final Stage: NV12toARGB color space conversion // Final Stage: NV12toARGB color space conversion
interopFrame.create(height, width, CV_8UC4); _outFrame.create(height, width, CV_8UC4);
GpuMat outFrame = _outFrame.getGpuMat();
loadHueCSC(hueColorSpaceMat);
NV12_to_RGB(decodedFrame, interopFrame); NV12_to_RGB(decodedFrame, outFrame);
} }
}
bool cv::gpu::VideoReader_GPU::Impl::grab(GpuMat& frame) bool VideoReaderImpl::nextFrame(OutputArray frame)
{
if (videoSource_->hasError() || videoParser_->hasError())
CV_Error(cv::Error::StsUnsupportedFormat, "Unsupported video source");
if (!videoSource_->isStarted() || frameQueue_->isEndOfDecode())
return false;
if (frames_.empty())
{ {
CUVIDPARSERDISPINFO displayInfo; if (videoSource_->hasError() || videoParser_->hasError())
CV_Error(Error::StsUnsupportedFormat, "Unsupported video source");
for (;;)
{
if (frameQueue_->dequeue(displayInfo))
break;
if (videoSource_->hasError() || videoParser_->hasError())
CV_Error(cv::Error::StsUnsupportedFormat, "Unsupported video source");
if (frameQueue_->isEndOfDecode()) if (!videoSource_->isStarted() || frameQueue_->isEndOfDecode())
return false; return false;
// Wait a bit if (frames_.empty())
detail::Thread::sleep(1);
}
bool isProgressive = displayInfo.progressive_frame != 0;
const int num_fields = isProgressive ? 1 : 2 + displayInfo.repeat_first_field;
for (int active_field = 0; active_field < num_fields; ++active_field)
{ {
CUVIDPROCPARAMS videoProcParams; CUVIDPARSERDISPINFO displayInfo;
std::memset(&videoProcParams, 0, sizeof(CUVIDPROCPARAMS));
videoProcParams.progressive_frame = displayInfo.progressive_frame; for (;;)
videoProcParams.second_field = active_field; {
videoProcParams.top_field_first = displayInfo.top_field_first; if (frameQueue_->dequeue(displayInfo))
videoProcParams.unpaired_field = (num_fields == 1); break;
frames_.push_back(std::make_pair(displayInfo, videoProcParams)); if (videoSource_->hasError() || videoParser_->hasError())
} CV_Error(Error::StsUnsupportedFormat, "Unsupported video source");
}
if (frames_.empty()) if (frameQueue_->isEndOfDecode())
return false; return false;
std::pair<CUVIDPARSERDISPINFO, CUVIDPROCPARAMS> frameInfo = frames_.front(); // Wait a bit
frames_.pop_front(); detail::Thread::sleep(1);
}
{ bool isProgressive = displayInfo.progressive_frame != 0;
VideoCtxAutoLock autoLock(lock_); const int num_fields = isProgressive ? 1 : 2 + displayInfo.repeat_first_field;
// map decoded video frame to CUDA surface for (int active_field = 0; active_field < num_fields; ++active_field)
cv::gpu::GpuMat decodedFrame = videoDecoder_->mapFrame(frameInfo.first.picture_index, frameInfo.second); {
CUVIDPROCPARAMS videoProcParams;
std::memset(&videoProcParams, 0, sizeof(CUVIDPROCPARAMS));
// perform post processing on the CUDA surface (performs colors space conversion and post processing) videoProcParams.progressive_frame = displayInfo.progressive_frame;
// comment this out if we inclue the line of code seen above videoProcParams.second_field = active_field;
cudaPostProcessFrame(decodedFrame, frame, videoDecoder_->targetWidth(), videoDecoder_->targetHeight()); videoProcParams.top_field_first = displayInfo.top_field_first;
videoProcParams.unpaired_field = (num_fields == 1);
// unmap video frame frames_.push_back(std::make_pair(displayInfo, videoProcParams));
// unmapFrame() synchronizes with the VideoDecode API (ensures the frame has finished decoding) }
videoDecoder_->unmapFrame(decodedFrame); }
}
// release the frame, so it can be re-used in decoder if (frames_.empty())
if (frames_.empty()) return false;
frameQueue_->releaseFrame(frameInfo.first);
return true; std::pair<CUVIDPARSERDISPINFO, CUVIDPROCPARAMS> frameInfo = frames_.front();
} frames_.pop_front();
//////////////////////////////////////////////////////////////////////////// {
VideoCtxAutoLock autoLock(lock_);
cv::gpu::VideoReader_GPU::VideoReader_GPU() // map decoded video frame to CUDA surface
{ GpuMat decodedFrame = videoDecoder_->mapFrame(frameInfo.first.picture_index, frameInfo.second);
}
cv::gpu::VideoReader_GPU::VideoReader_GPU(const String& filename) // perform post processing on the CUDA surface (performs colors space conversion and post processing)
{ // comment this out if we inclue the line of code seen above
open(filename); cudaPostProcessFrame(decodedFrame, frame, videoDecoder_->targetWidth(), videoDecoder_->targetHeight());
}
cv::gpu::VideoReader_GPU::VideoReader_GPU(const cv::Ptr<VideoSource>& source) // unmap video frame
{ // unmapFrame() synchronizes with the VideoDecode API (ensures the frame has finished decoding)
open(source); videoDecoder_->unmapFrame(decodedFrame);
} }
cv::gpu::VideoReader_GPU::~VideoReader_GPU() // release the frame, so it can be re-used in decoder
{ if (frames_.empty())
close(); frameQueue_->releaseFrame(frameInfo.first);
return true;
}
} }
void cv::gpu::VideoReader_GPU::open(const String& filename) Ptr<VideoReader> cv::gpucodec::createVideoReader(const String& filename)
{ {
CV_Assert( !filename.empty() ); CV_Assert( !filename.empty() );
#ifndef __APPLE__ Ptr<detail::VideoSource> videoSource;
try try
{ {
cv::Ptr<VideoSource> source(new detail::CuvidVideoSource(filename)); videoSource = new detail::CuvidVideoSource(filename);
open(source);
}
catch (const std::runtime_error&)
#endif
{
cv::Ptr<VideoSource> source(new cv::gpu::detail::FFmpegVideoSource(filename));
open(source);
} }
} catch (...)
void cv::gpu::VideoReader_GPU::open(const cv::Ptr<VideoSource>& source)
{
CV_Assert( !source.empty() );
close();
impl_ = new Impl(source);
}
bool cv::gpu::VideoReader_GPU::isOpened() const
{
return !impl_.empty();
}
void cv::gpu::VideoReader_GPU::close()
{
impl_.release();
}
bool cv::gpu::VideoReader_GPU::read(GpuMat& image)
{
if (!isOpened())
return false;
if (!impl_->grab(image))
{ {
close(); Ptr<RawVideoSource> source(new detail::FFmpegVideoSource(filename));
return false; videoSource = new detail::RawVideoSourceWrapper(source);
} }
return true; return new VideoReaderImpl(videoSource);
}
cv::gpu::VideoReader_GPU::FormatInfo cv::gpu::VideoReader_GPU::format() const
{
CV_Assert( isOpened() );
return impl_->format();
}
bool cv::gpu::VideoReader_GPU::VideoSource::parseVideoData(const unsigned char* data, size_t size, bool endOfStream)
{
return videoParser_->parseVideoData(data, size, endOfStream);
} }
void cv::gpu::VideoReader_GPU::dumpFormat(std::ostream& st) Ptr<VideoReader> cv::gpucodec::createVideoReader(const Ptr<RawVideoSource>& source)
{ {
static const char* codecs[] = Ptr<detail::VideoSource> videoSource(new detail::RawVideoSourceWrapper(source));
{ return new VideoReaderImpl(videoSource);
"MPEG1",
"MPEG2",
"MPEG4",
"VC1",
"H264",
"JPEG",
"H264_SVC",
"H264_MVC"
};
static const char* chromas[] =
{
"Monochrome",
"YUV420",
"YUV422",
"YUV444"
};
FormatInfo _format = this->format();
st << "Frame Size : " << _format.width << "x" << _format.height << std::endl;
st << "Codec : " << (_format.codec <= H264_MVC ? codecs[_format.codec] : "Uncompressed YUV") << std::endl;
st << "Chroma Format : " << chromas[_format.chromaFormat] << std::endl;
} }
#endif // HAVE_NVCUVID #endif // HAVE_NVCUVID
template <> void cv::Ptr<cv::gpu::VideoReader_GPU::Impl>::delete_obj()
{
if (obj) delete obj;
}
modules/gpucodec/src/video_source.cpp 0 → 100644
浏览文件 @ 76211709
/*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
modules/gpucodec/src/video_source.hpp 0 → 100644
浏览文件 @ 76211709
/*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__
modules/gpucodec/test/test_video.cpp
浏览文件 @ 76211709
...@@ -57,19 +57,15 @@ GPU_TEST_P(Video, Reader) ...@@ -57,19 +57,15 @@ GPU_TEST_P(Video, Reader)
const std::string inputFile = std::string(cvtest::TS::ptr()->get_data_path()) + "video/" + GET_PARAM(1); const std::string inputFile = std::string(cvtest::TS::ptr()->get_data_path()) + "video/" + GET_PARAM(1);
cv::gpu::VideoReader_GPU reader(inputFile); cv::Ptr<cv::gpucodec::VideoReader> reader = cv::gpucodec::createVideoReader(inputFile);
ASSERT_TRUE(reader.isOpened());
cv::gpu::GpuMat frame; cv::gpu::GpuMat frame;
for (int i = 0; i < 10; ++i) for (int i = 0; i < 10; ++i)
{ {
ASSERT_TRUE(reader.read(frame)); ASSERT_TRUE(reader->nextFrame(frame));
ASSERT_FALSE(frame.empty()); ASSERT_FALSE(frame.empty());
} }
reader.close();
ASSERT_FALSE(reader.isOpened());
} }
////////////////////////////////////////////////////// //////////////////////////////////////////////////////
......
modules/superres/src/frame_source.cpp
浏览文件 @ 76211709
...@@ -210,7 +210,7 @@ namespace ...@@ -210,7 +210,7 @@ namespace
private: private:
String fileName_; String fileName_;
VideoReader_GPU reader_; Ptr<gpucodec::VideoReader> reader_;
GpuMat frame_; GpuMat frame_;
}; };
...@@ -223,13 +223,13 @@ namespace ...@@ -223,13 +223,13 @@ namespace
{ {
if (_frame.kind() == _InputArray::GPU_MAT) if (_frame.kind() == _InputArray::GPU_MAT)
{ {
bool res = reader_.read(_frame.getGpuMatRef()); bool res = reader_->nextFrame(_frame.getGpuMatRef());
if (!res) if (!res)
_frame.release(); _frame.release();
} }
else else
{ {
bool res = reader_.read(frame_); bool res = reader_->nextFrame(frame_);
if (!res) if (!res)
_frame.release(); _frame.release();
else else
...@@ -239,9 +239,7 @@ namespace ...@@ -239,9 +239,7 @@ namespace
void VideoFrameSource_GPU::reset() void VideoFrameSource_GPU::reset()
{ {
reader_.close(); reader_ = gpucodec::createVideoReader(fileName_);
reader_.open(fileName_);
CV_Assert( reader_.isOpened() );
} }
} }
......
samples/gpu/video_reader.cpp
浏览文件 @ 76211709
...@@ -30,8 +30,7 @@ int main(int argc, const char* argv[]) ...@@ -30,8 +30,7 @@ int main(int argc, const char* argv[])
cv::VideoCapture reader(fname); cv::VideoCapture reader(fname);
cv::gpu::GpuMat d_frame; cv::gpu::GpuMat d_frame;
cv::gpu::VideoReader_GPU d_reader(fname); cv::Ptr<cv::gpucodec::VideoReader> d_reader = cv::gpucodec::createVideoReader(fname);
d_reader.dumpFormat(std::cout);
cv::TickMeter tm; cv::TickMeter tm;
std::vector<double> cpu_times; std::vector<double> cpu_times;
...@@ -46,7 +45,7 @@ int main(int argc, const char* argv[]) ...@@ -46,7 +45,7 @@ int main(int argc, const char* argv[])
cpu_times.push_back(tm.getTimeMilli()); cpu_times.push_back(tm.getTimeMilli());
tm.reset(); tm.start(); tm.reset(); tm.start();
if (!d_reader.read(d_frame)) if (!d_reader->nextFrame(d_frame))
break; break;
tm.stop(); tm.stop();
gpu_times.push_back(tm.getTimeMilli()); gpu_times.push_back(tm.getTimeMilli());
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或