Chiebot-Mirror
/
opencv_contrib
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Two factory methods.

Browse Source
pull/3360/head
James Bowley 3 years ago
parent 4fa9c71169
commit fbd6827e71
4 changed files with 18 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 39
      modules/cudacodec/include/opencv2/cudacodec.hpp
  2. 2
      modules/cudacodec/perf/perf_video.cpp
  3. 30
      modules/cudacodec/src/video_writer.cpp
  4. 6
      modules/cudacodec/test/test_video.cpp

39
modules/cudacodec/include/opencv2/cudacodec.hpp
Unescape View File

@ -231,10 +231,11 @@ public:
@param codec Codec. @param codec Codec.
@param fps Framerate of the created video stream. @param fps Framerate of the created video stream.
@param colorFormat OpenCv color format of the frames to be encoded. @param colorFormat OpenCv color format of the frames to be encoded.
@param encoderCallback Callbacks for video encoder. See cudacodec::EncoderCallback. Required for working with the encoded video stream.
@param stream Stream for frame pre-processing. @param stream Stream for frame pre-processing.
*/ */
CV_EXPORTS_W Ptr<cudacodec::VideoWriter> createVideoWriter(const String& fileName, const Size frameSize, const CODEC_VW codec = CODEC_VW::H264, CV_EXPORTS_W Ptr<cudacodec::VideoWriter> createVideoWriter(const String& fileName, const Size frameSize, const CODEC_VW codec = CODEC_VW::H264, const double fps = 25.0,
const double fps = 25.0, const COLOR_FORMAT_VW colorFormat = BGR, const Stream& stream = Stream::Null()); const COLOR_FORMAT_VW colorFormat = BGR, Ptr<EncoderCallback> encoderCallback = 0, const Stream& stream = Stream::Null());
/** @brief Creates video writer. /** @brief Creates video writer.
@ -244,39 +245,11 @@ CV_EXPORTS_W Ptr<cudacodec::VideoWriter> createVideoWriter(const String& fileNam
@param fps Framerate of the created video stream. @param fps Framerate of the created video stream.
@param colorFormat OpenCv color format of the frames to be encoded. @param colorFormat OpenCv color format of the frames to be encoded.
@param params Additional encoding parameters. @param params Additional encoding parameters.
@param encoderCallback Callbacks for video encoder. See cudacodec::EncoderCallback. Required for working with the encoded video stream.
@param stream Stream for frame pre-processing. @param stream Stream for frame pre-processing.
*/ */
CV_EXPORTS_W Ptr<cudacodec::VideoWriter> createVideoWriter(const String& fileName, const Size frameSize, const CODEC_VW codec, CV_EXPORTS_W Ptr<cudacodec::VideoWriter> createVideoWriter(const String& fileName, const Size frameSize, const CODEC_VW codec, const double fps, const COLOR_FORMAT_VW colorFormat,
const double fps, const COLOR_FORMAT_VW colorFormat, const EncoderParams& params, const Stream& stream = Stream::Null()); const EncoderParams& params, Ptr<EncoderCallback> encoderCallback = 0, const Stream& stream = Stream::Null());
/** @brief Creates video writer.
@param encoderCallback Callbacks for video encoder. See cudacodec::EncoderCallback . Use it if you want to work with the raw video stream.
@param frameSize Size of the input video frames.
@param codec Codec.
@param fps Framerate of the created video stream.
@param colorFormat OpenCv color format of the frames to be encoded.
@param stream Stream for frame pre-processing.
The constructors initialize video writer. User can implement their own multiplexing with cudacodec::EncoderCallback.
*/
CV_EXPORTS_W Ptr<cudacodec::VideoWriter> createVideoWriter(const Ptr<EncoderCallback>& encoderCallback, const Size frameSize, const CODEC_VW codec = CODEC_VW::H264,
const double fps = 25.0, const COLOR_FORMAT_VW colorFormat = BGR, const Stream& stream = Stream::Null());
/** @brief Creates video writer.
@param encoderCallback Callbacks for video encoder. See cudacodec::EncoderCallback . Use it if you want to work with the raw video stream.
@param frameSize Size of the input video frames.
@param codec Codec.
@param fps Framerate of the created video stream.
@param colorFormat OpenCv color format of the frames to be encoded.
@param params Additional encoding parameters.
@param stream Stream for frame pre-processing.
The constructors initialize video writer. User can implement their own multiplexing with cudacodec::EncoderCallback.
*/
CV_EXPORTS_W Ptr<cudacodec::VideoWriter> createVideoWriter(const Ptr<EncoderCallback>& encoderCallback, const Size frameSize, const CODEC_VW codec,
const double fps, const COLOR_FORMAT_VW colorFormat, const EncoderParams& params, const Stream& stream = Stream::Null());
////////////////////////////////// Video Decoding ////////////////////////////////////////// ////////////////////////////////// Video Decoding //////////////////////////////////////////

