From b70370f3fdb39b08c8be3c22aafbb77a7063bdba Mon Sep 17 00:00:00 2001 From: Sergey Ivanov Date: Fri, 10 Dec 2021 11:58:59 +0300 Subject: [PATCH] Merge pull request #21230 from sivanov-work:gapi_win32_vpl_fix G-API: Fix Win32 build: uint64_t ->size_t * Fix Win32 build: uint64_t ->size_t * Fix for MAC --- .../include/opencv2/gapi/streaming/onevpl/cfg_params.hpp | 2 +- modules/gapi/samples/onevpl_infer_single_roi.cpp | 4 ++-- modules/gapi/src/streaming/onevpl/cfg_params.cpp | 8 ++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/gapi/include/opencv2/gapi/streaming/onevpl/cfg_params.hpp b/modules/gapi/include/opencv2/gapi/streaming/onevpl/cfg_params.hpp index 0f35200f49..bfd922496a 100644 --- a/modules/gapi/include/opencv2/gapi/streaming/onevpl/cfg_params.hpp +++ b/modules/gapi/include/opencv2/gapi/streaming/onevpl/cfg_params.hpp @@ -61,7 +61,7 @@ struct GAPI_EXPORTS CfgParam { * */ static constexpr const char *frames_pool_size_name() { return "frames_pool_size"; } - static CfgParam create_frames_pool_size(uint64_t value); + static CfgParam create_frames_pool_size(size_t value); /** * @brief acceleration_mode_name diff --git a/modules/gapi/samples/onevpl_infer_single_roi.cpp b/modules/gapi/samples/onevpl_infer_single_roi.cpp index 1ab06de739..06950bcabe 100644 --- a/modules/gapi/samples/onevpl_infer_single_roi.cpp +++ b/modules/gapi/samples/onevpl_infer_single_roi.cpp @@ -196,8 +196,8 @@ int main(int argc, char *argv[]) { std::string file_path = cmd.get("input"); const std::string output = cmd.get("output"); const auto face_model_path = cmd.get("facem"); - const auto streaming_queue_capacity = cmd.get("streaming_queue_capacity"); - const auto source_queue_capacity = cmd.get("frames_pool_size"); + const auto streaming_queue_capacity = cmd.get("streaming_queue_capacity"); + const auto source_queue_capacity = cmd.get("frames_pool_size"); // check ouput file extension if (!output.empty()) { diff --git a/modules/gapi/src/streaming/onevpl/cfg_params.cpp b/modules/gapi/src/streaming/onevpl/cfg_params.cpp index 97458faed3..599f751358 100644 --- a/modules/gapi/src/streaming/onevpl/cfg_params.cpp +++ b/modules/gapi/src/streaming/onevpl/cfg_params.cpp @@ -86,8 +86,12 @@ CfgParam::CfgParam (const std::string& param_name, value_t&& param_value, bool i CfgParam::~CfgParam() = default; -CfgParam CfgParam::create_frames_pool_size(uint64_t value) { - return CfgParam::create(CfgParam::frames_pool_size_name(), value, false); +CfgParam CfgParam::create_frames_pool_size(size_t value) { + // NB: cast to uint64_t because CfgParam inner variant works over + // uint64_t instead of size_t and mirrored VPL types variety + // but size_t looks more friendly for C++ high-level development + return CfgParam::create(CfgParam::frames_pool_size_name(), + static_cast(value), false); } CfgParam CfgParam::create_acceleration_mode(uint32_t value) {