Skip to content

Commit

Permalink
[RT Common] Put top-level params' filling in ImplDescription in one f…
Browse files Browse the repository at this point in the history 
…unction

Put top-level params' filling in ImplDescription in one internal
function, for later use in another "lightweight" version of
MFX_IMPLCAPS_IMPLDESCSTRUCTURE, and use in future's new API for property
based query.
  • Loading branch information
@jinyuan-dev @gfxVPLsdm
jinyuan-dev authored and gfxVPLsdm committed Nov 13, 2024
1 parent 5de4322 commit 8ea4583
Showing 1 changed file with 51 additions and 46 deletions.
97 changes: 51 additions & 46 deletions _studio/mfx_lib/shared/src/libmfxsw.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -710,6 +710,56 @@ static bool QueryImplCaps(std::function < bool (VideoCORE&, mfxU32, mfxU32 , mfx
return true;
};

static void FillImplsDescription(mfx::ImplDescription& impl, VideoCORE& core, mfxU32 deviceId, mfxU32 adapterNum, const std::vector<bool>& subDevMask)
{
impl.Version.Version = MFX_STRUCT_VERSION(1, 2);
impl.Impl = MFX_IMPL_TYPE_HARDWARE;
impl.ApiVersion = { { MFX_VERSION_MINOR, MFX_VERSION_MAJOR } };
impl.VendorID = 0x8086;
// use adapterNum as VendorImplID, app. supposed just to copy it from mfxImplDescription to mfxInitializationParam
impl.VendorImplID = adapterNum;
impl.AccelerationMode = core.GetVAType() == MFX_HW_VAAPI ? MFX_ACCEL_MODE_VIA_VAAPI : MFX_ACCEL_MODE_VIA_D3D11;

impl.AccelerationModeDescription.Version.Version = MFX_STRUCT_VERSION(1, 0);
mfx::PODArraysHolder& ah = impl;
ah.PushBack(impl.AccelerationModeDescription.Mode) = impl.AccelerationMode;
impl.AccelerationModeDescription.NumAccelerationModes++;
impl.PoolPolicies.Version.Version = MFX_STRUCT_VERSION(1, 0);
impl.PoolPolicies.NumPoolPolicies = 3;
ah.PushBack(impl.PoolPolicies.Policy) = MFX_ALLOCATION_OPTIMAL;
ah.PushBack(impl.PoolPolicies.Policy) = MFX_ALLOCATION_UNLIMITED;
ah.PushBack(impl.PoolPolicies.Policy) = MFX_ALLOCATION_LIMITED;

impl.Dev.Version.Version = MFX_STRUCT_VERSION(1, 1);
impl.Dev.MediaAdapterType = MFX_MEDIA_UNKNOWN;

if (auto pCore1_19 = QueryCoreInterface<IVideoCore_API_1_19>(&core, MFXICORE_API_1_19_GUID))
{
mfxPlatform platform = {};
if (MFX_ERR_NONE == pCore1_19->QueryPlatform(&platform))
impl.Dev.MediaAdapterType = platform.MediaAdapterType;
}

snprintf(impl.Dev.DeviceID, sizeof(impl.Dev.DeviceID), "%x/%d", deviceId, adapterNum);
snprintf(impl.ImplName, sizeof(impl.ImplName), "mfx-gen");
snprintf(impl.License, sizeof(impl.License),
"MIT License"
);

for (std::size_t i = 0, e = subDevMask.size(); i != e; ++i)
{
if (subDevMask[i])
{
auto& subDevices = ah.PushBack(impl.Dev.SubDevices);
subDevices.Index = impl.Dev.NumSubDevices;
snprintf(subDevices.SubDeviceID, sizeof(subDevices.SubDeviceID), "%d", static_cast<mfxU32>(i));
impl.Dev.NumSubDevices++;
}
}

return;
};

mfxHDL* MFX_CDECL MFXQueryImplsDescription(mfxImplCapsDeliveryFormat format, mfxU32* num_impls)
{
PERF_UTILITY_AUTO(__FUNCTION__, PERF_LEVEL_API);
Expand Down Expand Up @@ -849,53 +899,8 @@ mfxHDL* MFX_CDECL MFXQueryImplsDescription(mfxImplCapsDeliveryFormat format, mfx

auto& impl = holder->PushBack();

impl.Version.Version = MFX_STRUCT_VERSION(1, 2);
impl.Impl = MFX_IMPL_TYPE_HARDWARE;
impl.ApiVersion = { { MFX_VERSION_MINOR, MFX_VERSION_MAJOR } };
impl.VendorID = 0x8086;
// use adapterNum as VendorImplID, app. supposed just to copy it from mfxImplDescription to mfxInitializationParam
impl.VendorImplID = adapterNum;
impl.AccelerationMode = core.GetVAType() == MFX_HW_VAAPI ? MFX_ACCEL_MODE_VIA_VAAPI : MFX_ACCEL_MODE_VIA_D3D11;

impl.AccelerationModeDescription.Version.Version = MFX_STRUCT_VERSION(1, 0);
mfx::PODArraysHolder& ah = impl;
ah.PushBack(impl.AccelerationModeDescription.Mode) = impl.AccelerationMode;
impl.AccelerationModeDescription.NumAccelerationModes++;
impl.PoolPolicies.Version.Version = MFX_STRUCT_VERSION(1, 0);
impl.PoolPolicies.NumPoolPolicies = 3;
ah.PushBack(impl.PoolPolicies.Policy) = MFX_ALLOCATION_OPTIMAL;
ah.PushBack(impl.PoolPolicies.Policy) = MFX_ALLOCATION_UNLIMITED;
ah.PushBack(impl.PoolPolicies.Policy) = MFX_ALLOCATION_LIMITED;

impl.Dev.Version.Version = MFX_STRUCT_VERSION(1, 1);
impl.Dev.MediaAdapterType = MFX_MEDIA_UNKNOWN;

if (auto pCore1_19 = QueryCoreInterface<IVideoCore_API_1_19>(&core, MFXICORE_API_1_19_GUID))
{
mfxPlatform platform = {};
if (MFX_ERR_NONE == pCore1_19->QueryPlatform(&platform))
impl.Dev.MediaAdapterType = platform.MediaAdapterType;
}

snprintf(impl.Dev.DeviceID, sizeof(impl.Dev.DeviceID), "%x/%d", deviceId, adapterNum);
snprintf(impl.ImplName, sizeof(impl.ImplName), "mfx-gen");
snprintf(impl.License, sizeof(impl.License),
"MIT License"
);

for (std::size_t i = 0, e = subDevMask.size(); i != e; ++i)
{
if (subDevMask[i])
{
auto & subDevices = ah.PushBack(impl.Dev.SubDevices);
subDevices.Index = impl.Dev.NumSubDevices;
snprintf(subDevices.SubDeviceID, sizeof(subDevices.SubDeviceID), "%d", static_cast<mfxU32>(i));
impl.Dev.NumSubDevices++;
}
}
FillImplsDescription(impl, core, deviceId, adapterNum, subDevMask);

impl.AccelerationModeDescription.Version.Version = MFX_STRUCT_VERSION(1, 0);
impl.PoolPolicies.Version.Version = MFX_STRUCT_VERSION(1, 0);
impl.Dec.Version.Version = MFX_STRUCT_VERSION(1, 0);
impl.Enc.Version.Version = MFX_STRUCT_VERSION(1, 0);
impl.VPP.Version.Version = MFX_STRUCT_VERSION(1, 0);
Expand Down

0 comments on commit 8ea4583

Please sign in to comment.