@@ -358,7 +358,7 @@ void AV1EncToolsCommon::InitInternal(const FeatureBlocks& /*blocks*/, TPushII Pu
358
358
MFX_CHECK (bEncTools, MFX_ERR_NONE);
359
359
MFX_CHECK (!m_pEncTools, MFX_ERR_NONE);
360
360
361
- mfxEncTools* encTools = GetEncTools (par);
361
+ m_pEncTools = GetEncTools (par);
362
362
mfxEncToolsCtrlExtDevice extBufDevice = {};
363
363
mfxEncToolsCtrlExtAllocator extBufAlloc = {};
364
364
mfxExtBuffer* ExtParam[2 ] = {};
@@ -389,47 +389,47 @@ void AV1EncToolsCommon::InitInternal(const FeatureBlocks& /*blocks*/, TPushII Pu
389
389
MFX_CHECK_STS (sts);
390
390
391
391
m_bEncToolsInner = false ;
392
- if (!(encTools && encTools ->Context ))
392
+ if (!(m_pEncTools && m_pEncTools ->Context ))
393
393
{
394
- encTools = MFXVideoENCODE_CreateEncTools (par);
395
- m_bEncToolsInner = !!encTools ;
394
+ m_pEncTools = MFXVideoENCODE_CreateEncTools (par);
395
+ m_bEncToolsInner = !!m_pEncTools ;
396
396
}
397
- if (encTools)
397
+
398
+ m_destroy = [this ]()
398
399
{
400
+ if (m_bEncToolsInner)
401
+ MFXVideoENCODE_DestroyEncTools (m_pEncTools);
402
+ m_bEncToolsInner = false ;
403
+
404
+ };
405
+
406
+ if (m_pEncTools)
407
+ {
399
408
mfxExtEncToolsConfig supportedConfig = {};
400
409
401
- encTools ->GetSupportedConfig (encTools ->Context , &supportedConfig, &m_EncToolCtrl);
410
+ m_pEncTools ->GetSupportedConfig (m_pEncTools ->Context , &supportedConfig, &m_EncToolCtrl);
402
411
403
412
if (CorrectVideoParams (par, supportedConfig))
404
413
MFX_RETURN (MFX_ERR_INCOMPATIBLE_VIDEO_PARAM);
405
414
406
415
SetDefaultConfig (par, m_EncToolConfig, caps.ForcedSegmentationSupport );
407
416
408
- sts = encTools ->Init (encTools ->Context , &m_EncToolConfig, &m_EncToolCtrl);
417
+ sts = m_pEncTools ->Init (m_pEncTools ->Context , &m_EncToolConfig, &m_EncToolCtrl);
409
418
MFX_CHECK_STS (sts);
410
419
411
- sts = encTools ->GetActiveConfig (encTools ->Context , &m_EncToolConfig);
420
+ sts = m_pEncTools ->GetActiveConfig (m_pEncTools ->Context , &m_EncToolConfig);
412
421
MFX_CHECK_STS (sts);
413
422
414
- encTools ->GetDelayInFrames (encTools ->Context , &m_EncToolConfig, &m_EncToolCtrl, &m_maxDelay);
423
+ m_pEncTools ->GetDelayInFrames (m_pEncTools ->Context , &m_EncToolConfig, &m_EncToolCtrl, &m_maxDelay);
415
424
416
425
auto & taskMgrIface = TaskManager::TMInterface::Get (strg);
417
426
auto & tm = taskMgrIface.m_Manager ;
418
427
419
428
S_ET_SUBMIT = tm.AddStage (tm.S_NEW );
420
429
S_ET_QUERY = tm.AddStage (S_ET_SUBMIT);
421
430
422
- m_pEncTools = encTools;
423
431
}
424
432
425
- m_destroy = [this ]()
426
- {
427
- if (m_bEncToolsInner)
428
- MFXVideoENCODE_DestroyEncTools (m_pEncTools);
429
- m_bEncToolsInner = false ;
430
-
431
- };
432
-
433
433
return MFX_ERR_NONE;
434
434
});
435
435
0 commit comments