mirror of
https://github.com/opencv/opencv.git
synced 2026-07-31 08:13:04 +04:00
Merge pull request #21049 from sivanov-work:vpl_dx11_merge
G-API: oneVPL merge DX11 acceleration * Merge DX11 initial * Fold conditions row in MACRO in utils * Inject DeviceSelector * Turn on DeviceSelector in DX11 * Change sharedLock logic & Move FMT checking in FrameAdapter c-tor * Move out NumSuggestFrame to configure params * Drain file source fix * Fix compilation * Force zero initializetion of SharedLock * Fix some compiler warnings * Fix integer comparison warnings * Fix integers in sample * Integrate Demux * Fix compilation * Add predefined names for some CfgParam * Trigger CI * Fix MultithreadCtx bug, Add Dx11 GetBlobParam(), Get rif of ATL CComPtr * Fix UT: remove unit test with deprecated video from opencv_extra * Add creators for most usable CfgParam * Eliminate some warnings * Fix warning in GAPI_Assert * Apply comments * Add VPL wrapped header with MSVC pragma to get rid of global warning masking
This commit is contained in:
@@ -39,8 +39,6 @@ array_element_t files[] = {
|
||||
true, true, true},
|
||||
array_element_t {"highgui/video/sample_322x242_15frames.yuv420p.libvpx-vp9.mp4",
|
||||
true, true, true},
|
||||
array_element_t {"highgui/video/sample_322x242_15frames.yuv420p.libx264.avi",
|
||||
true, true, true},
|
||||
array_element_t {"highgui/video/sample_322x242_15frames.yuv420p.libx264.mp4",
|
||||
true, true, true},
|
||||
array_element_t {"highgui/video/sample_322x242_15frames.yuv420p.libx265.mp4",
|
||||
@@ -82,7 +80,7 @@ TEST_P(OneVPL_Source_MFPAsyncDispatcherTest, open_and_decode_file)
|
||||
mfxVariant mfx_param_0;
|
||||
mfx_param_0.Type = MFX_VARIANT_TYPE_U32;
|
||||
mfx_param_0.Data.U32 = provider_ptr->get_mfx_codec_id();
|
||||
EXPECT_EQ(MFXSetConfigFilterProperty(cfg_inst_0,(mfxU8 *)"mfxImplDescription.mfxDecoderDescription.decoder.CodecID",
|
||||
EXPECT_EQ(MFXSetConfigFilterProperty(cfg_inst_0,(mfxU8 *)CfgParam::decoder_id_name(),
|
||||
mfx_param_0), MFX_ERR_NONE);
|
||||
|
||||
// create MFX session
|
||||
@@ -135,7 +133,7 @@ TEST_P(OneVPL_Source_MFPAsyncDispatcherTest, choose_dmux_provider)
|
||||
EXPECT_FALSE(dd_result);
|
||||
provider_ptr = DataProviderDispatcher::create(path,
|
||||
{ CfgParam::create<std::string>(
|
||||
"mfxImplDescription.mfxDecoderDescription.decoder.CodecID",
|
||||
CfgParam::decoder_id_name(),
|
||||
"MFX_CODEC_HEVC") /* Doesn't matter what codec for RAW here*/});
|
||||
EXPECT_TRUE(std::dynamic_pointer_cast<FileDataProvider>(provider_ptr));
|
||||
GTEST_SUCCEED();
|
||||
|
||||
Reference in New Issue
Block a user