[vpp] Enable copy pass thru for VAAPI

Issue: MDP-53850 Fixes: Intel-Media-SDK#1027
Alexandr-Konovalov · Mar 19, 2019 · 039ecba · 039ecba
1 parent dad7abb
commit 039ecba
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 14 deletions.
diff --git a/_studio/mfx_lib/shared/src/mfx_session.cpp b/_studio/mfx_lib/shared/src/mfx_session.cpp
@@ -920,9 +920,7 @@ mfxStatus _mfxSession_1_10::InitEx(mfxInitParam& par)
         if (pCmCore)
         {
             mfxRes = pCmCore->SetCmCopyStatus(false);
-        }
-        if (MFX_ERR_NONE != mfxRes) {
-            return mfxRes;
+            MFX_CHECK_STS(mfxRes);
         }
     }
 

diff --git a/_studio/mfx_lib/vpp/include/mfx_vpp_hw.h b/_studio/mfx_lib/vpp/include/mfx_vpp_hw.h
@@ -908,6 +908,8 @@ namespace MfxHwVideoProcessing
             mfxFrameSurface1 *pInputSurface,
             mfxFrameSurface1 *pOutputSurface);
 
+        bool UseCopyPassThrough(const DdiTask *pTask) const;
+
         mfxStatus PreWorkOutSurface(ExtSurface & output);
         mfxStatus PreWorkInputSurface(std::vector<ExtSurface> & surfQueue);
 

diff --git a/_studio/mfx_lib/vpp/src/mfx_vpp_hw.cpp b/_studio/mfx_lib/vpp/src/mfx_vpp_hw.cpp
@@ -2962,6 +2962,28 @@ mfxStatus VideoVPPHW::Close()
 } // mfxStatus VideoVPPHW::Close()
 
 
+bool VideoVPPHW::UseCopyPassThrough(const DdiTask *pTask) const
+{
+    if (!m_config.m_bCopyPassThroughEnable
+        || IsRoiDifferent(pTask->input.pSurf, pTask->output.pSurf))
+    {
+        return false;
+    }
+
+    if (m_pCore->GetVAType() != MFX_HW_VAAPI || m_ioMode != D3D_TO_D3D)
+    {
+        return true;
+    }
+
+    // Under VAAPI for D3D_TO_D3D either CM copy or VPP pipeline are preferred by
+    // performance reasons. So, before enabling CopyPassThrough for a task we check
+    // for CM availability to do fallback to VPP if there is no CM.
+    // This can't be done in ConfigureExecuteParams() because CmCopy status is set later.
+    const VAAPIVideoCORE *vaapiCore = dynamic_cast<VAAPIVideoCORE*>(m_pCore);
+    assert(vaapiCore);
+    return vaapiCore? vaapiCore->CmCopy() : false;
+}
+
 mfxStatus VideoVPPHW::VppFrameCheck(
                                     mfxFrameSurface1 *input,
                                     mfxFrameSurface1 *output,
@@ -3115,9 +3137,11 @@ mfxStatus VideoVPPHW::VppFrameCheck(
 #endif
     MFX_CHECK_STS(sts);
 
+    bool useCopyPassThrough = UseCopyPassThrough(pTask);
+
     if (VPP_SYNC_WORKLOAD == m_workloadMode)
     {
-        pTask->bRunTimeCopyPassThrough = (true == m_config.m_bCopyPassThroughEnable && false == IsRoiDifferent(pTask->input.pSurf, pTask->output.pSurf));
+        pTask->bRunTimeCopyPassThrough = useCopyPassThrough;
 
         // submit task
         SyncTaskSubmission(pTask);
@@ -3136,8 +3160,7 @@ mfxStatus VideoVPPHW::VppFrameCheck(
     }
     else
     {
-        if (false == m_config.m_bCopyPassThroughEnable ||
-            (true == m_config.m_bCopyPassThroughEnable && true == IsRoiDifferent(pTask->input.pSurf, pTask->output.pSurf)))
+        if (!useCopyPassThrough)
         {
             pTask->bRunTimeCopyPassThrough = false;
 
@@ -6104,7 +6127,6 @@ mfxStatus ConfigureExecuteParams(
         executeParams.bSceneDetectionEnable = false;
     }
 
-#if defined(WIN64) || defined (WIN32)
     if ( (0 == memcmp(&videoParam.vpp.In, &videoParam.vpp.Out, sizeof(mfxFrameInfo))) &&
          executeParams.IsDoNothing() )
     {
@@ -6115,7 +6137,6 @@ mfxStatus ConfigureExecuteParams(
         config.m_bCopyPassThroughEnable = false;// after Reset() parameters may be changed,
                                             // flag should be disabled
     }
-#endif//m_bCopyPassThroughEnable == false for another OS
 
     if (inDNRatio == outDNRatio && !executeParams.bVarianceEnable && !executeParams.bComposite &&
             !(config.m_extConfig.mode == IS_REFERENCES) )

diff --git a/_studio/shared/include/libmfx_core_vaapi.h b/_studio/shared/include/libmfx_core_vaapi.h
@@ -121,9 +121,10 @@ class VAAPIVideoCORE : public CommonCORE
         CMEnabledCoreAdapter(VAAPIVideoCORE *pVAAPICore): m_pVAAPICore(pVAAPICore)
         {
         };
-        virtual mfxStatus SetCmCopyStatus(bool enable)
+        virtual mfxStatus SetCmCopyStatus(bool enable) override
         {
-            return m_pVAAPICore->SetCmCopyStatus(enable);
+            m_pVAAPICore->SetCmCopy(enable);
+            return MFX_ERR_NONE;
         };
     protected:
         VAAPIVideoCORE *m_pVAAPICore;
@@ -175,7 +176,9 @@ class VAAPIVideoCORE : public CommonCORE
     mfxStatus              GetVAService(VADisplay *pVADisplay);
 
     // this function should not be virtual
-    mfxStatus SetCmCopyStatus(bool enable);
+    void SetCmCopy(bool enable);
+
+    bool CmCopy() const { return m_bCmCopy; }
 
 protected:
     VAAPIVideoCORE(const mfxU32 adapterNum, const mfxU32 numThreadsAvailable, const mfxSession session = NULL);

diff --git a/_studio/shared/src/libmfx_core_vaapi.cpp b/_studio/shared/src/libmfx_core_vaapi.cpp
@@ -812,8 +812,8 @@ VAAPIVideoCORE::GetVAService(
 
 } // mfxStatus VAAPIVideoCORE::GetVAService(...)
 
-mfxStatus
-VAAPIVideoCORE::SetCmCopyStatus(bool enable)
+void
+VAAPIVideoCORE::SetCmCopy(bool enable)
 {
     m_bCmCopyAllowed = enable;
     if (!enable)
@@ -824,7 +824,6 @@ VAAPIVideoCORE::SetCmCopyStatus(bool enable)
         }
         m_bCmCopy = false;
     }
-    return MFX_ERR_NONE;
 } // mfxStatus VAAPIVideoCORE::SetCmCopyStatus(...)
 
 mfxStatus