2
modules/cudacodec/perf/perf_video.cpp
Unescape View File

@ -147,7 +147,7 @@ PERF_TEST_P(WriteToFile, VideoWriter, Combine(VIDEO_SRC, COLOR_FORMAT, CODEC))
frames.push_back(frame); frames.push_back(frame);
} }
stream.waitForCompletion(); stream.waitForCompletion();
cv::Ptr<cv::cudacodec::VideoWriter> d_writer = cv::cudacodec::createVideoWriter(outputFile, frameBgr.size(), codec, fps, surfaceFormat, stream); cv::Ptr<cv::cudacodec::VideoWriter> d_writer = cv::cudacodec::createVideoWriter(outputFile, frameBgr.size(), codec, fps, surfaceFormat, 0, stream);
for (int i = 0; i < nFrames - 1; ++i) { for (int i = 0; i < nFrames - 1; ++i) {
startTimer(); startTimer();
d_writer->write(frames[i]); d_writer->write(frames[i]);

30
modules/cudacodec/src/video_writer.cpp
Unescape View File

@ -48,10 +48,8 @@ using namespace cv::cuda;
#if !defined(HAVE_NVCUVENC) #if !defined(HAVE_NVCUVENC)
Ptr<cudacodec::VideoWriter> createVideoWriter(const String&, const Size, const CODEC_VW, const double, const COLOR_FORMAT_VW, const cv::cuda::Stream&) { throw_no_cuda(); return Ptr<cv::cudacodec::VideoWriter>(); } Ptr<cudacodec::VideoWriter> createVideoWriter(const String&, const Size, const CODEC_VW, const double, const COLOR_FORMAT_VW, const Ptr<EncoderCallback>, const cv::cuda::Stream&) { throw_no_cuda(); return Ptr<cv::cudacodec::VideoWriter>(); }
Ptr<cudacodec::VideoWriter> createVideoWriter(const String&, const Size, const CODEC_VW, const double, const COLOR_FORMAT_VW, const EncoderParams&, const cv::cuda::Stream&) { throw_no_cuda(); return Ptr<cv::cudacodec::VideoWriter>(); } Ptr<cudacodec::VideoWriter> createVideoWriter(const String&, const Size, const CODEC_VW, const double, const COLOR_FORMAT_VW, const EncoderParams&, const Ptr<EncoderCallback>, const cv::cuda::Stream&) { throw_no_cuda(); return Ptr<cv::cudacodec::VideoWriter>(); }
Ptr<cudacodec::VideoWriter> createVideoWriter(const Ptr<EncoderCallback>&, const Size, const CODEC_VW codec, const double, const COLOR_FORMAT_VW, const cv::cuda::Stream&) { throw_no_cuda(); return Ptr<cv::cudacodec::VideoWriter>(); }
Ptr<cudacodec::VideoWriter> createVideoWriter(const Ptr<EncoderCallback>&, const Size, const CODEC_VW, const double, const COLOR_FORMAT_VW, const EncoderParams&, const cv::cuda::Stream&) { throw_no_cuda(); return Ptr<cv::cudacodec::VideoWriter>(); }
#else // !defined HAVE_NVCUVENC #else // !defined HAVE_NVCUVENC
@ -376,29 +374,17 @@ EncoderParams VideoWriterImpl::getEncoderParams() const {
return encoderParams; return encoderParams;
}; };
Ptr<VideoWriter> createVideoWriter(const String& fileName, const Size frameSize, const CODEC_VW codec, const double fps, Ptr<VideoWriter> createVideoWriter(const String& fileName, const Size frameSize, const CODEC_VW codec, const double fps, const COLOR_FORMAT_VW colorFormat,
const COLOR_FORMAT_VW colorFormat, const Stream& stream) Ptr<EncoderCallback> encoderCallback, const Stream& stream)
{
Ptr<EncoderCallback> rawVideoWriter = new RawVideoWriter(fileName);
return createVideoWriter(rawVideoWriter, frameSize, codec, fps, colorFormat, stream);
}
Ptr<VideoWriter> createVideoWriter(const String& fileName, const Size frameSize, const CODEC_VW codec, const double fps,
const COLOR_FORMAT_VW colorFormat, const EncoderParams& params, const Stream& stream)
{
Ptr<EncoderCallback> rawVideoWriter = new RawVideoWriter(fileName);
return createVideoWriter(rawVideoWriter, frameSize, codec, fps, colorFormat, params, stream);
}
Ptr<VideoWriter> createVideoWriter(const Ptr<EncoderCallback>& encoderCallback, const Size frameSize, const CODEC_VW codec, const double fps,
const COLOR_FORMAT_VW colorFormat, const Stream& stream)
{ {
encoderCallback = encoderCallback ? encoderCallback : new RawVideoWriter(fileName);
return makePtr<VideoWriterImpl>(encoderCallback, frameSize, codec, fps, colorFormat, stream); return makePtr<VideoWriterImpl>(encoderCallback, frameSize, codec, fps, colorFormat, stream);
} }
Ptr<VideoWriter> createVideoWriter(const Ptr<EncoderCallback>& encoderCallback, const Size frameSize, const CODEC_VW codec, const double fps, Ptr<VideoWriter> createVideoWriter(const String& fileName, const Size frameSize, const CODEC_VW codec, const double fps, const COLOR_FORMAT_VW colorFormat,
const COLOR_FORMAT_VW colorFormat, const EncoderParams& params, const Stream& stream) const EncoderParams& params, Ptr<EncoderCallback> encoderCallback, const Stream& stream)
{ {
encoderCallback = encoderCallback ? encoderCallback : new RawVideoWriter(fileName);
return makePtr<VideoWriterImpl>(encoderCallback, frameSize, codec, fps, colorFormat, params, stream); return makePtr<VideoWriterImpl>(encoderCallback, frameSize, codec, fps, colorFormat, params, stream);
} }

6
modules/cudacodec/test/test_video.cpp
Unescape View File

@ -463,7 +463,7 @@ CUDA_TEST_P(TransCode, H264ToH265)
Mat tst; frame.download(tst); Mat tst; frame.download(tst);
if (writer.empty()) { if (writer.empty()) {
frameSz = Size(fmt.width, fmt.height); frameSz = Size(fmt.width, fmt.height);
writer = cv::cudacodec::createVideoWriter(outputFile, frameSz, codec, fps, colorFormat, stream); writer = cv::cudacodec::createVideoWriter(outputFile, frameSz, codec, fps, colorFormat, 0, stream);
} }
writer->write(frame); writer->write(frame);
} }
@ -537,7 +537,7 @@ CUDA_TEST_P(Write, Writer)
ASSERT_FALSE(frame.empty()); ASSERT_FALSE(frame.empty());
if (writer.empty()) { if (writer.empty()) {
frameSz = frame.size(); frameSz = frame.size();
writer = cv::cudacodec::createVideoWriter(outputFile, frameSz, codec, fps, colorFormat, stream); writer = cv::cudacodec::createVideoWriter(outputFile, frameSz, codec, fps, colorFormat, 0, stream);
} }
CvtColor(frame, frameNewSf, colorFormat); CvtColor(frame, frameNewSf, colorFormat);
if (deviceSrc) { if (deviceSrc) {
@ -618,7 +618,7 @@ CUDA_TEST_P(EncoderParams, Writer)
dFrame.upload(frame); dFrame.upload(frame);
if (writer.empty()) { if (writer.empty()) {
frameSz = frame.size(); frameSz = frame.size();
writer = cv::cudacodec::createVideoWriter(outputFile, frameSz, codec, fps, colorFormat, params, stream); writer = cv::cudacodec::createVideoWriter(outputFile, frameSz, codec, fps, colorFormat, params, 0, stream);
cv::cudacodec::EncoderParams paramsOut = writer->getEncoderParams(); cv::cudacodec::EncoderParams paramsOut = writer->getEncoderParams();
ASSERT_EQ(params, paramsOut); ASSERT_EQ(params, paramsOut);
} }

Write Preview
Loading…
Cancel
Save