mirror of https://github.com/opencv/opencv.git
Minor refactoring Partially address review comments Move DX-related stuff from the sample to a default source Simplify the default OneVPL config Address minor review comments Add class for the default VPL source WIP: Add initial stub for tests with description Removing default vpl source and minor refactoring Refactor default files Fix build and application crash Address review comments Add test on VPL + OCL interaction compared to CPU behavior Fix testpull/22559/head
Alexey Smirnov
2 years ago
parent
2aad039b4f
commit
4c74e6d89d
16 changed files with 386 additions and 16 deletions
@ -0,0 +1,29 @@ |
||||
// This file is part of OpenCV project.
|
||||
// It is subject to the license terms in the LICENSE file found in the top-level directory
|
||||
// of this distribution and at http://opencv.org/license.html.
|
||||
//
|
||||
// Copyright (C) 2022 Intel Corporation
|
||||
|
||||
#ifndef OPENCV_GAPI_STREAMING_ONEVPL_UTILS_HPP |
||||
#define OPENCV_GAPI_STREAMING_ONEVPL_UTILS_HPP |
||||
|
||||
#include <opencv2/gapi/own/exports.hpp> // GAPI_EXPORTS |
||||
#include <opencv2/gapi/streaming/onevpl/cfg_params.hpp> |
||||
#include <opencv2/gapi/streaming/onevpl/device_selector_interface.hpp> |
||||
|
||||
namespace cv { |
||||
namespace gapi { |
||||
namespace wip { |
||||
namespace onevpl { |
||||
|
||||
/**
|
||||
* @brief Provides default device selector based on config. |
||||
*/ |
||||
GAPI_EXPORTS std::shared_ptr<IDeviceSelector> getDefaultDeviceSelector(const std::vector<CfgParam>& cfg_params); |
||||
|
||||
} // namespace onevpl
|
||||
} // namespace wip
|
||||
} // namespace gapi
|
||||
} // namespace cv
|
||||
|
||||
#endif // OPENCV_GAPI_STREAMING_ONEVPL_UTILS_HPP
|
||||
@ -0,0 +1,106 @@ |
||||
#include <algorithm> |
||||
#include <fstream> |
||||
#include <iostream> |
||||
#include <cctype> |
||||
#include <tuple> |
||||
#include <memory> |
||||
|
||||
#include <opencv2/imgproc.hpp> |
||||
#include <opencv2/gapi.hpp> |
||||
#include <opencv2/gapi/core.hpp> |
||||
#include <opencv2/gapi/gpu/ggpukernel.hpp> |
||||
#include <opencv2/gapi/streaming/onevpl/source.hpp> |
||||
#include <opencv2/gapi/streaming/onevpl/data_provider_interface.hpp> |
||||
#include <opencv2/gapi/streaming/onevpl/default.hpp> |
||||
#include <opencv2/highgui.hpp> // CommandLineParser |
||||
#include <opencv2/gapi/ocl/core.hpp> |
||||
|
||||
const std::string about = |
||||
"This is an example presents decoding on GPU using VPL Source and passing it to OpenCL backend"; |
||||
const std::string keys = |
||||
"{ h help | | Print this help message }" |
||||
"{ input | | Path to the input video file. Use .avi extension }" |
||||
"{ accel_mode | mfxImplDescription.AccelerationMode:MFX_ACCEL_MODE_VIA_D3D11 | Acceleration mode for VPL }"; |
||||
|
||||
namespace { |
||||
namespace cfg { |
||||
// FIXME: Move OneVPL arguments parser to a single place
|
||||
typename cv::gapi::wip::onevpl::CfgParam create_from_string(const std::string &line); |
||||
} // namespace cfg
|
||||
} // anonymous namespace
|
||||
|
||||
int main(int argc, char *argv[]) { |
||||
cv::CommandLineParser cmd(argc, argv, keys); |
||||
cmd.about(about); |
||||
if (cmd.has("help")) { |
||||
cmd.printMessage(); |
||||
return 0; |
||||
} |
||||
|
||||
// Get file name
|
||||
const auto input = cmd.get<std::string>("input"); |
||||
const auto accel_mode = cmd.get<std::string>("accel_mode"); |
||||
|
||||
// Create VPL config
|
||||
std::vector<cv::gapi::wip::onevpl::CfgParam> source_cfgs; |
||||
source_cfgs.push_back(cfg::create_from_string(accel_mode)); |
||||
|
||||
// Create VPL-based source
|
||||
std::shared_ptr<cv::gapi::wip::onevpl::IDeviceSelector> default_device_selector = |
||||
cv::gapi::wip::onevpl::getDefaultDeviceSelector(source_cfgs); |
||||
|
||||
cv::gapi::wip::IStreamSource::Ptr source = cv::gapi::wip::make_onevpl_src(input, source_cfgs, |
||||
default_device_selector); |
||||
|
||||
// Build the graph
|
||||
cv::GFrame in; // input frame from VPL source
|
||||
auto bgr_gmat = cv::gapi::streaming::BGR(in); // conversion from VPL source frame to BGR UMat
|
||||
auto out = cv::gapi::blur(bgr_gmat, cv::Size(4,4)); // ocl kernel of blur operation
|
||||
|
||||
cv::GStreamingCompiled pipeline = cv::GComputation(cv::GIn(in), cv::GOut(out)) |
||||
.compileStreaming(cv::compile_args(cv::gapi::core::ocl::kernels())); |
||||
pipeline.setSource(std::move(source)); |
||||
|
||||
// The execution part
|
||||
size_t frames = 0u; |
||||
cv::TickMeter tm; |
||||
cv::Mat outMat; |
||||
|
||||
pipeline.start(); |
||||
tm.start(); |
||||
|
||||
while (pipeline.pull(cv::gout(outMat))) { |
||||
cv::imshow("OutVideo", outMat); |
||||
cv::waitKey(1); |
||||
++frames; |
||||
} |
||||
tm.stop(); |
||||
std::cout << "Processed " << frames << " frames" << " (" << frames / tm.getTimeSec() << " FPS)" << std::endl; |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
namespace { |
||||
namespace cfg { |
||||
typename cv::gapi::wip::onevpl::CfgParam create_from_string(const std::string &line) { |
||||
using namespace cv::gapi::wip; |
||||
|
||||
if (line.empty()) { |
||||
throw std::runtime_error("Cannot parse CfgParam from emply line"); |
||||
} |
||||
|
||||
std::string::size_type name_endline_pos = line.find(':'); |
||||
if (name_endline_pos == std::string::npos) { |
||||
throw std::runtime_error("Cannot parse CfgParam from: " + line + |
||||
"\nExpected separator \":\""); |
||||
} |
||||
|
||||
std::string name = line.substr(0, name_endline_pos); |
||||
std::string value = line.substr(name_endline_pos + 1); |
||||
|
||||
return cv::gapi::wip::onevpl::CfgParam::create(name, value, |
||||
/* vpp params strongly optional */ |
||||
name.find("vpp.") == std::string::npos); |
||||
} |
||||
} // namespace cfg
|
||||
} // anonymous namespace
|
||||
@ -0,0 +1,52 @@ |
||||
// This file is part of OpenCV project.
|
||||
// It is subject to the license terms in the LICENSE file found in the top-level directory
|
||||
// of this distribution and at http://opencv.org/license.html.
|
||||
//
|
||||
// Copyright (C) 2022 Intel Corporation
|
||||
|
||||
#include <iostream> |
||||
#include <memory> |
||||
|
||||
#include <opencv2/gapi/streaming/onevpl/default.hpp> |
||||
#include <opencv2/gapi/streaming/onevpl/cfg_params.hpp> |
||||
#include <opencv2/gapi/streaming/onevpl/device_selector_interface.hpp> |
||||
|
||||
#include "cfg_param_device_selector.hpp" |
||||
|
||||
#ifdef HAVE_ONEVPL |
||||
|
||||
namespace cv { |
||||
namespace gapi { |
||||
namespace wip { |
||||
namespace onevpl { |
||||
|
||||
std::shared_ptr<IDeviceSelector> getDefaultDeviceSelector(const std::vector<CfgParam>& cfg_params) { |
||||
std::shared_ptr<CfgParamDeviceSelector> default_accel_contex(new CfgParamDeviceSelector(cfg_params)); |
||||
|
||||
return default_accel_contex; |
||||
} |
||||
|
||||
} // namespace onevpl
|
||||
} // namespace wip
|
||||
} // namespace gapi
|
||||
} // namespace cv
|
||||
|
||||
#else // HAVE_ONEVPL
|
||||
|
||||
namespace cv { |
||||
namespace gapi { |
||||
namespace wip { |
||||
namespace onevpl { |
||||
|
||||
std::shared_ptr<IDeviceSelector> getDefaultDeviceSelector(const std::vector<CfgParam>&) { |
||||
std::cerr << "Cannot utilize getDefaultVPLDeviceAndCtx without HAVE_ONEVPL enabled" << std::endl; |
||||
util::throw_error(std::logic_error("Cannot utilize getDefaultVPLDeviceAndCtx without HAVE_ONEVPL enabled")); |
||||
return nullptr; |
||||
} |
||||
|
||||
} // namespace onevpl
|
||||
} // namespace wip
|
||||
} // namespace gapi
|
||||
} // namespace cv
|
||||
|
||||
#endif // HAVE_ONEVPL
|
||||
Loading…
Reference in new issue