Refine for commit 5e49236

Author: gfxVPLsdm

_studio/mfx_lib/CMakeLists.txt

@@ -201,13 +201,4 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pkg-config.pc.cmake" ${PKG_CONFIG_FN
 install( FILES ${PKG_CONFIG_FNAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
 endif()
 
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/decode_next/framework/CMakeLists.txt")
-  add_subdirectory(decode_next/framework)
-  add_subdirectory(decode_next/vesfc)
-  target_link_libraries(mfxcore PUBLIC mfx_decode_next_framework mfx_decode_next_vesfc)
-  target_include_directories(mfxcore PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/decode_next/registry)
-  target_sources(mfxcore PRIVATE decode_next/registry/decode_codecs_registry.cpp)
-  target_compile_definitions(mfxcore PRIVATE MFX_ENABLE_DECODE_NEXT)
-endif()
-
 include(sources_ext.cmake OPTIONAL)

_studio/mfx_lib/shared/src/libmfxsw_decode.cpp

@@ -69,17 +69,8 @@
 
 #include "mfx_unified_decode_logging.h"
 
-#if defined(MFX_ENABLE_DECODE_NEXT)
-#include "video_decode.h"
-#include "decode_codecs_registry.h"
-#endif
 
 
-#if defined(MFX_ENABLE_DECODE_NEXT)
-using mfx::decode_next::IsDecodeNextEnabled;
-using mfx::decode_next::RegisterAllDecodeImpls;
-using mfx::decode_next::ReportDecodeNextStatus;
-#endif
 
 template<>
 VideoDECODE* _mfxSession::Create<VideoDECODE>(mfxVideoParam& par)
@@ -88,14 +79,6 @@ VideoDECODE* _mfxSession::Create<VideoDECODE>(mfxVideoParam& par)
     VideoCORE*   core    = m_pCORE.get();
     mfxStatus    mfxRes  = MFX_ERR_MEMORY_ALLOC;
 
-#if defined(MFX_ENABLE_DECODE_NEXT)
-    if (IsDecodeNextEnabled(core->GetHWType(), par.mfx.CodecId))
-    {
-        RegisterAllDecodeImpls();
-        pDECODE = new mfx::decode_next::VideoDECODENext(core, par.mfx.CodecId, &mfxRes);
-    }
-    else
-#endif
     {
         // create a codec instance
         switch (par.mfx.CodecId)
@@ -197,14 +180,6 @@ mfxStatus MFXVideoDECODE_Query(mfxSession session, mfxVideoParam *in, mfxVideoPa
 
     try
     {
-#if defined(MFX_ENABLE_DECODE_NEXT)
-        if (IsDecodeNextEnabled(session->m_pCORE->GetHWType(), out->mfx.CodecId))
-        {
-            RegisterAllDecodeImpls();
-            mfxRes = mfx::decode_next::DecodeAdapter::Query(session->m_pCORE.get(), out->mfx.CodecId, in, out);
-        }
-        else
-#endif
         {
             switch (out->mfx.CodecId)
             {
@@ -297,14 +272,6 @@ mfxStatus MFXVideoDECODE_QueryIOSurf(mfxSession session, mfxVideoParam *par, mfx
 
     try
     {
-#if defined(MFX_ENABLE_DECODE_NEXT)
-        if (IsDecodeNextEnabled(session->m_pCORE->GetHWType(), par->mfx.CodecId))
-        {
-            RegisterAllDecodeImpls();
-            mfxRes = mfx::decode_next::DecodeAdapter::QueryIOSurf(session->m_pCORE.get(), par->mfx.CodecId, par, request);
-        }
-        else
-#endif
         {
             switch (par->mfx.CodecId)
             {
@@ -400,14 +367,6 @@ mfxStatus MFXVideoDECODE_DecodeHeader(mfxSession session, mfxBitstream *bs, mfxV
 
     try
     {
-#if defined(MFX_ENABLE_DECODE_NEXT)
-        if (IsDecodeNextEnabled(session->m_pCORE->GetHWType(), par->mfx.CodecId))
-        {
-            RegisterAllDecodeImpls();
-            mfxRes = mfx::decode_next::DecodeAdapter::DecodeHeader(session->m_pCORE.get(), par->mfx.CodecId, bs, par);
-        }
-        else
-#endif
         {
             switch (par->mfx.CodecId)
             {
@@ -500,16 +459,14 @@ mfxStatus MFXVideoDECODE_Init(mfxSession session, mfxVideoParam *par)
 
     try
     {
-        // Create new decode instance
+        // check existence of component
         if (!session->m_pDECODE)
         {
+            // create a new instance
             session->m_pDECODE.reset(session->Create<VideoDECODE>(*par));
             MFX_CHECK(session->m_pDECODE.get(), MFX_ERR_INVALID_VIDEO_PARAM);
         }
 
-#if defined(MFX_ENABLE_DECODE_NEXT)
-        ReportDecodeNextStatus(session->m_pCORE->GetHWType(), par->mfx.CodecId);
-#endif
 
         // Init decode instance
         mfxRes = session->m_pDECODE->Init(par);

_studio/shared/include/mfx_umc_alloc_wrapper.h

@@ -270,14 +270,6 @@ class SurfaceSource : public UMC::FrameAllocator
     void SetFreeSurfaceAllowedFlag(bool flag);
 
 protected:
-#if defined(MFX_ENABLE_UNIT_TEST_DECODE_NEXT)
-    struct TestCtorTag {};
-    SurfaceSource(TestCtorTag, mfxFrameAllocResponse& resp, mfxFrameAllocResponse& respAlien)
-        : m_core(nullptr)
-        , m_response(resp)
-        , m_response_alien(respAlien)
-    {}
-#endif
 
     VideoCORE*                                    m_core;
 
@@ -416,53 +408,4 @@ class mfx_UMC_FrameAllocator_D3D_Converter : public mfx_UMC_FrameAllocator_D3D
 
 #endif // #if defined (MFX_ENABLE_MJPEG_VIDEO_DECODE) && defined (MFX_VA_WIN)
 
-class DecVppSfc;
-class SurfaceSourceDecodeVpp : public SurfaceSource
-{
-public:
-    SurfaceSourceDecodeVpp(VideoCORE* core, const mfxVideoParam& video_param, eMFXPlatform platform, mfxFrameAllocRequest& request, mfxFrameAllocRequest& request_internal,
-        mfxFrameAllocResponse& response, mfxFrameAllocResponse& response_alien);
-
-    // suppose that Close() calls Reset(), so override only Reset()
-    virtual UMC::Status Reset() override;
-
-    virtual mfxStatus StartPreparingToOutput(mfxFrameSurface1* surface_work, UMC::FrameData* in, const mfxVideoParam* par, mfxU16* taskId);
-    virtual mfxStatus CheckPreparingToOutput(mfxFrameSurface1* surface_work, UMC::FrameData* in, const mfxVideoParam* par, mfxU16 taskId);
-
-#if defined(MFX_ENABLE_UNIT_TEST_DECODE_NEXT)
-    SurfaceSourceDecodeVpp(TestCtorTag, mfxFrameAllocResponse& resp, mfxFrameAllocResponse& respAlien);
-#endif
-
-private:
-    std::unique_ptr<DecVppSfc> m_pCc;
-
-    mfxStatus InitVideoVpp(const mfxVideoParam* params);
-    mfxStatus FindSurfaceByMemId(const UMC::FrameData* in, const mfxHDLPair& hdlPair, mfxFrameSurface1& out_surface);
-};
-
-class mfx_UMC_FrameAllocator_Decode_Vpp : public mfx_UMC_FrameAllocator_D3D
-{
-public:
-    virtual UMC::Status InitMfx(UMC::FrameAllocatorParams* pParams,
-        VideoCORE* mfxCore,
-        const mfxVideoParam* params,
-        const mfxFrameAllocRequest* request,
-        mfxFrameAllocResponse* response,
-        bool isUseExternalFrames,
-        bool isSWplatform) override;
-
-    // suppose that Close() calls Reset(), so override only Reset()
-    virtual UMC::Status Reset() override;
-
-    mfxStatus StartPreparingToOutput(mfxFrameSurface1* surface_work, UMC::FrameData* in, const mfxVideoParam* par, mfxU16* taskId);
-    mfxStatus CheckPreparingToOutput(mfxFrameSurface1* surface_work, UMC::FrameData* in, const mfxVideoParam* par, mfxU16 taskId);
-
-private:
-    std::unique_ptr<DecVppSfc> m_pCc;
-
-    mfxStatus InitVideoVpp(const mfxVideoParam* params);
-    mfxStatus FindSurfaceByMemId(const UMC::FrameData* in, const mfxHDLPair& hdlPair, mfxFrameSurface1& out_surface);
-
-    friend class SurfaceSourceDecodeVpp;
-};
 #endif //_MFX_ALLOC_WRAPPER_H_