Merge pull request #22507 from TolyaTalamanov:at/replace-mfx-major-version-assert-to-warning

G-API: Replace MFX major version assertion to warning
pull/22526/head
Alexander Smorkalov 3 years ago committed by GitHub
commit 1ae801554d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      modules/gapi/src/streaming/onevpl/source_priv.cpp

@ -227,10 +227,10 @@ GSource::Priv::Priv(std::shared_ptr<IDataProvider> provider,
// TODO Add factory static method in ProcessingEngineBase // TODO Add factory static method in ProcessingEngineBase
if (mfx_impl_description->ApiVersion.Major >= VPL_NEW_API_MAJOR_VERSION) { if (mfx_impl_description->ApiVersion.Major >= VPL_NEW_API_MAJOR_VERSION) {
GAPI_Assert(false && GAPI_LOG_WARNING(NULL,
"GSource mfx_impl_description->ApiVersion.Major >= VPL_NEW_API_MAJOR_VERSION" "GSource mfx_impl_description->ApiVersion.Major >= VPL_NEW_API_MAJOR_VERSION"
" - is not implemented"); " - is not implemented. Rollback to MFX implementation");
} else { }
const auto& transcode_params = VPLLegacyTranscodeEngine::get_vpp_params(preferred_params); const auto& transcode_params = VPLLegacyTranscodeEngine::get_vpp_params(preferred_params);
if (!transcode_params.empty()) { if (!transcode_params.empty()) {
engine.reset(new VPLLegacyTranscodeEngine(std::move(acceleration))); engine.reset(new VPLLegacyTranscodeEngine(std::move(acceleration)));
@ -238,7 +238,6 @@ GSource::Priv::Priv(std::shared_ptr<IDataProvider> provider,
engine.reset(new VPLLegacyDecodeEngine(std::move(acceleration))); engine.reset(new VPLLegacyDecodeEngine(std::move(acceleration)));
} }
} }
}
// create engine session for processing mfx session pipeline // create engine session for processing mfx session pipeline
auto engine_session_ptr = engine->initialize_session(mfx_session, cfg_params, auto engine_session_ptr = engine->initialize_session(mfx_session, cfg_params,

Loading…
Cancel
Save