mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-01 23:30:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #22994 from alalek:gapi_build_issues

Browse Source
This commit is contained in:
Alexander Alekhin 2022-12-20 09:42:16 +00:00
commit 41d172f22d
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gapi/CMakeLists.txt
View File

@ -382,7 +382,7 @@ if(TARGET example_gapi_onevpl_infer_with_advanced_device_selection)
ocv_target_include_directories(example_gapi_onevpl_infer_with_advanced_device_selection SYSTEM PRIVATE ${OPENCL_INCLUDE_DIRS}) ocv_target_include_directories(example_gapi_onevpl_infer_with_advanced_device_selection SYSTEM PRIVATE ${OPENCL_INCLUDE_DIRS})
endif() endif()
if(UNIX AND HAVE_VA) if(UNIX AND HAVE_VA)
message ("GAPI VPL samples with VAAPI") message(STATUS "GAPI VPL samples with VAAPI")
ocv_target_include_directories(example_gapi_onevpl_infer_with_advanced_device_selection SYSTEM PRIVATE ${VA_INCLUDE_DIR}) ocv_target_include_directories(example_gapi_onevpl_infer_with_advanced_device_selection SYSTEM PRIVATE ${VA_INCLUDE_DIR})
ocv_target_link_libraries(example_gapi_onevpl_infer_with_advanced_device_selection PRIVATE ${VA_LIBRARIES}) ocv_target_link_libraries(example_gapi_onevpl_infer_with_advanced_device_selection PRIVATE ${VA_LIBRARIES})
endif() endif()

3
modules/gapi/src/executor/gtbbexecutor.hpp
View File

@ -12,6 +12,9 @@
#endif #endif
#ifdef HAVE_TBB #ifdef HAVE_TBB
#ifndef TBB_SUPPRESS_DEPRECATED_MESSAGES
#define TBB_SUPPRESS_DEPRECATED_MESSAGES 1
#endif
#include <tbb/tbb.h> #include <tbb/tbb.h>
#include <tbb/task.h> #include <tbb/task.h>
#if TBB_INTERFACE_VERSION < 12000 #if TBB_INTERFACE_VERSION < 12000

6
modules/gapi/test/executor/gtbbexecutor_internal_tests.cpp
View File

@ -50,7 +50,7 @@ TEST(TBBExecutor, Basic) {
}); });
q.push(&n); q.push(&n);
execute(q); execute(q);
EXPECT_EQ(true, executed); EXPECT_TRUE(executed);
} }
TEST(TBBExecutor, SerialExecution) { TEST(TBBExecutor, SerialExecution) {
@ -117,8 +117,8 @@ TEST(TBBExecutor, AsyncBasic) {
async_thread.join(); async_thread.join();
EXPECT_EQ(true, callback_called); EXPECT_TRUE(callback_called);
EXPECT_EQ(true, master_was_blocked_until_callback_called); EXPECT_TRUE(master_was_blocked_until_callback_called);
} }
TEST(TBBExecutor, Dependencies) { TEST(TBBExecutor, Dependencies) {

4
modules/gapi/test/streaming/gapi_gstreamer_pipeline_facade_int_tests.cpp
View File

@ -138,9 +138,9 @@ TEST(GStreamerPipelineFacadeTest, IsPlayingUnitTest)
"video/x-raw,width=1920,height=1080,framerate=3/1 ! " "video/x-raw,width=1920,height=1080,framerate=3/1 ! "
"appsink name=sink2"); "appsink name=sink2");
EXPECT_EQ(false, pipelineFacade.isPlaying()); EXPECT_FALSE(pipelineFacade.isPlaying());
pipelineFacade.play(); pipelineFacade.play();
EXPECT_EQ(true, pipelineFacade.isPlaying()); EXPECT_TRUE(pipelineFacade.isPlaying());
} }
TEST(GStreamerPipelineFacadeTest, MTSafetyUnitTest) TEST(GStreamerPipelineFacadeTest, MTSafetyUnitTest)